From 9a17fce9cf5b90446b73a9b52b68d98fde11baa1 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Mon, 26 Jul 2021 10:02:02 +0800 Subject: [PATCH] roojs-bootstrap.js roojs-bootstrap-debug.js Roo/bootstrap/Table.js --- Roo/bootstrap/Table.js | 2 +- roojs-bootstrap-debug.js | 2 +- roojs-bootstrap.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Roo/bootstrap/Table.js b/Roo/bootstrap/Table.js index ee43082be6..3fb39bb7ce 100644 --- a/Roo/bootstrap/Table.js +++ b/Roo/bootstrap/Table.js @@ -397,7 +397,7 @@ Roo.extend(Roo.bootstrap.Table, Roo.bootstrap.Component, { this.relayEvents(this.bodyEl, ["mousedown","mouseup","mouseover","mouseout","keypress"]); - this.proxy = table.createChild({ cls:"x-grid-resize-proxy", html: ' ' }); + this.proxy = this.el.createChild({ cls:"x-grid-resize-proxy", html: ' ' }); if(this.enableColumnResize !== false && Roo.grid.SplitDragZone){ diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index 89e2cfb97d..628f37075e 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -8978,7 +8978,7 @@ Roo.extend(Roo.bootstrap.Table, Roo.bootstrap.Component, { this.relayEvents(this.bodyEl, ["mousedown","mouseup","mouseover","mouseout","keypress"]); - this.proxy = table.createChild({ cls:"x-grid-resize-proxy", html: ' ' }); + this.proxy = this.el.createChild({ cls:"x-grid-resize-proxy", html: ' ' }); if(this.enableColumnResize !== false && Roo.grid.SplitDragZone){ diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js index b7d6a59b5c..d59f54707a 100644 --- a/roojs-bootstrap.js +++ b/roojs-bootstrap.js @@ -372,7 +372,7 @@ this.ds=this.store;this.ds.xmodule=this.xmodule||false;}if(this.footer&&this.sto if(this.footer){this.footer.parentId=this.id;this.footer.onRender(this.el.select('tfoot tr td').first(),null);if(this.lazyLoad){this.el.select('tfoot tr td').first().addClass('hide');}}if(this.loadMask){this.maskEl=new Roo.LoadMask(this.el,{store:this.ds,msgCls:'roo-el-mask-msg'} );}this.store.on('load',this.onLoad,this);this.store.on('beforeload',this.onBeforeLoad,this);this.store.on('update',this.onUpdate,this);this.store.on('add',this.onAdd,this);this.store.on("clear",this.clear,this);this.el.on("contextmenu",this.onContextMenu,this); this.cm.on("headerchange",this.onHeaderChange,this);this.cm.on("hiddenchange",this.onHiddenChange,this,arguments);this.bodyEl.on("click",this.onClick,this);this.bodyEl.on("dblclick",this.onDblClick,this);this.bodyEl.on('scroll',this.onBodyScroll,this);this.relayEvents(this.bodyEl,["mousedown","mouseup","mouseover","mouseout","keypress"]); -this.proxy=table.createChild({cls:"x-grid-resize-proxy",html:' '});if(this.enableColumnResize!==false&&Roo.grid.SplitDragZone){new Roo.grid.SplitDragZone(this,this.headEl.dom,false);}},getView:function(){return this;},onContextMenu:function(e,t){this.processEvent("contextmenu",e); +this.proxy=this.el.createChild({cls:"x-grid-resize-proxy",html:' '});if(this.enableColumnResize!==false&&Roo.grid.SplitDragZone){new Roo.grid.SplitDragZone(this,this.headEl.dom,false);}},getView:function(){return this;},onContextMenu:function(e,t){this.processEvent("contextmenu",e); },processEvent:function(A,e){if(A!='touchstart'){this.fireEvent(A,e);}var t=e.getTarget();var B=Roo.get(t);if(!B){return;}if(B.findParent('tfoot',false,true)){return;}if(B.findParent('thead',false,true)){if(e.getTarget().nodeName.toLowerCase()!='th'){B=Roo.get(t).findParent('th',false,true); if(!B){Roo.log("failed to find th in thead?");Roo.log(e.getTarget());return;}}var C=B.dom.cellIndex;var D=A=='touchstart'?'click':A;this.fireEvent("header"+D,this,C,e);return;}if(e.getTarget().nodeName.toLowerCase()!='td'){B=Roo.get(t).findParent('td',false,true); if(!B){Roo.log("failed to find th in tbody?");Roo.log(e.getTarget());return;}}var E=B.findParent('tr',false,true);var C=B.dom.cellIndex;var F=E.dom.rowIndex-1;if(E!==false){this.fireEvent("row"+A,this,F,e);if(B!==false){this.fireEvent("cell"+A,this,F,C,e); -- 2.39.2