From fc4f0bce3ae5ff16554cd9dd97e274802a3d13da Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Tue, 8 Mar 2011 00:05:55 +0000 Subject: [PATCH] Update compiled build --- buildSDK/dependancy_ui.txt | 1 - roojs-all.js | 2 +- roojs-debug.js | 7 ++++--- roojs-ui-debug.js | 7 ++++--- roojs-ui.js | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/buildSDK/dependancy_ui.txt b/buildSDK/dependancy_ui.txt index 51ffd13f1d..3a1715d5f8 100644 --- a/buildSDK/dependancy_ui.txt +++ b/buildSDK/dependancy_ui.txt @@ -158,4 +158,3 @@ Roo.XTemplate // extras.. Roo.XComponent Roo.Login - diff --git a/roojs-all.js b/roojs-all.js index 4eec8cd763..42c65ad373 100644 --- a/roojs-all.js +++ b/roojs-all.js @@ -918,7 +918,7 @@ this.scroll=false;this.grid=A;this.ddel=document.createElement('div');this.ddel. Roo.grid.ColumnModel=function(A){this.config=A;this.lookup={};for(var i=0,B=A.length;i-1?this.config[B]:false;},getIndexById:function(id){for(var i=0,A=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=="string"&&A.length<1){return " ";}return A;};Roo.grid.DefaultColumnModel=Roo.grid.ColumnModel; +this.config[A].locked=B;if(!C){this.fireEvent("columnlockchange",this,A,B);}},getTotalLockedWidth:function(){var A=0;for(var i=0;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=="string"&&A.length<1){return " ";}return A;};Roo.grid.DefaultColumnModel=Roo.grid.ColumnModel; Roo.grid.AbstractSelectionModel=function(){this.locked=false;Roo.grid.AbstractSelectionModel.superclass.constructor.call(this);};Roo.extend(Roo.grid.AbstractSelectionModel,Roo.util.Observable,{init:function(A){this.grid=A;this.initEvents();},lock:function(){this.locked=true;},unlock:function(){this.locked=false;},isLocked:function(){return this.locked;}}); Roo.grid.RowSelectionModel=function(A){Roo.apply(this,A);this.selections=new Roo.util.MixedCollection(false,function(o){return o.id;});this.last=false;this.lastActive=false;this.addEvents({"selectionchange":true,"afterselectionchange":true,"beforerowselect":true,"rowselect":true,"rowdeselect":true});Roo.grid.RowSelectionModel.superclass.constructor.call(this);this.locked=false;};Roo.extend(Roo.grid.RowSelectionModel,Roo.grid.AbstractSelectionModel,{singleSelect:false,initEvents:function(){if(!this.grid.enableDragDrop&&!this.grid.enableDrag){this.grid.on("mousedown",this.handleMouseDown,this);}else {this.grid.on("rowclick",this.handleDragableRowClick,this);} this.rowNav=new Roo.KeyNav(this.grid.getGridEl(),{"up":function(e){if(!e.shiftKey){this.selectPrevious(e.shiftKey);}else if(this.last!==false&&this.lastActive!==false){var B=this.last;this.selectRange(this.last,this.lastActive-1);this.grid.getView().focusRow(this.lastActive);if(B!==false){this.last=B;}}else {this.selectFirstRow();} diff --git a/roojs-debug.js b/roojs-debug.js index a07d67f2c6..b6117b3c2d 100644 --- a/roojs-debug.js +++ b/roojs-debug.js @@ -47588,7 +47588,8 @@ Roo.extend(Roo.grid.GridView, Roo.grid.AbstractGridView, { return this.cm.getColumnId(index); }, - getSplitters : function(){ + getSplitters : function() + { if(this.splitterSelector){ return Roo.DomQuery.select(this.splitterSelector); }else{ @@ -47764,7 +47765,7 @@ Roo.extend(Roo.grid.GridView, Roo.grid.AbstractGridView, { var pos = 0, locked = true; for(var i = 0, len = cm.getColumnCount(); i < len; i++){ if(cm.isHidden(i)) continue; - var w = cm.getColumnWidth(i); + var w = cm.getColumnWidth(i); // make sure it's a number if(!cm.isLocked(i) && locked){ pos = 0; locked = false; @@ -49211,7 +49212,7 @@ Roo.extend(Roo.grid.ColumnModel, Roo.util.Observable, { * @return {Number} */ getColumnWidth : function(col){ - return this.config[col].width || this.defaultWidth; + return this.config[col].width * 1 || this.defaultWidth; }, /** diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js index 88b86114a5..eaf8aa035e 100644 --- a/roojs-ui-debug.js +++ b/roojs-ui-debug.js @@ -33197,7 +33197,8 @@ Roo.extend(Roo.grid.GridView, Roo.grid.AbstractGridView, { return this.cm.getColumnId(index); }, - getSplitters : function(){ + getSplitters : function() + { if(this.splitterSelector){ return Roo.DomQuery.select(this.splitterSelector); }else{ @@ -33373,7 +33374,7 @@ Roo.extend(Roo.grid.GridView, Roo.grid.AbstractGridView, { var pos = 0, locked = true; for(var i = 0, len = cm.getColumnCount(); i < len; i++){ if(cm.isHidden(i)) continue; - var w = cm.getColumnWidth(i); + var w = cm.getColumnWidth(i); // make sure it's a number if(!cm.isLocked(i) && locked){ pos = 0; locked = false; @@ -34820,7 +34821,7 @@ Roo.extend(Roo.grid.ColumnModel, Roo.util.Observable, { * @return {Number} */ getColumnWidth : function(col){ - return this.config[col].width || this.defaultWidth; + return this.config[col].width * 1 || this.defaultWidth; }, /** diff --git a/roojs-ui.js b/roojs-ui.js index 9229dcd215..8056b573de 100644 --- a/roojs-ui.js +++ b/roojs-ui.js @@ -676,7 +676,7 @@ this.scroll=false;this.grid=A;this.ddel=document.createElement('div');this.ddel. Roo.grid.ColumnModel=function(A){this.config=A;this.lookup={};for(var i=0,B=A.length;i-1?this.config[B]:false;},getIndexById:function(id){for(var i=0,A=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=="string"&&A.length<1){return " ";}return A;};Roo.grid.DefaultColumnModel=Roo.grid.ColumnModel; +this.config[A].locked=B;if(!C){this.fireEvent("columnlockchange",this,A,B);}},getTotalLockedWidth:function(){var A=0;for(var i=0;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=="string"&&A.length<1){return " ";}return A;};Roo.grid.DefaultColumnModel=Roo.grid.ColumnModel; Roo.grid.AbstractSelectionModel=function(){this.locked=false;Roo.grid.AbstractSelectionModel.superclass.constructor.call(this);};Roo.extend(Roo.grid.AbstractSelectionModel,Roo.util.Observable,{init:function(A){this.grid=A;this.initEvents();},lock:function(){this.locked=true;},unlock:function(){this.locked=false;},isLocked:function(){return this.locked;}}); Roo.grid.RowSelectionModel=function(A){Roo.apply(this,A);this.selections=new Roo.util.MixedCollection(false,function(o){return o.id;});this.last=false;this.lastActive=false;this.addEvents({"selectionchange":true,"afterselectionchange":true,"beforerowselect":true,"rowselect":true,"rowdeselect":true});Roo.grid.RowSelectionModel.superclass.constructor.call(this);this.locked=false;};Roo.extend(Roo.grid.RowSelectionModel,Roo.grid.AbstractSelectionModel,{singleSelect:false,initEvents:function(){if(!this.grid.enableDragDrop&&!this.grid.enableDrag){this.grid.on("mousedown",this.handleMouseDown,this);}else {this.grid.on("rowclick",this.handleDragableRowClick,this);} this.rowNav=new Roo.KeyNav(this.grid.getGridEl(),{"up":function(e){if(!e.shiftKey){this.selectPrevious(e.shiftKey);}else if(this.last!==false&&this.lastActive!==false){var B=this.last;this.selectRange(this.last,this.lastActive-1);this.grid.getView().focusRow(this.lastActive);if(B!==false){this.last=B;}}else {this.selectFirstRow();} -- 2.39.2