From 111b7970dee607fab003f2fd705caaf761f3722a Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Mon, 15 Aug 2016 15:49:01 +0800 Subject: [PATCH] roojs-ui.js roojs-ui-debug.js roojs-all.js roojs-debug.js --- roojs-all.js | 2 +- roojs-debug.js | 3 +-- roojs-ui-debug.js | 3 +-- roojs-ui.js | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/roojs-all.js b/roojs-all.js index 3411aee9a0..0f0b3d3e37 100644 --- a/roojs-all.js +++ b/roojs-all.js @@ -2226,7 +2226,7 @@ ds.on("add",this.onAdd,this);ds.on("remove",this.onRemove,this);ds.on("update",t this.cm.un("hiddenchange",this.onHiddenChange,this);this.cm.un("columnmoved",this.onColumnMove,this);this.cm.un("columnlockchange",this.onColumnLock,this);}if(cm){this.generateRules(cm);cm.on("widthchange",this.onColWidthChange,this);cm.on("headerchange",this.onHeaderChange,this); cm.on("hiddenchange",this.onHiddenChange,this);cm.on("columnmoved",this.onColumnMove,this);cm.on("columnlockchange",this.onColumnLock,this);}this.cm=cm;},init:function(A){Roo.grid.GridView.superclass.init.call(this,A);this.bind(A.dataSource,A.colModel);A.on("headerclick",this.handleHeaderClick,this); if(A.trackMouseOver){A.on("mouseover",this.onRowOver,this);A.on("mouseout",this.onRowOut,this);}A.cancelTextSelection=function(){};this.gridId=A.id;var B=this.templates||{};if(!B.master){B.master=new Roo.Template('
','','
','
','
','
{lockedHeader}
','
{lockedBody}
',"
",'
','
{header}
','
{body}
',"
",'
','
 
',"
"); -B.master.disableformats=true;}if(!B.header){B.header=new Roo.Template('','{cells}',"
{splits}");B.header.disableformats=true;}B.header.compile();if(!B.hcell){B.hcell=new Roo.Template('
','
{value}
',"
"); +B.master.disableformats=true;}if(!B.header){B.header=new Roo.Template('','{cells}',"
{splits}");B.header.disableformats=true;}B.header.compile();if(!B.hcell){B.hcell=new Roo.Template('
','
{value}
',"
"); B.hcell.disableFormats=true;}B.hcell.compile();if(!B.hsplit){B.hsplit=new Roo.Template('
 
');B.hsplit.disableFormats=true;}B.hsplit.compile(); if(!B.body){B.body=new Roo.Template('',"{rows}","
");B.body.disableFormats=true;}B.body.compile();if(!B.row){B.row=new Roo.Template('{cells}');B.row.disableFormats=true; }B.row.compile();if(!B.cell){B.cell=new Roo.Template('','
{value}
',""); diff --git a/roojs-debug.js b/roojs-debug.js index 9978e03694..11a94a4923 100644 --- a/roojs-debug.js +++ b/roojs-debug.js @@ -40692,7 +40692,6 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField, reset : function() { - //Roo.form.ComboBoxArray.superclass.reset.call(this); this.items.clear(); Roo.each(this.outerWrap.select('.x-cbarray-item', true).elements, function(el){ @@ -53660,7 +53659,7 @@ Roo.extend(Roo.grid.GridView, Roo.grid.AbstractGridView, { if(!tpls.hcell){ tpls.hcell = new Roo.Template( - '
', + '
', '
{value}
', "
" ); diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js index b32f283732..8c7fba936f 100644 --- a/roojs-ui-debug.js +++ b/roojs-ui-debug.js @@ -24219,7 +24219,6 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField, reset : function() { - //Roo.form.ComboBoxArray.superclass.reset.call(this); this.items.clear(); Roo.each(this.outerWrap.select('.x-cbarray-item', true).elements, function(el){ @@ -37187,7 +37186,7 @@ Roo.extend(Roo.grid.GridView, Roo.grid.AbstractGridView, { if(!tpls.hcell){ tpls.hcell = new Roo.Template( - '
', + '
', '
{value}
', "
" ); diff --git a/roojs-ui.js b/roojs-ui.js index b0a2f396fd..4c6ddfee18 100644 --- a/roojs-ui.js +++ b/roojs-ui.js @@ -1556,7 +1556,7 @@ ds.on("add",this.onAdd,this);ds.on("remove",this.onRemove,this);ds.on("update",t this.cm.un("hiddenchange",this.onHiddenChange,this);this.cm.un("columnmoved",this.onColumnMove,this);this.cm.un("columnlockchange",this.onColumnLock,this);}if(cm){this.generateRules(cm);cm.on("widthchange",this.onColWidthChange,this);cm.on("headerchange",this.onHeaderChange,this); cm.on("hiddenchange",this.onHiddenChange,this);cm.on("columnmoved",this.onColumnMove,this);cm.on("columnlockchange",this.onColumnLock,this);}this.cm=cm;},init:function(A){Roo.grid.GridView.superclass.init.call(this,A);this.bind(A.dataSource,A.colModel);A.on("headerclick",this.handleHeaderClick,this); if(A.trackMouseOver){A.on("mouseover",this.onRowOver,this);A.on("mouseout",this.onRowOut,this);}A.cancelTextSelection=function(){};this.gridId=A.id;var B=this.templates||{};if(!B.master){B.master=new Roo.Template('
','','
','
','
','
{lockedHeader}
','
{lockedBody}
',"
",'
','
{header}
','
{body}
',"
",'
','
 
',"
"); -B.master.disableformats=true;}if(!B.header){B.header=new Roo.Template('','{cells}',"
{splits}");B.header.disableformats=true;}B.header.compile();if(!B.hcell){B.hcell=new Roo.Template('
','
{value}
',"
"); +B.master.disableformats=true;}if(!B.header){B.header=new Roo.Template('','{cells}',"
{splits}");B.header.disableformats=true;}B.header.compile();if(!B.hcell){B.hcell=new Roo.Template('
','
{value}
',"
"); B.hcell.disableFormats=true;}B.hcell.compile();if(!B.hsplit){B.hsplit=new Roo.Template('
 
');B.hsplit.disableFormats=true;}B.hsplit.compile(); if(!B.body){B.body=new Roo.Template('',"{rows}","
");B.body.disableFormats=true;}B.body.compile();if(!B.row){B.row=new Roo.Template('{cells}');B.row.disableFormats=true; }B.row.compile();if(!B.cell){B.cell=new Roo.Template('','
{value}
',""); -- 2.39.2