diff options
| author | Paul Bakaus <paul.bakaus@googlemail.com> | 2009-08-22 13:48:04 +0000 |
|---|---|---|
| committer | Paul Bakaus <paul.bakaus@googlemail.com> | 2009-08-22 13:48:04 +0000 |
| commit | 957774c6850671601006d03ebdf9ce2653cac467 (patch) | |
| tree | 87cea3fb2d09570006aa9a31703c2abf4fefb835 /ui/ui.sortable.js | |
| parent | d28166805f72de1f76dcbc322e5c79ec50791882 (diff) | |
| download | jquery-ui-957774c6850671601006d03ebdf9ce2653cac467.tar.gz jquery-ui-957774c6850671601006d03ebdf9ce2653cac467.zip | |
sortable: toArray/serialize should not include the placeholder, fixes #4138
Diffstat (limited to 'ui/ui.sortable.js')
| -rw-r--r-- | ui/ui.sortable.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/ui.sortable.js b/ui/ui.sortable.js index dc2306561..adce49abf 100644 --- a/ui/ui.sortable.js +++ b/ui/ui.sortable.js @@ -485,13 +485,13 @@ $.widget("ui.sortable", $.extend({}, $.ui.mouse, { for (var j = cur.length - 1; j >= 0; j--){ var inst = $.data(cur[j], 'sortable'); if(inst && inst != this && !inst.options.disabled) { - queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element) : $(inst.options.items, inst.element).not(".ui-sortable-helper"), inst]); + queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element) : $(inst.options.items, inst.element).not(".ui-sortable-helper").not('.ui-sortable-placeholder'), inst]); } }; }; } - queries.push([$.isFunction(this.options.items) ? this.options.items.call(this.element, null, { options: this.options, item: this.currentItem }) : $(this.options.items, this.element).not(".ui-sortable-helper"), this]); + queries.push([$.isFunction(this.options.items) ? this.options.items.call(this.element, null, { options: this.options, item: this.currentItem }) : $(this.options.items, this.element).not(".ui-sortable-helper").not('.ui-sortable-placeholder'), this]); for (var i = queries.length - 1; i >= 0; i--){ queries[i][0].each(function() { @@ -967,7 +967,7 @@ $.widget("ui.sortable", $.extend({}, $.ui.mouse, { //Do what was originally in plugins if(this._storedCursor) $('body').css("cursor", this._storedCursor); //Reset cursor - if(this._storedOpacity) this.helper.css("opacity", this._storedOpacity); //Reset cursor + if(this._storedOpacity) this.helper.css("opacity", this._storedOpacity); //Reset opacity if(this._storedZIndex) this.helper.css("zIndex", this._storedZIndex == 'auto' ? '' : this._storedZIndex); //Reset z-index this.dragging = false; |