Changeset 461

Timestamp:

10/21/06 20:21:37 (2 years ago)

Author:

stefan

Message:

Changed 'onDrag' is now 'onDragModifier' because is a pre modifier for the coordinates
Added 'onDrag' callback that gets the modified coordinates

Files:

• plugins/interface/idrag.js (modified) (7 diffs)

plugins/interface/idrag.js

@@ -160 +160 @@
         if (elm.dragCfg.containment) {
             jQuery.iDrag.getContainment(elm);
-            elm.dragCfg.onDrag.containment = jQuery.iDrag.fitToContainer;
+            elm.dragCfg.onDragModifier.containment = jQuery.iDrag.fitToContainer;
         }
 
@@ -176 +176 @@
 
         if (elm.dragCfg.gx) {
-            elm.dragCfg.onDrag.grid = jQuery.iDrag.snapToGrid;
+            elm.dragCfg.onDragModifier.grid = jQuery.iDrag.snapToGrid;
         }
         if (elm.dragCfg.zIndex != false) {
@@ -382 +382 @@
         dy = dragged.dragCfg.currentPointer.y - dragged.dragCfg.pointer.y;
 
-        for (i in dragged.dragCfg.onDrag) {
-            newCoords = dragged.dragCfg.onDrag[i].apply(dragged, [dragged.dragCfg.oR.x + dx, dragged.dragCfg.oR.y + dy, dx, dy]);
+        for (i in dragged.dragCfg.onDragModifier) {
+            newCoords = dragged.dragCfg.onDragModifier[i].apply(dragged, [dragged.dragCfg.oR.x + dx, dragged.dragCfg.oR.y + dy, dx, dy]);
             if (newCoords && newCoords.constructor == Object) {
                 dx = i != 'user' ? newCoords.dx : (newCoords.x - dragged.dragCfg.oR.x);
@@ -397 +397 @@
         }
 
+        if(dragged.dragCfg.onDrag)
+            dragged.dragCfg.onDrag.apply(dragged, [dragged.dragCfg.oR.x + dx, dragged.dragCfg.oR.y + dy]);
+            
         if (!dragged.dragCfg.axis || dragged.dragCfg.axis == 'horizontally') {
             dragged.dragCfg.nRx = dragged.dragCfg.oR.x + dx;
@@ -405 +408 @@
             jQuery.iDrag.helper.get(0).style.top = dragged.dragCfg.ny + 'px';
         }
-
+        
         if (jQuery.iDrop && jQuery.iDrop.count > 0 ){
             jQuery.iDrop.checkhover(dragged, clonedEl);
@@ -482 +485 @@
                     fx : parseInt(o.fx)||null,
                     hpc : o.hpc ? o.hpc : false,
-                    onDrag : {},
+                    onDragModifier : {},
                     pointer : {},
                     onStart : o.onStart && o.onStart.constructor == Function ? o.onStart : false,
@@ -492 +495 @@
                     autoSize : o.autoSize ? true : false
                 };
+                if (o.onDragModifier && o.onDragModifier.constructor == Function)
+                    this.dragCfg.onDragModifier.user = o.onDragModifier;
                 if (o.onDrag && o.onDrag.constructor == Function)
-                    this.dragCfg.onDrag.user = o.onDrag;
+                    this.dragCfg.onDrag = o.onDrag;
                 if (o.containment && ((o.containment.constructor == String && (o.containment == 'parent' || o.containment == 'document')) || (o.containment.constructor == Array && o.containment.length == 4) )) {
                     this.dragCfg.containment = o.containment;