Permalink
Browse files

Merge branch 'master' into interactions

Conflicts:
	demos/draggable/cursor-style.html
	ui/jquery.ui.draggable.js
  • Loading branch information...
2 parents a065d35 + ec062c1 commit adaf034f6dd87542f5fc23969d63e6c36f74373d @scottgonzalez scottgonzalez committed Mar 14, 2012
Showing with 3,359 additions and 6,167 deletions.
  1. +1 −1 MIT-LICENSE.txt
  2. +4 −4 demos/accordion/collapsible.html
  3. +4 −4 demos/accordion/custom-icons.html
  4. +4 −4 demos/accordion/default.html
  5. +4 −4 demos/accordion/fillspace.html
  6. +6 −6 demos/accordion/hoverintent.html
  7. +0 −1 demos/accordion/index.html
  8. +0 −57 demos/accordion/mouseover.html
  9. +3 −4 demos/accordion/no-auto-height.html
  10. +16 −18 demos/accordion/sortable.html
  11. +1 −1 demos/addClass/default.html
  12. +2 −2 demos/autocomplete/categories.html
  13. +2 −2 demos/autocomplete/combobox.html
  14. +4 −0 demos/datepicker/localization.html
  15. +18 −17 demos/effect/easing.html
  16. +2 −0 demos/index.html
  17. +15 −12 demos/position/cycler.html
  18. +1 −1 demos/sortable/connect-lists.html
  19. +9 −2 external/qunit.css
  20. +647 −440 external/qunit.js
  21. +122 −121 tests/jquery.simulate.js
  22. +0 −17 tests/static/slider/default.html
  23. +0 −17 tests/static/slider/default_vertical.html
  24. +0 −17 tests/static/slider/slider_horizontal.html
  25. +0 −17 tests/static/slider/slider_horizontal_range.html
  26. +0 −17 tests/static/slider/slider_horizontal_range_max.html
  27. +0 −17 tests/static/slider/slider_horizontal_range_min.html
  28. +0 −17 tests/static/slider/slider_vertical.html
  29. +0 −17 tests/static/slider/slider_vertical_range.html
  30. +0 −17 tests/static/slider/slider_vertical_range_max.html
  31. +0 −17 tests/static/slider/slider_vertical_range_min.html
  32. +6 −6 tests/unit/accordion/accordion.html
  33. +0 −7 tests/unit/accordion/accordion_core.js
  34. +1 −1 tests/unit/accordion/accordion_defaults.js
  35. +1 −0 tests/unit/accordion/accordion_defaults_deprecated.js
  36. +6 −6 tests/unit/accordion/accordion_deprecated.html
  37. +6 −6 tests/unit/accordion/accordion_events.js
  38. +3 −3 tests/unit/accordion/accordion_test_helpers.js
  39. +72 −0 tests/unit/all-active.html
  40. +0 −39 tests/unit/autocomplete/autocomplete_core.js
  41. +4 −1 tests/unit/autocomplete/autocomplete_events.js
  42. +54 −0 tests/unit/autocomplete/autocomplete_options.js
  43. +12 −12 tests/unit/button/button_core.js
  44. +19 −19 tests/unit/button/button_options.js
  45. +35 −35 tests/unit/core/core.js
  46. +35 −35 tests/unit/datepicker/datepicker_core.js
  47. +25 −25 tests/unit/datepicker/datepicker_events.js
  48. +155 −155 tests/unit/datepicker/datepicker_options.js
  49. +8 −8 tests/unit/datepicker/datepicker_tickets.js
  50. +9 −9 tests/unit/dialog/dialog_core.js
  51. +42 −42 tests/unit/dialog/dialog_events.js
  52. +15 −15 tests/unit/dialog/dialog_methods.js
  53. +77 −77 tests/unit/dialog/dialog_options.js
  54. +8 −8 tests/unit/dialog/dialog_tickets.js
  55. +1 −1 tests/unit/draggable/draggable_core.js
  56. +9 −9 tests/unit/draggable/draggable_events.js
  57. +9 −9 tests/unit/draggable/draggable_methods.js
  58. +74 −74 tests/unit/draggable/draggable_options.js
  59. +10 −10 tests/unit/droppable/droppable_methods.js
  60. +2 −2 tests/unit/droppable/droppable_options.js
  61. +6 −6 tests/unit/menu/menu_core.js
  62. +4 −1 tests/unit/menu/menu_defaults.js
  63. +198 −169 tests/unit/menu/menu_events.js
  64. +4 −4 tests/unit/menu/menu_methods.js
  65. +2 −2 tests/unit/menu/menu_options.js
  66. +35 −35 tests/unit/position/position_core.js
  67. +28 −28 tests/unit/position/position_core_within.js
  68. +3 −3 tests/unit/position/position_deprecated.js
  69. +7 −7 tests/unit/progressbar/progressbar_core.js
  70. +5 −5 tests/unit/progressbar/progressbar_events.js
  71. +5 −5 tests/unit/progressbar/progressbar_methods.js
  72. +5 −5 tests/unit/progressbar/progressbar_options.js
  73. +25 −25 tests/unit/resizable/resizable_core.js
  74. +3 −3 tests/unit/resizable/resizable_methods.js
  75. +52 −52 tests/unit/resizable/resizable_options.js
  76. +2 −2 tests/unit/selectable/selectable_events.js
  77. +9 −9 tests/unit/selectable/selectable_methods.js
  78. +4 −4 tests/unit/selectable/selectable_options.js
  79. +34 −34 tests/unit/slider/slider_core.js
  80. +11 −11 tests/unit/slider/slider_events.js
  81. +14 −14 tests/unit/slider/slider_methods.js
  82. +13 −13 tests/unit/slider/slider_options.js
  83. +9 −9 tests/unit/sortable/sortable_methods.js
  84. +2 −2 tests/unit/sortable/sortable_tickets.js
  85. +29 −29 tests/unit/spinner/spinner_methods.js
  86. +18 −18 tests/unit/spinner/spinner_options.js
  87. +3 −3 tests/unit/tabs/tabs.html
  88. +5 −4 tests/unit/tabs/tabs_core.js
  89. +3 −3 tests/unit/tabs/tabs_deprecated.html
  90. +65 −65 tests/unit/tabs/tabs_deprecated.js
  91. +59 −59 tests/unit/tabs/tabs_events.js
  92. +14 −14 tests/unit/tabs/tabs_methods.js
  93. +11 −11 tests/unit/tabs/tabs_options.js
  94. +4 −4 tests/unit/testsuite.js
  95. +1 −0 tests/unit/tooltip/tooltip_core.js
  96. +7 −7 tests/unit/tooltip/tooltip_events.js
  97. +2 −2 tests/unit/tooltip/tooltip_methods.js
  98. +7 −7 tests/unit/tooltip/tooltip_options.js
  99. +168 −108 tests/unit/widget/widget_core.js
  100. +95 −0 tests/visual/accordion/accordion.html
  101. +50 −2,942 tests/visual/dialog/dialog_on_page_with_large_dom.html
  102. +7 −7 tests/visual/menu/drilldown.html
  103. +6 −5 tests/visual/menu/menu.html
  104. +22 −15 tests/visual/tooltip/tooltip.html
  105. +6 −11 themes/base/jquery.ui.accordion.css
  106. +1 −1 themes/base/jquery.ui.all.css
  107. +1 −1 themes/base/jquery.ui.autocomplete.css
  108. +1 −1 themes/base/jquery.ui.base.css
  109. +1 −1 themes/base/jquery.ui.button.css
  110. +1 −1 themes/base/jquery.ui.core.css
  111. +1 −1 themes/base/jquery.ui.datepicker.css
  112. +1 −1 themes/base/jquery.ui.dialog.css
  113. +2 −2 themes/base/jquery.ui.menu.css
  114. +1 −1 themes/base/jquery.ui.progressbar.css
  115. +1 −1 themes/base/jquery.ui.resizable.css
  116. +1 −1 themes/base/jquery.ui.selectable.css
  117. +1 −1 themes/base/jquery.ui.slider.css
  118. +1 −1 themes/base/jquery.ui.spinner.css
  119. +1 −1 themes/base/jquery.ui.tabs.css
  120. +1 −1 themes/base/jquery.ui.theme.css
  121. +1 −1 themes/base/jquery.ui.tooltip.css
  122. +15 −15 ui/i18n/jquery.ui.datepicker-bg.js
  123. +1 −1 ui/i18n/jquery.ui.datepicker-cs.js
  124. +8 −8 ui/i18n/jquery.ui.datepicker-da.js
  125. +1 −1 ui/i18n/jquery.ui.datepicker-et.js
  126. +7 −7 ui/i18n/jquery.ui.datepicker-fi.js
  127. +2 −2 ui/i18n/jquery.ui.datepicker-fr.js
  128. +2 −2 ui/i18n/jquery.ui.datepicker-he.js
  129. +23 −0 ui/i18n/jquery.ui.datepicker-hi.js
  130. +23 −0 ui/i18n/jquery.ui.datepicker-km.js
  131. +18 −18 ui/i18n/jquery.ui.datepicker-no.js
  132. +8 −8 ui/i18n/jquery.ui.datepicker-sv.js
  133. +2 −2 ui/jquery.effects.blind.js
  134. +1 −1 ui/jquery.effects.bounce.js
  135. +1 −1 ui/jquery.effects.clip.js
  136. +38 −218 ui/jquery.effects.core.js
  137. +1 −1 ui/jquery.effects.drop.js
  138. +1 −1 ui/jquery.effects.explode.js
  139. +1 −1 ui/jquery.effects.fade.js
  140. +1 −1 ui/jquery.effects.fold.js
  141. +1 −1 ui/jquery.effects.highlight.js
  142. +1 −1 ui/jquery.effects.pulsate.js
  143. +1 −1 ui/jquery.effects.scale.js
  144. +1 −1 ui/jquery.effects.shake.js
  145. +1 −1 ui/jquery.effects.slide.js
  146. +1 −1 ui/jquery.effects.transfer.js
  147. +152 −205 ui/jquery.ui.accordion.js
  148. +40 −20 ui/jquery.ui.autocomplete.js
  149. +9 −9 ui/jquery.ui.button.js
  150. +9 −19 ui/jquery.ui.core.js
  151. +15 −16 ui/jquery.ui.datepicker.js
  152. +1 −1 ui/jquery.ui.dialog.js
  153. +1 −1 ui/jquery.ui.droppable.js
  154. +41 −34 ui/jquery.ui.menu.js
  155. +10 −10 ui/jquery.ui.mouse.js
  156. +6 −6 ui/jquery.ui.position.js
  157. +1 −1 ui/jquery.ui.progressbar.js
  158. +32 −66 ui/jquery.ui.resizable.js
  159. +1 −1 ui/jquery.ui.selectable.js
  160. +19 −23 ui/jquery.ui.slider.js
  161. +3 −3 ui/jquery.ui.sortable.js
  162. +1 −1 ui/jquery.ui.spinner.js
  163. +128 −148 ui/jquery.ui.tabs.js
  164. +21 −11 ui/jquery.ui.tooltip.js
  165. +67 −34 ui/jquery.ui.widget.js
