/drupal7/sites/all/modules/jquery_update/replace/ui/ui/jquery.ui.draggable.js - Annoter - Club Drupal - Forge Centrale Marseille

Paste

Télécharger (30,4 ko) Statistiques

root / drupal7 / sites / all / modules / jquery_update / replace / ui / ui / jquery.ui.draggable.js @ 503b3f7b

-b3f7b
+/*!
  * jQuery UI Draggable 1.10.2
  * http://jqueryui.com
-ad3d82
+            Assos Assos
-b3f7b
+ * Copyright 2013 jQuery Foundation and other contributors
  * Released under the MIT license.
-ad3d82
+ * http://jquery.org/license
+ *
-b3f7b
+ * http://api.jqueryui.com/draggable/
-ad3d82
+            Assos Assos
  * Depends:
  *        jquery.ui.core.js
  *        jquery.ui.mouse.js
  *        jquery.ui.widget.js
  */
 (function( $, undefined ) {
 $.widget("ui.draggable", $.ui.mouse, {
-b3f7b
+        version: "1.10.2",
-ad3d82
+        widgetEventPrefix: "drag",
         options: {
                 addClasses: true,
                 appendTo: "parent",
                 axis: false,
                 connectToSortable: false,
                 containment: false,
                 cursor: "auto",
                 cursorAt: false,
                 grid: false,
                 handle: false,
                 helper: "original",
                 iframeFix: false,
                 opacity: false,
                 refreshPositions: false,
                 revert: false,
                 revertDuration: 500,
                 scope: "default",
                 scroll: true,
                 scrollSensitivity: 20,
                 scrollSpeed: 20,
                 snap: false,
                 snapMode: "both",
                 snapTolerance: 20,
                 stack: false,
-b3f7b
+                zIndex: false,
                 // callbacks
                 drag: null,
                 start: null,
                 stop: null
-ad3d82
+        },
         _create: function() {
-b3f7b
+                if (this.options.helper === "original" && !(/^(?:r|a|f)/).test(this.element.css("position"))) {
                         this.element[0].style.position = "relative";
+                }
                 if (this.options.addClasses){
                         this.element.addClass("ui-draggable");
+                }
                 if (this.options.disabled){
                         this.element.addClass("ui-draggable-disabled");
+                }
-ad3d82
+            Assos Assos
                 this._mouseInit();
         },
-b3f7b
+        _destroy: function() {
                 this.element.removeClass( "ui-draggable ui-draggable-dragging ui-draggable-disabled" );
-ad3d82
+                this._mouseDestroy();
         },
         _mouseCapture: function(event) {
                 var o = this.options;
                 // among others, prevent a drag on a resizable-handle
-b3f7b
+                if (this.helper || o.disabled || $(event.target).closest(".ui-resizable-handle").length > 0) {
-ad3d82
+                        return false;
-b3f7b
+            Assos Assos
-ad3d82
+            Assos Assos
                 //Quit if we're not on a valid handle
                 this.handle = this._getHandle(event);
-b3f7b
+                if (!this.handle) {
-ad3d82
+                        return false;
-b3f7b
+            Assos Assos
                 $(o.iframeFix === true ? "iframe" : o.iframeFix).each(function() {
                         $("<div class='ui-draggable-iframeFix' style='background: #fff;'></div>")
                         .css({
                                 width: this.offsetWidth+"px", height: this.offsetHeight+"px",
                                 position: "absolute", opacity: "0.001", zIndex: 1000
                         })
                         .css($(this).offset())
                         .appendTo("body");
                 });
-ad3d82
+            Assos Assos
                 return true;
         },
         _mouseStart: function(event) {
                 var o = this.options;
                 //Create and append the visible helper
                 this.helper = this._createHelper(event);
-b3f7b
+                this.helper.addClass("ui-draggable-dragging");
-ad3d82
+                //Cache the helper size
                 this._cacheHelperProportions();
                 //If ddmanager is used for droppables, set the global draggable
-b3f7b
+                if($.ui.ddmanager) {
-ad3d82
+                        $.ui.ddmanager.current = this;
-b3f7b
+            Assos Assos
-ad3d82
+            Assos Assos
                 /*
                  * - Position generation -
                  * This block generates everything position related - it's the core of draggables.
                  */
                 //Cache the margins of the original element
                 this._cacheMargins();
                 //Store the helper's css position
                 this.cssPosition = this.helper.css("position");
                 this.scrollParent = this.helper.scrollParent();
                 //The element's absolute position on the page minus margins
                 this.offset = this.positionAbs = this.element.offset();
                 this.offset = {
                         top: this.offset.top - this.margins.top,
                         left: this.offset.left - this.margins.left
                 };
                 $.extend(this.offset, {
                         click: { //Where the click happened, relative to the element
                                 left: event.pageX - this.offset.left,
                                 top: event.pageY - this.offset.top
                         },
                         parent: this._getParentOffset(),
                         relative: this._getRelativeOffset() //This is a relative to absolute position minus the actual position calculation - only used for relative positioned helper
                 });
                 //Generate the original position
                 this.originalPosition = this.position = this._generatePosition(event);
                 this.originalPageX = event.pageX;
                 this.originalPageY = event.pageY;
-b3f7b
+                //Adjust the mouse offset relative to the helper if "cursorAt" is supplied
-ad3d82
+                (o.cursorAt && this._adjustOffsetFromHelper(o.cursorAt));
                 //Set a containment if given in the options
-b3f7b
+                if(o.containment) {
-ad3d82
+                        this._setContainment();
-b3f7b
+            Assos Assos
-ad3d82
+            Assos Assos
                 //Trigger event + callbacks
                 if(this._trigger("start", event) === false) {
                         this._clear();
                         return false;
+                }
                 //Recache the helper size
                 this._cacheHelperProportions();
                 //Prepare the droppable offsets
-b3f7b
+                if ($.ui.ddmanager && !o.dropBehaviour) {
-ad3d82
+                        $.ui.ddmanager.prepareOffsets(this, event);
-b3f7b
+            Assos Assos
-ad3d82
+            Assos Assos
                 this._mouseDrag(event, true); //Execute the drag once - this causes the helper not to be visible before getting its correct position
-b3f7b
+            Assos Assos
                 //If the ddmanager is used for droppables, inform the manager that dragging has started (see #5003)
                 if ( $.ui.ddmanager ) {
                         $.ui.ddmanager.dragStart(this, event);
+                }
-ad3d82
+                return true;
         },
         _mouseDrag: function(event, noPropagation) {
                 //Compute the helpers position
                 this.position = this._generatePosition(event);
                 this.positionAbs = this._convertPositionTo("absolute");
                 //Call plugins and callbacks and use the resulting position if something is returned
                 if (!noPropagation) {
                         var ui = this._uiHash();
-b3f7b
+                        if(this._trigger("drag", event, ui) === false) {
-ad3d82
+                                this._mouseUp({});
                                 return false;
+                        }
                         this.position = ui.position;
+                }
-b3f7b
+                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, event);
+                }
-ad3d82
+            Assos Assos
                 return false;
         },
         _mouseStop: function(event) {
                 //If we are using droppables, inform the manager about the drop
-b3f7b
+                var element,
                         that = this,
                         elementInDom = false,
                         dropped = false;
                 if ($.ui.ddmanager && !this.options.dropBehaviour) {
-ad3d82
+                        dropped = $.ui.ddmanager.drop(this, event);
-b3f7b
+            Assos Assos
-ad3d82
+            Assos Assos
                 //if a drop comes from outside (a sortable)
                 if(this.dropped) {
                         dropped = this.dropped;
                         this.dropped = false;
+                }
-b3f7b
+            Assos Assos
                 //if the original element is no longer in the DOM don't bother to continue (see #8269)
                 element = this.element[0];
                 while ( element && (element = element.parentNode) ) {
                         if (element === document ) {
                                 elementInDom = true;
+                        }
+                }
                 if ( !elementInDom && this.options.helper === "original" ) {
-ad3d82
+                        return false;
-b3f7b
+            Assos Assos
-ad3d82
+            Assos Assos
-b3f7b
+                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))) {
-ad3d82
+                        $(this.helper).animate(this.originalPosition, parseInt(this.options.revertDuration, 10), function() {
-b3f7b
+                                if(that._trigger("stop", event) !== false) {
                                         that._clear();
-ad3d82
+            Assos Assos
                         });
                 } else {
                         if(this._trigger("stop", event) !== false) {
                                 this._clear();
+                        }
+                }
                 return false;
         },
-b3f7b
+            Assos Assos
         _mouseUp: function(event) {
                 //Remove frame helpers
                 $("div.ui-draggable-iframeFix").each(function() {
                         this.parentNode.removeChild(this);
                 });
                 //If the ddmanager is used for droppables, inform the manager that dragging has stopped (see #5003)
                 if( $.ui.ddmanager ) {
                         $.ui.ddmanager.dragStop(this, event);
+                }
                 return $.ui.mouse.prototype._mouseUp.call(this, event);
         },
-ad3d82
+        cancel: function() {
-b3f7b
+            Assos Assos
-ad3d82
+                if(this.helper.is(".ui-draggable-dragging")) {
                         this._mouseUp({});
                 } else {
                         this._clear();
+                }
-b3f7b
+            Assos Assos
-ad3d82
+                return this;
-b3f7b
+            Assos Assos
-ad3d82
+        },
         _getHandle: function(event) {
-b3f7b
+                return this.options.handle ?
                         !!$( event.target ).closest( this.element.find( this.options.handle ) ).length :
                         true;
-ad3d82
+        },
         _createHelper: function(event) {
-b3f7b
+                var o = this.options,
                         helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [event])) : (o.helper === "clone" ? this.element.clone().removeAttr("id") : this.element);
-ad3d82
+            Assos Assos
-b3f7b
+                if(!helper.parents("body").length) {
                         helper.appendTo((o.appendTo === "parent" ? this.element[0].parentNode : o.appendTo));
+                }
-ad3d82
+            Assos Assos
-b3f7b
+                if(helper[0] !== this.element[0] && !(/(fixed|absolute)/).test(helper.css("position"))) {
-ad3d82
+                        helper.css("position", "absolute");
-b3f7b
+            Assos Assos
-ad3d82
+            Assos Assos
                 return helper;
         },
         _adjustOffsetFromHelper: function(obj) {
-b3f7b
+                if (typeof obj === "string") {
                         obj = obj.split(" ");
-ad3d82
+            Assos Assos
                 if ($.isArray(obj)) {
                         obj = {left: +obj[0], top: +obj[1] || 0};
+                }
-b3f7b
+                if ("left" in obj) {
-ad3d82
+                        this.offset.click.left = obj.left + this.margins.left;
+                }
-b3f7b
+                if ("right" in obj) {
-ad3d82
+                        this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left;
+                }
-b3f7b
+                if ("top" in obj) {
-ad3d82
+                        this.offset.click.top = obj.top + this.margins.top;
+                }
-b3f7b
+                if ("bottom" in obj) {
-ad3d82
+                        this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top;
+                }
         },
         _getParentOffset: function() {
                 //Get the offsetParent and cache its position
                 this.offsetParent = this.helper.offsetParent();
                 var po = this.offsetParent.offset();
                 // This is a special case where we need to modify a offset calculated on start, since the following happened:
                 // 1. The position of the helper is absolute, so it's position is calculated based on the next positioned parent
                 // 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't the document, which means that
                 //    the scroll is included in the initial calculation of the offset of the parent, and never recalculated upon drag
-b3f7b
+                if(this.cssPosition === "absolute" && this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) {
-ad3d82
+                        po.left += this.scrollParent.scrollLeft();
                         po.top += this.scrollParent.scrollTop();
+                }
-b3f7b
+                //This needs to be actually done for all browsers, since pageX/pageY includes this information
                 //Ugly IE fix
                 if((this.offsetParent[0] === document.body) ||
                         (this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() === "html" && $.ui.ie)) {
-ad3d82
+                        po = { top: 0, left: 0 };
-b3f7b
+            Assos Assos
-ad3d82
+            Assos Assos
                 return {
                         top: po.top + (parseInt(this.offsetParent.css("borderTopWidth"),10) || 0),
                         left: po.left + (parseInt(this.offsetParent.css("borderLeftWidth"),10) || 0)
                 };
         },
         _getRelativeOffset: function() {
-b3f7b
+                if(this.cssPosition === "relative") {
-ad3d82
+                        var p = this.element.position();
                         return {
                                 top: p.top - (parseInt(this.helper.css("top"),10) || 0) + this.scrollParent.scrollTop(),
                                 left: p.left - (parseInt(this.helper.css("left"),10) || 0) + this.scrollParent.scrollLeft()
                         };
                 } else {
                         return { top: 0, left: 0 };
+                }
         },
         _cacheMargins: function() {
                 this.margins = {
                         left: (parseInt(this.element.css("marginLeft"),10) || 0),
                         top: (parseInt(this.element.css("marginTop"),10) || 0),
                         right: (parseInt(this.element.css("marginRight"),10) || 0),
                         bottom: (parseInt(this.element.css("marginBottom"),10) || 0)
                 };
         },
         _cacheHelperProportions: function() {
                 this.helperProportions = {
                         width: this.helper.outerWidth(),
                         height: this.helper.outerHeight()
                 };
         },
         _setContainment: function() {
-b3f7b
+                var over, c, ce,
                         o = this.options;
-ad3d82
+            Assos Assos
-b3f7b
+                if(o.containment === "parent") {
                         o.containment = this.helper[0].parentNode;
+                }
                 if(o.containment === "document" || o.containment === "window") {
-ad3d82
+                        this.containment = [
-b3f7b
+                                o.containment === "document" ? 0 : $(window).scrollLeft() - this.offset.relative.left - this.offset.parent.left,
                                 o.containment === "document" ? 0 : $(window).scrollTop() - this.offset.relative.top - this.offset.parent.top,
                                 (o.containment === "document" ? 0 : $(window).scrollLeft()) + $(o.containment === "document" ? document : window).width() - this.helperProportions.width - this.margins.left,
                                 (o.containment === "document" ? 0 : $(window).scrollTop()) + ($(o.containment === "document" ? document : window).height() || document.body.parentNode.scrollHeight) - this.helperProportions.height - this.margins.top
-ad3d82
+                        ];
-b3f7b
+            Assos Assos
                 if(!(/^(document|window|parent)$/).test(o.containment) && o.containment.constructor !== Array) {
                         c = $(o.containment);
                         ce = c[0];
                         if(!ce) {
                                 return;
+                        }
                         over = ($(ce).css("overflow") !== "hidden");
                         this.containment = [
                                 (parseInt($(ce).css("borderLeftWidth"),10) || 0) + (parseInt($(ce).css("paddingLeft"),10) || 0),
                                 (parseInt($(ce).css("borderTopWidth"),10) || 0) + (parseInt($(ce).css("paddingTop"),10) || 0),
                                 (over ? Math.max(ce.scrollWidth,ce.offsetWidth) : ce.offsetWidth) - (parseInt($(ce).css("borderRightWidth"),10) || 0) - (parseInt($(ce).css("paddingRight"),10) || 0) - this.helperProportions.width - this.margins.left - this.margins.right,
                                 (over ? Math.max(ce.scrollHeight,ce.offsetHeight) : ce.offsetHeight) - (parseInt($(ce).css("borderBottomWidth"),10) || 0) - (parseInt($(ce).css("paddingBottom"),10) || 0) - this.helperProportions.height - this.margins.top  - this.margins.bottom
                         ];
                         this.relative_container = c;
                 } else if(o.containment.constructor === Array) {
-ad3d82
+                        this.containment = o.containment;
+                }
         },
         _convertPositionTo: function(d, pos) {
-b3f7b
+                if(!pos) {
                         pos = this.position;
+                }
                 var mod = d === "absolute" ? 1 : -1,
                         scroll = this.cssPosition === "absolute" && !(this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
-ad3d82
+            Assos Assos
                 return {
                         top: (
-b3f7b
+                                pos.top        +                                                                                                                                // The absolute mouse position
                                 this.offset.relative.top * mod +                                                                                // Only for relative positioned nodes: Relative offset from element to offset parent
                                 this.offset.parent.top * mod -                                                                                // The offsetParent's offset without borders (offset + border)
                                 ( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod)
-ad3d82
+                        ),
                         left: (
-b3f7b
+                                pos.left +                                                                                                                                // The absolute mouse position
                                 this.offset.relative.left * mod +                                                                                // Only for relative positioned nodes: Relative offset from element to offset parent
                                 this.offset.parent.left * mod        -                                                                                // The offsetParent's offset without borders (offset + border)
                                 ( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ) * mod)
-ad3d82
+            Assos Assos
                 };
         },
         _generatePosition: function(event) {
-b3f7b
+                var containment, co, top, left,
                         o = this.options,
                         scroll = this.cssPosition === "absolute" && !(this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent,
                         scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName),
                         pageX = event.pageX,
                         pageY = event.pageY;
-ad3d82
+            Assos Assos
                 /*
                  * - Position constraining -
                  * Constrain the position to a mix of grid, containment.
                  */
                 if(this.originalPosition) { //If we are not dragging yet, we won't check for options
                         if(this.containment) {
-b3f7b
+                        if (this.relative_container){
                                 co = this.relative_container.offset();
                                 containment = [ this.containment[0] + co.left,
                                         this.containment[1] + co.top,
                                         this.containment[2] + co.left,
                                         this.containment[3] + co.top ];
+                        }
                         else {
                                 containment = this.containment;
+                        }
                                 if(event.pageX - this.offset.click.left < containment[0]) {
                                         pageX = containment[0] + this.offset.click.left;
+                                }
                                 if(event.pageY - this.offset.click.top < containment[1]) {
                                         pageY = containment[1] + this.offset.click.top;
+                                }
                                 if(event.pageX - this.offset.click.left > containment[2]) {
                                         pageX = containment[2] + this.offset.click.left;
+                                }
                                 if(event.pageY - this.offset.click.top > containment[3]) {
                                         pageY = containment[3] + this.offset.click.top;
+                                }
-ad3d82
+            Assos Assos
                         if(o.grid) {
-b3f7b
+                                //Check for grid elements set to 0 to prevent divide by 0 error causing invalid argument errors in IE (see ticket #6950)
                                 top = o.grid[1] ? this.originalPageY + Math.round((pageY - this.originalPageY) / o.grid[1]) * o.grid[1] : this.originalPageY;
                                 pageY = containment ? ((top - this.offset.click.top >= containment[1] || top - this.offset.click.top > containment[3]) ? top : ((top - this.offset.click.top >= containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
-ad3d82
+            Assos Assos
-b3f7b
+                                left = o.grid[0] ? this.originalPageX + Math.round((pageX - this.originalPageX) / o.grid[0]) * o.grid[0] : this.originalPageX;
                                 pageX = containment ? ((left - this.offset.click.left >= containment[0] || left - this.offset.click.left > containment[2]) ? left : ((left - this.offset.click.left >= containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
-ad3d82
+            Assos Assos
+                }
                 return {
                         top: (
-b3f7b
+                                pageY -                                                                                                                                        // The absolute mouse position
                                 this.offset.click.top        -                                                                                                // Click offset (relative to the element)
                                 this.offset.relative.top -                                                                                                // Only for relative positioned nodes: Relative offset from element to offset parent
                                 this.offset.parent.top +                                                                                                // The offsetParent's offset without borders (offset + border)
                                 ( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ))
-ad3d82
+                        ),
                         left: (
-b3f7b
+                                pageX -                                                                                                                                        // The absolute mouse position
                                 this.offset.click.left -                                                                                                // Click offset (relative to the element)
                                 this.offset.relative.left -                                                                                                // Only for relative positioned nodes: Relative offset from element to offset parent
                                 this.offset.parent.left +                                                                                                // The offsetParent's offset without borders (offset + border)
                                 ( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ))
-ad3d82
+            Assos Assos
                 };
         },
         _clear: function() {
                 this.helper.removeClass("ui-draggable-dragging");
-b3f7b
+                if(this.helper[0] !== this.element[0] && !this.cancelHelperRemoval) {
                         this.helper.remove();
+                }
-ad3d82
+                this.helper = null;
                 this.cancelHelperRemoval = false;
         },
         // From now on bulk stuff - mainly helpers
         _trigger: function(type, event, ui) {
                 ui = ui || this._uiHash();
                 $.ui.plugin.call(this, type, [event, ui]);
-b3f7b
+                //The absolute position has to be recalculated after plugins
                 if(type === "drag") {
                         this.positionAbs = this._convertPositionTo("absolute");
+                }
-ad3d82
+                return $.Widget.prototype._trigger.call(this, type, event, ui);
         },
         plugins: {},
-b3f7b
+        _uiHash: function() {
-ad3d82
+                return {
                         helper: this.helper,
                         position: this.position,
                         originalPosition: this.originalPosition,
                         offset: this.positionAbs
                 };
+        }
 });
 $.ui.plugin.add("draggable", "connectToSortable", {
         start: function(event, ui) {
-b3f7b
+                var inst = $(this).data("ui-draggable"), o = inst.options,
-ad3d82
+                        uiSortable = $.extend({}, ui, { item: inst.element });
                 inst.sortables = [];
                 $(o.connectToSortable).each(function() {
-b3f7b
+                        var sortable = $.data(this, "ui-sortable");
-ad3d82
+                        if (sortable && !sortable.options.disabled) {
                                 inst.sortables.push({
                                         instance: sortable,
                                         shouldRevert: sortable.options.revert
                                 });
                                 sortable.refreshPositions();        // Call the sortable's refreshPositions at drag start to refresh the containerCache since the sortable container cache is used in drag and needs to be up to date (this will ensure it's initialised as well as being kept in step with any changes that might have happened on the page).
                                 sortable._trigger("activate", event, uiSortable);
+                        }
                 });
         },
         stop: function(event, ui) {
                 //If we are still over the sortable, we fake the stop event of the sortable, but also remove helper
-b3f7b
+                var inst = $(this).data("ui-draggable"),
-ad3d82
+                        uiSortable = $.extend({}, ui, { item: inst.element });
                 $.each(inst.sortables, function() {
                         if(this.instance.isOver) {
                                 this.instance.isOver = 0;
                                 inst.cancelHelperRemoval = true; //Don't remove the helper in the draggable instance
                                 this.instance.cancelHelperRemoval = false; //Remove it in the sortable instance (so sortable plugins like revert still work)
-b3f7b
+                                //The sortable revert is supported, and we have to set a temporary dropped variable on the draggable to support revert: "valid/invalid"
                                 if(this.shouldRevert) {
                                         this.instance.options.revert = this.shouldRevert;
+                                }
-ad3d82
+            Assos Assos
                                 //Trigger the stop of the sortable
                                 this.instance._mouseStop(event);
                                 this.instance.options.helper = this.instance.options._helper;
                                 //If the helper has been the original item, restore properties in the sortable
-b3f7b
+                                if(inst.options.helper === "original") {
                                         this.instance.currentItem.css({ top: "auto", left: "auto" });
+                                }
-ad3d82
+            Assos Assos
                         } else {
                                 this.instance.cancelHelperRemoval = false; //Remove the helper in the sortable instance
                                 this.instance._trigger("deactivate", event, uiSortable);
+                        }
                 });
         },
         drag: function(event, ui) {
-b3f7b
+                var inst = $(this).data("ui-draggable"), that = this;
-ad3d82
+            Assos Assos
-b3f7b
+                $.each(inst.sortables, function() {
-ad3d82
+            Assos Assos
-b3f7b
+                        var innermostIntersecting = false,
                                 thisSortable = this;
-ad3d82
+            Assos Assos
                         //Copy over some variables to allow calling the sortable's native _intersectsWith
                         this.instance.positionAbs = inst.positionAbs;
                         this.instance.helperProportions = inst.helperProportions;
                         this.instance.offset.click = inst.offset.click;
-b3f7b
+            Assos Assos
-ad3d82
+                        if(this.instance._intersectsWith(this.instance.containerCache)) {
-b3f7b
+                                innermostIntersecting = true;
                                 $.each(inst.sortables, function () {
                                         this.instance.positionAbs = inst.positionAbs;
                                         this.instance.helperProportions = inst.helperProportions;
                                         this.instance.offset.click = inst.offset.click;
                                         if (this !== thisSortable &&
                                                 this.instance._intersectsWith(this.instance.containerCache) &&
                                                 $.contains(thisSortable.instance.element[0], this.instance.element[0])
                                         ) {
                                                 innermostIntersecting = false;
+                                        }
                                         return innermostIntersecting;
                                 });
+                        }
-ad3d82
+            Assos Assos
-b3f7b
+                        if(innermostIntersecting) {
-ad3d82
+                                //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)
-b3f7b
+                                        this.instance.currentItem = $(that).clone().removeAttr("id").appendTo(this.instance.element).data("ui-sortable-item", true);
-ad3d82
+                                        this.instance.options._helper = this.instance.options.helper; //Store helper option to later restore it
                                         this.instance.options.helper = function() { return ui.helper[0]; };
                                         event.target = this.instance.currentItem[0];
                                         this.instance._mouseCapture(event, true);
                                         this.instance._mouseStart(event, 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._trigger("toSortable", event);
                                         inst.dropped = this.instance.element; //draggable revert needs that
                                         //hack so receive/update callbacks work (mostly)
                                         inst.currentItem = inst.element;
                                         this.instance.fromOutside = inst;
+                                }
                                 //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
-b3f7b
+                                if(this.instance.currentItem) {
                                         this.instance._mouseDrag(event);
+                                }
-ad3d82
+            Assos Assos
                         } 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) {
                                         this.instance.isOver = 0;
                                         this.instance.cancelHelperRemoval = true;
-b3f7b
+            Assos Assos
-ad3d82
+                                        //Prevent reverting on this forced stop
                                         this.instance.options.revert = false;
-b3f7b
+            Assos Assos
-ad3d82
+                                        // The out event needs to be triggered independently
-b3f7b
+                                        this.instance._trigger("out", event, this.instance._uiHash(this.instance));
-ad3d82
+                                        this.instance._mouseStop(event, 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();
-b3f7b
+                                        if(this.instance.placeholder) {
                                                 this.instance.placeholder.remove();
+                                        }
-ad3d82
+            Assos Assos
                                         inst._trigger("fromSortable", event);
                                         inst.dropped = false; //draggable revert needs that
+                                }
-b3f7b
+            Assos Assos
-ad3d82
+            Assos Assos
                 });
+        }
 });
 $.ui.plugin.add("draggable", "cursor", {
-b3f7b
+        start: function() {
                 var t = $("body"), o = $(this).data("ui-draggable").options;
                 if (t.css("cursor")) {
                         o._cursor = t.css("cursor");
+                }
-ad3d82
+                t.css("cursor", o.cursor);
         },
-b3f7b
+        stop: function() {
                 var o = $(this).data("ui-draggable").options;
                 if (o._cursor) {
                         $("body").css("cursor", o._cursor);
+                }
-ad3d82
+            Assos Assos
 });
 $.ui.plugin.add("draggable", "opacity", {
         start: function(event, ui) {
-b3f7b
+                var t = $(ui.helper), o = $(this).data("ui-draggable").options;
                 if(t.css("opacity")) {
                         o._opacity = t.css("opacity");
+                }
                 t.css("opacity", o.opacity);
-ad3d82
+        },
         stop: function(event, ui) {
-b3f7b
+                var o = $(this).data("ui-draggable").options;
                 if(o._opacity) {
                         $(ui.helper).css("opacity", o._opacity);
+                }
-ad3d82
+            Assos Assos
 });
 $.ui.plugin.add("draggable", "scroll", {
-b3f7b
+        start: function() {
                 var i = $(this).data("ui-draggable");
                 if(i.scrollParent[0] !== document && i.scrollParent[0].tagName !== "HTML") {
                         i.overflowOffset = i.scrollParent.offset();
+                }
-ad3d82
+        },
-b3f7b
+        drag: function( event ) {
-ad3d82
+            Assos Assos
-b3f7b
+                var i = $(this).data("ui-draggable"), o = i.options, scrolled = false;
-ad3d82
+            Assos Assos
-b3f7b
+                if(i.scrollParent[0] !== document && i.scrollParent[0].tagName !== "HTML") {
-ad3d82
+            Assos Assos
-b3f7b
+                        if(!o.axis || o.axis !== "x") {
                                 if((i.overflowOffset.top + i.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity) {
-ad3d82
+                                        i.scrollParent[0].scrollTop = scrolled = i.scrollParent[0].scrollTop + o.scrollSpeed;
-b3f7b
+                                } else if(event.pageY - i.overflowOffset.top < o.scrollSensitivity) {
-ad3d82
+                                        i.scrollParent[0].scrollTop = scrolled = i.scrollParent[0].scrollTop - o.scrollSpeed;
-b3f7b
+            Assos Assos
-ad3d82
+            Assos Assos
-b3f7b
+                        if(!o.axis || o.axis !== "y") {
                                 if((i.overflowOffset.left + i.scrollParent[0].offsetWidth) - event.pageX < o.scrollSensitivity) {
-ad3d82
+                                        i.scrollParent[0].scrollLeft = scrolled = i.scrollParent[0].scrollLeft + o.scrollSpeed;
-b3f7b
+                                } else if(event.pageX - i.overflowOffset.left < o.scrollSensitivity) {
-ad3d82
+                                        i.scrollParent[0].scrollLeft = scrolled = i.scrollParent[0].scrollLeft - o.scrollSpeed;
-b3f7b
+            Assos Assos
-ad3d82
+            Assos Assos
                 } else {
-b3f7b
+                        if(!o.axis || o.axis !== "x") {
                                 if(event.pageY - $(document).scrollTop() < o.scrollSensitivity) {
-ad3d82
+                                        scrolled = $(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
-b3f7b
+                                } else if($(window).height() - (event.pageY - $(document).scrollTop()) < o.scrollSensitivity) {
-ad3d82
+                                        scrolled = $(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
-b3f7b
+            Assos Assos
-ad3d82
+            Assos Assos
-b3f7b
+                        if(!o.axis || o.axis !== "y") {
                                 if(event.pageX - $(document).scrollLeft() < o.scrollSensitivity) {
-ad3d82
+                                        scrolled = $(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);
-b3f7b
+                                } else if($(window).width() - (event.pageX - $(document).scrollLeft()) < o.scrollSensitivity) {
-ad3d82
+                                        scrolled = $(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
-b3f7b
+            Assos Assos
-ad3d82
+            Assos Assos
+                }
-b3f7b
+                if(scrolled !== false && $.ui.ddmanager && !o.dropBehaviour) {
-ad3d82
+                        $.ui.ddmanager.prepareOffsets(i, event);
-b3f7b
+            Assos Assos
-ad3d82
+            Assos Assos
+        }
 });
 $.ui.plugin.add("draggable", "snap", {
-b3f7b
+        start: function() {
                 var i = $(this).data("ui-draggable"),
                         o = i.options;
-ad3d82
+            Assos Assos
                 i.snapElements = [];
-b3f7b
+                $(o.snap.constructor !== String ? ( o.snap.items || ":data(ui-draggable)" ) : o.snap).each(function() {
                         var $t = $(this),
                                 $o = $t.offset();
                         if(this !== i.element[0]) {
                                 i.snapElements.push({
                                         item: this,
                                         width: $t.outerWidth(), height: $t.outerHeight(),
                                         top: $o.top, left: $o.left
                                 });
+                        }
-ad3d82
+                });
         },
         drag: function(event, ui) {
-b3f7b
+                var ts, bs, ls, rs, l, r, t, b, i, first,
                         inst = $(this).data("ui-draggable"),
                         o = inst.options,
                         d = o.snapTolerance,
                         x1 = ui.offset.left, x2 = x1 + inst.helperProportions.width,
-ad3d82
+                        y1 = ui.offset.top, y2 = y1 + inst.helperProportions.height;
-b3f7b
+                for (i = inst.snapElements.length - 1; i >= 0; i--){
-ad3d82
+            Assos Assos
-b3f7b
+                        l = inst.snapElements[i].left;
                         r = l + inst.snapElements[i].width;
                         t = inst.snapElements[i].top;
                         b = t + inst.snapElements[i].height;
-ad3d82
+            Assos Assos
                         //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))) {
-b3f7b
+                                if(inst.snapElements[i].snapping) {
                                         (inst.options.snap.release && inst.options.snap.release.call(inst.element, event, $.extend(inst._uiHash(), { snapItem: inst.snapElements[i].item })));
+                                }
-ad3d82
+                                inst.snapElements[i].snapping = false;
                                 continue;
+                        }
-b3f7b
+                        if(o.snapMode !== "inner") {
                                 ts = Math.abs(t - y2) <= d;
                                 bs = Math.abs(b - y1) <= d;
                                 ls = Math.abs(l - x2) <= d;
                                 rs = Math.abs(r - x1) <= d;
                                 if(ts) {
                                         ui.position.top = inst._convertPositionTo("relative", { top: t - inst.helperProportions.height, left: 0 }).top - inst.margins.top;
+                                }
                                 if(bs) {
                                         ui.position.top = inst._convertPositionTo("relative", { top: b, left: 0 }).top - inst.margins.top;
+                                }
                                 if(ls) {
                                         ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l - inst.helperProportions.width }).left - inst.margins.left;
+                                }
                                 if(rs) {
                                         ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r }).left - inst.margins.left;
+                                }
-ad3d82
+            Assos Assos
-b3f7b
+                        first = (ts || bs || ls || rs);
                         if(o.snapMode !== "outer") {
                                 ts = Math.abs(t - y1) <= d;
                                 bs = Math.abs(b - y2) <= d;
                                 ls = Math.abs(l - x1) <= d;
                                 rs = Math.abs(r - x2) <= d;
                                 if(ts) {
                                         ui.position.top = inst._convertPositionTo("relative", { top: t, left: 0 }).top - inst.margins.top;
+                                }
                                 if(bs) {
                                         ui.position.top = inst._convertPositionTo("relative", { top: b - inst.helperProportions.height, left: 0 }).top - inst.margins.top;
+                                }
                                 if(ls) {
                                         ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l }).left - inst.margins.left;
+                                }
                                 if(rs) {
                                         ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r - inst.helperProportions.width }).left - inst.margins.left;
+                                }
-ad3d82
+            Assos Assos
-b3f7b
+                        if(!inst.snapElements[i].snapping && (ts || bs || ls || rs || first)) {
-ad3d82
+                                (inst.options.snap.snap && inst.options.snap.snap.call(inst.element, event, $.extend(inst._uiHash(), { snapItem: inst.snapElements[i].item })));
-b3f7b
+            Assos Assos
-ad3d82
+                        inst.snapElements[i].snapping = (ts || bs || ls || rs || first);
-b3f7b
+            Assos Assos
-ad3d82
+            Assos Assos
+        }
 });
 $.ui.plugin.add("draggable", "stack", {
-b3f7b
+        start: function() {
                 var min,
                         o = this.data("ui-draggable").options,
                         group = $.makeArray($(o.stack)).sort(function(a,b) {
                                 return (parseInt($(a).css("zIndex"),10) || 0) - (parseInt($(b).css("zIndex"),10) || 0);
                         });
-ad3d82
+            Assos Assos
                 if (!group.length) { return; }
-b3f7b
+            Assos Assos
                 min = parseInt($(group[0]).css("zIndex"), 10) || 0;
-ad3d82
+                $(group).each(function(i) {
-b3f7b
+                        $(this).css("zIndex", min + i);
-ad3d82
+                });
-b3f7b
+                this.css("zIndex", (min + group.length));
-ad3d82
+            Assos Assos
 });
 $.ui.plugin.add("draggable", "zIndex", {
         start: function(event, ui) {
-b3f7b
+                var t = $(ui.helper), o = $(this).data("ui-draggable").options;
                 if(t.css("zIndex")) {
                         o._zIndex = t.css("zIndex");
+                }
                 t.css("zIndex", o.zIndex);
-ad3d82
+        },
         stop: function(event, ui) {
-b3f7b
+                var o = $(this).data("ui-draggable").options;
                 if(o._zIndex) {
                         $(ui.helper).css("zIndex", o._zIndex);
+                }
-ad3d82
+            Assos Assos
 });
 })(jQuery);