]> source.dussan.org Git - jquery-ui.git/commitdiff
Draggable: Using the new core intersect method on connectToSortable.
authorEduardo Lundgren <eduardolundgren@gmail.com>
Mon, 10 Nov 2008 05:18:20 +0000 (05:18 +0000)
committerEduardo Lundgren <eduardolundgren@gmail.com>
Mon, 10 Nov 2008 05:18:20 +0000 (05:18 +0000)
ui/ui.draggable.js

index e18800090075fdfbad0dafae7fcca582494b1edd..5d27c079715c46439e9f5c1fb9cf15a214f53363 100644 (file)
@@ -4,7 +4,7 @@
  * Copyright (c) 2008 Paul Bakaus
  * Dual licensed under the MIT (MIT-LICENSE.txt)
  * and GPL (GPL-LICENSE.txt) licenses.
- * 
+ *
  * http://docs.jquery.com/UI/Draggables
  *
  * Depends:
@@ -13,9 +13,9 @@
 (function($) {
 
 $.widget("ui.draggable", $.extend({}, $.ui.mouse, {
-       
+
        getHandle: function(e) {
-               
+
                var handle = !this.options.handle || !$(this.options.handle, this.element).length ? true : false;
                $(this.options.handle, this.element)
                        .find("*")
@@ -23,91 +23,91 @@ $.widget("ui.draggable", $.extend({}, $.ui.mouse, {
                        .each(function() {
                                if(this == e.target) handle = true;
                        });
-               
+
                return handle;
-               
+
        },
-       
+
        createHelper: function(e) {
-               
+
                var o = this.options;
                var helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [e])) : (o.helper == 'clone' ? this.element.clone() : this.element);
-               
+
                if(!helper.parents('body').length)
                        helper.appendTo((o.appendTo == 'parent' ? this.element[0].parentNode : o.appendTo));
-               
+
                if(helper[0] != this.element[0] && !(/(fixed|absolute)/).test(helper.css("position")))
                        helper.css("position", "absolute");
-               
+
                return helper;
-               
+
        },
-       
+
        _init: function() {
-               
+
                if (this.options.helper == 'original' && !(/^(?:r|a|f)/).test(this.element.css("position")))
                        this.element[0].style.position = 'relative';
-               
+
                (this.options.cssNamespace && this.element.addClass(this.options.cssNamespace+"-draggable"));
                (this.options.disabled && this.element.addClass('ui-draggable-disabled'));
-               
+
                this._mouseInit();
-               
+
        },
-       
+
        _mouseCapture: function(e) {
-               
+
                var o = this.options;
-               
+
                if (this.helper || o.disabled || $(e.target).is('.ui-resizable-handle'))
                        return false;
-               
+
                //Quit if we're not on a valid handle
                this.handle = this.getHandle(e);
                if (!this.handle)
                        return false;
-               
+
                return true;
-               
+
        },
-       
+
        _mouseStart: function(e) {
-               
+
                var o = this.options;
-               
+
                //Create and append the visible helper
                this.helper = this.createHelper(e);
-               
+
                //If ddmanager is used for droppables, set the global draggable
                if($.ui.ddmanager)
                        $.ui.ddmanager.current = this;
-               
+
                /*
                 * - Position generation -
                 * This block generates everything position related - it's the core of draggables.
                 */
-               
+
                this.margins = {                                                                                                                                                                //Cache the margins
                        left: (parseInt(this.element.css("marginLeft"),10) || 0),
                        top: (parseInt(this.element.css("marginTop"),10) || 0)
-               };              
-               
+               };
+
                this.cssPosition = this.helper.css("position");                                                                                                 //Store the helper's css position
                this.offset = this.element.offset();                                                                                                                    //The element's absolute position on the page
                this.offset = {                                                                                                                                                                 //Substract the margins from the element's absolute offset
                        top: this.offset.top - this.margins.top,
                        left: this.offset.left - this.margins.left
                };
-               
+
                this.offset.click = {                                                                                                                                                   //Where the click happened, relative to the element
                        left: e.pageX - this.offset.left,
                        top: e.pageY - this.offset.top
                };
-               
+
                //Calling this method cached the next parents that have scrollTop / scrollLeft attached
                this.cacheScrollParents();
-               
-               
+
+
                this.offsetParent = this.helper.offsetParent(); var po = this.offsetParent.offset();                    //Get the offsetParent and cache its position
                if(this.offsetParent[0] == document.body && $.browser.mozilla) po = { top: 0, left: 0 };                                                                                                        //Ugly FF3 fix
                if(this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() == 'html' && $.browser.msie) po = { top: 0, left: 0 };            //Ugly IE fix
@@ -115,7 +115,7 @@ $.widget("ui.draggable", $.extend({}, $.ui.mouse, {
                        top: po.top + (parseInt(this.offsetParent.css("borderTopWidth"),10) || 0),
                        left: po.left + (parseInt(this.offsetParent.css("borderLeftWidth"),10) || 0)
                };
-               
+
                //This is a relative to absolute position minus the actual position calculation - only used for relative positioned helper
                if(this.cssPosition == "relative") {
                        var p = this.element.position();
@@ -126,17 +126,17 @@ $.widget("ui.draggable", $.extend({}, $.ui.mouse, {
                } else {
                        this.offset.relative = { top: 0, left: 0 };
                }
-               
+
                //Generate the original position
                this.originalPosition = this._generatePosition(e);
-               
+
                //Cache the helper size
                this.cacheHelperProportions();
-               
+
                //Adjust the mouse offset relative to the helper if 'cursorAt' is supplied
                if(o.cursorAt)
                        this.adjustOffsetFromHelper(o.cursorAt);
-               
+
                //Cache later used stuff
                $.extend(this, {
                        PAGEY_INCLUDES_SCROLL: (this.cssPosition == "absolute" && (!this.scrollTopParent[0].tagName || (/(html|body)/i).test(this.scrollTopParent[0].tagName))),
@@ -144,27 +144,27 @@ $.widget("ui.draggable", $.extend({}, $.ui.mouse, {
                        OFFSET_PARENT_NOT_SCROLL_PARENT_Y: this.scrollTopParent[0] != this.offsetParent[0] && !(this.scrollTopParent[0] == document && (/(body|html)/i).test(this.offsetParent[0].tagName)),
                        OFFSET_PARENT_NOT_SCROLL_PARENT_X: this.scrollLeftParent[0] != this.offsetParent[0] && !(this.scrollLeftParent[0] == document && (/(body|html)/i).test(this.offsetParent[0].tagName))
                });
-               
+
                if(o.containment)
                        this.setContainment();
-               
+
                //Call plugins and callbacks
                this._propagate("start", e);
-               
+
                //Recache the helper size
                this.cacheHelperProportions();
-               
+
                //Prepare the droppable offsets
                if ($.ui.ddmanager && !o.dropBehaviour)
                        $.ui.ddmanager.prepareOffsets(this, e);
-               
+
                this.helper.addClass("ui-draggable-dragging");
                this._mouseDrag(e); //Execute the drag once - this causes the helper not to be visible before getting its correct position
                return true;
        },
-       
+
        cacheScrollParents: function() {
-               
+
                this.scrollTopParent = function(el) {
                        do { if(/auto|scroll/.test(el.css('overflow')) || (/auto|scroll/).test(el.css('overflow-y'))) return el; el = el.parent(); } while (el[0].parentNode);
                        return $(document);
@@ -173,25 +173,25 @@ $.widget("ui.draggable", $.extend({}, $.ui.mouse, {
                        do { if(/auto|scroll/.test(el.css('overflow')) || (/auto|scroll/).test(el.css('overflow-x'))) return el; el = el.parent(); } while (el[0].parentNode);
                        return $(document);
                }(this.helper);
-               
+
        },
-       
+
        adjustOffsetFromHelper: function(obj) {
                if(obj.left != undefined) this.offset.click.left = obj.left + this.margins.left;
                if(obj.right != undefined) this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left;
                if(obj.top != undefined) this.offset.click.top = obj.top + this.margins.top;
                if(obj.bottom != undefined) this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top;
        },
-       
+
        cacheHelperProportions: function() {
                this.helperProportions = {
                        width: this.helper.outerWidth(),
                        height: this.helper.outerHeight()
                };
        },
-       
+
        setContainment: function() {
-               
+
                var o = this.options;
                if(o.containment == 'parent') o.containment = this.helper[0].parentNode;
                if(o.containment == 'document' || o.containment == 'window') this.containment = [
@@ -200,12 +200,12 @@ $.widget("ui.draggable", $.extend({}, $.ui.mouse, {
                        $(o.containment == 'document' ? document : window).width() - this.offset.relative.left - this.offset.parent.left - this.helperProportions.width - this.margins.left - (parseInt(this.element.css("marginRight"),10) || 0),
                        ($(o.containment == 'document' ? document : window).height() || document.body.parentNode.scrollHeight) - this.offset.relative.top - this.offset.parent.top - this.helperProportions.height - this.margins.top - (parseInt(this.element.css("marginBottom"),10) || 0)
                ];
-               
+
                if(!(/^(document|window|parent)$/).test(o.containment)) {
                        var ce = $(o.containment)[0];
                        var co = $(o.containment).offset();
                        var over = ($(ce).css("overflow") != 'hidden');
-                       
+
                        this.containment = [
                                co.left + (parseInt($(ce).css("borderLeftWidth"),10) || 0) - this.offset.relative.left - this.offset.parent.left,
                                co.top + (parseInt($(ce).css("borderTopWidth"),10) || 0) - this.offset.relative.top - this.offset.parent.top,
@@ -213,14 +213,14 @@ $.widget("ui.draggable", $.extend({}, $.ui.mouse, {
                                co.top+(over ? Math.max(ce.scrollHeight,ce.offsetHeight) : ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - this.offset.relative.top - this.offset.parent.top - this.helperProportions.height - this.margins.top - (parseInt(this.element.css("marginBottom"),10) || 0)
                        ];
                }
-               
+
        },
-       
+
        _convertPositionTo: function(d, pos) {
-               
+
                if(!pos) pos = this.position;
                var mod = d == "absolute" ? 1 : -1;
-               
+
                return {
                        top: (
                                pos.top                                                                                                                                 // the calculated relative position
@@ -241,7 +241,7 @@ $.widget("ui.draggable", $.extend({}, $.ui.mouse, {
                };
        },
        _generatePosition: function(e) {
-       
+
                var o = this.options;
                var position = {
                        top: (
@@ -261,9 +261,9 @@ $.widget("ui.draggable", $.extend({}, $.ui.mouse, {
                                - (this.cssPosition == "fixed" ? $(document).scrollLeft() : 0)
                        )
                };
-               
+
                if(!this.originalPosition) return position;                                                                             //If we are not dragging yet, we won't check for options
-               
+
                /*
                 * - Position constraining -
                 * Constrain the position to a mix of grid, containment.
@@ -274,39 +274,39 @@ $.widget("ui.draggable", $.extend({}, $.ui.mouse, {
                        if(position.left > this.containment[2]) position.left = this.containment[2];
                        if(position.top > this.containment[3]) position.top = this.containment[3];
                }
-               
+
                if(o.grid) {
                        var top = this.originalPosition.top + Math.round((position.top - this.originalPosition.top) / o.grid[1]) * o.grid[1];
                        position.top = this.containment ? (!(top < this.containment[1] || top > this.containment[3]) ? top : (!(top < this.containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
-                       
+
                        var left = this.originalPosition.left + Math.round((position.left - this.originalPosition.left) / o.grid[0]) * o.grid[0];
                        position.left = this.containment ? (!(left < this.containment[0] || left > this.containment[2]) ? left : (!(left < this.containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
                }
-               
+
                return position;
        },
        _mouseDrag: function(e) {
-               
+
                //Compute the helpers position
                this.position = this._generatePosition(e);
                this.positionAbs = this._convertPositionTo("absolute");
-               
-               //Call plugins and callbacks and use the resulting position if something is returned            
+
+               //Call plugins and callbacks and use the resulting position if something is returned
                this.position = this._propagate("drag", e) || this.position;
-               
+
                if(!this.options.axis || this.options.axis != "y") this.helper[0].style.left = this.position.left+'px';
                if(!this.options.axis || this.options.axis != "x") this.helper[0].style.top = this.position.top+'px';
                if($.ui.ddmanager) $.ui.ddmanager.drag(this, e);
-               
+
                return false;
        },
        _mouseStop: function(e) {
-               
+
                //If we are using droppables, inform the manager about the drop
                var dropped = false;
                if ($.ui.ddmanager && !this.options.dropBehaviour)
-                       var dropped = $.ui.ddmanager.drop(this, e);             
-               
+                       var dropped = $.ui.ddmanager.drop(this, e);
+
                if((this.options.revert == "invalid" && !dropped) || (this.options.revert == "valid" && dropped) || this.options.revert === true || ($.isFunction(this.options.revert) && this.options.revert.call(this.element, dropped))) {
                        var self = this;
                        $(this.helper).animate(this.originalPosition, parseInt(this.options.revertDuration, 10), function() {
@@ -317,7 +317,7 @@ $.widget("ui.draggable", $.extend({}, $.ui.mouse, {
                        this._propagate("stop", e);
                        this._clear();
                }
-               
+
                return false;
        },
        _clear: function() {
@@ -327,7 +327,7 @@ $.widget("ui.draggable", $.extend({}, $.ui.mouse, {
                this.helper = null;
                this.cancelHelperRemoval = false;
        },
-       
+
        // From now on bulk stuff - mainly helpers
        plugins: {},
        uiHash: function(e) {
@@ -335,7 +335,7 @@ $.widget("ui.draggable", $.extend({}, $.ui.mouse, {
                        helper: this.helper,
                        position: this.position,
                        absolutePosition: this.positionAbs,
-                       options: this.options                   
+                       options: this.options
                };
        },
        _propagate: function(n,e) {
@@ -416,7 +416,7 @@ $.ui.plugin.add("draggable", "opacity", {
 
 $.ui.plugin.add("draggable", "iframeFix", {
        start: function(e, ui) {
-               $(ui.options.iframeFix === true ? "iframe" : ui.options.iframeFix).each(function() {                                    
+               $(ui.options.iframeFix === true ? "iframe" : ui.options.iframeFix).each(function() {
                        $('<div class="ui-draggable-iframeFix" style="background: #fff;"></div>')
                        .css({
                                width: this.offsetWidth+"px", height: this.offsetHeight+"px",
@@ -427,7 +427,7 @@ $.ui.plugin.add("draggable", "iframeFix", {
                });
        },
        stop: function(e, ui) {
-               $("div.ui-draggable-iframeFix").each(function() { this.parentNode.removeChild(this); }); //Remove frame helpers 
+               $("div.ui-draggable-iframeFix").each(function() { this.parentNode.removeChild(this); }); //Remove frame helpers
        }
 });
 
@@ -435,7 +435,7 @@ $.ui.plugin.add("draggable", "scroll", {
        start: function(e, ui) {
                var o = ui.options;
                var i = $(this).data("draggable");
-               
+
                i.overflowY = function(el) {
                        do { if(/auto|scroll/.test(el.css('overflow')) || (/auto|scroll/).test(el.css('overflow-y'))) return el; el = el.parent(); } while (el[0].parentNode);
                        return $(document);
@@ -444,16 +444,16 @@ $.ui.plugin.add("draggable", "scroll", {
                        do { if(/auto|scroll/.test(el.css('overflow')) || (/auto|scroll/).test(el.css('overflow-x'))) return el; el = el.parent(); } while (el[0].parentNode);
                        return $(document);
                }(this);
-               
+
                if(i.overflowY[0] != document && i.overflowY[0].tagName != 'HTML') i.overflowYOffset = i.overflowY.offset();
                if(i.overflowX[0] != document && i.overflowX[0].tagName != 'HTML') i.overflowXOffset = i.overflowX.offset();
-               
+
        },
        drag: function(e, ui) {
-               
+
                var o = ui.options, scrolled = false;
                var i = $(this).data("draggable");
-               
+
                if(i.overflowY[0] != document && i.overflowY[0].tagName != 'HTML') {
                        if((i.overflowYOffset.top + i.overflowY[0].offsetHeight) - e.pageY < o.scrollSensitivity)
                                i.overflowY[0].scrollTop = scrolled = i.overflowY[0].scrollTop + o.scrollSpeed;
@@ -465,7 +465,7 @@ $.ui.plugin.add("draggable", "scroll", {
                        if($(window).height() - (e.pageY - $(document).scrollTop()) < o.scrollSensitivity)
                                scrolled = $(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
                }
-               
+
                if(i.overflowX[0] != document && i.overflowX[0].tagName != 'HTML') {
                        if((i.overflowXOffset.left + i.overflowX[0].offsetWidth) - e.pageX < o.scrollSensitivity)
                                i.overflowX[0].scrollLeft = scrolled = i.overflowX[0].scrollLeft + o.scrollSpeed;
@@ -477,19 +477,19 @@ $.ui.plugin.add("draggable", "scroll", {
                        if($(window).width() - (e.pageX - $(document).scrollLeft()) < o.scrollSensitivity)
                                scrolled = $(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
                }
-               
+
                if(scrolled !== false)
                        $.ui.ddmanager.prepareOffsets(i, e);
-               
+
        }
 });
 
 $.ui.plugin.add("draggable", "snap", {
        start: function(e, ui) {
-               
+
                var inst = $(this).data("draggable");
                inst.snapElements = [];
-               
+
                $(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({
@@ -498,28 +498,28 @@ $.ui.plugin.add("draggable", "snap", {
                                top: $o.top, left: $o.left
                        });
                });
-               
+
        },
        drag: function(e, ui) {
-               
+
                var inst = $(this).data("draggable");
                var d = ui.options.snapTolerance;
-               
+
                var x1 = ui.absolutePosition.left, x2 = x1 + inst.helperProportions.width,
                        y1 = ui.absolutePosition.top, y2 = y1 + inst.helperProportions.height;
-               
+
                for (var i = inst.snapElements.length - 1; i >= 0; i--){
-                       
+
                        var l = inst.snapElements[i].left, r = l + inst.snapElements[i].width,
                                t = inst.snapElements[i].top, b = t + inst.snapElements[i].height;
-                       
+
                        //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))) {
                                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') {
                                var ts = Math.abs(t - y2) <= d;
                                var bs = Math.abs(b - y1) <= d;
@@ -530,9 +530,9 @@ $.ui.plugin.add("draggable", "snap", {
                                if(ls) ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l - inst.helperProportions.width }).left;
                                if(rs) ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r }).left;
                        }
-                       
+
                        var first = (ts || bs || ls || rs);
-                       
+
                        if(ui.options.snapMode != 'outer') {
                                var ts = Math.abs(t - y1) <= d;
                                var bs = Math.abs(b - y2) <= d;
@@ -543,19 +543,19 @@ $.ui.plugin.add("draggable", "snap", {
                                if(ls) ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l }).left;
                                if(rs) ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r - inst.helperProportions.width }).left;
                        }
-                       
+
                        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);
-                       
+
                };
-               
+
        }
 });
 
 $.ui.plugin.add("draggable", "connectToSortable", {
        start: function(e,ui) {
-               
+
                var inst = $(this).data("draggable");
                inst.sortables = [];
                $(ui.options.connectToSortable).each(function() {
@@ -565,17 +565,17 @@ $.ui.plugin.add("draggable", "connectToSortable", {
                                        instance: sortable,
                                        shouldRevert: sortable.options.revert
                                });
-                               sortable._refreshItems();       //Do a one-time refresh at start to refresh the containerCache  
+                               sortable._refreshItems();       //Do a one-time refresh at start to refresh the containerCache
                                sortable._propagate("activate", e, inst);
                        }
                });
-               
+
        },
        stop: function(e,ui) {
-               
+
                //If we are still over the sortable, we fake the stop event of the sortable, but also remove helper
                var inst = $(this).data("draggable");
-               
+
                $.each(inst.sortables, function() {
                        if(this.instance.isOver) {
                                this.instance.isOver = 0;
@@ -583,66 +583,65 @@ $.ui.plugin.add("draggable", "connectToSortable", {
                                this.instance.cancelHelperRemoval = false; //Remove it in the sortable instance (so sortable plugins like revert still work)
                                if(this.shouldRevert) this.instance.options.revert = true; //revert here
                                this.instance._mouseStop(e);
-                               
+
                                //Also propagate receive event, since the sortable is actually receiving a element
                                this.instance.element.triggerHandler("sortreceive", [e, $.extend(this.instance._ui(), { sender: inst.element })], this.instance.options["receive"]);
-                               
+
                                this.instance.options.helper = this.instance.options._helper;
                        } else {
                                this.instance.cancelHelperRemoval = false; //Remove the helper in the sortable instance
                                this.instance._propagate("deactivate", e, inst);
                        }
-                       
+
                });
-               
+
        },
        drag: function(e,ui) {
-               
+
                var inst = $(this).data("draggable"), self = this;
-               
+
                var checkPos = function(o) {
-                       
-                       var l = o.left, r = l + o.width,
-                               t = o.top, b = t + o.height;
-                       
-                       return (l < (this.positionAbs.left + this.offset.click.left) && (this.positionAbs.left + this.offset.click.left) < r
-                                       && t < (this.positionAbs.top + this.offset.click.top) && (this.positionAbs.top + this.offset.click.top) < b);                           
+                       var dyClick = this.offset.click.top, dxClick = this.offset.click.left;
+                       var helperTop = this.positionAbs.top, helperLeft = this.positionAbs.left;
+                       var itemHeight = o.height, itemWidth = o.width;
+                       var itemTop = o.top, itemLeft = o.left;
+
+                       return $.ui.intersect(helperTop + dyClick, helperLeft + dxClick, itemTop, itemLeft, itemHeight, itemWidth);
                };
-               
+
                $.each(inst.sortables, function(i) {
-                       
+
                        if(checkPos.call(inst, this.instance.containerCache)) {
-                               
+
                                //If it intersects, we use a little isOver variable and set it once, so our move-in stuff gets fired only once
                                if(!this.instance.isOver) {
                                        this.instance.isOver = 1;
-                                       
                                        //Now we fake the start of dragging for the sortable instance,
                                        //by cloning the list group item, appending it to the sortable and using it as inst.currentItem
                                        //We can then fire the start event of the sortable with our passed browser event, and our own helper (so it doesn't create a new one)
                                        this.instance.currentItem = $(self).clone().appendTo(this.instance.element).data("sortable-item", true);
                                        this.instance.options._helper = this.instance.options.helper; //Store helper option to later restore it
                                        this.instance.options.helper = function() { return ui.helper[0]; };
-                                       
+
                                        e.target = this.instance.currentItem[0];
                                        this.instance._mouseCapture(e, true);
                                        this.instance._mouseStart(e, true, true);
-                                       
+
                                        //Because the browser event is way off the new appended portlet, we modify a couple of variables to reflect the changes
                                        this.instance.offset.click.top = inst.offset.click.top;
                                        this.instance.offset.click.left = inst.offset.click.left;
                                        this.instance.offset.parent.left -= inst.offset.parent.left - this.instance.offset.parent.left;
                                        this.instance.offset.parent.top -= inst.offset.parent.top - this.instance.offset.parent.top;
-                                       
+
                                        inst._propagate("toSortable", e);
-                                       
+
                                }
-                               
+
                                //Provided we did all the previous steps, we can fire the drag event of the sortable on every draggable drag, when it intersects with the sortable
                                if(this.instance.currentItem) this.instance._mouseDrag(e);
-                               
+
                        } else {
-                               
+
                                //If it doesn't intersect with the sortable, and it intersected before,
                                //we fake the drag stop of the sortable, but make sure it doesn't remove the helper by using cancelHelperRemoval
                                if(this.instance.isOver) {
@@ -651,18 +650,18 @@ $.ui.plugin.add("draggable", "connectToSortable", {
                                        this.instance.options.revert = false; //No revert here
                                        this.instance._mouseStop(e, true);
                                        this.instance.options.helper = this.instance.options._helper;
-                                       
+
                                        //Now we remove our currentItem, the list group clone again, and the placeholder, and animate the helper back to it's original size
                                        this.instance.currentItem.remove();
                                        if(this.instance.placeholder) this.instance.placeholder.remove();
-                                       
+
                                        inst._propagate("fromSortable", e);
                                }
-                               
+
                        };
-                       
+
                });
-               
+
        }
 });
 
@@ -671,11 +670,11 @@ $.ui.plugin.add("draggable", "stack", {
                var group = $.makeArray($(ui.options.stack.group)).sort(function(a,b) {
                        return (parseInt($(a).css("zIndex"),10) || ui.options.stack.min) - (parseInt($(b).css("zIndex"),10) || ui.options.stack.min);
                });
-               
+
                $(group).each(function(i) {
                        this.style.zIndex = ui.options.stack.min + i;
                });
-               
+
                this[0].style.zIndex = ui.options.stack.min + group.length;
        }
 });