dojox-rails 0.13.0 → 0.14.0

data/vendor/assets/javascripts/dojox/grid/enhanced/plugins/Pagination.js

@@ -245,7 +245,7 @@ return;
 }
 var _42=g._getPadBorder().h;
 if(!this.plugin.gh){
-this.plugin.gh=_6.contentBox(g.domNode).h+2*_42;
+this.plugin.gh=(g.domNode.clientHeight||_6.style(g.domNode,"height"))+2*_42;
 }
 if(_41){
 _40=_41;

data/vendor/assets/javascripts/dojox/grid/enhanced/plugins/Selector.js

@@ -647,7 +647,7 @@ if(_a7&&this._lastType==_a4&&_aa==this._toSelect&&this._config[_a4]==_10){
 if(_a4==="row"){
 this._isUsingRowSelector=true;
 }
-this._startPoint[_a4]=this._lastEndPoint[_a4];
+this._startPoint[_a4]=this._lastAnchorPoint[_a4];
 this._highlight(_a4,this._startPoint[_a4]);
 this._isUsingRowSelector=false;
 }else{

data/vendor/assets/javascripts/dojox/grid/enhanced/plugins/filter/ClearFilterConfirm.js

@@ -1,6 +1,7 @@
 //>>built
-define("dojox/grid/enhanced/plugins/filter/ClearFilterConfirm",["dojo/_base/declare","dojo/cache","dijit/_Widget","dijit/_TemplatedMixin","dijit/_WidgetsInTemplateMixin"],function(_1,_2,_3,_4,_5){
-return _1("dojox.grid.enhanced.plugins.filter.ClearFilterConfirm",[_3,_4,_5],{templateString:_2("dojox.grid","enhanced/templates/ClearFilterConfirmPane.html"),widgetsInTemplate:true,plugin:null,postMixInProperties:function(){
+require({cache:{"url:dojox/grid/enhanced/templates/ClearFilterConfirmPane.html":"<div class=\"dojoxGridClearFilterConfirm\">\n\t<div class=\"dojoxGridClearFilterMsg\">\n\t\t${_clearFilterMsg}\n\t</div>\n\t<div class=\"dojoxGridClearFilterBtns\" dojoAttachPoint=\"btnsNode\">\n\t\t<span dojoType=\"dijit.form.Button\" label=\"${_cancelBtnLabel}\" dojoAttachPoint=\"cancelBtn\" dojoAttachEvent=\"onClick:_onCancel\"></span>\n\t\t<span dojoType=\"dijit.form.Button\" label=\"${_clearBtnLabel}\" dojoAttachPoint=\"clearBtn\" dojoAttachEvent=\"onClick:_onClear\"></span>\n\t</div>\n</div>\n"}});
+define("dojox/grid/enhanced/plugins/filter/ClearFilterConfirm",["dojo/_base/declare","dijit/_Widget","dijit/_TemplatedMixin","dijit/_WidgetsInTemplateMixin","dojo/text!../../templates/ClearFilterConfirmPane.html"],function(_1,_2,_3,_4,_5){
+return _1("dojox.grid.enhanced.plugins.filter.ClearFilterConfirm",[_2,_3,_4],{templateString:_5,widgetsInTemplate:true,plugin:null,postMixInProperties:function(){
 var _6=this.plugin.nls;
 this._clearBtnLabel=_6["clearButton"];
 this._cancelBtnLabel=_6["cancelButton"];

data/vendor/assets/javascripts/dojox/grid/enhanced/plugins/filter/FilterBar.js

@@ -1,5 +1,6 @@
 //>>built
-define("dojox/grid/enhanced/plugins/filter/FilterBar",["dojo/_base/declare","dojo/_base/array","dojo/_base/connect","dojo/_base/lang","dojo/_base/sniff","dojo/_base/event","dojo/_base/html","dojo/_base/window","dojo/cache","dojo/query","dijit/_Widget","dijit/_TemplatedMixin","dijit/_WidgetsInTemplateMixin","dojo/fx","dojo/_base/fx","dojo/string","dijit/focus"],function(_1,_2,_3,_4,_5,_6,_7,_8,_9,_a,_b,_c,_d,fx,_e,_f,_10){
+require({cache:{"url:dojox/grid/enhanced/templates/FilterBar.html":"<table class=\"dojoxGridFBar\" border=\"0\" cellspacing=\"0\" role=\"presentation\" dojoAttachEvent=\"onclick:_onClickFilterBar, onmouseenter:_onMouseEnter, onmouseleave:_onMouseLeave, onmousemove:_onMouseMove\"\n\t><tr><td class=\"dojoxGridFBarBtnTD\"\n\t\t><span dojoType=\"dijit.form.Button\" class=\"dojoxGridFBarBtn\" dojoAttachPoint=\"defineFilterButton\" label=\"...\" iconClass=\"dojoxGridFBarDefFilterBtnIcon\" showLabel=\"true\" dojoAttachEvent=\"onClick:_showFilterDefDialog, onMouseEnter:_onEnterButton, onMouseLeave:_onLeaveButton, onMouseMove:_onMoveButton\"></span\n\t></td><td class=\"dojoxGridFBarInfoTD\"\n\t\t><span class=\"dojoxGridFBarInner\"\n\t\t\t><span class=\"dojoxGridFBarStatus\" dojoAttachPoint=\"statusBarNode\">${_noFilterMsg}</span\n\t\t\t><span dojoType=\"dijit.form.Button\" class=\"dojoxGridFBarClearFilterBtn\" dojoAttachPoint=\"clearFilterButton\" \n\t\t\t\tlabel=\"${_filterBarClearBtnLabel}\" iconClass=\"dojoxGridFBarClearFilterBtnIcon\" showLabel=\"true\" \n\t\t\t\tdojoAttachEvent=\"onClick:_clearFilterDefDialog, onMouseEnter:_onEnterButton, onMouseLeave:_onLeaveButton, onMouseMove:_onMoveButton\"></span\n\t\t\t><span dojotype=\"dijit.form.Button\" class=\"dojoxGridFBarCloseBtn\" dojoAttachPoint=\"closeFilterBarButton\" \n\t\t\t\tlabel=\"${_closeFilterBarBtnLabel}\" iconClass=\"dojoxGridFBarCloseBtnIcon\" showLabel=\"false\" \n\t\t\t\tdojoAttachEvent=\"onClick:_closeFilterBar, onMouseEnter:_onEnterButton, onMouseLeave:_onLeaveButton, onMouseMove:_onMoveButton\"></span\n\t\t></span\n\t></td></tr\n></table>\n"}});
+define("dojox/grid/enhanced/plugins/filter/FilterBar",["dojo/_base/declare","dojo/_base/array","dojo/_base/connect","dojo/_base/lang","dojo/_base/sniff","dojo/_base/event","dojo/_base/html","dojo/_base/window","dojo/query","dijit/_Widget","dijit/_TemplatedMixin","dijit/_WidgetsInTemplateMixin","dojo/fx","dojo/_base/fx","dojo/string","dijit/focus","dojo/text!../../templates/FilterBar.html"],function(_1,_2,_3,_4,_5,_6,_7,_8,_9,_a,_b,_c,fx,_d,_e,_f,_10){
 var _11="dojoxGridFBarHover",_12="dojoxGridFBarFiltered",_13=function(evt){
 try{
 if(evt&&evt.preventDefault){
@@ -9,14 +10,14 @@ _6.stop(evt);
 catch(e){
 }
 };
-return _1("dojox.grid.enhanced.plugins.filter.FilterBar",[_b,_c,_d],{templateString:_9("dojox.grid","enhanced/templates/FilterBar.html"),widgetsInTemplate:true,_timeout_statusTooltip:300,_handle_statusTooltip:null,_curColIdx:-1,plugin:null,postMixInProperties:function(){
+return _1("dojox.grid.enhanced.plugins.filter.FilterBar",[_a,_b,_c],{templateString:_10,widgetsInTemplate:true,_timeout_statusTooltip:300,_handle_statusTooltip:null,_curColIdx:-1,plugin:null,postMixInProperties:function(){
 var _14=this.plugin;
 var nls=_14.nls;
 this._filterBarDefBtnLabel=nls["filterBarDefButton"];
 this._filterBarClearBtnLabel=nls["filterBarClearButton"];
 this._closeFilterBarBtnLabel=nls["closeFilterBarBtn"];
 var _15=_14.args.itemsName||nls["defaultItemsName"];
-this._noFilterMsg=_f.substitute(nls["filterBarMsgNoFilterTemplate"],["",_15]);
+this._noFilterMsg=_e.substitute(nls["filterBarMsgNoFilterTemplate"],["",_15]);
 var t=this.plugin.args.statusTipTimeout;
 if(typeof t=="number"){
 this._timeout_statusTooltip=t;
@@ -74,9 +75,9 @@ _1f-=2;
 return _18?(_1d-_1f):(_1d+_1f);
 })}}};
 _2.forEach(g.views.views,function(_20){
-_1b.push(_e.animateProperty(_4.mixin({"node":_20.domNode},_1e,_1a)),_e.animateProperty(_4.mixin({"node":_20.scrollboxNode},_1e,_1a)));
+_1b.push(_d.animateProperty(_4.mixin({"node":_20.domNode},_1e,_1a)),_d.animateProperty(_4.mixin({"node":_20.scrollboxNode},_1e,_1a)));
 });
-_1b.push(_e.animateProperty(_4.mixin({"node":g.viewsNode},_1e,_1a)));
+_1b.push(_d.animateProperty(_4.mixin({"node":g.viewsNode},_1e,_1a)));
 fx.combine(_1b).play();
 }else{
 _7.style(this.domNode,"display",_18?"":"none");
@@ -85,7 +86,7 @@ g.update();
 },toggleFilterBar:function(_21,_22){
 this.showFilterBar(!this.isFilterBarShown(),_21,_22);
 },getColumnIdx:function(_23){
-var _24=_a("[role='columnheader']",this.plugin.grid.viewsHeaderNode);
+var _24=_9("[role='columnheader']",this.plugin.grid.viewsHeaderNode);
 var idx=-1;
 for(var i=_24.length-1;i>=0;--i){
 var _25=_7.position(_24[i]);
@@ -136,7 +137,7 @@ this._defPaneIsShown=true;
 },_onCloseFilterDefDialog:function(){
 this._defPaneIsShown=false;
 this._curColIdx=-1;
-_10.focus(this.defineFilterButton.domNode);
+_f.focus(this.defineFilterButton.domNode);
 },_onClickFilterBar:function(e){
 _13(e);
 this._clearStatusTipTimeout();
@@ -186,12 +187,12 @@ if(_2c){
 }
 }
 if(this._focusPos===0){
-_10.focus(this.defineFilterButton.focusNode);
+_f.focus(this.defineFilterButton.focusNode);
 }else{
 if(this._focusPos===1&&_2c){
-_10.focus(this.clearFilterButton.focusNode);
+_f.focus(this.clearFilterButton.focusNode);
 }else{
-_10.focus(this.closeFilterBarButton.focusNode);
+_f.focus(this.closeFilterBarButton.focusNode);
 }
 }
 }
@@ -232,10 +233,10 @@ return _2f;
 },_onFiltered:function(_33,_34){
 var p=this.plugin,_35=p.args.itemsName||p.nls["defaultItemsName"],msg="",g=p.grid,_36=g.layer("filter");
 if(_36.filterDef()){
-msg=_f.substitute(p.nls["filterBarMsgHasFilterTemplate"],[_33,_34,_35]);
+msg=_e.substitute(p.nls["filterBarMsgHasFilterTemplate"],[_33,_34,_35]);
 _7.addClass(this.domNode,_12);
 }else{
-msg=_f.substitute(p.nls["filterBarMsgNoFilterTemplate"],[_34,_35]);
+msg=_e.substitute(p.nls["filterBarMsgNoFilterTemplate"],[_34,_35]);
 _7.removeClass(this.domNode,_12);
 }
 this.statusBarNode.innerHTML=msg;

data/vendor/assets/javascripts/dojox/grid/enhanced/plugins/filter/FilterDefDialog.js

@@ -1,28 +1,29 @@
 //>>built
-define("dojox/grid/enhanced/plugins/filter/FilterDefDialog",["dojo/_base/declare","dojo/_base/array","dojo/_base/connect","dojo/_base/lang","dojo/_base/event","dojo/_base/html","dojo/_base/sniff","dojo/cache","dojo/keys","dojo/string","dojo/window","dojo/date/locale","./FilterBuilder","../Dialog","dijit/form/ComboBox","dijit/form/TextBox","dijit/form/NumberTextBox","dijit/form/DateTextBox","dijit/form/TimeTextBox","dijit/form/Button","dijit/layout/AccordionContainer","dijit/layout/ContentPane","dijit/_Widget","dijit/_TemplatedMixin","dijit/_WidgetsInTemplateMixin","dijit/focus","dojox/html/metrics","dijit/a11y","dijit/Tooltip","dijit/form/Select","dijit/form/RadioButton","dojox/html/ellipsis","../../../cells/dijit"],function(_1,_2,_3,_4,_5,_6,_7,_8,_9,_a,_b,_c,_d,_e,_f,_10,_11,_12,_13,_14,_15,_16,_17,_18,_19,_1a,_1b,_1c){
-var _1d={relSelect:60,accordionTitle:70,removeCBoxBtn:-1,colSelect:90,condSelect:95,valueBox:10,addCBoxBtn:20,filterBtn:30,clearBtn:40,cancelBtn:50};
-var _1e=_1("dojox.grid.enhanced.plugins.filter.AccordionContainer",_15,{nls:null,addChild:function(_1f,_20){
-var _21=arguments[0]=_1f._pane=new _16({content:_1f});
+require({cache:{"url:dojox/grid/enhanced/templates/FilterDefPane.html":"<div class=\"dojoxGridFDPane\">\n\t<div class=\"dojoxGridFDPaneRelation\">${_relMsgFront}\n\t<span class=\"dojoxGridFDPaneModes\" dojoAttachPoint=\"criteriaModeNode\">\n\t\t<select dojoAttachPoint=\"_relSelect\" dojoType=\"dijit.form.Select\" dojoAttachEvent=\"onChange: _onRelSelectChange\">\n\t\t\t<option value=\"0\">${_relAll}</option>\n\t\t\t<option value=\"1\">${_relAny}</option>\n\t\t</select>\n\t</span>\n\t${_relMsgTail}\n\t</div>\n\t<div dojoAttachPoint=\"criteriaPane\" class=\"dojoxGridFDPaneRulePane\"></div>\n\t<div dojoAttachPoint=\"_addCBoxBtn\" dojoType=\"dijit.form.Button\" \n\t\tclass=\"dojoxGridFDPaneAddCBoxBtn\" iconClass=\"dojoxGridFDPaneAddCBoxBtnIcon\"\n\t\tdojoAttachEvent=\"onClick:_onAddCBox\" label=\"${_addRuleBtnLabel}\" showLabel=\"false\">\n\t</div>\n\t<div class=\"dojoxGridFDPaneBtns\" dojoAttachPoint=\"buttonsPane\">\n\t\t<span dojoAttachPoint=\"_cancelBtn\" dojoType=\"dijit.form.Button\" \n\t\t\tdojoAttachEvent=\"onClick:_onCancel\" label=\"${_cancelBtnLabel}\">\n\t\t</span>\n\t\t<span dojoAttachPoint=\"_clearFilterBtn\" dojoType=\"dijit.form.Button\" \n\t\t\tdojoAttachEvent=\"onClick:_onClearFilter\" label=\"${_clearBtnLabel}\" disabled=\"true\">\n\t\t</span>\n\t\t<span dojoAttachPoint=\"_filterBtn\" dojoType=\"dijit.form.Button\" \n\t\t\tdojoAttachEvent=\"onClick:_onFilter\" label=\"${_filterBtnLabel}\" disabled=\"true\">\n\t\t</span>\n\t</div>\n</div>\n","url:dojox/grid/enhanced/templates/CriteriaBox.html":"<div class=\"dojoxGridFCBox\">\n\t<div class=\"dojoxGridFCBoxSelCol\" dojoAttachPoint=\"selColNode\">\n\t\t<span class=\"dojoxGridFCBoxField\">${_colSelectLabel}</span>\n\t\t<select dojoAttachPoint=\"_colSelect\" dojoType=\"dijit.form.Select\" \n\t\t\tclass=\"dojoxGridFCBoxColSelect\"\n\t\t\tdojoAttachEvent=\"onChange:_onChangeColumn\">\n\t\t</select>\n\t</div>\n\t<div class=\"dojoxGridFCBoxCondition\" dojoAttachPoint=\"condNode\">\n\t\t<span class=\"dojoxGridFCBoxField\">${_condSelectLabel}</span>\n\t\t<select dojoAttachPoint=\"_condSelect\" dojoType=\"dijit.form.Select\" \n\t\t\tclass=\"dojoxGridFCBoxCondSelect\"\n\t\t\tdojoAttachEvent=\"onChange:_onChangeCondition\">\n\t\t</select>\n\t\t<div class=\"dojoxGridFCBoxCondSelectAlt\" dojoAttachPoint=\"_condSelectAlt\" style=\"display:none;\"></div>\n\t</div>\n\t<div class=\"dojoxGridFCBoxValue\" dojoAttachPoint=\"valueNode\">\n\t\t<span class=\"dojoxGridFCBoxField\">${_valueBoxLabel}</span>\n\t</div>\n</div>\n","url:dojox/grid/enhanced/templates/FilterBoolValueBox.html":"<div class=\"dojoxGridBoolValueBox\">\n\t<div class=\"dojoxGridTrueBox\">\n\t\t<input dojoType=\"dijit.form.RadioButton\" type='radio' name='a1' id='${_baseId}_rbTrue' checked=\"true\" \n\t\t\tdojoAttachPoint=\"rbTrue\" dojoAttachEvent=\"onChange: onChange\"/>\n\t\t<div class=\"dojoxGridTrueLabel\" for='${_baseId}_rbTrue'>${_lblTrue}</div>\n\t</div>\n\t<div class=\"dojoxGridFalseBox\">\n\t\t<input dojoType=\"dijit.form.RadioButton\" dojoAttachPoint=\"rbFalse\" type='radio' name='a1' id='${_baseId}_rbFalse'/>\n\t\t<div class=\"dojoxGridTrueLabel\" for='${_baseId}_rbFalse'>${_lblFalse}</div>\n\t</div>\n</div>\n"}});
+define("dojox/grid/enhanced/plugins/filter/FilterDefDialog",["dojo/_base/declare","dojo/_base/array","dojo/_base/connect","dojo/_base/lang","dojo/_base/event","dojo/_base/html","dojo/_base/sniff","dojo/keys","dojo/string","dojo/window","dojo/date/locale","./FilterBuilder","../Dialog","dijit/form/ComboBox","dijit/form/TextBox","dijit/form/NumberTextBox","dijit/form/DateTextBox","dijit/form/TimeTextBox","dijit/form/Button","dijit/layout/AccordionContainer","dijit/layout/ContentPane","dijit/_Widget","dijit/_TemplatedMixin","dijit/_WidgetsInTemplateMixin","dijit/focus","dojox/html/metrics","dijit/a11y","dojo/text!../../templates/FilterDefPane.html","dojo/text!../../templates/CriteriaBox.html","dojo/text!../../templates/FilterBoolValueBox.html","dijit/Tooltip","dijit/form/Select","dijit/form/RadioButton","dojox/html/ellipsis","../../../cells/dijit"],function(_1,_2,_3,_4,_5,_6,_7,_8,_9,_a,_b,_c,_d,_e,_f,_10,_11,_12,_13,_14,_15,_16,_17,_18,_19,_1a,_1b,_1c,_1d,_1e){
+var _1f={relSelect:60,accordionTitle:70,removeCBoxBtn:-1,colSelect:90,condSelect:95,valueBox:10,addCBoxBtn:20,filterBtn:30,clearBtn:40,cancelBtn:50};
+var _20=_1("dojox.grid.enhanced.plugins.filter.AccordionContainer",_14,{nls:null,addChild:function(_21,_22){
+var _23=arguments[0]=_21._pane=new _15({content:_21});
 this.inherited(arguments);
-this._modifyChild(_21);
-},removeChild:function(_22){
-var _23=_22,_24=false;
-if(_22._pane){
-_24=true;
-_23=arguments[0]=_22._pane;
+this._modifyChild(_23);
+},removeChild:function(_24){
+var _25=_24,_26=false;
+if(_24._pane){
+_26=true;
+_25=arguments[0]=_24._pane;
 }
 this.inherited(arguments);
-if(_24){
+if(_26){
 this._hackHeight(false,this._titleHeight);
-var _25=this.getChildren();
-if(_25.length===1){
-_6.style(_25[0]._removeCBoxBtn.domNode,"display","none");
+var _27=this.getChildren();
+if(_27.length===1){
+_6.style(_27[0]._removeCBoxBtn.domNode,"display","none");
 }
 }
-_23.destroyRecursive();
-},selectChild:function(_26){
-if(_26._pane){
-arguments[0]=_26._pane;
+_25.destroyRecursive();
+},selectChild:function(_28){
+if(_28._pane){
+arguments[0]=_28._pane;
 }
 this.inherited(arguments);
 },resize:function(){
@@ -34,33 +35,33 @@ return;
 }
 this.inherited(arguments);
 if(parseInt(_7("ie"),10)==7){
-_2.some(this._connects,function(_27){
-if((_27[0]||{})[1]=="onresize"){
-this.disconnect(_27);
+_2.some(this._connects,function(_29){
+if((_29[0]||{})[1]=="onresize"){
+this.disconnect(_29);
 return true;
 }
 },this);
 }
-_2.forEach(this.getChildren(),function(_28){
-this._modifyChild(_28,true);
+_2.forEach(this.getChildren(),function(_2a){
+this._modifyChild(_2a,true);
 },this);
-},_onKeyPress:function(e,_29){
-if(this.disabled||e.altKey||!(_29||e.ctrlKey)){
+},_onKeyPress:function(e,_2b){
+if(this.disabled||e.altKey||!(_2b||e.ctrlKey)){
 return;
 }
-var k=_9,c=e.charOrCode,ltr=_6._isBodyLtr(),_2a=null;
-if((_29&&c==k.UP_ARROW)||(e.ctrlKey&&c==k.PAGE_UP)){
-_2a=false;
+var k=_8,c=e.charOrCode,ltr=_6._isBodyLtr(),_2c=null;
+if((_2b&&c==k.UP_ARROW)||(e.ctrlKey&&c==k.PAGE_UP)){
+_2c=false;
 }else{
-if((_29&&c==k.DOWN_ARROW)||(e.ctrlKey&&(c==k.PAGE_DOWN||c==k.TAB))){
-_2a=true;
+if((_2b&&c==k.DOWN_ARROW)||(e.ctrlKey&&(c==k.PAGE_DOWN||c==k.TAB))){
+_2c=true;
 }else{
 if(c==(ltr?k.LEFT_ARROW:k.RIGHT_ARROW)){
-_2a=this._focusOnRemoveBtn?null:false;
+_2c=this._focusOnRemoveBtn?null:false;
 this._focusOnRemoveBtn=!this._focusOnRemoveBtn;
 }else{
 if(c==(ltr?k.RIGHT_ARROW:k.LEFT_ARROW)){
-_2a=this._focusOnRemoveBtn?true:null;
+_2c=this._focusOnRemoveBtn?true:null;
 this._focusOnRemoveBtn=!this._focusOnRemoveBtn;
 }else{
 return;
@@ -68,73 +69,73 @@ return;
 }
 }
 }
-if(_2a!==null){
-this._adjacent(_2a)._buttonWidget._onTitleClick();
+if(_2c!==null){
+this._adjacent(_2c)._buttonWidget._onTitleClick();
 }
 _5.stop(e);
-_b.scrollIntoView(this.selectedChildWidget._buttonWidget.domNode.parentNode);
+_a.scrollIntoView(this.selectedChildWidget._buttonWidget.domNode.parentNode);
 if(_7("ie")){
-this.selectedChildWidget._removeCBoxBtn.focusNode.setAttribute("tabIndex",this._focusOnRemoveBtn?_1d.accordionTitle:-1);
+this.selectedChildWidget._removeCBoxBtn.focusNode.setAttribute("tabIndex",this._focusOnRemoveBtn?_1f.accordionTitle:-1);
 }
-_1a.focus(this.selectedChildWidget[this._focusOnRemoveBtn?"_removeCBoxBtn":"_buttonWidget"].focusNode);
-},_modifyChild:function(_2b,_2c){
-if(!_2b||!this._started){
+_19.focus(this.selectedChildWidget[this._focusOnRemoveBtn?"_removeCBoxBtn":"_buttonWidget"].focusNode);
+},_modifyChild:function(_2d,_2e){
+if(!_2d||!this._started){
 return;
 }
-_6.style(_2b.domNode,"overflow","hidden");
-_2b._buttonWidget.connect(_2b._buttonWidget,"_setSelectedAttr",function(){
-this.focusNode.setAttribute("tabIndex",this.selected?_1d.accordionTitle:"-1");
+_6.style(_2d.domNode,"overflow","hidden");
+_2d._buttonWidget.connect(_2d._buttonWidget,"_setSelectedAttr",function(){
+this.focusNode.setAttribute("tabIndex",this.selected?_1f.accordionTitle:"-1");
 });
-var _2d=this;
-_2b._buttonWidget.connect(_2b._buttonWidget.domNode,"onclick",function(){
-_2d._focusOnRemoveBtn=false;
+var _2f=this;
+_2d._buttonWidget.connect(_2d._buttonWidget.domNode,"onclick",function(){
+_2f._focusOnRemoveBtn=false;
 });
-(_2b._removeCBoxBtn=new _14({label:this.nls.removeRuleButton,showLabel:false,iconClass:"dojoxGridFCBoxRemoveCBoxBtnIcon",tabIndex:_1d.removeCBoxBtn,onClick:_4.hitch(_2b.content,"onRemove"),onKeyPress:function(e){
-_2d._onKeyPress(e,_2b._buttonWidget.contentWidget);
-}})).placeAt(_2b._buttonWidget.domNode);
-var i,_2e=this.getChildren();
-if(_2e.length===1){
-_2b._buttonWidget.set("selected",true);
-_6.style(_2b._removeCBoxBtn.domNode,"display","none");
+(_2d._removeCBoxBtn=new _13({label:this.nls.removeRuleButton,showLabel:false,iconClass:"dojoxGridFCBoxRemoveCBoxBtnIcon",tabIndex:_1f.removeCBoxBtn,onClick:_4.hitch(_2d.content,"onRemove"),onKeyPress:function(e){
+_2f._onKeyPress(e,_2d._buttonWidget.contentWidget);
+}})).placeAt(_2d._buttonWidget.domNode);
+var i,_30=this.getChildren();
+if(_30.length===1){
+_2d._buttonWidget.set("selected",true);
+_6.style(_2d._removeCBoxBtn.domNode,"display","none");
 }else{
-for(i=0;i<_2e.length;++i){
-if(_2e[i]._removeCBoxBtn){
-_6.style(_2e[i]._removeCBoxBtn.domNode,"display","");
+for(i=0;i<_30.length;++i){
+if(_30[i]._removeCBoxBtn){
+_6.style(_30[i]._removeCBoxBtn.domNode,"display","");
 }
 }
 }
-this._setupTitleDom(_2b);
+this._setupTitleDom(_2d);
 if(!this._titleHeight){
-for(i=0;i<_2e.length;++i){
-if(_2e[i]!=this.selectedChildWidget){
-this._titleHeight=_6.marginBox(_2e[i]._buttonWidget.domNode.parentNode).h;
+for(i=0;i<_30.length;++i){
+if(_30[i]!=this.selectedChildWidget){
+this._titleHeight=_6.marginBox(_30[i]._buttonWidget.domNode.parentNode).h;
 break;
 }
 }
 }
-if(!_2c){
+if(!_2e){
 this._hackHeight(true,this._titleHeight);
 }
-},_hackHeight:function(_2f,_30){
-var _31=this.getChildren(),dn=this.domNode,h=_6.style(dn,"height");
-if(!_2f){
-dn.style.height=(h-_30)+"px";
+},_hackHeight:function(_31,_32){
+var _33=this.getChildren(),dn=this.domNode,h=_6.style(dn,"height");
+if(!_31){
+dn.style.height=(h-_32)+"px";
 }else{
-if(_31.length>1){
-dn.style.height=(h+_30)+"px";
+if(_33.length>1){
+dn.style.height=(h+_32)+"px";
 }else{
 return;
 }
 }
 this.resize();
-},_setupTitleDom:function(_32){
-var w=_6.contentBox(_32._buttonWidget.titleNode).w;
+},_setupTitleDom:function(_34){
+var w=_6.contentBox(_34._buttonWidget.titleNode).w;
 if(_7("ie")<8){
 w-=8;
 }
-_6.style(_32._buttonWidget.titleTextNode,"width",w+"px");
+_6.style(_34._buttonWidget.titleTextNode,"width",w+"px");
 }});
-var _33=_1("dojox.grid.enhanced.plugins.filter.FilterDefPane",[_17,_18,_19],{templateString:_8("dojox.grid","enhanced/templates/FilterDefPane.html"),widgetsInTemplate:true,dlg:null,postMixInProperties:function(){
+var _35=_1("dojox.grid.enhanced.plugins.filter.FilterDefPane",[_16,_17,_18],{templateString:_1c,widgetsInTemplate:true,dlg:null,postMixInProperties:function(){
 this.plugin=this.dlg.plugin;
 var nls=this.plugin.nls;
 this._addRuleBtnLabel=nls.addRuleButton;
@@ -148,12 +149,12 @@ this._relMsgTail=nls.relationMsgTail;
 },postCreate:function(){
 this.inherited(arguments);
 this.connect(this.domNode,"onkeypress","_onKey");
-(this.cboxContainer=new _1e({nls:this.plugin.nls})).placeAt(this.criteriaPane);
-this._relSelect.set("tabIndex",_1d.relSelect);
-this._addCBoxBtn.set("tabIndex",_1d.addCBoxBtn);
-this._cancelBtn.set("tabIndex",_1d.cancelBtn);
-this._clearFilterBtn.set("tabIndex",_1d.clearBtn);
-this._filterBtn.set("tabIndex",_1d.filterBtn);
+(this.cboxContainer=new _20({nls:this.plugin.nls})).placeAt(this.criteriaPane);
+this._relSelect.set("tabIndex",_1f.relSelect);
+this._addCBoxBtn.set("tabIndex",_1f.addCBoxBtn);
+this._cancelBtn.set("tabIndex",_1f.cancelBtn);
+this._clearFilterBtn.set("tabIndex",_1f.clearBtn);
+this._filterBtn.set("tabIndex",_1f.filterBtn);
 var nls=this.plugin.nls;
 this._relSelect.domNode.setAttribute("aria-label",nls.waiRelAll);
 this._addCBoxBtn.domNode.setAttribute("aria-label",nls.waiAddRuleButton);
@@ -177,11 +178,11 @@ this.dlg.onClearFilter();
 },_onFilter:function(){
 this.dlg.onFilter();
 },_onKey:function(e){
-if(e.keyCode==_9.ENTER){
+if(e.keyCode==_8.ENTER){
 this.dlg.onFilter();
 }
 }});
-var _34=_1("dojox.grid.enhanced.plugins.filter.CriteriaBox",[_17,_18,_19],{templateString:_8("dojox.grid","enhanced/templates/CriteriaBox.html"),widgetsInTemplate:true,dlg:null,postMixInProperties:function(){
+var _36=_1("dojox.grid.enhanced.plugins.filter.CriteriaBox",[_16,_17,_18],{templateString:_1d,widgetsInTemplate:true,dlg:null,postMixInProperties:function(){
 this.plugin=this.dlg.plugin;
 this._curValueBox=null;
 var nls=this.plugin.nls;
@@ -191,45 +192,45 @@ this._valueBoxLabel=nls.valueBoxLabel;
 this._anyColumnOption=nls.anyColumnOption;
 },postCreate:function(){
 var dlg=this.dlg,g=this.plugin.grid;
-this._colSelect.set("tabIndex",_1d.colSelect);
+this._colSelect.set("tabIndex",_1f.colSelect);
 this._colOptions=this._getColumnOptions();
 this._colSelect.addOption([{label:this.plugin.nls.anyColumnOption,value:"anycolumn",selected:dlg.curColIdx<0},{value:""}].concat(this._colOptions));
-this._condSelect.set("tabIndex",_1d.condSelect);
+this._condSelect.set("tabIndex",_1f.condSelect);
 this._condSelect.addOption(this._getUsableConditions(dlg.getColumnType(dlg.curColIdx)));
 this._showSelectOrLabel(this._condSelect,this._condSelectAlt);
 this.connect(g.layout,"moveColumn","onMoveColumn");
-var _35=this;
+var _37=this;
 setTimeout(function(){
-var _36=dlg.getColumnType(dlg.curColIdx);
-_35._setValueBoxByType(_36);
+var _38=dlg.getColumnType(dlg.curColIdx);
+_37._setValueBoxByType(_38);
 },0);
 },_getColumnOptions:function(){
-var _37=this.dlg.curColIdx>=0?String(this.dlg.curColIdx):"anycolumn";
-return _2.map(_2.filter(this.plugin.grid.layout.cells,function(_38){
-return !(_38.filterable===false||_38.hidden);
-}),function(_39){
-return {label:_39.name||_39.field,value:String(_39.index),selected:_37==String(_39.index)};
+var _39=this.dlg.curColIdx>=0?String(this.dlg.curColIdx):"anycolumn";
+return _2.map(_2.filter(this.plugin.grid.layout.cells,function(_3a){
+return !(_3a.filterable===false||_3a.hidden);
+}),function(_3b){
+return {label:_3b.name||_3b.field,value:String(_3b.index),selected:_39==String(_3b.index)};
 });
 },onMoveColumn:function(){
 var tmp=this._onChangeColumn;
 this._onChangeColumn=function(){
 };
-var _3a=this._colSelect.get("selectedOptions");
+var _3c=this._colSelect.get("selectedOptions");
 this._colSelect.removeOption(this._colOptions);
 this._colOptions=this._getColumnOptions();
 this._colSelect.addOption(this._colOptions);
 var i=0;
 for(;i<this._colOptions.length;++i){
-if(this._colOptions[i].label==_3a.label){
+if(this._colOptions[i].label==_3c.label){
 break;
 }
 }
 if(i<this._colOptions.length){
 this._colSelect.set("value",this._colOptions[i].value);
 }
-var _3b=this;
+var _3d=this;
 setTimeout(function(){
-_3b._onChangeColumn=tmp;
+_3d._onChangeColumn=tmp;
 },0);
 },onRemove:function(){
 this.dlg.removeCriteriaBoxes(this);
@@ -241,9 +242,9 @@ this._curValueBox=null;
 this.plugin=null;
 this.dlg=null;
 },_showSelectOrLabel:function(sel,alt){
-var _3c=sel.getOptions();
-if(_3c.length==1){
-alt.innerHTML=_3c[0].label;
+var _3e=sel.getOptions();
+if(_3e.length==1){
+alt.innerHTML=_3e[0].label;
 _6.style(sel.domNode,"display","none");
 _6.style(alt,"display","");
 }else{
@@ -252,9 +253,9 @@ _6.style(alt,"display","none");
 }
 },_onChangeColumn:function(val){
 this._checkValidCriteria();
-var _3d=this.dlg.getColumnType(val);
-this._setConditionsByType(_3d);
-this._setValueBoxByType(_3d);
+var _3f=this.dlg.getColumnType(val);
+this._setConditionsByType(_3f);
+this._setValueBoxByType(_3f);
 this._updateValueBox();
 },_onChangeCondition:function(val){
 this._checkValidCriteria();
@@ -264,7 +265,7 @@ this._isRange=f;
 this._setValueBoxByType(this.dlg.getColumnType(this._colSelect.get("value")));
 }
 this._updateValueBox();
-},_updateValueBox:function(_3e){
+},_updateValueBox:function(_40){
 this._curValueBox.set("disabled",this._condSelect.get("value")=="isempty");
 },_checkValidCriteria:function(){
 setTimeout(_4.hitch(this,function(){
@@ -272,43 +273,43 @@ this.updateRuleTitle();
 this.dlg._updatePane();
 }),0);
 },_createValueBox:function(cls,arg){
-var _3f=_4.hitch(arg.cbox,"_checkValidCriteria");
-return new cls(_4.mixin(arg,{tabIndex:_1d.valueBox,onKeyPress:_3f,onChange:_3f,"class":"dojoxGridFCBoxValueBox"}));
+var _41=_4.hitch(arg.cbox,"_checkValidCriteria");
+return new cls(_4.mixin(arg,{tabIndex:_1f.valueBox,onKeyPress:_41,onChange:_41,"class":"dojoxGridFCBoxValueBox"}));
 },_createRangeBox:function(cls,arg){
-var _40=_4.hitch(arg.cbox,"_checkValidCriteria");
-_4.mixin(arg,{tabIndex:_1d.valueBox,onKeyPress:_40,onChange:_40});
-var div=_6.create("div",{"class":"dojoxGridFCBoxValueBox"}),_41=new cls(arg),txt=_6.create("span",{"class":"dojoxGridFCBoxRangeValueTxt","innerHTML":this.plugin.nls.rangeTo}),end=new cls(arg);
-_6.addClass(_41.domNode,"dojoxGridFCBoxStartValue");
+var _42=_4.hitch(arg.cbox,"_checkValidCriteria");
+_4.mixin(arg,{tabIndex:_1f.valueBox,onKeyPress:_42,onChange:_42});
+var div=_6.create("div",{"class":"dojoxGridFCBoxValueBox"}),_43=new cls(arg),txt=_6.create("span",{"class":"dojoxGridFCBoxRangeValueTxt","innerHTML":this.plugin.nls.rangeTo}),end=new cls(arg);
+_6.addClass(_43.domNode,"dojoxGridFCBoxStartValue");
 _6.addClass(end.domNode,"dojoxGridFCBoxEndValue");
-div.appendChild(_41.domNode);
+div.appendChild(_43.domNode);
 div.appendChild(txt);
 div.appendChild(end.domNode);
 div.domNode=div;
-div.set=function(_42,_43){
-if(_4.isObject(_43)){
-_41.set("value",_43.start);
-end.set("value",_43.end);
+div.set=function(_44,_45){
+if(_4.isObject(_45)){
+_43.set("value",_45.start);
+end.set("value",_45.end);
 }
 };
 div.get=function(){
-var s=_41.get("value"),e=end.get("value");
+var s=_43.get("value"),e=end.get("value");
 return s&&e?{start:s,end:e}:"";
 };
 return div;
-},changeCurrentColumn:function(_44){
-var _45=this.dlg.curColIdx;
+},changeCurrentColumn:function(_46){
+var _47=this.dlg.curColIdx;
 this._colSelect.removeOption(this._colOptions);
 this._colOptions=this._getColumnOptions();
 this._colSelect.addOption(this._colOptions);
-this._colSelect.set("value",_45>=0?String(_45):"anycolumn");
+this._colSelect.set("value",_47>=0?String(_47):"anycolumn");
 this.updateRuleTitle(true);
 },curColumn:function(){
 return this._colSelect.getOptions(this._colSelect.get("value")).label;
 },curCondition:function(){
 return this._condSelect.getOptions(this._condSelect.get("value")).label;
 },curValue:function(){
-var _46=this._condSelect.get("value");
-if(_46=="isempty"){
+var _48=this._condSelect.get("value");
+if(_48=="isempty"){
 return "";
 }
 return this._curValueBox?this._curValueBox.get("value"):"";
@@ -316,8 +317,8 @@ return this._curValueBox?this._curValueBox.get("value"):"";
 if(this.isEmpty()){
 return null;
 }
-var _47=this._colSelect.get("value"),_48=this.dlg.getColumnType(_47),_49=this.curValue(),_4a=this._condSelect.get("value");
-return {"column":_47,"condition":_4a,"value":_49,"formattedVal":this.formatValue(_48,_4a,_49),"type":_48,"colTxt":this.curColumn(),"condTxt":this.curCondition()};
+var _49=this._colSelect.get("value"),_4a=this.dlg.getColumnType(_49),_4b=this.curValue(),_4c=this._condSelect.get("value");
+return {"column":_49,"condition":_4c,"value":_4b,"formattedVal":this.formatValue(_4a,_4c,_4b),"type":_4a,"colTxt":this.curColumn(),"condTxt":this.curCondition()};
 },load:function(obj){
 var tmp=[this._onChangeColumn,this._onChangeCondition];
 this._onChangeColumn=this._onChangeCondition=function(){
@@ -334,9 +335,9 @@ obj.type=this.dlg.getColumnType(this._colSelect.get("value"));
 if(obj.condition){
 this._condSelect.set("value",obj.condition);
 }
-var _4b=obj.value||"";
-if(_4b||(obj.type!="date"&&obj.type!="time")){
-this._curValueBox.set("value",_4b);
+var _4d=obj.value||"";
+if(_4d||(obj.type!="date"&&obj.type!="time")){
+this._curValueBox.set("value",_4d);
 }
 this._updateValueBox();
 setTimeout(_4.hitch(this,function(){
@@ -347,77 +348,77 @@ this._onChangeCondition=tmp[1];
 if(this.isEmpty()){
 return null;
 }
-var _4c=this._colSelect.get("value");
-return this.dlg.getExprForCriteria({"type":this.dlg.getColumnType(_4c),"column":_4c,"condition":this._condSelect.get("value"),"value":this.curValue()});
+var _4e=this._colSelect.get("value");
+return this.dlg.getExprForCriteria({"type":this.dlg.getColumnType(_4e),"column":_4e,"condition":this._condSelect.get("value"),"value":this.curValue()});
 },isEmpty:function(){
-var _4d=this._condSelect.get("value");
-if(_4d=="isempty"){
+var _4f=this._condSelect.get("value");
+if(_4f=="isempty"){
 return false;
 }
 var v=this.curValue();
 return v===""||v===null||typeof v=="undefined"||(typeof v=="number"&&isNaN(v));
-},updateRuleTitle:function(_4e){
-var _4f=this._pane._buttonWidget.titleTextNode;
-var _50=["<div class='dojoxEllipsis'>"];
-if(_4e||this.isEmpty()){
-_4f.title=_a.substitute(this.plugin.nls.ruleTitleTemplate,[this._ruleIndex||1]);
-_50.push(_4f.title);
+},updateRuleTitle:function(_50){
+var _51=this._pane._buttonWidget.titleTextNode;
+var _52=["<div class='dojoxEllipsis'>"];
+if(_50||this.isEmpty()){
+_51.title=_9.substitute(this.plugin.nls.ruleTitleTemplate,[this._ruleIndex||1]);
+_52.push(_51.title);
 }else{
-var _51=this.dlg.getColumnType(this._colSelect.get("value"));
-var _52=this.curColumn();
-var _53=this.curCondition();
-var _54=this.formatValue(_51,this._condSelect.get("value"),this.curValue());
-_50.push(_52,"&nbsp;<span class='dojoxGridRuleTitleCondition'>",_53,"</span>&nbsp;",_54);
-_4f.title=[_52," ",_53," ",_54].join("");
-}
-_4f.innerHTML=_50.join("");
+var _53=this.dlg.getColumnType(this._colSelect.get("value"));
+var _54=this.curColumn();
+var _55=this.curCondition();
+var _56=this.formatValue(_53,this._condSelect.get("value"),this.curValue());
+_52.push(_54,"&nbsp;<span class='dojoxGridRuleTitleCondition'>",_55,"</span>&nbsp;",_56);
+_51.title=[_54," ",_55," ",_56].join("");
+}
+_51.innerHTML=_52.join("");
 if(_7("mozilla")){
-var tt=_6.create("div",{"style":"width: 100%; height: 100%; position: absolute; top: 0; left: 0; z-index: 9999;"},_4f);
-tt.title=_4f.title;
+var tt=_6.create("div",{"style":"width: 100%; height: 100%; position: absolute; top: 0; left: 0; z-index: 9999;"},_51);
+tt.title=_51.title;
 }
-},updateRuleIndex:function(_55){
-if(this._ruleIndex!=_55){
-this._ruleIndex=_55;
+},updateRuleIndex:function(_57){
+if(this._ruleIndex!=_57){
+this._ruleIndex=_57;
 if(this.isEmpty()){
 this.updateRuleTitle();
 }
 }
 },setAriaInfo:function(idx){
-var dss=_a.substitute,nls=this.plugin.nls;
+var dss=_9.substitute,nls=this.plugin.nls;
 this._colSelect.domNode.setAttribute("aria-label",dss(nls.waiColumnSelectTemplate,[idx]));
 this._condSelect.domNode.setAttribute("aria-label",dss(nls.waiConditionSelectTemplate,[idx]));
 this._pane._removeCBoxBtn.domNode.setAttribute("aria-label",dss(nls.waiRemoveRuleButtonTemplate,[idx]));
 this._index=idx;
-},_getUsableConditions:function(_56){
-var _57=_4.clone(this.dlg._dataTypeMap[_56].conditions);
-var _58=(this.plugin.args.disabledConditions||{})[_56];
-var _59=parseInt(this._colSelect.get("value"),10);
-var _5a=isNaN(_59)?(this.plugin.args.disabledConditions||{})["anycolumn"]:this.plugin.grid.layout.cells[_59].disabledConditions;
-if(!_4.isArray(_58)){
-_58=[];
-}
+},_getUsableConditions:function(_58){
+var _59=_4.clone(this.dlg._dataTypeMap[_58].conditions);
+var _5a=(this.plugin.args.disabledConditions||{})[_58];
+var _5b=parseInt(this._colSelect.get("value"),10);
+var _5c=isNaN(_5b)?(this.plugin.args.disabledConditions||{})["anycolumn"]:this.plugin.grid.layout.cells[_5b].disabledConditions;
 if(!_4.isArray(_5a)){
 _5a=[];
 }
-var arr=_58.concat(_5a);
+if(!_4.isArray(_5c)){
+_5c=[];
+}
+var arr=_5a.concat(_5c);
 if(arr.length){
-var _5b={};
+var _5d={};
 _2.forEach(arr,function(c){
 if(_4.isString(c)){
-_5b[c.toLowerCase()]=true;
+_5d[c.toLowerCase()]=true;
 }
 });
-return _2.filter(_57,function(_5c){
-return !(_5c.value in _5b);
+return _2.filter(_59,function(_5e){
+return !(_5e.value in _5d);
 });
 }
-return _57;
-},_setConditionsByType:function(_5d){
-var _5e=this._condSelect;
-_5e.removeOption(_5e.options);
-_5e.addOption(this._getUsableConditions(_5d));
+return _59;
+},_setConditionsByType:function(_5f){
+var _60=this._condSelect;
+_60.removeOption(_60.options);
+_60.addOption(this._getUsableConditions(_5f));
 this._showSelectOrLabel(this._condSelect,this._condSelectAlt);
-},_setValueBoxByType:function(_5f){
+},_setValueBoxByType:function(_61){
 if(this._curValueBox){
 this.valueNode.removeChild(this._curValueBox.domNode);
 try{
@@ -427,108 +428,108 @@ catch(e){
 }
 delete this._curValueBox;
 }
-var _60=this.dlg._dataTypeMap[_5f].valueBoxCls[this._getValueBoxClsInfo(this._colSelect.get("value"),_5f)],_61=this._getValueBoxArgByType(_5f);
-this._curValueBox=this[this._isRange?"_createRangeBox":"_createValueBox"](_60,_61);
+var _62=this.dlg._dataTypeMap[_61].valueBoxCls[this._getValueBoxClsInfo(this._colSelect.get("value"),_61)],_63=this._getValueBoxArgByType(_61);
+this._curValueBox=this[this._isRange?"_createRangeBox":"_createValueBox"](_62,_63);
 this.valueNode.appendChild(this._curValueBox.domNode);
-this._curValueBox.domNode.setAttribute("aria-label",_a.substitute(this.plugin.nls.waiValueBoxTemplate,[this._index]));
+this._curValueBox.domNode.setAttribute("aria-label",_9.substitute(this.plugin.nls.waiValueBoxTemplate,[this._index]));
 this.dlg.onRendered(this);
-},_getValueBoxArgByType:function(_62){
-var g=this.plugin.grid,_63=g.layout.cells[parseInt(this._colSelect.get("value"),10)],res={cbox:this};
-if(_62=="string"){
-if(_63&&(_63.suggestion||_63.autoComplete)){
-_4.mixin(res,{store:g.store,searchAttr:_63.field||_63.name,query:g.query||{},fetchProperties:{sort:[{"attribute":_63.field||_63.name}],queryOptions:_4.mixin({ignoreCase:true,deep:true},g.queryOptions||{})}});
+},_getValueBoxArgByType:function(_64){
+var g=this.plugin.grid,_65=g.layout.cells[parseInt(this._colSelect.get("value"),10)],res={cbox:this};
+if(_64=="string"){
+if(_65&&(_65.suggestion||_65.autoComplete)){
+_4.mixin(res,{store:g.store,searchAttr:_65.field||_65.name,query:g.query||{},fetchProperties:{sort:[{"attribute":_65.field||_65.name}],queryOptions:_4.mixin({ignoreCase:true,deep:true},g.queryOptions||{})}});
 }
 }else{
-if(_62=="boolean"){
+if(_64=="boolean"){
 _4.mixin(res,this.dlg.builder.defaultArgs["boolean"]);
 }
 }
-if(_63&&_63.dataTypeArgs){
-_4.mixin(res,_63.dataTypeArgs);
+if(_65&&_65.dataTypeArgs){
+_4.mixin(res,_65.dataTypeArgs);
 }
 return res;
-},formatValue:function(_64,_65,v){
-if(_65=="isempty"){
+},formatValue:function(_66,_67,v){
+if(_67=="isempty"){
 return "";
 }
-if(_64=="date"||_64=="time"){
-var opt={selector:_64},fmt=_c.format;
-if(_65=="range"){
-return _a.substitute(this.plugin.nls.rangeTemplate,[fmt(v.start,opt),fmt(v.end,opt)]);
+if(_66=="date"||_66=="time"){
+var opt={selector:_66},fmt=_b.format;
+if(_67=="range"){
+return _9.substitute(this.plugin.nls.rangeTemplate,[fmt(v.start,opt),fmt(v.end,opt)]);
 }
 return fmt(v,opt);
 }else{
-if(_64=="boolean"){
+if(_66=="boolean"){
 return v?this._curValueBox._lblTrue:this._curValueBox._lblFalse;
 }
 }
 return v;
-},_getValueBoxClsInfo:function(_66,_67){
-var _68=this.plugin.grid.layout.cells[parseInt(_66,10)];
-if(_67=="string"){
-return (_68&&(_68.suggestion||_68.autoComplete))?"ac":"dft";
+},_getValueBoxClsInfo:function(_68,_69){
+var _6a=this.plugin.grid.layout.cells[parseInt(_68,10)];
+if(_69=="string"){
+return (_6a&&(_6a.suggestion||_6a.autoComplete))?"ac":"dft";
 }
 return "dft";
 }});
-var _69=_1("dojox.grid.enhanced.plugins.filter.UniqueComboBox",_f,{_openResultList:function(_6a){
-var _6b={},s=this.store,_6c=this.searchAttr;
-arguments[0]=_2.filter(_6a,function(_6d){
-var key=s.getValue(_6d,_6c),_6e=_6b[key];
-_6b[key]=true;
-return !_6e;
+var _6b=_1("dojox.grid.enhanced.plugins.filter.UniqueComboBox",_e,{_openResultList:function(_6c){
+var _6d={},s=this.store,_6e=this.searchAttr;
+arguments[0]=_2.filter(_6c,function(_6f){
+var key=s.getValue(_6f,_6e),_70=_6d[key];
+_6d[key]=true;
+return !_70;
 });
 this.inherited(arguments);
 },_onKey:function(evt){
-if(evt.charOrCode===_9.ENTER&&this._opened){
+if(evt.charOrCode===_8.ENTER&&this._opened){
 _5.stop(evt);
 }
 this.inherited(arguments);
 }});
-var _6f=_1("dojox.grid.enhanced.plugins.filter.BooleanValueBox",[_17,_18,_19],{templateString:_8("dojox.grid","enhanced/templates/FilterBoolValueBox.html"),widgetsInTemplate:true,constructor:function(_70){
-var nls=_70.cbox.plugin.nls;
-this._baseId=_70.cbox.id;
-this._lblTrue=_70.trueLabel||nls.trueLabel||"true";
-this._lblFalse=_70.falseLabel||nls.falseLabel||"false";
-this.args=_70;
+var _71=_1("dojox.grid.enhanced.plugins.filter.BooleanValueBox",[_16,_17,_18],{templateString:_1e,widgetsInTemplate:true,constructor:function(_72){
+var nls=_72.cbox.plugin.nls;
+this._baseId=_72.cbox.id;
+this._lblTrue=_72.trueLabel||nls.trueLabel||"true";
+this._lblFalse=_72.falseLabel||nls.falseLabel||"false";
+this.args=_72;
 },postCreate:function(){
 this.onChange();
 },onChange:function(){
-},get:function(_71){
+},get:function(_73){
 return this.rbTrue.get("checked");
-},set:function(_72,v){
+},set:function(_74,v){
 this.inherited(arguments);
-if(_72=="value"){
+if(_74=="value"){
 this.rbTrue.set("checked",!!v);
 this.rbFalse.set("checked",!v);
 }
 }});
-var _73=_1("dojox.grid.enhanced.plugins.filter.FilterDefDialog",null,{curColIdx:-1,_relOpCls:"logicall",_savedCriterias:null,plugin:null,constructor:function(_74){
-var _75=this.plugin=_74.plugin;
-this.builder=new _d();
+var _75=_1("dojox.grid.enhanced.plugins.filter.FilterDefDialog",null,{curColIdx:-1,_relOpCls:"logicall",_savedCriterias:null,plugin:null,constructor:function(_76){
+var _77=this.plugin=_76.plugin;
+this.builder=new _c();
 this._setupData();
 this._cboxes=[];
-this.defaultType=_75.args.defaultType||"string";
-(this.filterDefPane=new _33({"dlg":this})).startup();
-(this._defPane=new _e({"refNode":this.plugin.grid.domNode,"title":_75.nls.filterDefDialogTitle,"class":"dojoxGridFDTitlePane","iconClass":"dojoxGridFDPaneIcon","content":this.filterDefPane})).startup();
-this._defPane.connect(_75.grid.layer("filter"),"filterDef",_4.hitch(this,"_onSetFilter"));
-_75.grid.setFilter=_4.hitch(this,"setFilter");
-_75.grid.getFilter=_4.hitch(this,"getFilter");
-_75.grid.getFilterRelation=_4.hitch(this,function(){
+this.defaultType=_77.args.defaultType||"string";
+(this.filterDefPane=new _35({"dlg":this})).startup();
+(this._defPane=new _d({"refNode":this.plugin.grid.domNode,"title":_77.nls.filterDefDialogTitle,"class":"dojoxGridFDTitlePane","iconClass":"dojoxGridFDPaneIcon","content":this.filterDefPane})).startup();
+this._defPane.connect(_77.grid.layer("filter"),"filterDef",_4.hitch(this,"_onSetFilter"));
+_77.grid.setFilter=_4.hitch(this,"setFilter");
+_77.grid.getFilter=_4.hitch(this,"getFilter");
+_77.grid.getFilterRelation=_4.hitch(this,function(){
 return this._relOpCls;
 });
-_75.connect(_75.grid.layout,"moveColumn",_4.hitch(this,"onMoveColumn"));
-},onMoveColumn:function(_76,_77,_78,_79,_7a){
-if(this._savedCriterias&&_78!=_79){
-if(_7a){
---_79;
-}
-var min=_78<_79?_78:_79;
-var max=_78<_79?_79:_78;
-var dir=_79>min?1:-1;
+_77.connect(_77.grid.layout,"moveColumn",_4.hitch(this,"onMoveColumn"));
+},onMoveColumn:function(_78,_79,_7a,_7b,_7c){
+if(this._savedCriterias&&_7a!=_7b){
+if(_7c){
+--_7b;
+}
+var min=_7a<_7b?_7a:_7b;
+var max=_7a<_7b?_7b:_7a;
+var dir=_7b>min?1:-1;
 _2.forEach(this._savedCriterias,function(sc){
 var idx=parseInt(sc.column,10);
 if(!isNaN(idx)&&idx>=min&&idx<=max){
-sc.column=String(idx==_78?idx+(max-min)*dir:idx-dir);
+sc.column=String(idx==_7a?idx+(max-min)*dir:idx-dir);
 }
 });
 }
@@ -546,39 +547,39 @@ g.getFilterRelation=null;
 this.plugin=null;
 },_setupData:function(){
 var nls=this.plugin.nls;
-this._dataTypeMap={"number":{valueBoxCls:{dft:_11},conditions:[{label:nls.conditionEqual,value:"equalto",selected:true},{label:nls.conditionNotEqual,value:"notequalto"},{label:nls.conditionLess,value:"lessthan"},{label:nls.conditionLessEqual,value:"lessthanorequalto"},{label:nls.conditionLarger,value:"largerthan"},{label:nls.conditionLargerEqual,value:"largerthanorequalto"},{label:nls.conditionIsEmpty,value:"isempty"}]},"string":{valueBoxCls:{dft:_10,ac:_69},conditions:[{label:nls.conditionContains,value:"contains",selected:true},{label:nls.conditionIs,value:"equalto"},{label:nls.conditionStartsWith,value:"startswith"},{label:nls.conditionEndWith,value:"endswith"},{label:nls.conditionNotContain,value:"notcontains"},{label:nls.conditionIsNot,value:"notequalto"},{label:nls.conditionNotStartWith,value:"notstartswith"},{label:nls.conditionNotEndWith,value:"notendswith"},{label:nls.conditionIsEmpty,value:"isempty"}]},"date":{valueBoxCls:{dft:_12},conditions:[{label:nls.conditionIs,value:"equalto",selected:true},{label:nls.conditionBefore,value:"lessthan"},{label:nls.conditionAfter,value:"largerthan"},{label:nls.conditionRange,value:"range"},{label:nls.conditionIsEmpty,value:"isempty"}]},"time":{valueBoxCls:{dft:_13},conditions:[{label:nls.conditionIs,value:"equalto",selected:true},{label:nls.conditionBefore,value:"lessthan"},{label:nls.conditionAfter,value:"largerthan"},{label:nls.conditionRange,value:"range"},{label:nls.conditionIsEmpty,value:"isempty"}]},"boolean":{valueBoxCls:{dft:_6f},conditions:[{label:nls.conditionIs,value:"equalto",selected:true},{label:nls.conditionIsEmpty,value:"isempty"}]}};
-},setFilter:function(_7b,_7c){
-_7b=_7b||[];
-if(!_4.isArray(_7b)){
-_7b=[_7b];
-}
-var _7d=function(){
-if(_7b.length){
-this._savedCriterias=_2.map(_7b,function(_7e){
-var _7f=_7e.type||this.defaultType;
-return {"type":_7f,"column":String(_7e.column),"condition":_7e.condition,"value":_7e.value,"colTxt":this.getColumnLabelByValue(String(_7e.column)),"condTxt":this.getConditionLabelByValue(_7f,_7e.condition),"formattedVal":_7e.formattedVal||_7e.value};
+this._dataTypeMap={"number":{valueBoxCls:{dft:_10},conditions:[{label:nls.conditionEqual,value:"equalto",selected:true},{label:nls.conditionNotEqual,value:"notequalto"},{label:nls.conditionLess,value:"lessthan"},{label:nls.conditionLessEqual,value:"lessthanorequalto"},{label:nls.conditionLarger,value:"largerthan"},{label:nls.conditionLargerEqual,value:"largerthanorequalto"},{label:nls.conditionIsEmpty,value:"isempty"}]},"string":{valueBoxCls:{dft:_f,ac:_6b},conditions:[{label:nls.conditionContains,value:"contains",selected:true},{label:nls.conditionIs,value:"equalto"},{label:nls.conditionStartsWith,value:"startswith"},{label:nls.conditionEndWith,value:"endswith"},{label:nls.conditionNotContain,value:"notcontains"},{label:nls.conditionIsNot,value:"notequalto"},{label:nls.conditionNotStartWith,value:"notstartswith"},{label:nls.conditionNotEndWith,value:"notendswith"},{label:nls.conditionIsEmpty,value:"isempty"}]},"date":{valueBoxCls:{dft:_11},conditions:[{label:nls.conditionIs,value:"equalto",selected:true},{label:nls.conditionBefore,value:"lessthan"},{label:nls.conditionAfter,value:"largerthan"},{label:nls.conditionRange,value:"range"},{label:nls.conditionIsEmpty,value:"isempty"}]},"time":{valueBoxCls:{dft:_12},conditions:[{label:nls.conditionIs,value:"equalto",selected:true},{label:nls.conditionBefore,value:"lessthan"},{label:nls.conditionAfter,value:"largerthan"},{label:nls.conditionRange,value:"range"},{label:nls.conditionIsEmpty,value:"isempty"}]},"boolean":{valueBoxCls:{dft:_71},conditions:[{label:nls.conditionIs,value:"equalto",selected:true},{label:nls.conditionIsEmpty,value:"isempty"}]}};
+},setFilter:function(_7d,_7e){
+_7d=_7d||[];
+if(!_4.isArray(_7d)){
+_7d=[_7d];
+}
+var _7f=function(){
+if(_7d.length){
+this._savedCriterias=_2.map(_7d,function(_80){
+var _81=_80.type||this.defaultType;
+return {"type":_81,"column":String(_80.column),"condition":_80.condition,"value":_80.value,"colTxt":this.getColumnLabelByValue(String(_80.column)),"condTxt":this.getConditionLabelByValue(_81,_80.condition),"formattedVal":_80.formattedVal||_80.value};
 },this);
 this._criteriasChanged=true;
-if(_7c==="logicall"||_7c==="logicany"){
-this._relOpCls=_7c;
+if(_7e==="logicall"||_7e==="logicany"){
+this._relOpCls=_7e;
 }
-var _80=_2.map(_7b,this.getExprForCriteria,this);
-_80=this.builder.buildExpression(_80.length==1?_80[0]:{"op":this._relOpCls,"data":_80});
-this.plugin.grid.layer("filter").filterDef(_80);
+var _82=_2.map(_7d,this.getExprForCriteria,this);
+_82=this.builder.buildExpression(_82.length==1?_82[0]:{"op":this._relOpCls,"data":_82});
+this.plugin.grid.layer("filter").filterDef(_82);
 this.plugin.filterBar.toggleClearFilterBtn(false);
 }
 this._closeDlgAndUpdateGrid();
 };
 if(this._savedCriterias){
 this._clearWithoutRefresh=true;
-var _81=_3.connect(this,"clearFilter",this,function(){
-_3.disconnect(_81);
+var _83=_3.connect(this,"clearFilter",this,function(){
+_3.disconnect(_83);
 this._clearWithoutRefresh=false;
-_7d.apply(this);
+_7f.apply(this);
 });
 this.onClearFilter();
 }else{
-_7d.apply(this);
+_7f.apply(this);
 }
 },getFilter:function(){
 return _4.clone(this._savedCriterias)||[];
@@ -587,15 +588,15 @@ var nls=this.plugin.nls;
 if(v.toLowerCase()=="anycolumn"){
 return nls["anyColumnOption"];
 }else{
-var _82=this.plugin.grid.layout.cells[parseInt(v,10)];
-return _82?(_82.name||_82.field):"";
+var _84=this.plugin.grid.layout.cells[parseInt(v,10)];
+return _84?(_84.name||_84.field):"";
 }
-},getConditionLabelByValue:function(_83,c){
-var _84=this._dataTypeMap[_83].conditions;
-for(var i=_84.length-1;i>=0;--i){
-var _85=_84[i];
-if(_85.value==c.toLowerCase()){
-return _85.label;
+},getConditionLabelByValue:function(_85,c){
+var _86=this._dataTypeMap[_85].conditions;
+for(var i=_86.length-1;i>=0;--i){
+var _87=_86[i];
+if(_87.value==c.toLowerCase()){
+return _87.label;
 }
 }
 return "";
@@ -603,14 +604,14 @@ return "";
 if(typeof cnt!="number"||cnt<=0){
 return;
 }
-var cbs=this._cboxes,cc=this.filterDefPane.cboxContainer,_86=this.plugin.args.ruleCount,len=cbs.length,_87;
-if(_86>0&&len+cnt>_86){
-cnt=_86-len;
+var cbs=this._cboxes,cc=this.filterDefPane.cboxContainer,_88=this.plugin.args.ruleCount,len=cbs.length,_89;
+if(_88>0&&len+cnt>_88){
+cnt=_88-len;
 }
 for(;cnt>0;--cnt){
-_87=new _34({dlg:this});
-cbs.push(_87);
-cc.addChild(_87);
+_89=new _36({dlg:this});
+cbs.push(_89);
+cc.addChild(_89);
 }
 cc.startup();
 this._updatePane();
@@ -619,68 +620,68 @@ cc.selectChild(cbs[cbs.length-1]);
 this.filterDefPane.criteriaPane.scrollTop=1000000;
 if(cbs.length===4){
 if(_7("ie")<=6&&!this.__alreadyResizedForIE6){
-var _88=_6.position(cc.domNode);
-_88.w-=_1b.getScrollbar().w;
-cc.resize(_88);
+var _8a=_6.position(cc.domNode);
+_8a.w-=_1a.getScrollbar().w;
+cc.resize(_8a);
 this.__alreadyResizedForIE6=true;
 }else{
 cc.resize();
 }
 }
-},removeCriteriaBoxes:function(cnt,_89){
-var cbs=this._cboxes,cc=this.filterDefPane.cboxContainer,len=cbs.length,_8a=len-cnt,end=len-1,_8b,_8c=_2.indexOf(cbs,cc.selectedChildWidget.content);
+},removeCriteriaBoxes:function(cnt,_8b){
+var cbs=this._cboxes,cc=this.filterDefPane.cboxContainer,len=cbs.length,_8c=len-cnt,end=len-1,_8d,_8e=_2.indexOf(cbs,cc.selectedChildWidget.content);
 if(_4.isArray(cnt)){
-var i,_8d=cnt;
-_8d.sort();
-cnt=_8d.length;
-for(i=len-1;i>=0&&_2.indexOf(_8d,i)>=0;--i){
+var i,_8f=cnt;
+_8f.sort();
+cnt=_8f.length;
+for(i=len-1;i>=0&&_2.indexOf(_8f,i)>=0;--i){
 }
 if(i>=0){
-if(i!=_8c){
+if(i!=_8e){
 cc.selectChild(cbs[i]);
 }
 for(i=cnt-1;i>=0;--i){
-if(_8d[i]>=0&&_8d[i]<len){
-cc.removeChild(cbs[_8d[i]]);
-cbs.splice(_8d[i],1);
+if(_8f[i]>=0&&_8f[i]<len){
+cc.removeChild(cbs[_8f[i]]);
+cbs.splice(_8f[i],1);
 }
 }
 }
-_8a=cbs.length;
+_8c=cbs.length;
 }else{
-if(_89===true){
+if(_8b===true){
 if(cnt>=0&&cnt<len){
-_8a=end=cnt;
+_8c=end=cnt;
 cnt=1;
 }else{
 return;
 }
 }else{
-if(cnt instanceof _34){
-_8b=cnt;
+if(cnt instanceof _36){
+_8d=cnt;
 cnt=1;
-_8a=end=_2.indexOf(cbs,_8b);
+_8c=end=_2.indexOf(cbs,_8d);
 }else{
 if(typeof cnt!="number"||cnt<=0){
 return;
 }else{
 if(cnt>=len){
 cnt=end;
-_8a=1;
+_8c=1;
 }
 }
 }
 }
-if(end<_8a){
+if(end<_8c){
 return;
 }
-if(_8c>=_8a&&_8c<=end){
-cc.selectChild(cbs[_8a?_8a-1:end+1]);
+if(_8e>=_8c&&_8e<=end){
+cc.selectChild(cbs[_8c?_8c-1:end+1]);
 }
-for(;end>=_8a;--end){
+for(;end>=_8c;--end){
 cc.removeChild(cbs[end]);
 }
-cbs.splice(_8a,cnt);
+cbs.splice(_8c,cnt);
 }
 this._updatePane();
 this._updateCBoxTitles();
@@ -695,37 +696,37 @@ if(this._savedCriterias&&this._savedCriterias[idx]){
 return _4.mixin({relation:this._relOpCls=="logicall"?this.plugin.nls.and:this.plugin.nls.or},this._savedCriterias[idx]);
 }
 return null;
-},getExprForCriteria:function(_8e){
-if(_8e.column=="anycolumn"){
-var _8f=_2.filter(this.plugin.grid.layout.cells,function(_90){
-return !(_90.filterable===false||_90.hidden);
+},getExprForCriteria:function(_90){
+if(_90.column=="anycolumn"){
+var _91=_2.filter(this.plugin.grid.layout.cells,function(_92){
+return !(_92.filterable===false||_92.hidden);
 });
-return {"op":"logicany","data":_2.map(_8f,function(_91){
-return this.getExprForColumn(_8e.value,_91.index,_8e.type,_8e.condition);
+return {"op":"logicany","data":_2.map(_91,function(_93){
+return this.getExprForColumn(_90.value,_93.index,_90.type,_90.condition);
 },this)};
 }else{
-return this.getExprForColumn(_8e.value,_8e.column,_8e.type,_8e.condition);
+return this.getExprForColumn(_90.value,_90.column,_90.type,_90.condition);
 }
-},getExprForColumn:function(_92,_93,_94,_95){
-_93=parseInt(_93,10);
-var _96=this.plugin.grid.layout.cells[_93],_97=_96.field||_96.name,obj={"datatype":_94||this.getColumnType(_93),"args":_96.dataTypeArgs,"isColumn":true},_98=[_4.mixin({"data":this.plugin.args.isServerSide?_97:_96},obj)];
+},getExprForColumn:function(_94,_95,_96,_97){
+_95=parseInt(_95,10);
+var _98=this.plugin.grid.layout.cells[_95],_99=_98.field||_98.name,obj={"datatype":_96||this.getColumnType(_95),"args":_98.dataTypeArgs,"isColumn":true},_9a=[_4.mixin({"data":this.plugin.args.isServerSide?_99:_98},obj)];
 obj.isColumn=false;
-if(_95=="range"){
-_98.push(_4.mixin({"data":_92.start},obj),_4.mixin({"data":_92.end},obj));
+if(_97=="range"){
+_9a.push(_4.mixin({"data":_94.start},obj),_4.mixin({"data":_94.end},obj));
 }else{
-if(_95!="isempty"){
-_98.push(_4.mixin({"data":_92},obj));
+if(_97!="isempty"){
+_9a.push(_4.mixin({"data":_94},obj));
 }
 }
-return {"op":_95,"data":_98};
-},getColumnType:function(_99){
-var _9a=this.plugin.grid.layout.cells[parseInt(_99,10)];
-if(!_9a||!_9a.datatype){
+return {"op":_97,"data":_9a};
+},getColumnType:function(_9b){
+var _9c=this.plugin.grid.layout.cells[parseInt(_9b,10)];
+if(!_9c||!_9c.datatype){
 return this.defaultType;
 }
-var _9b=String(_9a.datatype).toLowerCase();
-return this._dataTypeMap[_9b]?_9b:this.defaultType;
-},clearFilter:function(_9c){
+var _9d=String(_9c.datatype).toLowerCase();
+return this._dataTypeMap[_9d]?_9d:this.defaultType;
+},clearFilter:function(_9e){
 if(!this._savedCriterias){
 return;
 }
@@ -739,15 +740,15 @@ this._cboxes[0].load({});
 }
 catch(e){
 }
-if(_9c){
+if(_9e){
 this.closeDialog();
 }else{
 this._closeDlgAndUpdateGrid();
 }
-},showDialog:function(_9d){
+},showDialog:function(_9f){
 this._defPane.show();
 this.plugin.filterStatusTip.closeDialog();
-this._prepareDialog(_9d);
+this._prepareDialog(_9f);
 },closeDialog:function(){
 if(this._defPane.open){
 this._defPane.hide();
@@ -780,50 +781,50 @@ this.removeCriteriaBoxes(cbs.length-1);
 cbs[0].load({});
 }
 this.closeDialog();
-},onRendered:function(_9e){
+},onRendered:function(_a0){
 if(!_7("ff")){
-var _9f=_1c._getTabNavigable(_6.byId(_9e.domNode));
-_1a.focus(_9f.lowest||_9f.first);
+var _a1=_1b._getTabNavigable(_6.byId(_a0.domNode));
+_19.focus(_a1.lowest||_a1.first);
 }else{
 var dp=this._defPane;
 dp._getFocusItems(dp.domNode);
-_1a.focus(dp._firstFocusItem);
+_19.focus(dp._firstFocusItem);
 }
-},_onSetFilter:function(_a0){
-if(_a0===null&&this._savedCriterias){
+},_onSetFilter:function(_a2){
+if(_a2===null&&this._savedCriterias){
 this.clearFilter();
 }
-},_prepareDialog:function(_a1){
-var sc=this._savedCriterias,cbs=this._cboxes,i,_a2;
-this.curColIdx=_a1;
+},_prepareDialog:function(_a3){
+var sc=this._savedCriterias,cbs=this._cboxes,i,_a4;
+this.curColIdx=_a3;
 if(!sc){
 if(cbs.length===0){
 this.addCriteriaBoxes(1);
 }else{
-for(i=0;(_a2=cbs[i]);++i){
-_a2.changeCurrentColumn();
+for(i=0;(_a4=cbs[i]);++i){
+_a4.changeCurrentColumn();
 }
 }
 }else{
 if(this._criteriasChanged){
 this.filterDefPane._relSelect.set("value",this._relOpCls==="logicall"?"0":"1");
 this._criteriasChanged=false;
-var _a3=sc.length>cbs.length?sc.length-cbs.length:0;
-this.addCriteriaBoxes(_a3);
+var _a5=sc.length>cbs.length?sc.length-cbs.length:0;
+this.addCriteriaBoxes(_a5);
 this.removeCriteriaBoxes(cbs.length-sc.length);
 this.filterDefPane._clearFilterBtn.set("disabled",false);
-for(i=0;i<cbs.length-_a3;++i){
+for(i=0;i<cbs.length-_a5;++i){
 cbs[i].load(sc[i]);
 }
-if(_a3>0){
-var _a4=[],_a5=_3.connect(this,"onRendered",function(_a6){
-var i=_2.indexOf(cbs,_a6);
-if(!_a4[i]){
-_a4[i]=true;
-if(--_a3===0){
-_3.disconnect(_a5);
+if(_a5>0){
+var _a6=[],_a7=_3.connect(this,"onRendered",function(_a8){
+var i=_2.indexOf(cbs,_a8);
+if(!_a6[i]){
+_a6[i]=true;
+if(--_a5===0){
+_3.disconnect(_a7);
 }
-_a6.load(sc[i]);
+_a8.load(sc[i]);
 }
 });
 }
@@ -831,17 +832,17 @@ _a6.load(sc[i]);
 }
 this.filterDefPane.cboxContainer.resize();
 },_defineFilter:function(){
-var cbs=this._cboxes,_a7=function(_a8){
-return _2.filter(_2.map(cbs,function(_a9){
-return _a9[_a8]();
-}),function(_aa){
-return !!_aa;
+var cbs=this._cboxes,_a9=function(_aa){
+return _2.filter(_2.map(cbs,function(_ab){
+return _ab[_aa]();
+}),function(_ac){
+return !!_ac;
 });
-},_ab=_a7("getExpr");
-this._savedCriterias=_a7("save");
-_ab=_ab.length==1?_ab[0]:{"op":this._relOpCls,"data":_ab};
-_ab=this.builder.buildExpression(_ab);
-this.plugin.grid.layer("filter").filterDef(_ab);
+},_ad=_a9("getExpr");
+this._savedCriterias=_a9("save");
+_ad=_ad.length==1?_ad[0]:{"op":this._relOpCls,"data":_ad};
+_ad=this.builder.buildExpression(_ad);
+this.plugin.grid.layer("filter").filterDef(_ad);
 this.filterDefPane._clearFilterBtn.set("disabled",false);
 },_updateCBoxTitles:function(){
 for(var cbs=this._cboxes,i=cbs.length;i>0;--i){
@@ -849,12 +850,12 @@ cbs[i-1].updateRuleIndex(i);
 cbs[i-1].setAriaInfo(i);
 }
 },_updatePane:function(){
-var cbs=this._cboxes,_ac=this.filterDefPane;
-_ac._addCBoxBtn.set("disabled",cbs.length==this.plugin.args.ruleCount);
-_ac._filterBtn.set("disabled",!this.canFilter());
+var cbs=this._cboxes,_ae=this.filterDefPane;
+_ae._addCBoxBtn.set("disabled",cbs.length==this.plugin.args.ruleCount);
+_ae._filterBtn.set("disabled",!this.canFilter());
 },canFilter:function(){
-return _2.filter(this._cboxes,function(_ad){
-return !_ad.isEmpty();
+return _2.filter(this._cboxes,function(_af){
+return !_af.isEmpty();
 }).length>0;
 },_closeDlgAndUpdateGrid:function(){
 this.closeDialog();
@@ -862,5 +863,5 @@ var g=this.plugin.grid;
 g.showMessage(g.loadingMessage);
 setTimeout(_4.hitch(g,g._refresh),this._defPane.duration+10);
 }});
-return _73;
+return _75;
 });