diff options
author | rvelices <rv-github@modusoptimus.com> | 2014-06-24 20:16:59 +0000 |
---|---|---|
committer | rvelices <rv-github@modusoptimus.com> | 2014-06-24 20:16:59 +0000 |
commit | 09228a746f3a67ea80ab6cc6013f535da8332a64 (patch) | |
tree | 15107374e3de6b8da403af5b75f828c7ea77315b /themes/default/js/ui/jquery.ui.droppable.js | |
parent | 03a3d1830cf67eb468bf4e48a879d2994055a492 (diff) |
upgrade jquery ui from 1.10.1 to 1.10.4
git-svn-id: http://piwigo.org/svn/trunk@28780 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r-- | themes/default/js/ui/jquery.ui.droppable.js | 48 |
1 files changed, 33 insertions, 15 deletions
diff --git a/themes/default/js/ui/jquery.ui.droppable.js b/themes/default/js/ui/jquery.ui.droppable.js index d4c468fb8..762d5498c 100644 --- a/themes/default/js/ui/jquery.ui.droppable.js +++ b/themes/default/js/ui/jquery.ui.droppable.js @@ -1,8 +1,8 @@ /*! - * jQuery UI Droppable 1.10.1 + * jQuery UI Droppable 1.10.4 * http://jqueryui.com * - * Copyright 2013 jQuery Foundation and other contributors + * Copyright 2014 jQuery Foundation and other contributors * Released under the MIT license. * http://jquery.org/license * @@ -21,7 +21,7 @@ function isOverAxis( x, reference, size ) { } $.widget("ui.droppable", { - version: "1.10.1", + version: "1.10.4", widgetEventPrefix: "drop", options: { accept: "*", @@ -41,7 +41,8 @@ $.widget("ui.droppable", { }, _create: function() { - var o = this.options, + var proportions, + o = this.options, accept = o.accept; this.isover = false; @@ -51,8 +52,20 @@ $.widget("ui.droppable", { return d.is(accept); }; - //Store the droppable's proportions - this.proportions = { width: this.element[0].offsetWidth, height: this.element[0].offsetHeight }; + this.proportions = function( /* valueToWrite */ ) { + if ( arguments.length ) { + // Store the droppable's proportions + proportions = arguments[ 0 ]; + } else { + // Retrieve or derive the droppable's proportions + return proportions ? + proportions : + proportions = { + width: this.element[ 0 ].offsetWidth, + height: this.element[ 0 ].offsetHeight + }; + } + }; // Add the reference and positions to the manager $.ui.ddmanager.droppables[o.scope] = $.ui.ddmanager.droppables[o.scope] || []; @@ -198,10 +211,14 @@ $.ui.intersect = function(draggable, droppable, toleranceMode) { } var draggableLeft, draggableTop, - x1 = (draggable.positionAbs || draggable.position.absolute).left, x2 = x1 + draggable.helperProportions.width, - y1 = (draggable.positionAbs || draggable.position.absolute).top, y2 = y1 + draggable.helperProportions.height, - l = droppable.offset.left, r = l + droppable.proportions.width, - t = droppable.offset.top, b = t + droppable.proportions.height; + x1 = (draggable.positionAbs || draggable.position.absolute).left, + y1 = (draggable.positionAbs || draggable.position.absolute).top, + x2 = x1 + draggable.helperProportions.width, + y2 = y1 + draggable.helperProportions.height, + l = droppable.offset.left, + t = droppable.offset.top, + r = l + droppable.proportions().width, + b = t + droppable.proportions().height; switch (toleranceMode) { case "fit": @@ -214,7 +231,7 @@ $.ui.intersect = function(draggable, droppable, toleranceMode) { case "pointer": draggableLeft = ((draggable.positionAbs || draggable.position.absolute).left + (draggable.clickOffset || draggable.offset.click).left); draggableTop = ((draggable.positionAbs || draggable.position.absolute).top + (draggable.clickOffset || draggable.offset.click).top); - return isOverAxis( draggableTop, t, droppable.proportions.height ) && isOverAxis( draggableLeft, l, droppable.proportions.width ); + return isOverAxis( draggableTop, t, droppable.proportions().height ) && isOverAxis( draggableLeft, l, droppable.proportions().width ); case "touch": return ( (y1 >= t && y1 <= b) || // Top edge touching @@ -254,7 +271,7 @@ $.ui.ddmanager = { // Filter out elements in the current dragged item for (j=0; j < list.length; j++) { if(list[j] === m[i].element[0]) { - m[i].proportions.height = 0; + m[i].proportions().height = 0; continue droppablesLoop; } } @@ -269,8 +286,8 @@ $.ui.ddmanager = { m[i]._activate.call(m[i], event); } - m[i].offset = m[i].element.offset(); - m[i].proportions = { width: m[i].element[0].offsetWidth, height: m[i].element[0].offsetHeight }; + m[ i ].offset = m[ i ].element.offset(); + m[ i ].proportions({ width: m[ i ].element[ 0 ].offsetWidth, height: m[ i ].element[ 0 ].offsetHeight }); } @@ -278,7 +295,8 @@ $.ui.ddmanager = { drop: function(draggable, event) { var dropped = false; - $.each($.ui.ddmanager.droppables[draggable.options.scope] || [], function() { + // Create a copy of the droppables in case the list changes during the drop (#9116) + $.each(($.ui.ddmanager.droppables[draggable.options.scope] || []).slice(), function() { if(!this.options) { return; |