View
@@ -1,4 +1,4 @@
-Copyright (c) 2011 Paul Bakaus, http://jqueryui.com/
+Copyright (c) 2012 Paul Bakaus, http://jqueryui.com/
This software consists of voluntary contributions made by many
individuals (AUTHORS.txt, http://jqueryui.com/about) For exact
@@ -22,15 +22,15 @@
<div class="demo">
<div id="accordion">
- <h3><a href="#">Section 1</a></h3>
+ <h3>Section 1</h3>
<div>
<p>Mauris mauris ante, blandit et, ultrices a, suscipit eget, quam. Integer ut neque. Vivamus nisi metus, molestie vel, gravida in, condimentum sit amet, nunc. Nam a nibh. Donec suscipit eros. Nam mi. Proin viverra leo ut odio. Curabitur malesuada. Vestibulum a velit eu ante scelerisque vulputate.</p>
</div>
- <h3><a href="#">Section 2</a></h3>
+ <h3>Section 2</h3>
<div>
<p>Sed non urna. Donec et ante. Phasellus eu ligula. Vestibulum sit amet purus. Vivamus hendrerit, dolor at aliquet laoreet, mauris turpis porttitor velit, faucibus interdum tellus libero ac justo. Vivamus non quam. In suscipit faucibus urna. </p>
</div>
- <h3><a href="#">Section 3</a></h3>
+ <h3>Section 3</h3>
<div>
<p>Nam enim risus, molestie et, porta ac, aliquam ac, risus. Quisque lobortis. Phasellus pellentesque purus in massa. Aenean in pede. Phasellus ac libero ac tellus pellentesque semper. Sed ac felis. Sed commodo, magna quis lacinia ornare, quam ante aliquam nisi, eu iaculis leo purus venenatis dui. </p>
<ul>
@@ -39,7 +39,7 @@
<li>List item three</li>
</ul>
</div>
- <h3><a href="#">Section 4</a></h3>
+ <h3>Section 4</h3>
<div>
<p>Cras dictum. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Aenean lacinia mauris vel est. </p><p>Suspendisse eu nisl. Nullam ut libero. Integer dignissim consequat lectus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. </p>
</div>
@@ -32,15 +32,15 @@
<div class="demo">
<div id="accordion">
- <h3><a href="#">Section 1</a></h3>
+ <h3>Section 1</h3>
<div>
<p>Mauris mauris ante, blandit et, ultrices a, suscipit eget, quam. Integer ut neque. Vivamus nisi metus, molestie vel, gravida in, condimentum sit amet, nunc. Nam a nibh. Donec suscipit eros. Nam mi. Proin viverra leo ut odio. Curabitur malesuada. Vestibulum a velit eu ante scelerisque vulputate.</p>
</div>
- <h3><a href="#">Section 2</a></h3>
+ <h3>Section 2</h3>
<div>
<p>Sed non urna. Donec et ante. Phasellus eu ligula. Vestibulum sit amet purus. Vivamus hendrerit, dolor at aliquet laoreet, mauris turpis porttitor velit, faucibus interdum tellus libero ac justo. Vivamus non quam. In suscipit faucibus urna. </p>
</div>
- <h3><a href="#">Section 3</a></h3>
+ <h3>Section 3</h3>
<div>
<p>Nam enim risus, molestie et, porta ac, aliquam ac, risus. Quisque lobortis. Phasellus pellentesque purus in massa. Aenean in pede. Phasellus ac libero ac tellus pellentesque semper. Sed ac felis. Sed commodo, magna quis lacinia ornare, quam ante aliquam nisi, eu iaculis leo purus venenatis dui. </p>
<ul>
@@ -49,7 +49,7 @@
<li>List item three</li>
</ul>
</div>
- <h3><a href="#">Section 4</a></h3>
+ <h3>Section 4</h3>
<div>
<p>Cras dictum. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Aenean lacinia mauris vel est. </p><p>Suspendisse eu nisl. Nullam ut libero. Integer dignissim consequat lectus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. </p>
</div>
@@ -20,7 +20,7 @@
<div class="demo">
<div id="accordion">
- <h3><a href="#">Section 1</a></h3>
+ <h3>Section 1</h3>
<div>
<p>
Mauris mauris ante, blandit et, ultrices a, suscipit eget, quam. Integer
@@ -29,7 +29,7 @@
odio. Curabitur malesuada. Vestibulum a velit eu ante scelerisque vulputate.
</p>
</div>
- <h3><a href="#">Section 2</a></h3>
+ <h3>Section 2</h3>
<div>
<p>
Sed non urna. Donec et ante. Phasellus eu ligula. Vestibulum sit amet
@@ -38,7 +38,7 @@
suscipit faucibus urna.
</p>
</div>
- <h3><a href="#">Section 3</a></h3>
+ <h3>Section 3</h3>
<div>
<p>
Nam enim risus, molestie et, porta ac, aliquam ac, risus. Quisque lobortis.
@@ -52,7 +52,7 @@
<li>List item three</li>
</ul>
</div>
- <h3><a href="#">Section 4</a></h3>
+ <h3>Section 4</h3>
<div>
<p>
Cras dictum. Pellentesque habitant morbi tristique senectus et netus
@@ -37,15 +37,15 @@ <h3 class="docs">Resize the outer container:</h3>
<div id="accordionResizer" style="padding:10px; width:350px; height:220px;" class="ui-widget-content">
<div id="accordion">
- <h3><a href="#">Section 1</a></h3>
+ <h3>Section 1</h3>
<div>
<p>Mauris mauris ante, blandit et, ultrices a, suscipit eget, quam. Integer ut neque. Vivamus nisi metus, molestie vel, gravida in, condimentum sit amet, nunc. Nam a nibh. Donec suscipit eros. Nam mi. Proin viverra leo ut odio. Curabitur malesuada. Vestibulum a velit eu ante scelerisque vulputate.</p>
</div>
- <h3><a href="#">Section 2</a></h3>
+ <h3>Section 2</h3>
<div>
<p>Sed non urna. Donec et ante. Phasellus eu ligula. Vestibulum sit amet purus. Vivamus hendrerit, dolor at aliquet laoreet, mauris turpis porttitor velit, faucibus interdum tellus libero ac justo. Vivamus non quam. In suscipit faucibus urna. </p>
</div>
- <h3><a href="#">Section 3</a></h3>
+ <h3>Section 3</h3>
<div>
<p>Nam enim risus, molestie et, porta ac, aliquam ac, risus. Quisque lobortis. Phasellus pellentesque purus in massa. Aenean in pede. Phasellus ac libero ac tellus pellentesque semper. Sed ac felis. Sed commodo, magna quis lacinia ornare, quam ante aliquam nisi, eu iaculis leo purus venenatis dui. </p>
<ul>
@@ -54,7 +54,7 @@ <h3 class="docs">Resize the outer container:</h3>
<li>List item three</li>
</ul>
</div>
- <h3><a href="#">Section 4</a></h3>
+ <h3>Section 4</h3>
<div>
<p>Cras dictum. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Aenean lacinia mauris vel est. </p><p>Suspendisse eu nisl. Nullam ut libero. Integer dignissim consequat lectus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. </p>
</div>
@@ -29,7 +29,7 @@
$( this ).unbind( "mouseover", jQuery.event.special.hoverintent.handler );
},
handler: function( event ) {
- var self = this,
+ var that = this,
args = arguments,
target = $( event.target ),
cX, cY, pX, pY;
@@ -54,7 +54,7 @@
// is fired asynchronously and the old event is no longer
// usable (#6028)
event.originalEvent = {};
- jQuery.event.handle.apply( self, args );
+ jQuery.event.handle.apply( that, args );
} else {
pX = cX;
pY = cY;
@@ -73,7 +73,7 @@
<div class="demo">
<div id="accordion">
- <h3><a href="#">Section 1</a></h3>
+ <h3>Section 1</h3>
<div>
<p>
Mauris mauris ante, blandit et, ultrices a, suscipit eget, quam. Integer
@@ -82,7 +82,7 @@
odio. Curabitur malesuada. Vestibulum a velit eu ante scelerisque vulputate.
</p>
</div>
- <h3><a href="#">Section 2</a></h3>
+ <h3>Section 2</h3>
<div>
<p>
Sed non urna. Donec et ante. Phasellus eu ligula. Vestibulum sit amet
@@ -91,7 +91,7 @@
suscipit faucibus urna.
</p>
</div>
- <h3><a href="#">Section 3</a></h3>
+ <h3>Section 3</h3>
<div>
<p>
Nam enim risus, molestie et, porta ac, aliquam ac, risus. Quisque lobortis.
@@ -105,7 +105,7 @@
<li>List item three</li>
</ul>
</div>
- <h3><a href="#">Section 4</a></h3>
+ <h3>Section 4</h3>
<div>
<p>
Cras dictum. Pellentesque habitant morbi tristique senectus et netus
@@ -14,7 +14,6 @@
<li><a href="fillspace.html">Fill space</a></li>
<li><a href="no-auto-height.html">No auto height</a></li>
<li><a href="collapsible.html">Collapse content</a></li>
- <li><a href="mouseover.html">Open on mouseover</a></li>
<li><a href="hoverintent.html">Open on hoverintent</a></li>
<li><a href="custom-icons.html">Customize icons</a></li>
<li><a href="sortable.html">Sortable</a></li>
@@ -1,57 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="utf-8">
- <title>jQuery UI Accordion - Open on mouseover</title>
- <link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
- <script src="../../jquery-1.7.1.js"></script>
- <script src="../../ui/jquery.ui.core.js"></script>
- <script src="../../ui/jquery.ui.widget.js"></script>
- <script src="../../ui/jquery.ui.accordion.js"></script>
- <link rel="stylesheet" href="../demos.css">
- <script>
- $(function() {
- $( "#accordion" ).accordion({
- event: "mouseover"
- });
- });
- </script>
-</head>
-<body>
-
-<div class="demo">
-
-<div id="accordion">
- <h3><a href="#">Section 1</a></h3>
- <div>
- <p>Mauris mauris ante, blandit et, ultrices a, suscipit eget, quam. Integer ut neque. Vivamus nisi metus, molestie vel, gravida in, condimentum sit amet, nunc. Nam a nibh. Donec suscipit eros. Nam mi. Proin viverra leo ut odio. Curabitur malesuada. Vestibulum a velit eu ante scelerisque vulputate.</p>
- </div>
- <h3><a href="#">Section 2</a></h3>
- <div>
- <p>Sed non urna. Donec et ante. Phasellus eu ligula. Vestibulum sit amet purus. Vivamus hendrerit, dolor at aliquet laoreet, mauris turpis porttitor velit, faucibus interdum tellus libero ac justo. Vivamus non quam. In suscipit faucibus urna. </p>
- </div>
- <h3><a href="#">Section 3</a></h3>
- <div>
- <p>Nam enim risus, molestie et, porta ac, aliquam ac, risus. Quisque lobortis. Phasellus pellentesque purus in massa. Aenean in pede. Phasellus ac libero ac tellus pellentesque semper. Sed ac felis. Sed commodo, magna quis lacinia ornare, quam ante aliquam nisi, eu iaculis leo purus venenatis dui. </p>
- <ul>
- <li>List item one</li>
- <li>List item two</li>
- <li>List item three</li>
- </ul>
- </div>
- <h3><a href="#">Section 4</a></h3>
- <div>
- <p>Cras dictum. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Aenean lacinia mauris vel est. </p><p>Suspendisse eu nisl. Nullam ut libero. Integer dignissim consequat lectus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. </p>
- </div>
-</div>
-
-</div><!-- End demo -->
-
-
-
-<div class="demo-description">
-<p>Toggle sections open/closed on mouseover with the <code>event</code> option. The default value for event is "click."</p>
-</div><!-- End demo-description -->
-
-</body>
-</html>
@@ -22,15 +22,15 @@
<div class="demo">
<div id="accordion">
- <h3><a href="#section1">Section 1</a></h3>
+ <h3>Section 1</h3>
<div>
<p>Mauris mauris ante, blandit et, ultrices a, susceros. Nam mi. Proin viverra leo ut odio. Curabitur malesuada. Vestibulum a velit eu ante scelerisque vulputate.</p>
</div>
- <h3><a href="#section2">Section 2</a></h3>
+ <h3>Section 2</h3>
<div>
<p>Sed non urna. Donec et ante. Phasellus eu ligula. Vestibulum sit amet purus. Vivamus hendrerit, dolor at aliquet laoreet, mauris turpis porttitor velit, faucibus interdum tellus libero ac justo. Vivamus non quam. In suscipit faucibus urna. </p>
</div>
- <h3><a href="#section3">Section 3</a></h3>
+ <h3>Section 3</h3>
<div>
<p>Nam enim risus, molestie et, porta ac, aliquam ac, risus. Quisque lobortis. Phasellus pellentesque purus in massa. Aenean in pede. Phasellus ac libero ac tellus pellentesque semper. Sed ac felis. Sed commodo, magna quis lacinia ornare, quam ante aliquam nisi, eu iaculis leo purus venenatis dui. </p>
<ul>
@@ -42,7 +42,6 @@
<li>List item</li>
<li>List item</li>
</ul>
- <a href="#othercontent">Link to other content</a>
</div>
</div>
@@ -11,25 +11,23 @@
<script src="../../ui/jquery.ui.sortable.js"></script>
<script src="../../ui/jquery.ui.accordion.js"></script>
<link rel="stylesheet" href="../demos.css">
+ <style>
+ /* IE has layout issues when sorting (see #5413) */
+ .group { zoom: 1 }
+ </style>
<script>
$(function() {
- var stop = false;
- $( "#accordion h3" ).click(function( event ) {
- if ( stop ) {
- event.stopImmediatePropagation();
- event.preventDefault();
- stop = false;
- }
- });
$( "#accordion" )
.accordion({
header: "> div > h3"
})
.sortable({
axis: "y",
handle: "h3",
- stop: function() {
- stop = true;
+ stop: function( event, ui ) {
+ // IE doesn't register the blur when sorting
+ // so trigger focusout handlers to remove .ui-state-focus
+ ui.item.children( "h3" ).triggerHandler( "focusout" );
}
});
});
@@ -40,20 +38,20 @@
<div class="demo">
<div id="accordion">
- <div>
- <h3><a href="#">Section 1</a></h3>
+ <div class="group">
+ <h3>Section 1</h3>
<div>
<p>Mauris mauris ante, blandit et, ultrices a, suscipit eget, quam. Integer ut neque. Vivamus nisi metus, molestie vel, gravida in, condimentum sit amet, nunc. Nam a nibh. Donec suscipit eros. Nam mi. Proin viverra leo ut odio. Curabitur malesuada. Vestibulum a velit eu ante scelerisque vulputate.</p>
</div>
</div>
- <div>
- <h3><a href="#">Section 2</a></h3>
+ <div class="group">
+ <h3>Section 2</h3>
<div>
<p>Sed non urna. Donec et ante. Phasellus eu ligula. Vestibulum sit amet purus. Vivamus hendrerit, dolor at aliquet laoreet, mauris turpis porttitor velit, faucibus interdum tellus libero ac justo. Vivamus non quam. In suscipit faucibus urna. </p>
</div>
</div>
- <div>
- <h3><a href="#">Section 3</a></h3>
+ <div class="group">
+ <h3>Section 3</h3>
<div>
<p>Nam enim risus, molestie et, porta ac, aliquam ac, risus. Quisque lobortis. Phasellus pellentesque purus in massa. Aenean in pede. Phasellus ac libero ac tellus pellentesque semper. Sed ac felis. Sed commodo, magna quis lacinia ornare, quam ante aliquam nisi, eu iaculis leo purus venenatis dui. </p>
<ul>
@@ -63,8 +61,8 @@
</ul>
</div>
</div>
- <div>
- <h3><a href="#">Section 4</a></h3>
+ <div class="group">
+ <h3>Section 4</h3>
<div>
<p>Cras dictum. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Aenean lacinia mauris vel est. </p><p>Suspendisse eu nisl. Nullam ut libero. Integer dignissim consequat lectus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. </p>
</div>
@@ -33,7 +33,7 @@
<div class="demo">
<div class="toggler">
- <div id="effect" class=" ui-corner-all">
+ <div id="effect" class="ui-corner-all">
Etiam libero neque, luctus a, eleifend nec, semper at, lorem. Sed pede.
</div>
</div>
@@ -22,14 +22,14 @@
<script>
$.widget( "custom.catcomplete", $.ui.autocomplete, {
_renderMenu: function( ul, items ) {
- var self = this,
+ var that = this,
currentCategory = "";
$.each( items, function( index, item ) {
if ( item.category != currentCategory ) {
ul.append( "<li class='ui-autocomplete-category'>" + item.category + "</li>" );
currentCategory = item.category;
}
- self._renderItem( ul, item );
+ that._renderItem( ul, item );
});
}
});
@@ -29,7 +29,7 @@
(function( $ ) {
$.widget( "ui.combobox", {
_create: function() {
- var self = this,
+ var that = this,
select = this.element.hide(),
selected = select.children( ":selected" ),
value = selected.val() ? selected.text() : "";
@@ -85,7 +85,7 @@
},
select: function( event, ui ) {
ui.item.option.selected = true;
- self._trigger( "selected", event, {
+ that._trigger( "selected", event, {
item: ui.item.option
});
},
Oops, something went wrong. Retry.

0 comments on commit adaf034

Please sign in to comment.