Skip to content
Permalink
Browse files

Merge branch 'master' into core-1.6.1

Conflicts:
	demos/menubar/default.html
	tests/unit/autocomplete/autocomplete.html
	tests/visual/effects/effects.all.html
	ui/jquery.ui.menu.js
	ui/jquery.ui.popup.js
  • Loading branch information
scottgonzalez committed Jul 25, 2011
2 parents daadc34 + 51ee3be commit 19a9de7e668cdb3b76c3b733d0147f1853cb38a5
Showing with 3,251 additions and 1,848 deletions.
  1. +1 −0 .gitignore
  2. +1 −0 AUTHORS.txt
  3. +12 −0 README.md
  4. +19 −100 demos/menubar/default.html
  5. +14 −16 demos/popup/default.html
  6. +15 −3 demos/position/default.html
  7. +22 −4 demos/widget/default.html
  8. +4 −4 tests/unit/accordion/accordion.html
  9. +17 −15 tests/unit/accordion/accordion_core.js
  10. +4 −4 tests/unit/accordion/accordion_deprecated.html
  11. +54 −36 tests/unit/accordion/accordion_deprecated.js
  12. +29 −29 tests/unit/accordion/accordion_events.js
  13. +8 −5 tests/unit/accordion/accordion_methods.js
  14. +36 −19 tests/unit/accordion/accordion_options.js
  15. +29 −31 tests/unit/autocomplete/autocomplete.html
  16. +58 −48 tests/unit/autocomplete/autocomplete_core.js
  17. +164 −173 tests/unit/autocomplete/autocomplete_events.js
  18. +23 −32 tests/unit/autocomplete/autocomplete_methods.js
  19. +131 −186 tests/unit/autocomplete/autocomplete_options.js
  20. +5 −0 tests/unit/datepicker/datepicker_events.js
  21. +10 −0 tests/unit/datepicker/datepicker_options.js
  22. +12 −2 tests/unit/datepicker/datepicker_tickets.js
  23. +50 −23 tests/unit/effects/effects.html
  24. +42 −0 tests/unit/effects/effects_core.js
  25. +61 −0 tests/unit/effects/effects_scale.js
  26. +21 −0 tests/unit/menu/menu_events.js
  27. +34 −27 tests/unit/position/position.html
  28. +83 −0 tests/unit/position/position_core.js
  29. +536 −0 tests/unit/position/position_core_within.js
  30. +19 −0 tests/unit/widget/widget_core.js
  31. +23 −0 tests/visual/datepicker/datepicker_ticket_7552.html
  32. +1 −0 tests/visual/{ → effects}/effects.all.css
  33. +19 −19 tests/visual/{ → effects}/effects.all.html
  34. 0 tests/visual/{ → effects}/effects.all.js
  35. +159 −0 tests/visual/effects/effects.scale.html
  36. +1 −1 tests/visual/position/position.html
  37. +200 −0 tests/visual/position/position_within.html
  38. +1 −0 themes/base/jquery.ui.base.css
  39. +1 −1 themes/base/jquery.ui.datepicker.css
  40. +7 −31 themes/base/jquery.ui.menu.css
  41. +15 −0 themes/base/jquery.ui.menubar.css
  42. +2 −2 themes/base/jquery.ui.theme.css
  43. +1 −1 ui/i18n/jquery.ui.datepicker-nl.js
  44. +51 −58 ui/jquery.effects.blind.js
  45. +89 −96 ui/jquery.effects.bounce.js
  46. +41 −44 ui/jquery.effects.clip.js
  47. +32 −2 ui/jquery.effects.core.js
  48. +43 −44 ui/jquery.effects.drop.js
  49. +66 −73 ui/jquery.effects.explode.js
  50. +16 −21 ui/jquery.effects.fade.js
  51. +50 −49 ui/jquery.effects.fold.js
  52. +29 −31 ui/jquery.effects.highlight.js
  53. +39 −44 ui/jquery.effects.pulsate.js
  54. +253 −214 ui/jquery.effects.scale.js
  55. +49 −53 ui/jquery.effects.shake.js
  56. +43 −45 ui/jquery.effects.slide.js
  57. +29 −29 ui/jquery.effects.transfer.js
  58. +20 −16 ui/jquery.ui.accordion.js
  59. +41 −6 ui/jquery.ui.datepicker.js
  60. +2 −3 ui/jquery.ui.dialog.js
  61. +171 −116 ui/jquery.ui.menu.js
  62. +37 −11 ui/jquery.ui.menubar.js
  63. +68 −34 ui/jquery.ui.popup.js
  64. +102 −33 ui/jquery.ui.position.js
  65. +18 −7 ui/jquery.ui.spinner.js
  66. +9 −2 ui/jquery.ui.tooltip.js
  67. +9 −5 ui/jquery.ui.widget.js
