Skip to content

Commit 31a68da

Browse files
authored
Merge pull request #238 from vansimke/18844
change 'isArray' to 'isArrayLike' in dojox/grid/_Layout::setStructure
2 parents 082aa52 + 74dad0b commit 31a68da

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

grid/_Layout.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ return declare("dojox.grid._Layout", null, {
7474
}
7575
}
7676
}
77-
77+
7878
//Fix #9481 - reset idx in cell markup
7979
array.forEach(this.cells, function(c){
8080
var marks = c.markup[2].split(" ");
@@ -84,7 +84,7 @@ return declare("dojox.grid._Layout", null, {
8484
c.markup[2] = marks.join(" ");
8585
}
8686
});
87-
87+
8888
this.grid.setupHeaderMenu();
8989
//this.grid.renderOnIdle();
9090
},
@@ -103,7 +103,7 @@ return declare("dojox.grid._Layout", null, {
103103
return false;
104104
}
105105
},
106-
106+
107107
addCellDef: function(inRowIndex, inCellIndex, inDef){
108108
var self = this;
109109
var getCellWidth = function(inDef){
@@ -142,7 +142,7 @@ return declare("dojox.grid._Layout", null, {
142142
props.unitWidth = getCellWidth(inDef);
143143
return new cell_type(lang.mixin({}, this._defaultCellProps, inDef, props));
144144
},
145-
145+
146146
addRowDef: function(inRowIndex, inDef){
147147
var result = [];
148148
var relSum = 0, pctSum = 0, doRel = true;
@@ -174,7 +174,7 @@ return declare("dojox.grid._Layout", null, {
174174
});
175175
}
176176
return result;
177-
177+
178178
},
179179

180180
addRowsDef: function(inDef){
@@ -190,15 +190,15 @@ return declare("dojox.grid._Layout", null, {
190190
}
191191
return result;
192192
},
193-
193+
194194
addViewDef: function(inDef){
195195
this._defaultCellProps = inDef.defaultCell || {};
196196
if(inDef.width && inDef.width == "auto"){
197197
delete inDef.width;
198198
}
199199
return lang.mixin({}, inDef, {cells: this.addRowsDef(inDef.rows || inDef.cells)});
200200
},
201-
201+
202202
setStructure: function(inStructure){
203203
this.fieldIndex = 0;
204204
this.cells = [];
@@ -244,7 +244,7 @@ return declare("dojox.grid._Layout", null, {
244244
("cells" in def || "rows" in def || ("type" in def && !isCell(def))));
245245
};
246246

247-
if(lang.isArray(inStructure)){
247+
if(lang.isArrayLike(inStructure)){
248248
var hasViews = false;
249249
for(var i=0, st; (st=inStructure[i]); i++){
250250
if(isView(st)){

0 commit comments

Comments
 (0)