Skip to content

Commit 19a9de7

Browse files
scottgonzalezscottgonzalez
committed
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
2 parents daadc34 + 51ee3be commit 19a9de7

File tree

67 files changed

+3251
-1848
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+3251
-1848
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ docs
55
*.diff
66
*.patch
77
.DS_Store
8+
.settings

‎AUTHORS.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ Bohdan Ganicky
1717
Scott González
1818
Marc Grabanski (m@marcgrabanski.com)
1919
Klaus Hartl (stilbuero.de)
20+
Hans Hillen (TPG, funded through AEGIS: http://www.aegis-project.eu/)
2021
Scott Jehl
2122
Cody Lindley
2223
Eduardo Lundgren (eduardolundgren@gmail.com)

‎README.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,18 @@ If you want to use jQuery UI, go to [jqueryui.com](http://jqueryui.com) to get s
88
If you are interested in helping developing jQuery UI, you are in the right place.
99
To discuss development with team members and the community, visit the [Developing jQuery UI Forum](http://forum.jquery.com/developing-jquery-ui).
1010

11+
For contributors
12+
---
13+
If you want to help and provide a patch for a bugfix or new feature, please take
14+
a few minutes and look at [our Getting Involved guide](http://wiki.jqueryui.com/w/page/35263114/Getting-Involved),
15+
in particular check out the [Coding standards](http://wiki.jqueryui.com/w/page/12137737/Coding-standards)
16+
and [Commit Message Style Guide](http://wiki.jqueryui.com/w/page/25941597/Commit-Message-Style-Guide).
17+
18+
In general, fork the project, create a branch for a specific change and send a
19+
pull request for that branch. Don't mix unrelated changes. You can use the commit
20+
message as the description for the pull request.
21+
22+
1123
For committers
1224
---
1325
When looking at pull requests, first check for [proper commit messages](http://wiki.jqueryui.com/w/page/12137724/Bug-Fixing-Guide).

‎demos/menubar/default.html

Lines changed: 19 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<title>jQuery UI Menubar - Default demo</title>
55
<link rel="stylesheet" href="../demos.css" type="text/css" />
6-
<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css" type="text/css" title="ui-theme" />
6+
<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css" />
77
<script src="../../jquery-1.6.2.js"></script>
88
<script src="../../ui/jquery.ui.core.js"></script>
99
<script src="../../ui/jquery.ui.widget.js"></script>
@@ -13,56 +13,32 @@
1313
<script src="../../ui/jquery.ui.menubar.js"></script>
1414
<script>
1515
$(function() {
16-
$("td:has(.menubar)").clone().appendTo("tbody tr:not(:first)");
17-
18-
$("#bar1, .menubar").menubar({
19-
select: function(event, ui) {
20-
$("<div/>").text("Selected: " + ui.item.text()).appendTo("#log");
16+
function select(event, ui) {
17+
$("<div/>").text("Selected: " + ui.item.text()).appendTo("#log");
18+
if (ui.item.text() == 'Quit') {
19+
$(this).menubar('destroy');
2120
}
21+
}
22+
$("#bar1").menubar({
23+
position: {
24+
within: $("#demo-frame").add(window).first()
25+
},
26+
select: select
2227
});
23-
28+
2429
$(".menubar-icons").menubar({
30+
autoExpand: true,
2531
menuIcon: true,
2632
buttons: true,
27-
select: function(event, ui) {
28-
$("<div/>").text("Selected: " + ui.item.text()).appendTo("#log");
29-
}
33+
position: {
34+
within: $("#demo-frame").add(window).first()
35+
},
36+
select: select
3037
});
3138
});
3239
</script>
33-
<style type="text/css">
34-
#bar1, #bar2 { margin: 0 0 4em; } /* style for this page only */
35-
.ui-menu { width: 200px; position: absolute; outline: none; z-index: 9999; }
36-
.ui-menu .ui-icon { float: right; }
37-
.ui-menu li.ui-state-disabled {
38-
font-weight: bold;
39-
padding: .0em .4em;
40-
margin: .4em 0 .2em;
41-
line-height: 1.5;
42-
}
43-
44-
/* menubar styles */
45-
.ui-menubar .ui-button { float: left; font-weight: normal; border-top-width: 0 !important; border-bottom-width: 0 !important; margin: 0; outline: none; }
46-
.ui-menubar .ui-menubar-link { border-right: 1px dashed transparent; border-left: 1px dashed transparent; }
47-
48-
.ui-menubar {
49-
list-style: none;
50-
margin: 0;
51-
padding-left: 0;
52-
}
53-
54-
.ui-menubar-item {
55-
float: left;
56-
}
57-
/*
58-
table {
59-
border-collapse: collapse;
60-
}
61-
th, td {
62-
padding: 0.5em;
63-
border: 1px solid black;
64-
}
65-
*/
40+
<style>
41+
#bar1, #bar2 { margin: 0 0 4em; }
6642
</style>
6743
</head>
6844
<body>
@@ -160,63 +136,6 @@
160136
</li>
161137
</ul>
162138

163-
<!--
164-
<table id="movies" class="ui-widget">
165-
<thead>
166-
<tr>
167-
<th data-field="Name" class="ui-widget-header">Name</th>
168-
<th data-field="ReleaseYear" class="ui-widget-header">Release Year</th>
169-
<th data-field="AverageRating" class="ui-widget-header">Average Rating</th>
170-
<th class="ui-widget-header"></th>
171-
</tr>
172-
</thead>
173-
<tbody>
174-
<tr>
175-
<td class="ui-widget-content">Red Hot Chili Peppers: Funky Monks</td>
176-
<td class="ui-widget-content">1993</td>
177-
<td class="ui-widget-content">3.6</td>
178-
<td class="ui-widget-content">
179-
<ul class="menubar">
180-
<li>
181-
<a href="#Options">Options</a>
182-
<ul>
183-
<li><a href="#Order...">Order...</a></li>
184-
<li class="ui-state-disabled">Write a Review...</li>
185-
<li><a href="#Find Similar Movies...">Find Similar Movies...</a></li>
186-
<li>
187-
<a href="#Rate">Rate</a>
188-
<ul>
189-
<li><a href="#5 stars">5 stars</a></li>
190-
<li><a href="#4 stars">4 stars</a></li>
191-
<li><a href="#3 stars">3 stars</a></li>
192-
<li><a href="#2 stars">2 stars</a></li>
193-
<li><a href="#1 stars">1 stars</a></li>
194-
</ul>
195-
</li>
196-
</ul>
197-
</li>
198-
</ul>
199-
</td>
200-
</tr>
201-
<tr>
202-
<td class="ui-widget-content">Rod Stewart: Storyteller 1984-1991</td>
203-
<td class="ui-widget-content">1991</td>
204-
<td class="ui-widget-content">3.1</td>
205-
</tr>
206-
<tr>
207-
<td class="ui-widget-content">Stevie Ray Vaughan and Double Trouble: Live at the El Mocambo 1983</td>
208-
<td class="ui-widget-content">1991</td>
209-
<td class="ui-widget-content">3.9</td>
210-
</tr>
211-
<tr>
212-
<td class="ui-widget-content">Spike and Mike's Sick &amp; Twisted Festival of Animation</td>
213-
<td class="ui-widget-content">1997</td>
214-
<td class="ui-widget-content">2.6</td>
215-
</tr>
216-
</tbody>
217-
</table>
218-
-->
219-
220139
<div class="ui-widget" style="margin-top:2em; font-family:Arial">
221140
Log:
222141
<div id="log" style="height: 100px; width: 300px; overflow: auto;" class="ui-widget-content"></div>

‎demos/popup/default.html

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<style type="text/css">
3030
.ui-popup { position: absolute; z-index: 5000; }
3131
.ui-menu { width: 200px; }
32-
32+
3333
/*
3434
table {
3535
border-collapse: collapse;
@@ -55,26 +55,24 @@
5555

5656
<div class="demo">
5757
<a href="#login-form">Log In</a>
58-
<div id="login-form" class="ui-widget-content" tabIndex="0">
59-
<form>
60-
<div>
61-
<label>Username</label>
62-
<input type="username" />
63-
</div>
64-
<div>
65-
<label>Password</label>
66-
<input type="password" />
67-
</div>
68-
<div>
69-
<input type="submit" class="submit" value="Login" />
70-
</div>
71-
</form>
58+
<div class="ui-widget-content" id="login-form" aria-label="Login options">
59+
<div>
60+
<label for="un">Username</label>
61+
<input type="text" id="un" />
62+
</div>
63+
<div>
64+
<label for="pw">Password</label>
65+
<input type="password" id="pw" />
66+
</div>
67+
<div>
68+
<input type="submit" value="Login" class="submit" />
69+
</div>
7270
</div>
7371
</div>
7472

7573
<div class="demo-description">
7674

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

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

‎demos/position/default.html

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
<script src="../../ui/jquery.ui.position.js"></script>
1313
<link rel="stylesheet" href="../demos.css">
1414
<style>
15-
div#parent {
15+
#parent {
1616
width: 60%;
1717
margin: 10px auto;
1818
padding: 5px;
1919
border: 1px solid #777;
2020
background-color: #fbca93;
2121
text-align: center;
2222
}
23-
div.positionable {
23+
.positionable {
2424
width: 75px;
2525
height: 75px;
2626
position: absolute;
@@ -30,6 +30,18 @@
3030
background-color: #bcd5e6;
3131
text-align: center;
3232
}
33+
.ui-flipped-top {
34+
border-top: 3px solid #000000;
35+
}
36+
.ui-flipped-bottom {
37+
border-bottom: 3px solid #000000;
38+
}
39+
.ui-flipped-left {
40+
border-left: 3px solid #000000;
41+
}
42+
.ui-flipped-right {
43+
border-right: 3px solid #000000;
44+
}
3345
select, input {
3446
margin-left: 15px;
3547
}
@@ -101,7 +113,7 @@
101113
<option value="left">left</option>
102114
<option value="center">center</option>
103115
<option value="right">right</option>
104-
</select>
116+
</select>
105117
<select id="my_vertical">
106118
<option value="top">top</option>
107119
<option value="middle">center</option>

‎demos/widget/default.html

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,23 @@
66
<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
77
<script src="../../jquery-1.6.2.js"></script>
88
<script src="../../ui/jquery.ui.core.js"></script>
9-
<script src="../../ui/jquery.ui.widget.js"></script>
109
<script src="../../ui/jquery.ui.position.js"></script>
10+
<script src="../../ui/jquery.ui.widget.js"></script>
11+
<script src="../../ui/jquery.ui.button.js"></script>
1112
<link rel="stylesheet" href="../demos.css">
1213
<style>
1314
.custom-colorize {
14-
font-size: 25px;
15+
font-size: 20px;
16+
position: relative;
1517
width: 75px;
1618
height: 75px;
1719
}
20+
.custom-colorize-changer {
21+
font-size: 10px;
22+
position: absolute;
23+
right: 0;
24+
bottom: 0;
25+
}
1826
</style>
1927
<script>
2028
$(function() {
@@ -40,8 +48,15 @@
4048
// prevent double click to select text
4149
.disableSelection();
4250

43-
// bind click events to random method
44-
this._bind({
51+
this.changer = $( "<button>", {
52+
text: "change",
53+
className: "custom-colorize-changer"
54+
})
55+
.appendTo( this.element )
56+
.button();
57+
58+
// bind click events on the changer button to the random method
59+
this._bind( this.changer, {
4560
// _bind won't call random when widget is disabled
4661
click: "random"
4762
});
@@ -78,6 +93,9 @@
7893
// events bound via _bind are removed automatically
7994
// revert other modifications here
8095
_destroy: function() {
96+
// remove generated elements
97+
this.changer.remove();
98+
8199
this.element
82100
.removeClass( "custom-colorize" )
83101
.enableSelection()

‎tests/unit/accordion/accordion.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@
2525
var actual = accordion.find( ".ui-accordion-content" ).map(function() {
2626
return $( this ).css( "display" ) === "none" ? 0 : 1;
2727
}).get();
28-
same( actual, expected );
28+
deepEqual( actual, expected );
2929
}
30-
function equalHeights( accordion, min, max ) {
30+
function accordion_equalHeights( accordion, min, max ) {
3131
var sizes = [];
3232
accordion.find( ".ui-accordion-content" ).each(function() {
3333
sizes.push( $( this ).outerHeight() );
3434
});
3535
ok( sizes[ 0 ] >= min && sizes[ 0 ] <= max,
3636
"must be within " + min + " and " + max + ", was " + sizes[ 0 ] );
37-
same( sizes[ 0 ], sizes[ 1 ] );
38-
same( sizes[ 0 ], sizes[ 2 ] );
37+
deepEqual( sizes[ 0 ], sizes[ 1 ] );
38+
deepEqual( sizes[ 0 ], sizes[ 2 ] );
3939
}
4040
function accordionSetupTeardown() {
4141
var animated = $.ui.accordion.prototype.options.animated;

0 commit comments

Comments
 (0)