allow string based values for comboboxarray

[roojs1] / Roo / grid / GridDragZone.js

diff --git a/Roo/grid/GridDragZone.js b/Roo/grid/GridDragZone.js
index 90f669d..1a59661 100644 (file)
--- a/Roo/grid/GridDragZone.js
+++ b/Roo/grid/GridDragZone.js
@@ -30,15 +30,25 @@ Roo.extend(Roo.grid.GridDragZone, Roo.dd.DragZone, {
     getDragData : function(e){
         var t = Roo.lib.Event.getTarget(e);
         var rowIndex = this.view.findRowIndex(t);
-        Roo.log(rowIndex);
-        if(rowIndex !== false){
-            var sm = this.grid.selModel;
+        var sm = this.grid.selModel;
             
-            // if editorgrid.. 
-            if (sm.getSelectedCell && (!sm.getSelectedCell() || (sm.getSelectedCell()[0] == rowIndex) ) ) {
-                Roo.log([ sm.getSelectedCell() ? sm.getSelectedCell()[0] : 'NO' , rowIndex ]);
+        //Roo.log(rowIndex);
+        
+        if (sm.getSelectedCell) {
+            // cell selection..
+            if (!sm.getSelectedCell()) {
                 return false;
             }
+            if (rowIndex != sm.getSelectedCell()[0]) {
+                return false;
+            }
+        
+        }
+        
+        if(rowIndex !== false){
+            
+            // if editorgrid.. 
+            
             
             //Roo.log([ sm.getSelectedCell() ? sm.getSelectedCell()[0] : 'NO' , rowIndex ]);
                
@@ -56,7 +66,7 @@ Roo.extend(Roo.grid.GridDragZone, Roo.dd.DragZone, {
                 ddel: this.ddel,
                 rowIndex: rowIndex,
                 selections:sm.getSelections ? sm.getSelections() : (
-                    sm.getSelectedCell() ? [ grid.ds.getAt(sm.getSelectedCell()[0]) ] : []
+                    sm.getSelectedCell() ? [ this.grid.ds.getAt(sm.getSelectedCell()[0]) ] : []
                 )
             };
         }