\
@@ -4467,7 +4574,7 @@ my.QueryEditor = Backbone.View.extend({
\
diff --git a/docs/tutorial-views.markdown b/docs/tutorial-views.markdown
index f8d4a916..b1dba993 100644
--- a/docs/tutorial-views.markdown
+++ b/docs/tutorial-views.markdown
@@ -21,17 +21,20 @@ Before writing any code with Recline, you need to do the following preparation s
2. Include the relevant CSS in the head section of your document:
{% highlight html %}
-
+
{% endhighlight %}
3. Include the relevant Javascript files somewhere on the page (preferably before body close tag):
{% highlight html %}
-
-
-
-
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
@@ -129,6 +135,9 @@ library and the Recline Flot Graph view:
+
+
+
diff --git a/download.markdown b/download.markdown
index 41b72ea0..056ed898 100644
--- a/download.markdown
+++ b/download.markdown
@@ -105,7 +105,7 @@ Here is an example of the page setup for an app using every Recline component:
-
+
{% include recline-deps.html %}
{% endhighlight %}
diff --git a/images/drag-handle.png b/images/drag-handle.png
new file mode 100644
index 00000000..ad7531cf
Binary files /dev/null and b/images/drag-handle.png differ
diff --git a/src/model.js b/src/model.js
index ee6b84b3..1c383b61 100644
--- a/src/model.js
+++ b/src/model.js
@@ -191,7 +191,11 @@ my.Dataset = Backbone.Model.extend({
this.trigger('query:start');
if (queryObj) {
- this.queryState.set(queryObj, {silent: true});
+ var attributes = queryObj;
+ if (queryObj instanceof my.Query) {
+ attributes = queryObj.toJSON();
+ }
+ this.queryState.set(attributes, {silent: true});
}
var actualQuery = this.queryState.toJSON();
diff --git a/src/view.map.js b/src/view.map.js
index a90270ce..dce77b5b 100644
--- a/src/view.map.js
+++ b/src/view.map.js
@@ -334,7 +334,7 @@ my.Map = Backbone.View.extend({
if (typeof(coord) != 'string') {
return(parseFloat(coord));
}
- var dms = coord.split(/[^\.\d\w]+/);
+ var dms = coord.split(/[^-?\.\d\w]+/);
var deg = 0; var m = 0;
var toDeg = [1, 60, 3600]; // conversion factors for Deg, min, sec
var i;
diff --git a/src/view.multiview.js b/src/view.multiview.js
index 5c8aa85f..b0e2480f 100644
--- a/src/view.multiview.js
+++ b/src/view.multiview.js
@@ -11,7 +11,7 @@ this.recline.View = this.recline.View || {};
// Manage multiple views together along with query editor etc. Usage:
//
//
-// var myExplorer = new model.recline.MultiView({
+// var myExplorer = new recline.View.MultiView({
// model: {{recline.Model.Dataset instance}}
// el: {{an existing dom element}}
// views: {{dataset views}}
@@ -79,10 +79,10 @@ this.recline.View = this.recline.View || {};
// special as it includes config of many of the subviews.
//
//
-// state = {
+// var state = {
// query: {dataset query state - see dataset.queryState object}
-// view-{id1}: {view-state for this view}
-// view-{id2}: {view-state for }
+// 'view-{id1}': {view-state for this view}
+// 'view-{id2}': {view-state for }
// ...
// // Explorer
// currentView: id of current view (defaults to first view if not specified)
@@ -248,6 +248,9 @@ my.MultiView = Backbone.View.extend({
// the main views
_.each(this.pageViews, function(view, pageName) {
view.view.render();
+ if (view.view.redraw) {
+ view.view.redraw();
+ }
$dataViewContainer.append(view.view.el);
if (view.view.elSidebar) {
$dataSidebar.append(view.view.elSidebar);
diff --git a/src/view.slickgrid.js b/src/view.slickgrid.js
index f9a9e385..25ca1579 100644
--- a/src/view.slickgrid.js
+++ b/src/view.slickgrid.js
@@ -155,11 +155,35 @@ my.SlickGrid = Backbone.View.extend({
}
}
};
- //Add row delete support , check if enableDelRow is set to true or not set
+ //Add row delete support, check if enableReOrderRow is set to true , by
+ //default it is set to false
+ // state: {
+ // gridOptions: {
+ // enableReOrderRow: true,
+ // },
+ if(this.state.get("gridOptions")
+ && this.state.get("gridOptions").enableReOrderRow != undefined
+ && this.state.get("gridOptions").enableReOrderRow == true ){
+ columns.push({
+ id: "#",
+ name: "",
+ width: 22,
+ behavior: "selectAndMove",
+ selectable: false,
+ resizable: false,
+ cssClass: "recline-cell-reorder"
+ })
+ }
+ //Add row delete support, check if enabledDelRow is set to true , by
+ //default it is set to false
+ // state: {
+ // gridOptions: {
+ // enabledDelRow: true,
+ // },
if(this.state.get("gridOptions")
&& this.state.get("gridOptions").enabledDelRow != undefined
&& this.state.get("gridOptions").enabledDelRow == true ){
- columns.push({
+ columns.push({
id: 'del',
name: '',
field: 'del',
@@ -167,7 +191,8 @@ my.SlickGrid = Backbone.View.extend({
width: 38,
formatter: formatter,
validator:validator
- })}
+ })
+ }
_.each(this.model.fields.toJSON(),function(field){
var column = {
id: field.id,
@@ -279,6 +304,71 @@ my.SlickGrid = Backbone.View.extend({
this.grid.setSortColumn(column, sortAsc);
}
+
+ /* Row reordering support based on
+ https://github.com/mleibman/SlickGrid/blob/gh-pages/examples/example9-row-reordering.html
+
+ */
+ self.grid.setSelectionModel(new Slick.RowSelectionModel());
+
+ var moveRowsPlugin = new Slick.RowMoveManager({
+ cancelEditOnDrag: true
+ });
+
+ moveRowsPlugin.onBeforeMoveRows.subscribe(function (e, data) {
+ for (var i = 0; i < data.rows.length; i++) {
+ // no point in moving before or after itself
+ if (data.rows[i] == data.insertBefore || data.rows[i] == data.insertBefore - 1) {
+ e.stopPropagation();
+ return false;
+ }
+ }
+ return true;
+ });
+
+ moveRowsPlugin.onMoveRows.subscribe(function (e, args) {
+
+ var extractedRows = [], left, right;
+ var rows = args.rows;
+ var insertBefore = args.insertBefore;
+
+ var data = self.model.records.toJSON()
+ left = data.slice(0, insertBefore);
+ right= data.slice(insertBefore, data.length);
+
+ rows.sort(function(a,b) { return a-b; });
+
+ for (var i = 0; i < rows.length; i++) {
+ extractedRows.push(data[rows[i]]);
+ }
+
+ rows.reverse();
+
+ for (var i = 0; i < rows.length; i++) {
+ var row = rows[i];
+ if (row < insertBefore) {
+ left.splice(row, 1);
+ } else {
+ right.splice(row - insertBefore, 1);
+ }
+ }
+
+ data = left.concat(extractedRows.concat(right));
+ var selectedRows = [];
+ for (var i = 0; i < rows.length; i++)
+ selectedRows.push(left.length + i);
+
+ self.model.records.reset(data)
+
+ });
+ //register The plugin to handle row Reorder
+ if(this.state.get("gridOptions")
+ && this.state.get("gridOptions").enableReOrderRow != undefined
+ && this.state.get("gridOptions").enableReOrderRow == true ){
+ self.grid.registerPlugin(moveRowsPlugin);
+ }
+ /* end row reordering support*/
+
this._slickHandler.subscribe(this.grid.onSort, function(e, args){
var order = (args.sortAsc) ? 'asc':'desc';
var sort = [{
@@ -287,11 +377,11 @@ my.SlickGrid = Backbone.View.extend({
}];
self.model.query({sort: sort});
});
-
+
this._slickHandler.subscribe(this.grid.onColumnsReordered, function(e, args){
self.state.set({columnsOrder: _.pluck(self.grid.getColumns(),'id')});
});
-
+
this.grid.onColumnsResized.subscribe(function(e, args){
var columns = args.grid.getColumns();
var defaultColumnWidth = args.grid.getOptions().defaultColumnWidth;
@@ -316,16 +406,26 @@ my.SlickGrid = Backbone.View.extend({
this._slickHandler.subscribe(this.grid.onClick,function(e, args){
//try catch , because this fail in qunit , but no
//error on browser.
- try{e.preventDefault()}catch(e){}
- if (args.cell == 0 && self.state.get("gridOptions").enabledDelRow == true){
- // We need to delete the associated model
- var model = data.getModel(args.row);
- model.destroy()
- }
+ try{e.preventDefault()}catch(e){}
+
+ // The cell of grid that handle row delete is The first cell (0) if
+ // The grid ReOrder is not present ie enableReOrderRow == false
+ // else it is The the second cell (1) , because The 0 is now cell
+ // that handle row Reoder.
+ var cell =0
+ if(self.state.get("gridOptions")
+ && self.state.get("gridOptions").enableReOrderRow != undefined
+ && self.state.get("gridOptions").enableReOrderRow == true ){
+ cell =1
+ }
+ if (args.cell == cell && self.state.get("gridOptions").enabledDelRow == true){
+ // We need to delete the associated model
+ var model = data.getModel(args.row);
+ model.destroy()
+ }
}) ;
var columnpicker = new Slick.Controls.ColumnPicker(columns, this.grid,
_.extend(options,{state:this.state}));
-
if (self.visible){
self.grid.init();
self.rendered = true;
@@ -333,8 +433,8 @@ my.SlickGrid = Backbone.View.extend({
// Defer rendering until the view is visible
self.rendered = false;
}
-
return this;
+
},
remove: function () {
diff --git a/src/widget.pager.js b/src/widget.pager.js
index fa112f4a..e5d81283 100644
--- a/src/widget.pager.js
+++ b/src/widget.pager.js
@@ -12,7 +12,7 @@ my.Pager = Backbone.View.extend({