From 2427a7b05b45495ca95ba5c1e41041a1749f1745 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Mon, 27 Jun 2016 12:44:53 +0800 Subject: [PATCH] roojs-ui.js roojs-ui-debug.js roojs-debug.js roojs-all.js --- roojs-all.js | 46 +++++++++++++++++++++++----------------------- roojs-debug.js | 4 ++-- roojs-ui-debug.js | 4 ++-- roojs-ui.js | 46 +++++++++++++++++++++++----------------------- 4 files changed, 50 insertions(+), 50 deletions(-) diff --git a/roojs-all.js b/roojs-all.js index 858b5417e2..0b859842cf 100644 --- a/roojs-all.js +++ b/roojs-all.js @@ -2223,7 +2223,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}
',""); @@ -2245,28 +2245,28 @@ if(id){return parseInt(id[1],10);}return 0;},findHeaderIndex:function(n){var r=R }return false;},getColumnId:function(A){return this.cm.getColumnId(A);},getSplitters:function(){if(this.splitterSelector){return Roo.DomQuery.select(this.splitterSelector);}else{return null;}},getSplitter:function(A){return this.getSplitters()[A];},onRowOver:function(e,t){var A; if((A=this.findRowIndex(t))!==false){this.getRowComposite(A).addClass("x-grid-row-over");}},onRowOut:function(e,t){var A;if((A=this.findRowIndex(t))!==false&&A!==this.findRowIndex(e.getRelatedTarget())){this.getRowComposite(A).removeClass("x-grid-row-over"); }},renderHeaders:function(){var cm=this.cm;var ct=this.templates.hcell,ht=this.templates.header,st=this.templates.hsplit;var cb=[],lb=[],sb=[],A=[],p={};for(var i=0,B=cm.getColumnCount();i=this.ds.getCount()){return null;}B=(B!==undefined?B:0);var cm=this.grid.colModel;while(cm.isHidden(B)){B++;}var el=this.getCell(A,B);if(!el){return null;}var c=this.scroller.dom;var D=parseInt(el.offsetTop,10);var E=parseInt(el.offsetLeft,10); -var F=D+el.offsetHeight;var G=E+el.offsetWidth;var ch=c.clientHeight-this.mainHd.dom.offsetHeight;var H=parseInt(c.scrollTop,10);var I=parseInt(c.scrollLeft,10);var J=H+ch;var K=I+c.clientWidth;if(DJ){c.scrollTop=F-ch;}if(C!==false){if(EK){c.scrollLeft=G-c.clientWidth;}}return el;},updateColumns:function(){this.grid.stopEditing();var cm=this.grid.colModel,A=this.getColumnIds();var B=0;for(var i=0,C=cm.getColumnCount();i"+A+"";var G=b.firstChild.rows;for(var i=0,H=G.length;i=this.ds.getCount()){return null;}B=(B!==undefined?B:0);var cm=this.grid.colModel;while(cm.isHidden(B)){B++;}var el=this.getCell(A,B);if(!el){return null;}var c=this.scroller.dom; +var D=parseInt(el.offsetTop,10);var E=parseInt(el.offsetLeft,10);var F=D+el.offsetHeight;var G=E+el.offsetWidth;var ch=c.clientHeight-this.mainHd.dom.offsetHeight;var H=parseInt(c.scrollTop,10);var I=parseInt(c.scrollLeft,10);var J=H+ch;var K=I+c.clientWidth; +if(DJ){c.scrollTop=F-ch;}if(C!==false){if(EK){c.scrollLeft=G-c.clientWidth;}}return el;},updateColumns:function(){this.grid.stopEditing();var cm=this.grid.colModel,A=this.getColumnIds();var B=0;for(var i=0,C=cm.getColumnCount(); +i"+A+"";var G=b.firstChild.rows;for(var i=0,H=G.length;i
', + '
', '
{value}
', "
" ); @@ -53941,7 +53941,7 @@ Roo.extend(Roo.grid.GridView, Roo.grid.AbstractGridView, { p.cellId = "x-grid-hd-0-" + i; p.splitId = "x-grid-csplit-0-" + i; p.id = cm.getColumnId(i); - p.title = cm.getColumnTooltip(i) || ""; + p.title = cm.getColumnTooltip(i) || cm.getColumnHeader() || ""; p.value = cm.getColumnHeader(i) || ""; p.style = (this.grid.enableColumnResize === false || !cm.isResizable(i) || cm.isFixed(i)) ? 'cursor:default' : ''; if(!cm.isLocked(i)){ diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js index afc443b8eb..1249aec16b 100644 --- a/roojs-ui-debug.js +++ b/roojs-ui-debug.js @@ -37119,7 +37119,7 @@ Roo.extend(Roo.grid.GridView, Roo.grid.AbstractGridView, { if(!tpls.hcell){ tpls.hcell = new Roo.Template( - '
', + '
', '
{value}
', "
" ); @@ -37468,7 +37468,7 @@ Roo.extend(Roo.grid.GridView, Roo.grid.AbstractGridView, { p.cellId = "x-grid-hd-0-" + i; p.splitId = "x-grid-csplit-0-" + i; p.id = cm.getColumnId(i); - p.title = cm.getColumnTooltip(i) || ""; + p.title = cm.getColumnTooltip(i) || cm.getColumnHeader() || ""; p.value = cm.getColumnHeader(i) || ""; p.style = (this.grid.enableColumnResize === false || !cm.isResizable(i) || cm.isFixed(i)) ? 'cursor:default' : ''; if(!cm.isLocked(i)){ diff --git a/roojs-ui.js b/roojs-ui.js index c89494b689..e1f5059e34 100644 --- a/roojs-ui.js +++ b/roojs-ui.js @@ -1553,7 +1553,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}
',""); @@ -1575,28 +1575,28 @@ if(id){return parseInt(id[1],10);}return 0;},findHeaderIndex:function(n){var r=R }return false;},getColumnId:function(A){return this.cm.getColumnId(A);},getSplitters:function(){if(this.splitterSelector){return Roo.DomQuery.select(this.splitterSelector);}else{return null;}},getSplitter:function(A){return this.getSplitters()[A];},onRowOver:function(e,t){var A; if((A=this.findRowIndex(t))!==false){this.getRowComposite(A).addClass("x-grid-row-over");}},onRowOut:function(e,t){var A;if((A=this.findRowIndex(t))!==false&&A!==this.findRowIndex(e.getRelatedTarget())){this.getRowComposite(A).removeClass("x-grid-row-over"); }},renderHeaders:function(){var cm=this.cm;var ct=this.templates.hcell,ht=this.templates.header,st=this.templates.hsplit;var cb=[],lb=[],sb=[],A=[],p={};for(var i=0,B=cm.getColumnCount();i=this.ds.getCount()){return null;}B=(B!==undefined?B:0);var cm=this.grid.colModel;while(cm.isHidden(B)){B++;}var el=this.getCell(A,B);if(!el){return null;}var c=this.scroller.dom;var D=parseInt(el.offsetTop,10);var E=parseInt(el.offsetLeft,10); -var F=D+el.offsetHeight;var G=E+el.offsetWidth;var ch=c.clientHeight-this.mainHd.dom.offsetHeight;var H=parseInt(c.scrollTop,10);var I=parseInt(c.scrollLeft,10);var J=H+ch;var K=I+c.clientWidth;if(DJ){c.scrollTop=F-ch;}if(C!==false){if(EK){c.scrollLeft=G-c.clientWidth;}}return el;},updateColumns:function(){this.grid.stopEditing();var cm=this.grid.colModel,A=this.getColumnIds();var B=0;for(var i=0,C=cm.getColumnCount();i"+A+"";var G=b.firstChild.rows;for(var i=0,H=G.length;i=this.ds.getCount()){return null;}B=(B!==undefined?B:0);var cm=this.grid.colModel;while(cm.isHidden(B)){B++;}var el=this.getCell(A,B);if(!el){return null;}var c=this.scroller.dom; +var D=parseInt(el.offsetTop,10);var E=parseInt(el.offsetLeft,10);var F=D+el.offsetHeight;var G=E+el.offsetWidth;var ch=c.clientHeight-this.mainHd.dom.offsetHeight;var H=parseInt(c.scrollTop,10);var I=parseInt(c.scrollLeft,10);var J=H+ch;var K=I+c.clientWidth; +if(DJ){c.scrollTop=F-ch;}if(C!==false){if(EK){c.scrollLeft=G-c.clientWidth;}}return el;},updateColumns:function(){this.grid.stopEditing();var cm=this.grid.colModel,A=this.getColumnIds();var B=0;for(var i=0,C=cm.getColumnCount(); +i"+A+"";var G=b.firstChild.rows;for(var i=0,H=G.length;i