Permalink
Browse files

Merge branch 'master' into grid

Conflicts:
	demos/menubar/default.html
  • Loading branch information...
2 parents e4084c4 + ec062c1 commit 7608f445d0b8f8d32beb47c975ddca56326d6601 @scottgonzalez scottgonzalez committed Mar 14, 2012
Showing with 3,911 additions and 7,606 deletions.
  1. +1 −1 MIT-LICENSE.txt
  2. +6 −0 build/build.xml
  3. +4 −4 demos/accordion/collapsible.html
  4. +4 −4 demos/accordion/custom-icons.html
  5. +4 −4 demos/accordion/default.html
  6. +4 −4 demos/accordion/fillspace.html
  7. +10 −6 demos/accordion/hoverintent.html
  8. +0 −1 demos/accordion/index.html
  9. +0 −57 demos/accordion/mouseover.html
  10. +3 −4 demos/accordion/no-auto-height.html
  11. +16 −18 demos/accordion/sortable.html
  12. +1 −1 demos/addClass/default.html
  13. +2 −2 demos/autocomplete/categories.html
  14. +2 −2 demos/autocomplete/combobox.html
  15. +4 −0 demos/datepicker/localization.html
  16. +2 −2 demos/draggable/cursor-style.html
  17. +18 −17 demos/effect/easing.html
  18. +23 −25 demos/index.html
  19. +0 −65 demos/menu/contextmenu.html
  20. +0 −153 demos/menubar/default.html
  21. +0 −16 demos/menubar/index.html
  22. +0 −84 demos/popup/animation.html
  23. +0 −69 demos/popup/default.html
  24. +0 −20 demos/popup/index.html
  25. +0 −108 demos/popup/popup-menu-table.html
  26. +0 −92 demos/popup/popup-menu.html
  27. +0 −61 demos/popup/tooltip.html
  28. +15 −12 demos/position/cycler.html
  29. +1 −1 demos/sortable/connect-lists.html
  30. +3 −29 demos/tooltip/video-player.html
  31. +9 −2 external/qunit.css
  32. +647 −440 external/qunit.js
  33. +139 −114 tests/jquery.simulate.js
  34. +0 −17 tests/static/slider/default.html
  35. +0 −17 tests/static/slider/default_vertical.html
  36. +0 −17 tests/static/slider/slider_horizontal.html
  37. +0 −17 tests/static/slider/slider_horizontal_range.html
  38. +0 −17 tests/static/slider/slider_horizontal_range_max.html
  39. +0 −17 tests/static/slider/slider_horizontal_range_min.html
  40. +0 −17 tests/static/slider/slider_vertical.html
  41. +0 −17 tests/static/slider/slider_vertical_range.html
  42. +0 −17 tests/static/slider/slider_vertical_range_max.html
  43. +0 −17 tests/static/slider/slider_vertical_range_min.html
  44. +6 −6 tests/unit/accordion/accordion.html
  45. +0 −7 tests/unit/accordion/accordion_core.js
  46. +1 −1 tests/unit/accordion/accordion_defaults.js
  47. +1 −0 tests/unit/accordion/accordion_defaults_deprecated.js
  48. +6 −6 tests/unit/accordion/accordion_deprecated.html
  49. +39 −0 tests/unit/accordion/accordion_events.js
  50. +1 −1 tests/unit/accordion/accordion_options.js
  51. +3 −3 tests/unit/accordion/accordion_test_helpers.js
  52. +72 −0 tests/unit/all-active.html
  53. +82 −39 tests/unit/autocomplete/autocomplete_core.js
  54. +4 −1 tests/unit/autocomplete/autocomplete_events.js
  55. +9 −2 tests/unit/autocomplete/autocomplete_methods.js
  56. +54 −0 tests/unit/autocomplete/autocomplete_options.js
  57. +12 −12 tests/unit/button/button_core.js
  58. +19 −19 tests/unit/button/button_options.js
  59. +35 −35 tests/unit/core/core.js
  60. +35 −35 tests/unit/datepicker/datepicker_core.js
  61. +25 −25 tests/unit/datepicker/datepicker_events.js
  62. +155 −155 tests/unit/datepicker/datepicker_options.js
  63. +8 −8 tests/unit/datepicker/datepicker_tickets.js
  64. +9 −9 tests/unit/dialog/dialog_core.js
  65. +42 −42 tests/unit/dialog/dialog_events.js
  66. +15 −15 tests/unit/dialog/dialog_methods.js
  67. +81 −76 tests/unit/dialog/dialog_options.js
  68. +17 −8 tests/unit/dialog/dialog_tickets.js
  69. +1 −1 tests/unit/draggable/draggable_core.js
  70. +9 −9 tests/unit/draggable/draggable_events.js
  71. +9 −9 tests/unit/draggable/draggable_methods.js
  72. +74 −74 tests/unit/draggable/draggable_options.js
  73. +10 −10 tests/unit/droppable/droppable_methods.js
  74. +2 −2 tests/unit/droppable/droppable_options.js
  75. +17 −17 tests/unit/menu/menu_core.js
  76. +5 −3 tests/unit/menu/menu_defaults.js
  77. +208 −170 tests/unit/menu/menu_events.js
  78. +30 −0 tests/unit/menu/menu_methods.js
  79. +28 −0 tests/unit/menu/menu_options.js
  80. +35 −35 tests/unit/position/position_core.js
  81. +28 −28 tests/unit/position/position_core_within.js
  82. +3 −3 tests/unit/position/position_deprecated.js
  83. +7 −7 tests/unit/progressbar/progressbar_core.js
  84. +5 −5 tests/unit/progressbar/progressbar_events.js
  85. +5 −5 tests/unit/progressbar/progressbar_methods.js
  86. +5 −5 tests/unit/progressbar/progressbar_options.js
  87. +25 −25 tests/unit/resizable/resizable_core.js
  88. +3 −3 tests/unit/resizable/resizable_methods.js
  89. +52 −52 tests/unit/resizable/resizable_options.js
  90. +2 −2 tests/unit/selectable/selectable_events.js
  91. +9 −9 tests/unit/selectable/selectable_methods.js
  92. +4 −4 tests/unit/selectable/selectable_options.js
  93. +34 −34 tests/unit/slider/slider_core.js
  94. +11 −11 tests/unit/slider/slider_events.js
  95. +14 −14 tests/unit/slider/slider_methods.js
  96. +13 −13 tests/unit/slider/slider_options.js
  97. +9 −9 tests/unit/sortable/sortable_methods.js
  98. +2 −2 tests/unit/sortable/sortable_tickets.js
  99. +29 −29 tests/unit/spinner/spinner_methods.js
  100. +56 −10 tests/unit/spinner/spinner_options.js
  101. +3 −3 tests/unit/tabs/tabs.html
  102. +5 −4 tests/unit/tabs/tabs_core.js
  103. +3 −3 tests/unit/tabs/tabs_deprecated.html
  104. +65 −65 tests/unit/tabs/tabs_deprecated.js
  105. +92 −53 tests/unit/tabs/tabs_events.js
  106. +14 −14 tests/unit/tabs/tabs_methods.js
  107. +11 −11 tests/unit/tabs/tabs_options.js
  108. +4 −4 tests/unit/testsuite.js
  109. +1 −0 tests/unit/tooltip/tooltip_core.js
  110. +7 −7 tests/unit/tooltip/tooltip_events.js
  111. +2 −2 tests/unit/tooltip/tooltip_methods.js
  112. +7 −7 tests/unit/tooltip/tooltip_options.js
  113. +183 −108 tests/unit/widget/widget_core.js
  114. +95 −0 tests/visual/accordion/accordion.html
  115. +50 −2,942 tests/visual/dialog/dialog_on_page_with_large_dom.html
  116. +7 −7 tests/visual/menu/drilldown.html
  117. +8 −7 tests/visual/menu/menu.html
  118. +22 −15 tests/visual/tooltip/tooltip.html
  119. +6 −8 themes/base/jquery.ui.accordion.css
  120. +1 −1 themes/base/jquery.ui.all.css
  121. +1 −1 themes/base/jquery.ui.autocomplete.css
  122. +1 −2 themes/base/jquery.ui.base.css
  123. +2 −2 themes/base/jquery.ui.button.css
  124. +1 −1 themes/base/jquery.ui.core.css
  125. +1 −1 themes/base/jquery.ui.datepicker.css
  126. +2 −2 themes/base/jquery.ui.dialog.css
  127. +2 −2 themes/base/jquery.ui.menu.css
  128. +0 −15 themes/base/jquery.ui.menubar.css
  129. +1 −1 themes/base/jquery.ui.progressbar.css
  130. +1 −1 themes/base/jquery.ui.resizable.css
  131. +1 −1 themes/base/jquery.ui.selectable.css
  132. +1 −1 themes/base/jquery.ui.slider.css
  133. +1 −1 themes/base/jquery.ui.spinner.css
  134. +1 −1 themes/base/jquery.ui.tabs.css
  135. +1 −1 themes/base/jquery.ui.theme.css
  136. +1 −1 themes/base/jquery.ui.tooltip.css
  137. +15 −15 ui/i18n/jquery.ui.datepicker-bg.js
  138. +1 −1 ui/i18n/jquery.ui.datepicker-cs.js
  139. +8 −8 ui/i18n/jquery.ui.datepicker-da.js
  140. +1 −1 ui/i18n/jquery.ui.datepicker-et.js
  141. +7 −7 ui/i18n/jquery.ui.datepicker-fi.js
  142. +2 −2 ui/i18n/jquery.ui.datepicker-fr.js
  143. +2 −2 ui/i18n/jquery.ui.datepicker-he.js
  144. +23 −0 ui/i18n/jquery.ui.datepicker-hi.js
  145. +23 −0 ui/i18n/jquery.ui.datepicker-km.js
  146. +7 −7 ui/i18n/jquery.ui.datepicker-ko.js
  147. +1 −1 ui/i18n/jquery.ui.datepicker-mk.js
  148. +2 −2 ui/i18n/jquery.ui.datepicker-nl-BE.js
  149. +18 −18 ui/i18n/jquery.ui.datepicker-no.js
  150. +8 −8 ui/i18n/jquery.ui.datepicker-sv.js
  151. +7 −5 ui/jquery.effects.blind.js
  152. +1 −1 ui/jquery.effects.bounce.js
  153. +1 −1 ui/jquery.effects.clip.js
  154. +38 −218 ui/jquery.effects.core.js
  155. +1 −1 ui/jquery.effects.drop.js
  156. +1 −1 ui/jquery.effects.explode.js
  157. +1 −1 ui/jquery.effects.fade.js
  158. +1 −1 ui/jquery.effects.fold.js
  159. +1 −1 ui/jquery.effects.highlight.js
  160. +1 −1 ui/jquery.effects.pulsate.js
  161. +1 −1 ui/jquery.effects.scale.js
  162. +1 −1 ui/jquery.effects.shake.js
  163. +1 −1 ui/jquery.effects.slide.js
  164. +1 −1 ui/jquery.effects.transfer.js
  165. +167 −202 ui/jquery.ui.accordion.js
  166. +56 −34 ui/jquery.ui.autocomplete.js
  167. +12 −14 ui/jquery.ui.button.js
  168. +13 −18 ui/jquery.ui.core.js
  169. +19 −17 ui/jquery.ui.datepicker.js
  170. +16 −5 ui/jquery.ui.dialog.js
  171. +19 −19 ui/jquery.ui.draggable.js
  172. +1 −1 ui/jquery.ui.droppable.js
  173. +92 −98 ui/jquery.ui.menu.js
  174. +0 −299 ui/jquery.ui.menubar.js
  175. +10 −10 ui/jquery.ui.mouse.js
  176. +0 −279 ui/jquery.ui.popup.js
  177. +13 −13 ui/jquery.ui.position.js
  178. +1 −1 ui/jquery.ui.progressbar.js
  179. +32 −66 ui/jquery.ui.resizable.js
  180. +1 −1 ui/jquery.ui.selectable.js
  181. +19 −23 ui/jquery.ui.slider.js
  182. +8 −4 ui/jquery.ui.sortable.js
  183. +14 −1 ui/jquery.ui.spinner.js
  184. +149 −160 ui/jquery.ui.tabs.js
  185. +21 −11 ui/jquery.ui.tooltip.js
  186. +76 −35 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
