From: Alan Knowles Date: Thu, 12 Oct 2017 09:03:12 +0000 (+0800) Subject: Roo/grid/ColumnModel.js X-Git-Url: http://git.roojs.org/?a=commitdiff_plain;h=2555855ef34122d589a748ff0460dde4f39e2c1c;p=roojs1 Roo/grid/ColumnModel.js roojs-bootstrap.js roojs-bootstrap-debug.js --- diff --git a/Roo/grid/ColumnModel.js b/Roo/grid/ColumnModel.js index 0b0973be3f..770f524470 100644 --- a/Roo/grid/ColumnModel.js +++ b/Roo/grid/ColumnModel.js @@ -538,7 +538,7 @@ Roo.grid.ColumnModel.defaultRenderer = function(value) return " "; } - return String.format("{1}", value); + return String.format("{0}", value); }; // Alias for backwards compatibility diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index f49c0913bd..8421a7cc6f 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -5552,7 +5552,7 @@ Roo.grid.ColumnModel.defaultRenderer = function(value) return " "; } - return String.format("{1}", value); + return String.format("{0}", value); }; // Alias for backwards compatibility diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js index 48a36bae7c..420b20ae58 100644 --- a/roojs-bootstrap.js +++ b/roojs-bootstrap.js @@ -216,7 +216,7 @@ for(var i=0,B=this.config.length;i=0&&this.config[A].resizable!==false&&this.config[A].fixed!==true; },setHidden:function(A,B){this.config[A].hidden=B;this.totalWidth=null;this.fireEvent("hiddenchange",this,A,B);},setEditor:function(A,B){this.config[A].editor=B;}});Roo.grid.ColumnModel.defaultRenderer=function(A){if(typeof A=="object"){return A;}if(typeof A=="string"&&A.length<1){return " "; -}return String.format("{1}",A);};Roo.grid.DefaultColumnModel=Roo.grid.ColumnModel; +}return String.format("{0}",A);};Roo.grid.DefaultColumnModel=Roo.grid.ColumnModel; // Roo/LoadMask.js Roo.LoadMask=function(el,A){this.el=Roo.get(el);Roo.apply(this,A);if(this.store){this.store.on('beforeload',this.onBeforeLoad,this);this.store.on('load',this.onLoad,this);this.store.on('loadexception',this.onLoadException,this);this.removeMask=false;}else{var um=this.el.getUpdateManager(); um.showLoadIndicator=false;um.on('beforeupdate',this.onBeforeLoad,this);um.on('update',this.onLoad,this);um.on('failure',this.onLoad,this);this.removeMask=true;}};Roo.LoadMask.prototype={msg:'Loading...',msgCls:'x-mask-loading',disabled:false,disable:function(){this.disabled=true;