sync

[roojs1] / roojs-bootstrap-debug.js

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index 76bddaa..c30b5b5 100644 (file)
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -2281,10 +2281,12 @@ Roo.extend(Roo.bootstrap.Card, Roo.bootstrap.Component,  {
             pos = this.getDropPoint(e, this.items[i].el.dom);
             
             //Roo.log(this.items[i].el.dom.id);
+            var ii = cards.length;
             cards.push(this.items[i]);
+            
             if (ctarget < 0 && pos == 'above') {
-                ctarget = i > 0 ? i - 1 : 0;
-                cpos = i > 0 ? 'below' : pos;
+                ctarget = ii > 0 ? ii - 1 : 0;
+                cpos = ii > 0 ? 'below' : pos;
             }
         }
         if (!cards.length) {
@@ -2319,7 +2321,7 @@ Roo.extend(Roo.bootstrap.Card, Roo.bootstrap.Component,  {
             return false;
         }
         
-        return [ cards[ctarget], cpos ];
+        return [ cards[ctarget], cpos, cards, ctarget ];
     },
     
     onNodeEnter : function(n, dd, e, data){
@@ -2352,7 +2354,10 @@ Roo.extend(Roo.bootstrap.Card, Roo.bootstrap.Component,  {
             return false;
         }
         
-        
+        var target_info = this.getTargetFromEvent(e,data.source.el);
+        if (target_info === false) {
+            return false;
+        }
         
         var pt = this.getDropPoint(e, n, dd);
         var insertAt = (n == this.bodyEl.dom) ? this.items.length : n.nodeIndex;