@@ -5,3 +5,4 @@ docs
*.diff
*.patch
.DS_Store
.settings
@@ -17,6 +17,7 @@ Bohdan Ganicky
Scott González
Marc Grabanski (m@marcgrabanski.com)
Klaus Hartl (stilbuero.de)
Hans Hillen (TPG, funded through AEGIS: http://www.aegis-project.eu/)
Scott Jehl
Cody Lindley
Eduardo Lundgren (eduardolundgren@gmail.com)
@@ -8,6 +8,18 @@ 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 contributors
---
If you want to help and provide a patch for a bugfix or new feature, please take
a few minutes and look at [our Getting Involved guide](http://wiki.jqueryui.com/w/page/35263114/Getting-Involved),
in particular check out the [Coding standards](http://wiki.jqueryui.com/w/page/12137737/Coding-standards)
and [Commit Message Style Guide](http://wiki.jqueryui.com/w/page/25941597/Commit-Message-Style-Guide).

In general, fork the project, create a branch for a specific change and send a
pull request for that branch. Don't mix unrelated changes. You can use the commit
message as the description for the pull request.


For committers
---
When looking at pull requests, first check for [proper commit messages](http://wiki.jqueryui.com/w/page/12137724/Bug-Fixing-Guide).
@@ -3,7 +3,7 @@
<head>
<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" />
<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css" />
<script src="../../jquery-1.6.2.js"></script>
<script src="../../ui/jquery.ui.core.js"></script>
<script src="../../ui/jquery.ui.widget.js"></script>
@@ -13,56 +13,32 @@
<script src="../../ui/jquery.ui.menubar.js"></script>
<script>
$(function() {
$("td:has(.menubar)").clone().appendTo("tbody tr:not(:first)");

$("#bar1, .menubar").menubar({
select: function(event, ui) {
$("<div/>").text("Selected: " + ui.item.text()).appendTo("#log");
function select(event, ui) {
$("<div/>").text("Selected: " + ui.item.text()).appendTo("#log");
if (ui.item.text() == 'Quit') {
$(this).menubar('destroy');
}
}
$("#bar1").menubar({
position: {
within: $("#demo-frame").add(window).first()
},
select: select
});

$(".menubar-icons").menubar({
autoExpand: true,
menuIcon: true,
buttons: true,
select: function(event, ui) {
$("<div/>").text("Selected: " + ui.item.text()).appendTo("#log");
}
position: {
within: $("#demo-frame").add(window).first()
},
select: select
});
});
</script>
<style type="text/css">
#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; }
.ui-menu li.ui-state-disabled {
font-weight: bold;
padding: .0em .4em;
margin: .4em 0 .2em;
line-height: 1.5;
}

/* menubar styles */
.ui-menubar .ui-button { float: left; font-weight: normal; border-top-width: 0 !important; border-bottom-width: 0 !important; margin: 0; outline: none; }
.ui-menubar .ui-menubar-link { border-right: 1px dashed transparent; border-left: 1px dashed transparent; }

.ui-menubar {
list-style: none;
margin: 0;
padding-left: 0;
}

.ui-menubar-item {
float: left;
}
/*
table {
border-collapse: collapse;
}
th, td {
padding: 0.5em;
border: 1px solid black;
}
*/
<style>
#bar1, #bar2 { margin: 0 0 4em; }
</style>
</head>
<body>
@@ -160,63 +136,6 @@
</li>
</ul>

<!--
<table id="movies" class="ui-widget">
<thead>
<tr>
<th data-field="Name" class="ui-widget-header">Name</th>
<th data-field="ReleaseYear" class="ui-widget-header">Release Year</th>
<th data-field="AverageRating" class="ui-widget-header">Average Rating</th>
<th class="ui-widget-header"></th>
</tr>
</thead>
<tbody>
<tr>
<td class="ui-widget-content">Red Hot Chili Peppers: Funky Monks</td>
<td class="ui-widget-content">1993</td>
<td class="ui-widget-content">3.6</td>
<td class="ui-widget-content">
<ul class="menubar">
<li>
<a href="#Options">Options</a>
<ul>
<li><a href="#Order...">Order...</a></li>
<li class="ui-state-disabled">Write a Review...</li>
<li><a href="#Find Similar Movies...">Find Similar Movies...</a></li>
<li>
<a href="#Rate">Rate</a>
<ul>
<li><a href="#5 stars">5 stars</a></li>
<li><a href="#4 stars">4 stars</a></li>
<li><a href="#3 stars">3 stars</a></li>
<li><a href="#2 stars">2 stars</a></li>
<li><a href="#1 stars">1 stars</a></li>
</ul>
</li>
</ul>
</li>
</ul>
</td>
</tr>
<tr>
<td class="ui-widget-content">Rod Stewart: Storyteller 1984-1991</td>
<td class="ui-widget-content">1991</td>
<td class="ui-widget-content">3.1</td>
</tr>
<tr>
<td class="ui-widget-content">Stevie Ray Vaughan and Double Trouble: Live at the El Mocambo 1983</td>
<td class="ui-widget-content">1991</td>
<td class="ui-widget-content">3.9</td>
</tr>
<tr>
<td class="ui-widget-content">Spike and Mike's Sick &amp; Twisted Festival of Animation</td>
<td class="ui-widget-content">1997</td>
<td class="ui-widget-content">2.6</td>
</tr>
</tbody>
</table>
-->

<div class="ui-widget" style="margin-top:2em; font-family:Arial">
Log:
<div id="log" style="height: 100px; width: 300px; overflow: auto;" class="ui-widget-content"></div>
@@ -29,7 +29,7 @@
<style type="text/css">
.ui-popup { position: absolute; z-index: 5000; }
.ui-menu { width: 200px; }

/*
table {
border-collapse: collapse;
@@ -55,26 +55,24 @@

<div class="demo">
<a href="#login-form">Log In</a>
<div id="login-form" class="ui-widget-content" tabIndex="0">
<form>
<div>
<label>Username</label>
<input type="username" />
</div>
<div>
<label>Password</label>
<input type="password" />
</div>
<div>
<input type="submit" class="submit" value="Login" />
</div>
</form>
<div class="ui-widget-content" id="login-form" aria-label="Login options">
<div>
<label for="un">Username</label>
<input type="text" id="un" />
</div>
<div>
<label for="pw">Password</label>
<input type="password" id="pw" />
</div>
<div>
<input type="submit" value="Login" class="submit" />
</div>
</div>
</div>

<div class="demo-description">

<p>A link to a login form that opens as a popup. [Not quite functional, focus handling needs to get better]</p>
<p>A link to a login form that opens as a popup.</p>

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

@@ -12,15 +12,15 @@
<script src="../../ui/jquery.ui.position.js"></script>
<link rel="stylesheet" href="../demos.css">
<style>
div#parent {
#parent {
width: 60%;
margin: 10px auto;
padding: 5px;
border: 1px solid #777;
background-color: #fbca93;
text-align: center;
}
div.positionable {
.positionable {
width: 75px;
height: 75px;
position: absolute;
@@ -30,6 +30,18 @@
background-color: #bcd5e6;
text-align: center;
}
.ui-flipped-top {
border-top: 3px solid #000000;
}
.ui-flipped-bottom {
border-bottom: 3px solid #000000;
}
.ui-flipped-left {
border-left: 3px solid #000000;
}
.ui-flipped-right {
border-right: 3px solid #000000;
}
select, input {
margin-left: 15px;
}
@@ -101,7 +113,7 @@
<option value="left">left</option>
<option value="center">center</option>
<option value="right">right</option>
</select>
</select>
<select id="my_vertical">
<option value="top">top</option>
<option value="middle">center</option>
@@ -6,15 +6,23 @@
<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
<script src="../../jquery-1.6.2.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.widget.js"></script>
<script src="../../ui/jquery.ui.button.js"></script>
<link rel="stylesheet" href="../demos.css">
<style>
.custom-colorize {
font-size: 25px;
font-size: 20px;
position: relative;
width: 75px;
height: 75px;
}
.custom-colorize-changer {
font-size: 10px;
position: absolute;
right: 0;
bottom: 0;
}
</style>
<script>
$(function() {
@@ -40,8 +48,15 @@
// prevent double click to select text
.disableSelection();

// bind click events to random method
this._bind({
this.changer = $( "<button>", {
text: "change",
className: "custom-colorize-changer"
})
.appendTo( this.element )
.button();

// bind click events on the changer button to the random method
this._bind( this.changer, {
// _bind won't call random when widget is disabled
click: "random"
});
@@ -78,6 +93,9 @@
// events bound via _bind are removed automatically
// revert other modifications here
_destroy: function() {
// remove generated elements
this.changer.remove();

this.element
.removeClass( "custom-colorize" )
.enableSelection()
@@ -25,17 +25,17 @@
var actual = accordion.find( ".ui-accordion-content" ).map(function() {
return $( this ).css( "display" ) === "none" ? 0 : 1;
}).get();
same( actual, expected );
deepEqual( actual, expected );
}
function equalHeights( accordion, min, max ) {
function accordion_equalHeights( accordion, min, max ) {
var sizes = [];
accordion.find( ".ui-accordion-content" ).each(function() {
sizes.push( $( this ).outerHeight() );
});
ok( sizes[ 0 ] >= min && sizes[ 0 ] <= max,
"must be within " + min + " and " + max + ", was " + sizes[ 0 ] );
same( sizes[ 0 ], sizes[ 1 ] );
same( sizes[ 0 ], sizes[ 2 ] );
deepEqual( sizes[ 0 ], sizes[ 1 ] );
deepEqual( sizes[ 0 ], sizes[ 2 ] );
}
function accordionSetupTeardown() {
var animated = $.ui.accordion.prototype.options.animated;

0 comments on commit 19a9de7

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