diff options
author | Scott González <scott.gonzalez@gmail.com> | 2011-05-02 14:46:01 -0700 |
---|---|---|
committer | Scott González <scott.gonzalez@gmail.com> | 2011-05-02 14:46:01 -0700 |
commit | 4f63e5ca6c3e1194f89484c43e98913ce4efa1e4 (patch) | |
tree | 1be942a1325c1b7bd9c16d2d6af2bf9f870d1c2a /ui | |
parent | d09599b201f9a59367c41d13cd38741b0c0103fe (diff) | |
parent | 2bf061ea6fd3bad7d6f5a77eebb22b7cc07140e4 (diff) | |
download | jquery-ui-4f63e5ca6c3e1194f89484c43e98913ce4efa1e4.tar.gz jquery-ui-4f63e5ca6c3e1194f89484c43e98913ce4efa1e4.zip |
Merge pull request #191 from whittet/patch-1.
Bug fix for another use case, see comment by whittet here: http://bugs.jq
Diffstat (limited to 'ui')
-rw-r--r-- | ui/jquery.ui.sortable.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/jquery.ui.sortable.js b/ui/jquery.ui.sortable.js index 131fb50d0..78349669a 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(); |