diff options
| author | gnarf <gnarf@gnarf.net> | 2011-03-07 11:15:28 -0600 |
|---|---|---|
| committer | gnarf <gnarf@gnarf.net> | 2011-03-07 11:15:28 -0600 |
| commit | fefb29d825a482a4c7006b0c91f440f3b024dbd2 (patch) | |
| tree | 1a9c96bada02f87a843a10ea12dfda684b228003 /ui/jquery.ui.sortable.js | |
| parent | b6debf4daf015173de904a361ddb1041fc9474a8 (diff) | |
| parent | d7979a8b7150ac36f6f57ad0c18c49a46965797c (diff) | |
| download | jquery-ui-fefb29d825a482a4c7006b0c91f440f3b024dbd2.tar.gz jquery-ui-fefb29d825a482a4c7006b0c91f440f3b024dbd2.zip | |
Merge branch 'master' into effects-api
Diffstat (limited to 'ui/jquery.ui.sortable.js')
| -rw-r--r-- | ui/jquery.ui.sortable.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/jquery.ui.sortable.js b/ui/jquery.ui.sortable.js index 05cbf2132..8356eeb9f 100644 --- a/ui/jquery.ui.sortable.js +++ b/ui/jquery.ui.sortable.js @@ -49,8 +49,8 @@ $.widget("ui.sortable", $.ui.mouse, { //Get the items this.refresh(); - //Let's determine if the items are floating - this.floating = this.items.length ? (/left|right/).test(this.items[0].item.css('float')) : false; + //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; //Let's determine the parent's offset this.offset = this.element.offset(); |