Merge branch 'master' of https://github.com/oria/gridx

modules/ColumnLock.js

@@ -56,6 +56,15 @@ define([
 		required: ['body'],
 
 		count: 0,
+
+		preload: function(){
+			var t = this;
+			if(t.grid.persist){
+				t.count = t.grid.persist.registerAndLoad('columnLock', function(){
+					return t.count;
+				});
+			}
+		},
 
 		load: function(args, deferStartup){
 			this.count = this.arg('count');

modules/Edit.js

@@ -756,7 +756,10 @@ define([
 					col.needCellWidget = function(cell){
 						return (!needCellWidget || needCellWidget.apply(col, arguments)) && cell.isEditable();
 					};
-					col._userDec = col.decorator;
+					// avoid infinite recursion
+					if(col.decorator != t._dummyDecorator){
+						col._userDec = col.decorator;
+					}
 					col.userDecorator = t._getDecorator(col.id);
 					col.setCellValue = getEditorValueSetter((col.editorArgs && col.editorArgs.toEditor) ||
 							lang.partial(getTypeData, col));

modules/HiddenColumns.js

@@ -185,6 +185,10 @@ define([
 				if(i < len){
 					changed = 1;
 					t.grid._columnsById[id] = c;
+					// restored column should not appear before locked columns
+					if(index < lockCount){
+						c.index = index = lockCount;
+					}
 					columns.splice(index, 0, c);
 					for(i = index + 1; i < columns.length; ++i){
 						columns[i].index = i;

modules/Persist.js

@@ -154,7 +154,7 @@ define([
 				enabled: true
 			};
 			var get = this.arg('get'),
-				content = get(this.arg('key'));
+				content = '_content' in this ? this._content : (this._content = get(this.arg('key')));
 			return content ? content[name] : null;
 		},
 
@@ -202,6 +202,7 @@ define([
 					}
 				}
 			}
+			delete t._content;
 			put(t.arg('key'), contents, t.arg('options'));
 		},