diff --git a/source/js/jquery-sortable.js b/source/js/jquery-sortable.js index 69a1312..1d5afed 100644 --- a/source/js/jquery-sortable.js +++ b/source/js/jquery-sortable.js @@ -1,5 +1,5 @@ /* =================================================== - * jquery-sortable.js v0.9.13 + * jquery-sortable.js v0.9.14 * http://johnny.github.com/jquery-sortable/ * =================================================== * Copyright (c) 2012 Jonas von Andrian @@ -85,6 +85,7 @@ // The Placeholder has not been moved yet. onDrag: function ($item, position, _super, event) { $item.css(position) + event.preventDefault() }, // Called after the drag has been started, // that is the mouse button is being held down and @@ -108,7 +109,7 @@ // Ignore if element clicked is input, select or textarea onMousedown: function ($item, _super, event) { if (!event.target.nodeName.match(/^(input|select|textarea)$/i)) { - event.preventDefault() + if (event.type.match(/^mouse/)) event.preventDefault() return true } }, @@ -126,9 +127,9 @@ serialize: function ($parent, $children, parentIsContainer) { var result = $.extend({}, $parent.data()) - if(parentIsContainer) + if (parentIsContainer) { return [$children] - else if ($children[0]){ + } else if ($children[0]){ result.children = $children } @@ -253,7 +254,7 @@ this.item = closestItem; this.itemContainer = itemContainer; if (this.item.is(this.options.exclude) || !this.options.onMousedown(this.item, groupDefaults.onMousedown, e)) { - return; + return; } this.setPointer(e); this.toggleListeners('on'); @@ -400,10 +401,11 @@ ) >= this.options.distance) }, getPointer: function(e) { - var o = e.originalEvent || e.originalEvent.touches && e.originalEvent.touches[0] + var o = e.originalEvent, + t = (e.originalEvent.touches && e.originalEvent.touches[0]) || {} return { - left: e.pageX || o.pageX, - top: e.pageY || o.pageY + left: e.pageX || o.pageX || t.pageX, + top: e.pageY || o.pageY || t.pageY } }, setupDelayTimer: function () {