Skip to content
Permalink
Browse files

Merge branch 'master' into effects-unit

  • Loading branch information...
gnarf committed May 1, 2011
2 parents d6379d1 + fe3b36b commit 4a4d7e4b7392d86944c06e2ec98feef9501f9731
Showing with 3,500 additions and 2,721 deletions.
  1. +3 −0 demos/autocomplete/combobox.html
  2. +4 −4 demos/demos.css
  3. +4 −4 demos/tabs/ajax.html
  4. +0 −1 demos/tabs/bottom.html
  5. +7 −1 demos/tabs/sortable.html
  6. +1 −1 demos/tabs/vertical.html
  7. +5 −2 demos/tooltip/custom-animation.html
  8. +1 −0 demos/tooltip/index.html
  9. +6 −7 demos/tooltip/tracking.html
  10. +0 −172 tests/static/menu/all-menus-icons.html
  11. +0 −39 tests/static/menu/default.html
  12. +4 −5 tests/unit/accordion/accordion.html
  13. +14 −14 tests/unit/accordion/accordion_core.js
  14. +6 −1 tests/unit/accordion/accordion_defaults.js
  15. +8 −1 tests/unit/accordion/accordion_defaults_deprecated.js
  16. +4 −5 tests/unit/accordion/{accordio.html → accordion_deprecated.html}
  17. +99 −99 tests/unit/accordion/accordion_deprecated.js
  18. +42 −41 tests/unit/accordion/accordion_events.js
  19. +13 −13 tests/unit/accordion/accordion_methods.js
  20. +111 −111 tests/unit/accordion/accordion_options.js
  21. +0 −5 tests/unit/accordion/accordion_tickets.js
  22. +0 −1 tests/unit/autocomplete/autocomplete.html
  23. +24 −18 tests/unit/autocomplete/autocomplete_defaults.js
  24. +0 −14 tests/unit/autocomplete/autocomplete_tickets.js
  25. +12 −13 tests/unit/button/button_defaults.js
  26. +33 −34 tests/unit/dialog/dialog_defaults.js
  27. +2 −2 tests/unit/dialog/dialog_options.js
  28. +0 −1 tests/unit/draggable/draggable.html
  29. +0 −8 tests/unit/draggable/draggable_tickets.js
  30. +0 −1 tests/unit/droppable/droppable.html
  31. +0 −8 tests/unit/droppable/droppable_tickets.js
  32. +10 −11 tests/unit/menu/menu_defaults.js
  33. 0 tests/unit/position/{positio.html → position_deprecated.html}
  34. +0 −1 tests/unit/progressbar/progressbar.html
  35. +9 −10 tests/unit/progressbar/progressbar_defaults.js
  36. +17 −0 tests/unit/progressbar/progressbar_options.js
  37. +0 −8 tests/unit/progressbar/progressbar_tickets.js
  38. +0 −1 tests/unit/resizable/resizable.html
  39. +0 −8 tests/unit/resizable/resizable_tickets.js
  40. +0 −1 tests/unit/selectable/selectable.html
  41. +0 −8 tests/unit/selectable/selectable_tickets.js
  42. +0 −1 tests/unit/slider/slider.html
  43. +18 −19 tests/unit/slider/slider_defaults.js
  44. +3 −3 tests/unit/slider/slider_methods.js
  45. +0 −8 tests/unit/slider/slider_tickets.js
  46. +14 −15 tests/unit/spinner/spinner_defaults.js
  47. +160 −95 tests/unit/tabs/tabs.html
  48. +55 −47 tests/unit/tabs/tabs_core.js
  49. +15 −26 tests/unit/tabs/tabs_defaults.js
  50. +29 −0 tests/unit/tabs/tabs_defaults_deprecated.js
  51. +185 −0 tests/unit/tabs/tabs_deprecated.html
  52. +386 −0 tests/unit/tabs/tabs_deprecated.js
  53. +186 −93 tests/unit/tabs/tabs_events.js
  54. +128 −180 tests/unit/tabs/tabs_methods.js
  55. +112 −90 tests/unit/tabs/tabs_options.js
  56. +14 −92 tests/unit/tabs/tabs_tickets.js
  57. +0 −2 tests/unit/testsuite.js
  58. +13 −14 tests/unit/tooltip/tooltip_defaults.js
  59. +0 −1 tests/unit/widget/widget.html
  60. +91 −0 tests/unit/widget/widget_core.js
  61. +0 −91 tests/unit/widget/widget_tickets.js
  62. +0 −32 tests/visual/dialog/dialog.html
  63. +0 −29 tests/visual/dialog/dialog_on_page_with_scrollbars.html
  64. +0 −36 tests/visual/dialog/dialog_option_buttons_OK_Cancel.html
  65. +0 −31 tests/visual/dialog/dialog_option_closeOnEscape_false.html
  66. +0 −31 tests/visual/dialog/dialog_option_closeOnEscape_true.html
  67. +0 −31 tests/visual/dialog/dialog_option_modal_false.html
  68. +0 −31 tests/visual/dialog/dialog_option_modal_true.html
  69. +0 −33 tests/visual/dialog/dialog_option_position_right_top.html
  70. +0 −44 tests/visual/dialog/dialog_ticket_4350.html
  71. +0 −44 tests/visual/dialog/dialog_ticket_4826.html
  72. +0 −62 tests/visual/index.html
  73. +41 −3 tests/visual/menu/menu.html
  74. +120 −96 tests/visual/menu/menubar.html
  75. +84 −39 tests/visual/menu/menubar.js
  76. +159 −0 tests/visual/menu/popup.html
  77. +124 −0 tests/visual/menu/popup.js
  78. +0 −54 tests/visual/sortable/sortable_ticket_4551.html
  79. +15 −10 tests/visual/tooltip/tooltip.html
  80. +12 −5 themes/base/jquery.ui.menu.css
  81. +6 −1 themes/base/jquery.ui.resizable.css
  82. +3 −4 themes/base/jquery.ui.tabs.css
  83. +1 −1 ui/i18n/jquery.ui.datepicker-nl.js
  84. +1 −1 ui/i18n/jquery.ui.datepicker-sk.js
  85. +24 −25 ui/jquery.effects.core.js
  86. +12 −3 ui/jquery.ui.accordion.js
  87. +11 −2 ui/jquery.ui.autocomplete.js
  88. +28 −24 ui/jquery.ui.core.js
  89. +36 −34 ui/jquery.ui.datepicker.js
  90. +62 −38 ui/jquery.ui.menu.js
  91. +1 −0 ui/jquery.ui.progressbar.js
  92. +2 −0 ui/jquery.ui.slider.js
  93. +4 −0 ui/jquery.ui.sortable.js
  94. +834 −463 ui/jquery.ui.tabs.js
  95. +68 −62 ui/jquery.ui.tooltip.js
  96. +4 −1 ui/jquery.ui.widget.js
