jQuery UI Development

Timestamp:

07/17/08 09:13:10 (19 months ago)

Author:

paul.bakaus

Message:

draggable: implemented more advanced features for the snap option - you can now pass in a object instead of a bolean into "snap", possible keys are the callbacks snap/release (which both receive ui.snapItem) and items (jQuery selector, defaults to :data(draggable))

Files:

• trunk/ui/ui.draggable.js (modified) (5 diffs)

trunk/ui/ui.draggable.js

@@ -380 +380 @@
                 var inst = $(this).data("draggable");
                 inst.snapElements = [];
-                $(ui.options.snap === true ? ':data(draggable)' : ui.options.snap).each(function() {
+
+                $(ui.options.snap.constructor != String ? ( ui.options.snap.items || ':data(draggable)' ) : ui.options.snap).each(function() {
                         var $t = $(this); var $o = $t.offset();
                         if(this != inst.element[0]) inst.snapElements.push({
@@ -391 +392 @@
         },
         drag: function(e, ui) {
-                
+        
                 var inst = $(this).data("draggable");
                 var d = ui.options.snapTolerance || 20;
@@ -403 +404 @@
                         
                         //Yes, I know, this is insane ;)
-                        if(!((l-d < x1 && x1 < r+d && t-d < y1 && y1 < b+d) || (l-d < x1 && x1 < r+d && t-d < y2 && y2 < b+d) || (l-d < x2 && x2 < r+d && t-d < y1 && y1 < b+d) || (l-d < x2 && x2 < r+d && t-d < y2 && y2 < b+d))) continue;
+                        if(!((l-d < x1 && x1 < r+d && t-d < y1 && y1 < b+d) || (l-d < x1 && x1 < r+d && t-d < y2 && y2 < b+d) || (l-d < x2 && x2 < r+d && t-d < y1 && y1 < b+d) || (l-d < x2 && x2 < r+d && t-d < y2 && y2 < b+d))) {
+                                if(inst.snapElements[i].snapping) (inst.options.snap.release && inst.options.snap.release.call(inst.element, null, $.extend(inst.uiHash(), { snapItem: inst.snapElements[i].item })));
+                                inst.snapElements[i].snapping = false;
+                                continue;
+                        }
                         
                         if(ui.options.snapMode != 'inner') {
@@ -416 +421 @@
                         }
                         
+                        var first = (ts || bs || ls || rs);
+                        
                         if(ui.options.snapMode != 'outer') {
                                 var ts = Math.abs(t - y1) <= 20;
@@ -427 +434 @@
                         }
                         
-                };
+                        if(!inst.snapElements[i].snapping && (ts || bs || ls || rs || first))
+                                (inst.options.snap.snap && inst.options.snap.snap.call(inst.element, null, $.extend(inst.uiHash(), { snapItem: inst.snapElements[i].item })));
+                        inst.snapElements[i].snapping = (ts || bs || ls || rs || first);
+                        
+                };
+
         }
 });