Merge branch 'master' into 1.3

Author: yurychika

.gitignore

@@ -5,6 +5,7 @@
 *.pydevproject
 .project
 .metadata
+*.txt
 bin/
 tmp/
 node_modules/

Grid.js

@@ -49,7 +49,7 @@ define([
 		//		- revision: Number: The Git rev from which dojo was pulled
 		major: 1,
 		minor: 3,
-		patch: 2,
+		patch: 3,
 		flag: "",
 		toString: function(){
 			return this.major + "." + this.minor + "." + this.patch + this.flag;	// String

core/model/cache/Sync.js

@@ -170,7 +170,7 @@ define([
 		indexToId: function(index, parentId){
 			this._init();
 			var items = this._struct[this.model.isId(parentId) ? parentId : this.layerId()];
-			return typeof index == 'number' && index >= 0 ? items && items[index + 1] : undefined;
+			return typeof index === 'number' && index >= 0 ? items && items[index + 1] : undefined;
 		},
 
 		idToIndex: function(id){
@@ -277,7 +277,7 @@ define([
 				array.forEach(s.getAttributes(item), function(attr){
 					obj[attr] = s.getValue(item, attr);
 				});
-				return obj;	
+				return obj;
 			}
 			return item;
 		},
@@ -288,7 +288,7 @@ define([
 				cellData; 
 
 			cellData = col.formatter ? col.formatter(rawData, rowId) : rawData[col.field || colId];
-			return (t.columns[colId] && t.columns[colId].encode === true)? entities.encode(cellData) : cellData;
+			return (t.columns[colId] && t.columns[colId].encode === true && typeof cellData === 'string')? entities.encode(cellData) : cellData;
 		},
 
 		_formatRow: function(rowData, rowId){

modules/Body.js

@@ -596,7 +596,7 @@ define([
 				}
 				n.innerHTML = '';
 				en.innerHTML = emptyInfo;
-				en.style.zIndex = '';
+				en.style.zIndex = 1;
 				t.onEmpty();
 				t.model.free();
 			}
@@ -809,9 +809,9 @@ define([
 
 					var cellContent = t._buildCellContent(col, rowId, cell, visualIndex, isPadding, cellData),
 						testNode = domConstruct.create('div', {innerHTML: cellContent}),
-						testNodeContent = (testNode.innerText || testNode.textContent).trim? 
-										(testNode.innerText || testNode.textContent).trim() : 
-										(testNode.innerText || testNode.textContent).replace(/\s/g, ''),
+						testNodeContent = (testNode.innerText !== undefined && testNode.innerText !== null) ? 
+											testNode.innerText : testNode.textContent;
+						testNodeContent = testNodeContent.trim ? testNodeContent.trim() : testNodeContent.replace(/\s/g, ''),
 						isEmpty = testNodeContent === ' ' || !testNodeContent;
 
 					testNode = '';

modules/CellWidget.js

@@ -209,7 +209,7 @@ define([
 				var t = this,
 					dn = t.domNode;
 				t.connect(dn, 'onmousedown', function(e){
-					if(e.target != dn && !t.cell.column.allowEventBubble){
+					if(e.target !== dn && !t.cell.column.allowEventBubble){
 						e.cancelBubble = true;
 					}
 				});

modules/ColumnLock.js

@@ -235,10 +235,13 @@ define([
 			this._updateScroller();//used for column dnd to sync hscroller.
 		},
 
-		_updateBody: function(){
+		_updateBody: function( aopFucMap ){
 			// summary:
 			//	Update the body for column lock
-			array.forEach(this.grid.bodyNode.childNodes, this._lockColumns, this);
+			if ( !aopFucMap || aopFucMap['_updateBody'] !== false ){
+				array.forEach(this.grid.bodyNode.childNodes, this._lockColumns, this);
+			}
+				
 		},
 
 		_updateScroller: function(){

modules/Dod.js

@@ -7,18 +7,19 @@ define([
 	"dojo/_base/lang",
 	"dojo/_base/Deferred",
 	"dojo/_base/array",
-	"../core/_Module",
 	"dojo/_base/declare",
 	"dojo/_base/fx",
 	"dojo/fx",
 	"dojo/keys",
+	'dojo/_base/event',
+	'dojo/_base/sniff',
+	"../core/_Module",
 	'../support/query',
 	'dijit/a11y',
-	'dijit/registry',
-	'dojo/_base/event',
-	'dojo/_base/sniff'
+	'dijit/registry'
 ], function(kernel, domConstruct, domStyle, domClass, domGeometry, lang,
-			Deferred, array, _Module, declare, baseFx, fx, keys, query, a11y, registry, event, has){
+			Deferred, array, declare, baseFx, fx, keys, event, has,
+			_Module, query, a11y, registry){
 	// kernel.experimental('gridx/modules/Dod');
 
 /*=====

modules/Edit.js

@@ -875,7 +875,11 @@ define([
 				if(cw && cw.btns){
 					domClass.add(cw.btns, 'gridxEditFocus');
 				}
-				g.body.onRender();
+				//
+				// Defect 12439, when combine the AlwaysEditing and ColumnLock
+				//     The _updateBody contians many rows to call _lockColumn, which is very slow
+				//
+				g.body.onRender( { '_updateBody': false } );
 			}
 		},
 

modules/ExpandableColumn.js

@@ -104,7 +104,7 @@ define([
 				}
 			}, this);
 
-			this.connect(this.expandBar, 'onclick', function(evt){
+			this.connect(this.expandoBar, 'onclick', function(evt){
 				if(domClass.contains(evt.target, 'gridxColumnExpando')){
 					var colId = evt.target.parentNode.getAttribute('data-column-id');
 					this.expand(colId);

modules/IndirectSelect.js

@@ -237,6 +237,7 @@ define([
 					}
 					domClass.add(headerCellNode, 'gridxHeaderCellFocus');
 					headerCellNode.focus();
+					g.focus.stopEvent(evt);
 					return true;
 				},
 				blur = function(){
@@ -249,7 +250,7 @@ define([
 				focusNode: rowHeader.headerNode,
 				doFocus: focus,
 				doBlur: blur,
-				onFocus: focus,
+				// onFocus: focus,
 				onBlur: blur
 			});
 		},