View
@@ -123,6 +123,12 @@
<mapper type="glob" from="*.js" to="${min.dir}/*.min.js" />
<targetfile/>
</apply>
+ <apply executable="build/minify-js.sh">
+ <fileset dir="${dist.dir}/ui/i18n" includes="**.js" />
+ <srcfile />
+ <mapper type="glob" from="*.js" to="${min.dir}/i18n/*.min.js" />
+ <targetfile/>
+ </apply>
<apply executable="java" parallel="false">
<fileset dir="${dist.dir}/themes/base" includes="*.css" />
<arg line="-jar" />
@@ -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 @@ <h3><a href="#">Section 3</a></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>
@@ -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 @@ <h3><a href="#">Section 3</a></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>
@@ -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 @@ <h3><a href="#">Section 1</a></h3>
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 @@ <h3><a href="#">Section 2</a></h3>
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 @@ <h3><a href="#">Section 3</a></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
@@ -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><a href="#">Section 3</a></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;
@@ -50,7 +50,11 @@
if ( ( Math.abs( pX - cX ) + Math.abs( pY - cY ) ) < cfg.sensitivity ) {
clear();
event.type = "hoverintent";
- jQuery.event.handle.apply( self, args );
+ // prevent accessing the original event since the new event
+ // is fired asynchronously and the old event is no longer
+ // usable (#6028)
+ event.originalEvent = {};
+ jQuery.event.handle.apply( that, args );
} else {
pX = cX;
pY = cY;
@@ -69,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
@@ -78,7 +82,7 @@ <h3><a href="#">Section 1</a></h3>
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
@@ -87,7 +91,7 @@ <h3><a href="#">Section 2</a></h3>
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.
@@ -101,7 +105,7 @@ <h3><a href="#">Section 3</a></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
@@ -14,7 +14,6 @@ <h4>Examples</h4>
<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 @@ <h3><a href="#section3">Section 3</a></h3>
<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 @@ <h3><a href="#">Section 3</a></h3>
</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 );
});
}
});
Oops, something went wrong.

0 comments on commit 7608f44

Please sign in to comment.