X-Git-Url: http://git.ithinksw.org/extjs.git/blobdiff_plain/6a7e4474cba9d8be4b2ec445e10f1691f7277c50..b37ceabb82336ee82757cd32efe353cfab8ec267:/src/data/GroupingStore.js diff --git a/src/data/GroupingStore.js b/src/data/GroupingStore.js index 1cd2a0a1..9b35852d 100644 --- a/src/data/GroupingStore.js +++ b/src/data/GroupingStore.js @@ -1,5 +1,5 @@ /*! - * Ext JS Library 3.2.0 + * Ext JS Library 3.2.2 * Copyright(c) 2006-2010 Ext JS, Inc. * licensing@extjs.com * http://www.extjs.com/license @@ -126,7 +126,7 @@ Ext.data.GroupingStore = Ext.extend(Ext.data.Store, { //check the contents of the first sorter. If the field matches the CURRENT groupField (before it is set to the new one), //remove the sorter as it is actually the grouper. The new grouper is added back in by this.sort - sorters = this.multiSortInfo.sorters; + var sorters = this.multiSortInfo.sorters; if (sorters.length > 0 && sorters[0].field == this.groupField) { sorters.shift(); } @@ -169,7 +169,7 @@ Ext.data.GroupingStore = Ext.extend(Ext.data.Store, { } else if (fieldName == undefined) { //we preserve the existing sortInfo here because this.sort is called after //clearGrouping and there may be existing sorting - sorters = [this.sortInfo]; + sorters = this.sortInfo ? [this.sortInfo] : []; } else { //TODO: this is lifted straight from Ext.data.Store's singleSort function. It should instead be //refactored into a common method if possible