Skip to content
Permalink
Browse files

Merge branch 'master' into selectmenu

  • Loading branch information...
fnagel committed Dec 12, 2012
2 parents d1350f9 + 747d853 commit f6372bd7eac41ae2c022ef510ec414d016e820ed
Showing with 1,991 additions and 1,395 deletions.
  1. +1 −1 build/tasks/testswarm.js
  2. +7 −7 demos/button/toolbar.html
  3. +6 −0 demos/datepicker/localization.html
  4. +0 −34 demos/progressbar/animated.html
  5. +8 −8 demos/progressbar/indeterminate.html
  6. +1 −2 demos/progressbar/index.html
  7. +58 −0 demos/progressbar/label.html
  8. +0 −33 demos/progressbar/resize.html
  9. +2 −2 package.json
  10. +71 −18 tests/jquery.simulate.js
  11. +5 −1 tests/unit/autocomplete/autocomplete_options.js
  12. +70 −2 tests/unit/button/button_core.js
  13. +15 −5 tests/unit/button/button_events.js
  14. +11 −0 tests/unit/button/button_options.js
  15. +0 −75 tests/unit/button/button_tickets.js
  16. +4 −5 tests/unit/core/core.js
  17. +144 −109 tests/unit/datepicker/datepicker_core.js
  18. +123 −68 tests/unit/datepicker/datepicker_options.js
  19. +4 −0 tests/unit/dialog/dialog.html
  20. +4 −3 tests/unit/dialog/dialog_common.js
  21. +82 −28 tests/unit/dialog/dialog_core.js
  22. +2 −0 tests/unit/dialog/dialog_deprecated.html
  23. +14 −0 tests/unit/dialog/dialog_events.js
  24. +60 −1 tests/unit/dialog/dialog_methods.js
  25. +72 −0 tests/unit/dialog/dialog_options.js
  26. +3 −4 tests/unit/dialog/dialog_test_helpers.js
  27. +0 −132 tests/unit/dialog/dialog_tickets.js
  28. +11 −14 tests/unit/draggable/draggable_core.js
  29. +16 −4 tests/unit/draggable/draggable_events.js
  30. +96 −48 tests/unit/draggable/draggable_options.js
  31. +4 −7 tests/unit/draggable/draggable_test_helpers.js
  32. +108 −91 tests/unit/menu/menu_events.js
  33. +3 −1 tests/unit/progressbar/progressbar_common.js
  34. +9 −1 tests/unit/progressbar/progressbar_core.js
  35. +16 −10 tests/unit/progressbar/progressbar_events.js
  36. +1 −1 tests/unit/progressbar/progressbar_methods.js
  37. +17 −25 tests/unit/progressbar/progressbar_options.js
  38. +16 −10 tests/unit/resizable/resizable.html
  39. +25 −21 tests/unit/resizable/resizable_events.js
  40. +55 −0 tests/unit/resizable/resizable_options.js
  41. +7 −11 tests/unit/resizable/resizable_test_helpers.js
  42. +18 −12 tests/unit/selectable/selectable_events.js
  43. +17 −4 tests/unit/selectable/selectable_methods.js
  44. +18 −4 tests/unit/selectable/selectable_options.js
  45. +0 −8 tests/unit/selectable/selectable_test_helpers.js
  46. +119 −24 tests/unit/sortable/sortable_events.js
  47. +5 −5 tests/unit/sortable/sortable_test_helpers.js
  48. +0 −69 tests/unit/sortable/sortable_tickets.js
  49. +100 −71 tests/unit/spinner/spinner_events.js
  50. +3 −3 tests/unit/tabs/tabs_core.js
  51. +3 −4 tests/unit/testsuite.js
  52. +42 −9 tests/unit/widget/widget_core.js
  53. +6 −1 tests/visual/dialog/complex-dialogs.html
  54. +1 −2 themes/base/jquery.ui.accordion.css
  55. +6 −4 themes/base/jquery.ui.button.css
  56. +1 −1 themes/base/jquery.ui.core.css
  57. +9 −6 themes/base/jquery.ui.dialog.css
  58. +1 −2 themes/base/jquery.ui.menu.css
  59. +0 −1 themes/base/jquery.ui.tabs.css
  60. +3 −2 themes/base/jquery.ui.theme.css
  61. +23 −0 ui/i18n/jquery.ui.datepicker-be.js
  62. +22 −0 ui/i18n/jquery.ui.datepicker-nb.js
  63. +22 −0 ui/i18n/jquery.ui.datepicker-nn.js
  64. +1 −0 ui/jquery.ui.accordion.js
  65. +2 −1 ui/jquery.ui.autocomplete.js
  66. +0 −12 ui/jquery.ui.core.js
  67. +7 −0 ui/jquery.ui.datepicker.js
  68. +183 −177 ui/jquery.ui.dialog.js
  69. +5 −1 ui/jquery.ui.droppable.js
  70. +1 −0 ui/jquery.ui.menu.js
  71. +37 −17 ui/jquery.ui.position.js
  72. +47 −48 ui/jquery.ui.progressbar.js
  73. +61 −61 ui/jquery.ui.resizable.js
  74. +1 −0 ui/jquery.ui.slider.js
  75. +8 −4 ui/jquery.ui.sortable.js
  76. +38 −35 ui/jquery.ui.tabs.js
  77. +30 −25 ui/jquery.ui.widget.js
