Skip to content
Permalink
Browse files

Merge branch 'master' into effects-unit

Conflicts:
	ui/jquery.effects.pulsate.js
  • Loading branch information...
gnarf committed May 10, 2011
2 parents 4dcfeee + 85ac420 commit 27a7deebf299e1673e8b452476be02e486bba2c6
Showing with 1,556 additions and 1,153 deletions.
  1. +17 −0 README.md
  2. +33 −29 demos/autocomplete/combobox.html
  3. +1 −2 demos/demos.css
  4. +4 −0 demos/index.html
  5. +16 −32 demos/menu/contextmenu.html
  6. +6 −6 demos/menu/default.html
  7. +1 −1 demos/menu/index.html
  8. +25 −23 tests/visual/menu/menubar.html → demos/menubar/default.html
  9. +16 −0 demos/menubar/index.html
  10. +83 −0 demos/popup/default.html
  11. +18 −0 demos/popup/index.html
  12. +108 −0 demos/popup/popup-menu-table.html
  13. +98 −0 demos/popup/popup-menu.html
  14. +1 −1 demos/resizable/constrain-area.html
  15. +52 −19 demos/tooltip/video-player.html
  16. +16 −0 tests/unit/autocomplete/autocomplete_events.js
  17. +1 −0 tests/unit/datepicker/datepicker.html
  18. +8 −0 tests/unit/datepicker/datepicker_core.js
  19. +4 −0 tests/unit/datepicker/datepicker_options.js
  20. BIN tests/unit/tabs/spinner.gif
  21. +0 −1 tests/unit/tabs/tabs.html
  22. +28 −0 tests/unit/tabs/tabs_core.js
  23. +0 −1 tests/unit/tabs/tabs_deprecated.html
  24. +207 −95 tests/unit/tabs/tabs_deprecated.js
  25. +84 −8 tests/unit/tabs/tabs_events.js
  26. +4 −13 tests/unit/tabs/tabs_methods.js
  27. +68 −15 tests/unit/tabs/tabs_options.js
  28. +0 −37 tests/unit/tabs/tabs_tickets.js
  29. +12 −0 tests/visual/effects.all.html
  30. +15 −5 tests/visual/effects.all.js
  31. +0 −191 tests/visual/menu/contextmenu.html
  32. +0 −234 tests/visual/menu/menubar.js
  33. +0 −176 tests/visual/menu/popup.html
  34. +0 −124 tests/visual/menu/popup.js
  35. +1 −1 ui/i18n/jquery.ui.datepicker-af.js
  36. +1 −1 ui/i18n/jquery.ui.datepicker-ar.js
  37. +1 −1 ui/i18n/jquery.ui.datepicker-az.js
  38. +1 −1 ui/i18n/jquery.ui.datepicker-bg.js
  39. +1 −1 ui/i18n/jquery.ui.datepicker-bs.js
  40. +1 −1 ui/i18n/jquery.ui.datepicker-cs.js
  41. +1 −1 ui/i18n/jquery.ui.datepicker-da.js
  42. +1 −1 ui/i18n/jquery.ui.datepicker-de.js
  43. +1 −1 ui/i18n/jquery.ui.datepicker-el.js
  44. +1 −1 ui/i18n/jquery.ui.datepicker-en-GB.js
  45. +1 −1 ui/i18n/jquery.ui.datepicker-eo.js
  46. +1 −1 ui/i18n/jquery.ui.datepicker-et.js
  47. +1 −1 ui/i18n/jquery.ui.datepicker-eu.js
  48. +1 −1 ui/i18n/jquery.ui.datepicker-fa.js
  49. +1 −1 ui/i18n/jquery.ui.datepicker-fo.js
  50. +1 −1 ui/i18n/jquery.ui.datepicker-fr-CH.js
  51. +1 −1 ui/i18n/jquery.ui.datepicker-fr.js
  52. +1 −1 ui/i18n/jquery.ui.datepicker-he.js
  53. +1 −1 ui/i18n/jquery.ui.datepicker-hr.js
  54. +1 −1 ui/i18n/jquery.ui.datepicker-ja.js
  55. +1 −1 ui/i18n/jquery.ui.datepicker-ml.js
  56. +1 −1 ui/i18n/jquery.ui.datepicker-nl.js
  57. +1 −1 ui/i18n/jquery.ui.datepicker-ro.js
  58. +1 −1 ui/i18n/jquery.ui.datepicker-sq.js
  59. +1 −1 ui/i18n/jquery.ui.datepicker-sr-SR.js
  60. +1 −1 ui/i18n/jquery.ui.datepicker-sr.js
  61. +1 −1 ui/i18n/jquery.ui.datepicker-sv.js
  62. +1 −1 ui/i18n/jquery.ui.datepicker-ta.js
  63. +1 −1 ui/i18n/jquery.ui.datepicker-th.js
  64. +1 −1 ui/i18n/jquery.ui.datepicker-vi.js
  65. +1 −1 ui/i18n/jquery.ui.datepicker-zh-TW.js
  66. +3 −3 ui/jquery.effects.bounce.js
  67. +4 −2 ui/jquery.effects.pulsate.js
  68. +28 −0 ui/jquery.ui.autocomplete.js
  69. +5 −0 ui/jquery.ui.button.js
  70. +19 −10 ui/jquery.ui.datepicker.js
  71. +1 −1 ui/jquery.ui.dialog.js
  72. +3 −1 ui/jquery.ui.menu.js
  73. +272 −0 ui/jquery.ui.menubar.js
  74. +8 −4 ui/jquery.ui.mouse.js
  75. +174 −0 ui/jquery.ui.popup.js
  76. +2 −0 ui/jquery.ui.resizable.js
  77. +78 −87 ui/jquery.ui.tabs.js
  78. +2 −1 ui/jquery.ui.tooltip.js
