diff options
| author | gnarf <gnarf@gnarf.net> | 2011-05-04 01:38:41 -0500 |
|---|---|---|
| committer | gnarf <gnarf@gnarf.net> | 2011-05-04 01:38:41 -0500 |
| commit | d61e0656c59761cf9729d2aacbc16d74e576a440 (patch) | |
| tree | 436fa7641aa06435fcbf49b3f3d88caf849a99f6 /ui/jquery.ui.sortable.js | |
| parent | c5c65dbac60463d04a6c34a3c0e3e9ce5a846a43 (diff) | |
| parent | f5ee22c74a2e0e48b686a94838e12cbb9b45c99c (diff) | |
| download | jquery-ui-d61e0656c59761cf9729d2aacbc16d74e576a440.tar.gz jquery-ui-d61e0656c59761cf9729d2aacbc16d74e576a440.zip | |
Merge branch 'master' into effects-unit
Diffstat (limited to 'ui/jquery.ui.sortable.js')
| -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(); |