Skip to content
Permalink
Browse files

Merge branch 'master' into selectmenu

  • Loading branch information...
fnagel committed Jan 2, 2013
2 parents 2eb9223 + 18b8ffd commit 1ba02e9c5fc96bfcdd82e6a72369f54a30a47ecb
Showing with 2,966 additions and 2,984 deletions.
  1. +11 −3 demos/tabs/manipulation.html
  2. +1 −0 tests/.jshintrc
  3. +4 −0 tests/unit/accordion/accordion.html
  4. +0 −1 tests/unit/button/button.html
  5. +128 −128 tests/unit/core/selector.js
  6. +329 −329 tests/unit/datepicker/datepicker_core.js
  7. +87 −87 tests/unit/datepicker/datepicker_events.js
  8. +102 −102 tests/unit/datepicker/datepicker_methods.js
  9. +714 −714 tests/unit/datepicker/datepicker_options.js
  10. +4 −4 tests/unit/datepicker/datepicker_test_helpers.js
  11. +0 −1 tests/unit/dialog/dialog.html
  12. +6 −6 tests/unit/dialog/dialog_common.js
  13. +4 −4 tests/unit/dialog/dialog_core.js
  14. +0 −1 tests/unit/dialog/dialog_deprecated.html
  15. +36 −26 tests/unit/dialog/dialog_deprecated.js
  16. +92 −92 tests/unit/dialog/dialog_events.js
  17. +54 −54 tests/unit/dialog/dialog_methods.js
  18. +167 −156 tests/unit/dialog/dialog_options.js
  19. +8 −8 tests/unit/dialog/dialog_test_helpers.js
  20. +12 −12 tests/unit/draggable/draggable_core.js
  21. +2 −2 tests/unit/draggable/draggable_events.js
  22. +27 −27 tests/unit/draggable/draggable_methods.js
  23. +135 −245 tests/unit/draggable/draggable_options.js
  24. +7 −7 tests/unit/draggable/draggable_test_helpers.js
  25. +6 −6 tests/unit/droppable/droppable_core.js
  26. +19 −19 tests/unit/droppable/droppable_methods.js
  27. +2 −2 tests/unit/droppable/droppable_test_helpers.js
  28. +4 −1 tests/unit/menu/menu_options.js
  29. +1 −1 tests/unit/qunit-composite.js
  30. +5 −5 tests/unit/resizable/resizable_common.js
  31. +20 −20 tests/unit/resizable/resizable_core.js
  32. +16 −16 tests/unit/resizable/resizable_options.js
  33. +0 −1 tests/unit/selectable/selectable.html
  34. +5 −5 tests/unit/selectable/selectable_common.js
  35. +28 −0 tests/unit/selectable/selectable_events.js
  36. +19 −19 tests/unit/selectable/selectable_methods.js
  37. +1 −1 tests/unit/selectable/selectable_options.js
  38. +2 −2 tests/unit/slider/slider_common.js
  39. +32 −32 tests/unit/slider/slider_core.js
  40. +43 −43 tests/unit/slider/slider_methods.js
  41. +20 −20 tests/unit/slider/slider_options.js
  42. +0 −1 tests/unit/sortable/sortable.html
  43. +63 −63 tests/unit/sortable/sortable_events.js
  44. +25 −25 tests/unit/sortable/sortable_methods.js
  45. +15 −15 tests/unit/spinner/spinner_events.js
  46. +11 −4 tests/unit/spinner/spinner_options.js
  47. +4 −4 themes/base/jquery.ui.theme.css
  48. +1 −0 ui/.jshintrc
  49. +4 −4 ui/jquery.ui.core.js
  50. +405 −405 ui/jquery.ui.datepicker.js
  51. +1 −1 ui/jquery.ui.dialog.js
  52. +56 −56 ui/jquery.ui.draggable.js
  53. +23 −23 ui/jquery.ui.droppable.js
  54. +1 −1 ui/jquery.ui.effect-transfer.js
  55. +1 −1 ui/jquery.ui.effect.js
  56. +15 −5 ui/jquery.ui.menu.js
  57. +15 −15 ui/jquery.ui.mouse.js
  58. +70 −70 ui/jquery.ui.resizable.js
  59. +27 −27 ui/jquery.ui.selectable.js
  60. +60 −60 ui/jquery.ui.sortable.js
  61. +16 −2 ui/jquery.ui.spinner.js
@@ -24,7 +24,7 @@
$(function() {
var tabTitle = $( "#tab_title" ),
tabContent = $( "#tab_content" ),
tabTemplate = "<li><a href='#{href}'>#{label}</a> <span class='ui-icon ui-icon-close'>Remove Tab</span></li>",
tabTemplate = "<li><a href='#{href}'>#{label}</a> <span class='ui-icon ui-icon-close' role='presentation'>Remove Tab</span></li>",
tabCounter = 2;
var tabs = $( "#tabs" ).tabs();
@@ -75,11 +75,19 @@
});
// close icon: removing the tab on click
$( "#tabs span.ui-icon-close" ).live( "click", function() {
tabs.delegate( "span.ui-icon-close", "click", function() {
var panelId = $( this ).closest( "li" ).remove().attr( "aria-controls" );
$( "#" + panelId ).remove();
tabs.tabs( "refresh" );
});
tabs.bind( "keyup", function( event ) {
if ( event.altKey && event.keyCode === $.ui.keyCode.BACKSPACE ) {
var panelId = tabs.find( ".ui-tabs-active" ).remove().attr( "aria-controls" );
$( "#" + panelId ).remove();
tabs.tabs( "refresh" );
}
});
});
</script>
</head>
@@ -100,7 +108,7 @@

<div id="tabs">
<ul>
<li><a href="#tabs-1">Nunc tincidunt</a> <span class="ui-icon ui-icon-close">Remove Tab</span></li>
<li><a href="#tabs-1">Nunc tincidunt</a> <span class="ui-icon ui-icon-close" role="presentation">Remove Tab</span></li>
</ul>
<div id="tabs-1">
<p>Proin elit arcu, rutrum commodo, vehicula tempus, commodo a, risus. Curabitur nec arcu. Donec sollicitudin mi sit amet mauris. Nam elementum quam ullamcorper ante. Etiam aliquet massa et lorem. Mauris dapibus lacus auctor risus. Aenean tempor ullamcorper leo. Vivamus sed magna quis ligula eleifend adipiscing. Duis orci. Aliquam sodales tortor vitae ipsum. Aliquam nulla. Duis aliquam molestie erat. Ut et mauris vel pede varius sollicitudin. Sed ut dolor nec orci tincidunt interdum. Phasellus ipsum. Nunc tristique tempus lectus.</p>
@@ -9,6 +9,7 @@
"latedef": true,
"noarg": true,
"onevar": true,
"quotmark": "double",
"trailing": true,
"undef": true,
"unused": true,
@@ -35,6 +35,10 @@
font-size: 12px;
line-height: 15px;
}
/* avoid IE7 oscillating between overflow visible and scroll values */
#list1 > div {
overflow: visible;
}
</style>
</head>
<body>
@@ -25,7 +25,6 @@
<script src="button_events.js"></script>
<script src="button_methods.js"></script>
<script src="button_options.js"></script>
<script src="button_tickets.js"></script>

<script src="../swarminject.js"></script>
</head>

0 comments on commit 1ba02e9

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