@@ -7,3 +7,20 @@ If you want to use jQuery UI, go to [jqueryui.com](http://jqueryui.com) to get s

If you are interested in helping developing jQuery UI, you are in the right place.
To discuss development with team members and the community, visit the [Developing jQuery UI Forum](http://forum.jquery.com/developing-jquery-ui).

For commiters
---
When looking at pull requests, first check for [proper commit messages](http://wiki.jqueryui.com/w/page/12137724/Bug-Fixing-Guide).

Unless everything is fine and you can merge directly via GitHub's interface, fetch the remote first:

git remote add [username] [his-fork.git] -f

If you want just one commit and edit the commit message:

git cherry-pick -e [sha-of-commit]

If it should go to the stable brach, cherry-pick it to stable:

git checkout 1-8-stable
git cherry-pick -x [sha-of-commit]
@@ -16,7 +16,7 @@
<style>
.ui-button { margin-left: -1px; }
.ui-button-icon-only .ui-button-text { padding: 0.35em; }
.ui-autocomplete-input { margin: 0; padding: 0.48em 0 0.47em 0.45em; }
.ui-autocomplete-input { margin: 0; padding: 0.4em 0 0.4em 0.45em; }
</style>
<script>
(function( $ ) {
@@ -26,6 +26,32 @@
select = this.element.hide(),
selected = select.children( ":selected" ),
value = selected.val() ? selected.text() : "";
function removeIfInvalid(element) {
var value = $( element ).val(),
matcher = new RegExp( "^" + $.ui.autocomplete.escapeRegex( value ) + "$", "i" ),
valid = false;
select.children( "option" ).each(function() {
if ( $( this ).text().match( matcher ) ) {
this.selected = valid = true;
return false;
}
});
if ( !valid ) {
// remove invalid value, as it didn't match anything
$( element )
.val( "" )
.attr( "title", value + " didn't match any item" )
.tooltip( "open" );
select.val( "" );
setTimeout(function() {
input.tooltip( "close" ).attr( "title", "" );
}, 2500 );
input.data( "autocomplete" ).term = "";
return false;
}
}
var input = this.input = $( "<input>" )
.insertAfter( select )
.val( value )
@@ -57,30 +83,8 @@
});
},
change: function( event, ui ) {
if ( !ui.item ) {
var value = $( this ).val(),
matcher = new RegExp( "^" + $.ui.autocomplete.escapeRegex( value ) + "$", "i" ),
valid = false;
select.children( "option" ).each(function() {
if ( $( this ).text().match( matcher ) ) {
this.selected = valid = true;
return false;
}
});
if ( !valid ) {
// remove invalid value, as it didn't match anything
$( this )
.val( "" )
.attr( "title", value + " didn't match any item" )
.tooltip( "open" );
select.val( "" );
setTimeout(function() {
input.tooltip( "close" ).attr( "title", "" );
}, 2500 );
input.data( "autocomplete" ).term = "";
return false;
}
}
if ( !ui.item )
return removeIfInvalid( this );
}
})
.addClass( "ui-widget ui-widget-content ui-corner-left" );
@@ -109,6 +113,7 @@
// close if already visible
if ( input.autocomplete( "widget" ).is( ":visible" ) ) {
input.autocomplete( "close" );
removeIfInvalid( input );
return;
}
@@ -124,10 +129,9 @@
.tooltip({
position: {
of: this.button
}
})
.tooltip( "widget" )
.addClass( "ui-state-highlight" );
},
tooltipClass: "ui-state-highlight"
});
},
destroy: function() {
@@ -129,8 +129,7 @@ eventually we should convert the font sizes to ems -- using px for now to minimi

.normal h3.demo-header { font-size:32px; padding:0 0 5px; border-bottom:1px solid #eee; text-transform: capitalize; }
.normal h4.demo-subheader { font-size:10px; text-transform: uppercase; color:#999; padding:8px 0 3px; border:0; margin:0; }
.normal a:link,
.normal a:visited { color:#1b75bb; text-decoration:none; }
#demo-notes a, #demo-link a, #demo-source a { color:#1b75bb; text-decoration:none; }
.normal a:hover,
.normal a:active { color:#0b559b; }

@@ -20,6 +20,8 @@
<script src="../ui/jquery.ui.draggable.js"></script>
<script src="../ui/jquery.ui.droppable.js"></script>
<script src="../ui/jquery.ui.menu.js"></script>
<script src="../ui/jquery.ui.menubar.js"></script>
<script src="../ui/jquery.ui.popup.js"></script>
<script src="../ui/jquery.ui.position.js"></script>
<script src="../ui/jquery.ui.progressbar.js"></script>
<script src="../ui/jquery.ui.resizable.js"></script>
@@ -279,6 +281,8 @@
<dd><a href="datepicker/index.html">Datepicker</a></dd>
<dd><a href="dialog/index.html">Dialog</a></dd>
<dd><a href="menu/index.html">Menu</a></dd>
<dd><a href="menubar/index.html">Menubar</a></dd>
<dd><a href="popup/index.html">Popup</a></dd>
<dd><a href="progressbar/index.html">Progressbar</a></dd>
<dd><a href="slider/index.html">Slider</a></dd>
<dd><a href="spinner/index.html">Spinner</a></dd>
@@ -3,44 +3,28 @@
<head>
<meta charset="UTF-8" />
<title>jQuery UI Menu - Contextmenu demo</title>
<link type="text/css" href="../../themes/base/jquery.ui.all.css" rel="stylesheet" />
<script type="text/javascript" src="../../jquery-1.5.1.js"></script>
<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
<script type="text/javascript" src="../../ui/jquery.ui.position.js"></script>
<script type="text/javascript" src="../../ui/jquery.ui.widget.js"></script>
<script type="text/javascript" src="../../ui/jquery.ui.menu.js"></script>
<script type="text/javascript" src="../../ui/jquery.ui.button.js"></script>
<link type="text/css" href="../demos.css" rel="stylesheet" />
<script type="text/javascript">
<link href="../../themes/base/jquery.ui.all.css" rel="stylesheet" />
<script src="../../jquery-1.5.1.js"></script>
<script src="../../ui/jquery.ui.core.js"></script>
<script src="../../ui/jquery.ui.position.js"></script>
<script src="../../ui/jquery.ui.widget.js"></script>
<script src="../../ui/jquery.ui.menu.js"></script>
<script src="../../ui/jquery.ui.button.js"></script>
<script src="../../ui/jquery.ui.popup.js"></script>
<link href="../demos.css" rel="stylesheet" />
<script>
$(function() {
$(".demo button").button({
icons: {
primary: "ui-icon-home",
secondary: "ui-icon-triangle-1-s"
}
}).each(function() {
$(this).next().menu({
select: function(event, ui) {
$(this).hide();
$("#log").append("<div>Selected " + ui.item.text() + "</div>");
}
}).hide();
}).click(function(event) {
var menu = $(this).next();
if (menu.is(":visible")) {
menu.hide();
return false;
}).next().menu({
select: function(event, ui) {
$(this).hide();
$("#log").append("<div>Selected " + ui.item.text() + "</div>");
}
menu.menu("blur").show().position({
my: "left top",
at: "right top",
of: this
});
$(document).one("click", function() {
menu.hide();
});
return false;
})
}).popup();
});
</script>
<style>
@@ -69,7 +53,7 @@

<div class="demo-description">

<p>A simple contextmenu: Click the button, or tab to it and hit space to open the menu. Use the mouse or cursor keys to select an item, click it or hit enter to select it.</p>
<p>TODO update - A simple contextmenu: Click the button, or tab to it and hit space to open the menu. Use the mouse or cursor keys to select an item, click it or hit enter to select it.</p>

<p>The keyboard handling is part of the menu. Using the input option to menu is configured to add the key event handlers to the button, as that button gets focused when clicked.</p>

@@ -4,12 +4,12 @@
<meta charset="UTF-8" />
<title>jQuery UI Menu - Default demo</title>
<link type="text/css" href="../../themes/base/jquery.ui.all.css" rel="stylesheet" />
<script type="text/javascript" src="../../jquery-1.5.1.js"></script>
<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
<script type="text/javascript" src="../../ui/jquery.ui.widget.js"></script>
<script type="text/javascript" src="../../ui/jquery.ui.menu.js"></script>
<link type="text/css" href="../demos.css" rel="stylesheet" />
<script type="text/javascript">
<script src="../../jquery-1.5.1.js"></script>
<script src="../../ui/jquery.ui.core.js"></script>
<script src="../../ui/jquery.ui.widget.js"></script>
<script src="../../ui/jquery.ui.menu.js"></script>
<link href="../demos.css" rel="stylesheet" />
<script>
$(function() {
$(".demo ul").menu();
});
@@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8" />
<title>jQuery UI Menu Demos</title>
<link type="text/css" href="../demos.css" rel="stylesheet" />
<link href="../demos.css" rel="stylesheet" />
</head>
<body>
<div class="demos-nav">
@@ -1,27 +1,18 @@
<!DOCTYPE html>
<html>
<head>
<title>Menu Visual Test: Default</title>
<link rel="stylesheet" href="../visual.css" type="text/css" />
<link rel="stylesheet" href="../../../themes/base/jquery.ui.all.css" type="text/css" title="ui-theme" />
<script type="text/javascript" src="../../../jquery-1.5.1.js"></script>
<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
<script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script>
<script type="text/javascript" src="../../../ui/jquery.ui.position.js"></script>
<script type="text/javascript" src="../../../ui/jquery.ui.button.js"></script>
<script type="text/javascript" src="../../../ui/jquery.ui.menu.js"></script>
<script type="text/javascript" src="menubar.js"></script>
<!--
<script type="text/javascript" src="http://jqueryui.com/themeroller/themeswitchertool/"></script>
-->
<script type="text/javascript">
<title>jQuery UI Menubar - Default demo</title>
<link rel="stylesheet" href="../demos.css" type="text/css" />
<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css" type="text/css" title="ui-theme" />
<script src="../../jquery-1.5.1.js"></script>
<script src="../../ui/jquery.ui.core.js"></script>
<script src="../../ui/jquery.ui.widget.js"></script>
<script src="../../ui/jquery.ui.position.js"></script>
<script src="../../ui/jquery.ui.button.js"></script>
<script src="../../ui/jquery.ui.menu.js"></script>
<script src="../../ui/jquery.ui.menubar.js"></script>
<script>
$(function() {
$.fn.themeswitcher && $('<div/>').css({
position: "absolute",
right: 10,
top: 10
}).appendTo(document.body).themeswitcher();
$("td:has(.menubar)").clone().appendTo("tbody tr:not(:first)");
$("#bar1, .menubar").menubar({
@@ -40,7 +31,6 @@
});
</script>
<style type="text/css">
body { font-size:62.5%; }
#bar1, #bar2 { margin: 0 0 4em; } /* style for this page only */
.ui-menu { width: 200px; position: absolute; outline: none; z-index: 9999; }
.ui-menu .ui-icon { float: right; }
@@ -64,18 +54,20 @@
.ui-menubar-item {
float: left;
}
/*
table {
border-collapse: collapse;
}
th, td {
padding: 0.5em;
border: 1px solid black;
}
*/
</style>
</head>
<body>

<div class="demo">
<ul id="bar1" class="menubar">
<li>
<a href="#">File</a>
@@ -168,6 +160,7 @@
</li>
</ul>

<!--
<table id="movies" class="ui-widget">
<thead>
<tr>
@@ -222,11 +215,20 @@
</tr>
</tbody>
</table>
-->

<div class="ui-widget" style="margin-top:2em; font-family:Arial">
Log:
<div id="log" style="height: 400px; width: 300px; overflow: auto;" class="ui-widget-content"></div>
<div id="log" style="height: 100px; width: 300px; overflow: auto;" class="ui-widget-content"></div>
</div>
</div>

<div class="demo-description">

<p>TODO</p>

</div><!-- End demo-description -->


</body>
</html>
@@ -0,0 +1,16 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<title>jQuery UI Menubar Demos</title>
<link href="../demos.css" rel="stylesheet" />
</head>
<body>
<div class="demos-nav">
<h4>Examples</h4>
<ul>
<li class="demo-config-on"><a href="default.html">Default functionality</a></li>
</ul>
</div>
</body>
</html>

0 comments on commit 27a7dee

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