@@ -56,7 +56,7 @@ function submit( commit, tests, configFile, version, done ) {
runMax: config.runMax,
"runNames[]": Object.keys( tests ),
"runUrls[]": testUrls,
"browserSets[]": [ "popular-no-ie6" ]
"browserSets[]": config.browserSets
});
}

@@ -11,12 +11,12 @@
<link rel="stylesheet" href="../demos.css">
<style>
#toolbar {
padding: 11px 4px 9px 4px;
padding: 4px;
display: inline-block;
}
/* support: IE7 */
*:first-child+html #toolbar {
padding: 4px 0px 4px 5px;
*+html #toolbar {
display: inline;
}
</style>
<script>
@@ -91,7 +91,7 @@
</head>
<body>

<span id="toolbar" class="ui-widget-header ui-corner-all">
<div id="toolbar" class="ui-widget-header ui-corner-all">
<button id="beginning">go to beginning</button>
<button id="rewind">rewind</button>
<button id="play">play</button>
@@ -106,12 +106,12 @@
<input type="radio" id="repeat1" name="repeat" /><label for="repeat1">Once</label>
<input type="radio" id="repeatall" name="repeat" /><label for="repeatall">All</label>
</span>
</span>
</div>

<div class="demo-description">
<p>
A mediaplayer toolbar. Take a look at the underlying markup: A few button elements,
an input of type checkbox for the Shuffle button, and three inputs of type radio for the Repeat options.
an input of type checkbox for the Shuffle button, and three inputs of type radio for the Repeat options.
</p>
</div>
</body>
@@ -12,6 +12,7 @@
<script src="../../ui/i18n/jquery.ui.datepicker-ar.js"></script>
<script src="../../ui/i18n/jquery.ui.datepicker-ar-DZ.js"></script>
<script src="../../ui/i18n/jquery.ui.datepicker-az.js"></script>
<script src="../../ui/i18n/jquery.ui.datepicker-be.js"></script>
<script src="../../ui/i18n/jquery.ui.datepicker-bg.js"></script>
<script src="../../ui/i18n/jquery.ui.datepicker-bs.js"></script>
<script src="../../ui/i18n/jquery.ui.datepicker-ca.js"></script>
@@ -53,8 +54,10 @@
<script src="../../ui/i18n/jquery.ui.datepicker-mk.js"></script>
<script src="../../ui/i18n/jquery.ui.datepicker-ml.js"></script>
<script src="../../ui/i18n/jquery.ui.datepicker-ms.js"></script>
<script src="../../ui/i18n/jquery.ui.datepicker-nb.js"></script>
<script src="../../ui/i18n/jquery.ui.datepicker-nl.js"></script>
<script src="../../ui/i18n/jquery.ui.datepicker-nl-BE.js"></script>
<script src="../../ui/i18n/jquery.ui.datepicker-nn.js"></script>
<script src="../../ui/i18n/jquery.ui.datepicker-no.js"></script>
<script src="../../ui/i18n/jquery.ui.datepicker-pl.js"></script>
<script src="../../ui/i18n/jquery.ui.datepicker-pt.js"></script>
@@ -100,6 +103,7 @@
<option value="hy">Armenian (&#1344;&#1377;&#1397;&#1381;&#1408;&#1381;&#1398;)</option>
<option value="az">Azerbaijani (Az&#601;rbaycan dili)</option>
<option value="eu">Basque (Euskara)</option>
<option value="be">Belarusian</option>
<option value="bs">Bosnian (Bosanski)</option>
<option value="bg">Bulgarian (&#1073;&#1098;&#1083;&#1075;&#1072;&#1088;&#1089;&#1082;&#1080; &#1077;&#1079;&#1080;&#1082;)</option>
<option value="ca">Catalan (Catal&agrave;)</option>
@@ -142,7 +146,9 @@
<option value="mk">Macedonian</option>
<option value="ml">Malayalam</option>
<option value="ms">Malaysian (Bahasa Malaysia)</option>
<option value="nb">Norwegian (Bokmål)</option>
<option value="no">Norwegian (Norsk)</option>
<option value="nn">Norwegian (Nynorsk)</option>
<option value="pl">Polish (Polski)</option>
<option value="pt">Portuguese (Portugu&ecirc;s)</option>
<option value="pt-BR">Portuguese/Brazilian (Portugu&ecirc;s)</option>

This file was deleted.

@@ -16,27 +16,27 @@
});
$( "button" ).on( "click", function( event ) {
var target = $( event.target ),
pbar = $( "#progressbar" ),
pbarValue = pbar.find( ".ui-progressbar-value" );
progressbar = $( "#progressbar" ),
progressbarValue = progressbar.find( ".ui-progressbar-value" );
if ( target.is( "#numButton" ) ) {
pbar.progressbar( "option", {
progressbar.progressbar( "option", {
value: Math.floor( Math.random() * 100 )
});
} else if ( target.is( "#colorButton" ) ) {
pbarValue.css({
progressbarValue.css({
"background": '#' + Math.floor( Math.random() * 16777215 ).toString( 16 )
});
} else if ( target.is( "#falseButton" ) ) {
pbar.progressbar( "option", "value", false );
progressbar.progressbar( "option", "value", false );
}
});
});
</script>
<style>
#progressbar .ui-progressbar-value {
background-color: #CCCCCC;
}
#progressbar .ui-progressbar-value {
background-color: #ccc;
}
</style>
</head>
<body>
@@ -8,9 +8,8 @@

<ul>
<li><a href="default.html">Default functionality</a></li>
<li><a href="animated.html">Animated</a></li>
<li><a href="resize.html">Resizable progressbar</a></li>
<li><a href="indeterminate.html">Indeterminate</a></li>
<li><a href="label.html">Custom Labels</a></li>
</ul>

</body>
@@ -0,0 +1,58 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>jQuery UI Progressbar - Custom Label</title>
<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
<script src="../../jquery-1.8.3.js"></script>
<script src="../../ui/jquery.ui.core.js"></script>
<script src="../../ui/jquery.ui.widget.js"></script>
<script src="../../ui/jquery.ui.progressbar.js"></script>
<link rel="stylesheet" href="../demos.css">
<style>
.progress-label {
float: left;
margin-left: 50%;
margin-top: 5px;
font-weight: bold;
text-shadow: 1px 1px 0 #fff;
}
</style>
<script>
$(function() {
var progressbar = $( "#progressbar" ),
progressLabel = $( ".progress-label" );
progressbar.progressbar({
value: false,
change: function() {
progressLabel.text( progressbar.progressbar( "value" ) + "%" );
},
complete: function() {
progressLabel.text( "Complete!" );
}
});
function progress() {
var val = progressbar.progressbar( "value" ) || 0;
progressbar.progressbar( "value", val + 1 );
if ( val < 99 ) {
setTimeout( progress, 100 );
}
}
setTimeout( progress, 3000 );
});
</script>
</head>
<body>

<div id="progressbar"><div class="progress-label">Loading...</div></div>

<div class="demo-description">
<p>Custom updated label demo.</p>
</div>
</body>
</html>

This file was deleted.

@@ -47,10 +47,10 @@
"grunt-css": "0.2.0",
"grunt-compare-size": "0.1.4",
"grunt-html": "0.1.1",
"grunt-junit": "0.1.4",
"grunt-junit": "0.1.5",
"grunt-git-authors": "1.0.0",
"rimraf": "2.0.1",
"testswarm": "0.2.3"
"testswarm": "0.3.0"
},
"keywords": []
}

0 comments on commit f6372bd

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