summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwhittet <whittet@gmail.com>2011-04-27 07:21:29 -0700
committerScott González <scott.gonzalez@gmail.com>2011-05-02 17:46:20 -0400
commitf3737a91835f6b35b49a5b821e7cc555340c6057 (patch)
tree7878e1d89db74cc53dbbb1644b6d0971ba03f606
parenta6d8fd1480d1d020a32cad015b43689fdefec352 (diff)
downloadjquery-ui-f3737a91835f6b35b49a5b821e7cc555340c6057.tar.gz
jquery-ui-f3737a91835f6b35b49a5b821e7cc555340c6057.zip
Bug fix for another use case, see comment by whittet here: http://bugs.jqueryui.com/ticket/6702
(cherry picked from commit 2bf061ea6fd3bad7d6f5a77eebb22b7cc07140e4)
-rw-r--r--ui/jquery.ui.sortable.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/jquery.ui.sortable.js b/ui/jquery.ui.sortable.js
index aae7c6799..91a42658f 100644
--- a/ui/jquery.ui.sortable.js
+++ b/ui/jquery.ui.sortable.js
@@ -50,7 +50,7 @@ $.widget("ui.sortable", $.ui.mouse, {
this.refresh();
//Let's determine if the items are being displayed horizontally
- this.floating = this.items.length ? (/left|right/).test(this.items[0].item.css('float')) || (/inline|table-cell/).test(this.items[0].item.css('display')) : false;
+ this.floating = this.items.length ? o.axis === 'x' || (/left|right/).test(this.items[0].item.css('float')) || (/inline|table-cell/).test(this.items[0].item.css('display')) : false;
//Let's determine the parent's offset
this.offset = this.element.offset();