@@ -112,6 +112,9 @@
return;
}
// work around a bug (likely same cause as #5265)
$( this ).blur();
// pass empty string as value to search for, displaying all results
input.autocomplete( "search", "" );
input.focus();
@@ -320,10 +320,10 @@ div.demo-description {
#widget-docs .ui-tabs-nav li a:hover,
#widget-docs .ui-tabs-nav li a:active { font-size:14px; padding:4px 1.2em 3px; color:#fff; }

#widget-docs .ui-tabs-nav li.ui-tabs-selected a:link,
#widget-docs .ui-tabs-nav li.ui-tabs-selected a:visited,
#widget-docs .ui-tabs-nav li.ui-tabs-selected a:hover,
#widget-docs .ui-tabs-nav li.ui-tabs-selected a:active { color:#e6820E; }
#widget-docs .ui-tabs-nav li.ui-tabs-active a:link,
#widget-docs .ui-tabs-nav li.ui-tabs-active a:visited,
#widget-docs .ui-tabs-nav li.ui-tabs-active a:hover,
#widget-docs .ui-tabs-nav li.ui-tabs-active a:active { color:#e6820E; }

#widget-docs .ui-tabs-panel { padding:20px 9px; font-size:12px; line-height:1.4; color:#000; }

@@ -12,12 +12,12 @@
<script>
$(function() {
$( "#tabs" ).tabs({
ajaxOptions: {
error: function( xhr, status, index, anchor ) {
$( anchor.hash ).html(
beforeLoad: function( event, ui ) {
ui.jqXHR.error(function() {
ui.panel.html(
"Couldn't load this tab. We'll try to fix this as soon as possible. " +
"If this wouldn't be a demo." );
}
});
}
});
});
@@ -23,7 +23,6 @@
.tabs-bottom .ui-tabs-panel { height: 140px; overflow: auto; }
.tabs-bottom .ui-tabs-nav { position: absolute !important; left: 0; bottom: 0; right:0; padding: 0 0.2em 0.2em 0; }
.tabs-bottom .ui-tabs-nav li { margin-top: -2px !important; margin-bottom: 1px !important; border-top: none; border-bottom-width: 1px; }
.ui-tabs-selected { margin-top: -3px !important; }
</style>
</head>
<body>
@@ -13,7 +13,13 @@
<link rel="stylesheet" href="../demos.css">
<script>
$(function() {
$( "#tabs" ).tabs().find( ".ui-tabs-nav" ).sortable({ axis: "x" });
var tabs = $( "#tabs" ).tabs();
tabs.find( ".ui-tabs-nav" ).sortable({
axis: "x",
stop: function() {
tabs.tabs( "refresh" );
}
});
});
</script>
</head>
@@ -20,7 +20,7 @@
.ui-tabs-vertical .ui-tabs-nav { padding: .2em .1em .2em .2em; float: left; width: 12em; }
.ui-tabs-vertical .ui-tabs-nav li { clear: left; width: 100%; border-bottom-width: 1px !important; border-right-width: 0 !important; margin: 0 -1px .2em 0; }
.ui-tabs-vertical .ui-tabs-nav li a { display:block; }
.ui-tabs-vertical .ui-tabs-nav li.ui-tabs-selected { padding-bottom: 0; padding-right: .1em; border-right-width: 1px; border-right-width: 1px; }
.ui-tabs-vertical .ui-tabs-nav li.ui-tabs-active { padding-bottom: 0; padding-right: .1em; border-right-width: 1px; border-right-width: 1px; }
.ui-tabs-vertical .ui-tabs-panel { padding: 1em; float: right; width: 40em;}
</style>
</head>
@@ -11,12 +11,15 @@
<link type="text/css" href="../demos.css" rel="stylesheet" />
<script type="text/javascript">
$(function() {
// TODO overhaul this with custom animation API
$(".demo").tooltip({
open: function() {
$(this).tooltip("widget").stop(false, true).hide().slideDown();
$(".ui-tooltip").stop(false, true).hide().slideDown();
},
close: function() {
$(this).tooltip("widget").stop(false, true).show().slideUp();
$(".ui-tooltip").stop(false, false).show().slideUp(function() {
$(this).remove();
});
}
});
});
@@ -14,6 +14,7 @@ <h4>Examples</h4>
<li><a href="tracking.html">Track the mouse</a></li>
<li><a href="custom-animation.html">Custom animation</a></li>
<li><a href="delegation-mixbag.html">Delegation Mixbag</a></li>
<li><a href="lots.html">Lots</a></li>
</ul>
</div>

@@ -13,20 +13,19 @@
$(function() {
$(".demo").tooltip({
open: function() {
var tooltip = $(this).tooltip("widget");
$(document).mousemove(function(event) {
tooltip.position({
my: "left center",
at: "right center",
offset: "25 25",
var tooltip = $( ".ui-tooltip" );
$(document).mousemove(function( event ) {
tooltip.position( {
my: "left+25 center",
at: "right+25 center",
of: event
});
})
// trigger once to override element-relative positioning
.mousemove();
},
close: function() {
$(document).unbind("mousemove");
$(document).unbind( "mousemove" );
}
});
});

This file was deleted.

This file was deleted.

@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
@@ -20,7 +20,7 @@
<script src="../testsuite.js"></script>

<script>
function state( accordion ) {
function accordion_state( accordion ) {
var expected = $.makeArray( arguments ).slice( 1 );
var actual = accordion.find( ".ui-accordion-content" ).map(function() {
return $( this ).css( "display" ) === "none" ? 0 : 1;
@@ -54,7 +54,6 @@
<script src="accordion_events.js"></script>
<script src="accordion_methods.js"></script>
<script src="accordion_options.js"></script>
<script src="accordion_tickets.js"></script>

<script src="../swarminject.js"></script>
<style>
@@ -130,8 +129,8 @@ <h2><a href="?p=1.1.2"><span>Bass</span></a></h2>
<li>
<h2><a href="?p=1.1.3">Drums</a></h2>
<ul>
<li><a href="?p=1.1.3.2">Acoustic Drums</a></li>
<li><a href="?p=1.1.3.3">Electronic Drums</a></li>
<li><a href="?p=1.1.3.2">Acoustic</a></li>
<li><a href="?p=1.1.3.3">Electronic</a></li>
<li><a href="?p=1.1.3.6">Accessories</a></li>
</ul>
</li>

0 comments on commit 4a4d7e4

Please sign in to comment.
You can’t perform that action at this time.