diff options
| author | Richard Worth <rdworth@gmail.com> | 2011-04-07 09:08:48 -0400 |
|---|---|---|
| committer | Richard Worth <rdworth@gmail.com> | 2011-04-07 09:08:48 -0400 |
| commit | 54016b8469345a325e8c1ab6f8a7d17b0f0f8d01 (patch) | |
| tree | 01292b351b17ee27865c2e24e1802f57771a66da | |
| parent | bc6a28ee03ed2eb391ec839a05ced94a84debefe (diff) | |
| download | jquery-ui-54016b8469345a325e8c1ab6f8a7d17b0f0f8d01.tar.gz jquery-ui-54016b8469345a325e8c1ab6f8a7d17b0f0f8d01.zip | |
Sortable: Reverted 56b0da59d71396a740cf48a75902243d561ba186 as #4551 is invalid.
| -rw-r--r-- | tests/visual/sortable/sortable_ticket_4551.html | 54 | ||||
| -rw-r--r-- | ui/jquery.ui.sortable.js | 4 |
2 files changed, 4 insertions, 54 deletions
diff --git a/tests/visual/sortable/sortable_ticket_4551.html b/tests/visual/sortable/sortable_ticket_4551.html deleted file mode 100644 index 2b83ae42e..000000000 --- a/tests/visual/sortable/sortable_ticket_4551.html +++ /dev/null @@ -1,54 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="UTF-8" /> - <title>Sortable Visual Test : Sortable ticket #4551</title> - <link rel="stylesheet" href="../visual.css" type="text/css" /> - <link rel="stylesheet" href="../../../themes/base/jquery.ui.all.css" type="text/css"> - <script type="text/javascript" src="../../../jquery-1.5.1.js"></script> - <script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script> - <script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script> - <script type="text/javascript" src="../../../ui/jquery.ui.mouse.js"></script> - <script type="text/javascript" src="../../../ui/jquery.ui.sortable.js"></script> - <script type="text/javascript"> - $(function() { - $("#first, #second").sortable({ - connectWith: '.sortable' - }).disableSelection(); - }); - </script> - <style type="text/css"> - .sortable { margin: 0; padding: 0; } - .sortable div { margin: 3px 3px 3px 0; background: #ccc; padding: 1px; border: 1px solid black; float:left; width: 100px; height: 140px; font-size: 1em; text-align: center; } - #second div { background: #acc; } - </style> -</head> -<body> - -<h1 class="ui-widget-header"><a href="http://dev.jqueryui.com/ticket/4551">#4551 - Sortable connectWith fails if item is floated</a></h1> - -<div id="first" class="sortable"> - <div>1</div> - <div>2</div> - <div>3</div> - <div>4</div> - <div>5</div> - <div>6</div> - <div>7</div> - <div>8</div> - <div>9</div> - <div>10</div> - <div>11</div> - <div>12</div> -</div> - -<br style="clear:both;"> -<hr /> - -<div id="second" class="sortable"> - <div>12</div> - <div>14</div> -</div> - -</body> -</html> diff --git a/ui/jquery.ui.sortable.js b/ui/jquery.ui.sortable.js index 8356eeb9f..131fb50d0 100644 --- a/ui/jquery.ui.sortable.js +++ b/ui/jquery.ui.sortable.js @@ -614,6 +614,10 @@ $.widget("ui.sortable", $.ui.mouse, { for (var i = this.items.length - 1; i >= 0; i--){ var item = this.items[i]; + //We ignore calculating positions of all connected containers when we're not over them + if(item.instance != this.currentContainer && this.currentContainer && item.item[0] != this.currentItem[0]) + continue; + var t = this.options.toleranceElement ? $(this.options.toleranceElement, item.item) : item.item; if (!fast) { |