From a50fd52f0feb3adafcf327d787bfa79e22134e17 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Wed, 17 Mar 2021 16:27:02 +0800 Subject: [PATCH] roojs-ui.js roojs-ui-debug.js roojs-all.js roojs-debug.js --- roojs-all.js | 2 +- roojs-debug.js | 2 +- roojs-ui-debug.js | 2 +- roojs-ui.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roojs-all.js b/roojs-all.js index 85d2eb9329..a16c4330dd 100644 --- a/roojs-all.js +++ b/roojs-all.js @@ -2457,7 +2457,7 @@ var w=this.cm.getColumnWidth(this.cellIndex);var A=Math.max(w-this.grid.minColum // Roo/grid/GridDragZone.js Roo.grid.GridDragZone=function(A,B){this.view=A.getView();Roo.grid.GridDragZone.superclass.constructor.call(this,this.view.mainBody.dom,B);if(this.view.lockedBody){this.setHandleElId(Roo.id(this.view.mainBody.dom));this.setOuterHandleElId(Roo.id(this.view.lockedBody.dom)); }this.scroll=false;this.grid=A;this.ddel=document.createElement('div');this.ddel.className='x-grid-dd-wrap';};Roo.extend(Roo.grid.GridDragZone,Roo.dd.DragZone,{ddGroup:"GridDD",getDragData:function(e){var t=Roo.lib.Event.getTarget(e);var A=this.view.findRowIndex(t); -var sm=this.grid.selModel;if(sm.getSelectedCell){if(!sm.getSelectedCell()){return false;}if(A!=sm.getSelectedCell()[0]){return false;}}var B=sm.getSelections?sm.getSelections():(sm.getSelectedCell()?[this.grid.ds.getAt(sm.getSelectedCell()[0])]:[]);if(B){if(e.hasModifier()){sm.handleMouseDown(e,t); +var sm=this.grid.selModel;if(sm.getSelectedCell){if(!sm.getSelectedCell()){return false;}if(A!=sm.getSelectedCell()[0]){return false;}}var B=sm.getSelections?sm.getSelections():(sm.getSelectedCell()?[this.grid.ds.getAt(sm.getSelectedCell()[0])]:[]);if(B||B.length){if(e.hasModifier()){sm.handleMouseDown(e,t); }Roo.log("getDragData");return {grid:this.grid,ddel:this.ddel,rowIndex:A,selections:sm.getSelections?sm.getSelections():(sm.getSelectedCell()?[this.grid.ds.getAt(sm.getSelectedCell()[0])]:[])};}return false;},onBeforeDrag:function(A,e){return A!==false;},onInitDrag:function(e){var A=this.dragData; this.ddel.innerHTML=this.grid.getDragDropText();this.proxy.update(this.ddel);},afterRepair:function(){this.dragging=false;},getRepairXY:function(e,A){return false;},onEndDrag:function(A,e){},onValidDrop:function(dd,e,id){this.hideProxy();},beforeInvalidDrop:function(e,id){} }); diff --git a/roojs-debug.js b/roojs-debug.js index 3cac4b8f5a..f406f9b991 100644 --- a/roojs-debug.js +++ b/roojs-debug.js @@ -58031,7 +58031,7 @@ Roo.extend(Roo.grid.GridDragZone, Roo.dd.DragZone, { sm.getSelectedCell() ? [ this.grid.ds.getAt(sm.getSelectedCell()[0]) ] : []); // before it used to all dragging of unseleted... - now we dont do that. - if(sels){ + if(sels || sels.length){ // if editorgrid.. diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js index a5a069e199..882ca3c58b 100644 --- a/roojs-ui-debug.js +++ b/roojs-ui-debug.js @@ -35026,7 +35026,7 @@ Roo.extend(Roo.grid.GridDragZone, Roo.dd.DragZone, { sm.getSelectedCell() ? [ this.grid.ds.getAt(sm.getSelectedCell()[0]) ] : []); // before it used to all dragging of unseleted... - now we dont do that. - if(sels){ + if(sels || sels.length){ // if editorgrid.. diff --git a/roojs-ui.js b/roojs-ui.js index ae29202996..39425eef46 100644 --- a/roojs-ui.js +++ b/roojs-ui.js @@ -1563,7 +1563,7 @@ var w=this.cm.getColumnWidth(this.cellIndex);var A=Math.max(w-this.grid.minColum // Roo/grid/GridDragZone.js Roo.grid.GridDragZone=function(A,B){this.view=A.getView();Roo.grid.GridDragZone.superclass.constructor.call(this,this.view.mainBody.dom,B);if(this.view.lockedBody){this.setHandleElId(Roo.id(this.view.mainBody.dom));this.setOuterHandleElId(Roo.id(this.view.lockedBody.dom)); }this.scroll=false;this.grid=A;this.ddel=document.createElement('div');this.ddel.className='x-grid-dd-wrap';};Roo.extend(Roo.grid.GridDragZone,Roo.dd.DragZone,{ddGroup:"GridDD",getDragData:function(e){var t=Roo.lib.Event.getTarget(e);var A=this.view.findRowIndex(t); -var sm=this.grid.selModel;if(sm.getSelectedCell){if(!sm.getSelectedCell()){return false;}if(A!=sm.getSelectedCell()[0]){return false;}}var B=sm.getSelections?sm.getSelections():(sm.getSelectedCell()?[this.grid.ds.getAt(sm.getSelectedCell()[0])]:[]);if(B){if(e.hasModifier()){sm.handleMouseDown(e,t); +var sm=this.grid.selModel;if(sm.getSelectedCell){if(!sm.getSelectedCell()){return false;}if(A!=sm.getSelectedCell()[0]){return false;}}var B=sm.getSelections?sm.getSelections():(sm.getSelectedCell()?[this.grid.ds.getAt(sm.getSelectedCell()[0])]:[]);if(B||B.length){if(e.hasModifier()){sm.handleMouseDown(e,t); }Roo.log("getDragData");return {grid:this.grid,ddel:this.ddel,rowIndex:A,selections:sm.getSelections?sm.getSelections():(sm.getSelectedCell()?[this.grid.ds.getAt(sm.getSelectedCell()[0])]:[])};}return false;},onBeforeDrag:function(A,e){return A!==false;},onInitDrag:function(e){var A=this.dragData; this.ddel.innerHTML=this.grid.getDragDropText();this.proxy.update(this.ddel);},afterRepair:function(){this.dragging=false;},getRepairXY:function(e,A){return false;},onEndDrag:function(A,e){},onValidDrop:function(dd,e,id){this.hideProxy();},beforeInvalidDrop:function(e,id){} }); -- 2.39.2