Skip to content

Commit 534996d

Browse files
scottgonzalezscottgonzalez
committed
Merge branch 'master' into editable
Conflicts: themes/base/jquery.ui.base.css
2 parents 2a961f5 + ec062c1 commit 534996d

File tree

186 files changed

+3911
-7606
lines changed

Some content is hidden

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

186 files changed

+3911
-7606
lines changed

‎MIT-LICENSE.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2011 Paul Bakaus, http://jqueryui.com/
1+
Copyright (c) 2012 Paul Bakaus, http://jqueryui.com/
22

33
This software consists of voluntary contributions made by many
44
individuals (AUTHORS.txt, http://jqueryui.com/about) For exact

‎build/build.xml

+6
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,12 @@
123123
<mapper type="glob" from="*.js" to="${min.dir}/*.min.js" />
124124
<targetfile/>
125125
</apply>
126+
<apply executable="build/minify-js.sh">
127+
<fileset dir="${dist.dir}/ui/i18n" includes="**.js" />
128+
<srcfile />
129+
<mapper type="glob" from="*.js" to="${min.dir}/i18n/*.min.js" />
130+
<targetfile/>
131+
</apply>
126132
<apply executable="java" parallel="false">
127133
<fileset dir="${dist.dir}/themes/base" includes="*.css" />
128134
<arg line="-jar" />

‎demos/accordion/collapsible.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@
2222
<div class="demo">
2323

2424
<div id="accordion">
25-
<h3><a href="#">Section 1</a></h3>
25+
<h3>Section 1</h3>
2626
<div>
2727
<p>Mauris mauris ante, blandit et, ultrices a, suscipit eget, quam. Integer ut neque. Vivamus nisi metus, molestie vel, gravida in, condimentum sit amet, nunc. Nam a nibh. Donec suscipit eros. Nam mi. Proin viverra leo ut odio. Curabitur malesuada. Vestibulum a velit eu ante scelerisque vulputate.</p>
2828
</div>
29-
<h3><a href="#">Section 2</a></h3>
29+
<h3>Section 2</h3>
3030
<div>
3131
<p>Sed non urna. Donec et ante. Phasellus eu ligula. Vestibulum sit amet purus. Vivamus hendrerit, dolor at aliquet laoreet, mauris turpis porttitor velit, faucibus interdum tellus libero ac justo. Vivamus non quam. In suscipit faucibus urna. </p>
3232
</div>
33-
<h3><a href="#">Section 3</a></h3>
33+
<h3>Section 3</h3>
3434
<div>
3535
<p>Nam enim risus, molestie et, porta ac, aliquam ac, risus. Quisque lobortis. Phasellus pellentesque purus in massa. Aenean in pede. Phasellus ac libero ac tellus pellentesque semper. Sed ac felis. Sed commodo, magna quis lacinia ornare, quam ante aliquam nisi, eu iaculis leo purus venenatis dui. </p>
3636
<ul>
@@ -39,7 +39,7 @@ <h3><a href="#">Section 3</a></h3>
3939
<li>List item three</li>
4040
</ul>
4141
</div>
42-
<h3><a href="#">Section 4</a></h3>
42+
<h3>Section 4</h3>
4343
<div>
4444
<p>Cras dictum. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Aenean lacinia mauris vel est. </p><p>Suspendisse eu nisl. Nullam ut libero. Integer dignissim consequat lectus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. </p>
4545
</div>

‎demos/accordion/custom-icons.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@
3232
<div class="demo">
3333

3434
<div id="accordion">
35-
<h3><a href="#">Section 1</a></h3>
35+
<h3>Section 1</h3>
3636
<div>
3737
<p>Mauris mauris ante, blandit et, ultrices a, suscipit eget, quam. Integer ut neque. Vivamus nisi metus, molestie vel, gravida in, condimentum sit amet, nunc. Nam a nibh. Donec suscipit eros. Nam mi. Proin viverra leo ut odio. Curabitur malesuada. Vestibulum a velit eu ante scelerisque vulputate.</p>
3838
</div>
39-
<h3><a href="#">Section 2</a></h3>
39+
<h3>Section 2</h3>
4040
<div>
4141
<p>Sed non urna. Donec et ante. Phasellus eu ligula. Vestibulum sit amet purus. Vivamus hendrerit, dolor at aliquet laoreet, mauris turpis porttitor velit, faucibus interdum tellus libero ac justo. Vivamus non quam. In suscipit faucibus urna. </p>
4242
</div>
43-
<h3><a href="#">Section 3</a></h3>
43+
<h3>Section 3</h3>
4444
<div>
4545
<p>Nam enim risus, molestie et, porta ac, aliquam ac, risus. Quisque lobortis. Phasellus pellentesque purus in massa. Aenean in pede. Phasellus ac libero ac tellus pellentesque semper. Sed ac felis. Sed commodo, magna quis lacinia ornare, quam ante aliquam nisi, eu iaculis leo purus venenatis dui. </p>
4646
<ul>
@@ -49,7 +49,7 @@ <h3><a href="#">Section 3</a></h3>
4949
<li>List item three</li>
5050
</ul>
5151
</div>
52-
<h3><a href="#">Section 4</a></h3>
52+
<h3>Section 4</h3>
5353
<div>
5454
<p>Cras dictum. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Aenean lacinia mauris vel est. </p><p>Suspendisse eu nisl. Nullam ut libero. Integer dignissim consequat lectus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. </p>
5555
</div>

‎demos/accordion/default.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<div class="demo">
2121

2222
<div id="accordion">
23-
<h3><a href="#">Section 1</a></h3>
23+
<h3>Section 1</h3>
2424
<div>
2525
<p>
2626
Mauris mauris ante, blandit et, ultrices a, suscipit eget, quam. Integer
@@ -29,7 +29,7 @@ <h3><a href="#">Section 1</a></h3>
2929
odio. Curabitur malesuada. Vestibulum a velit eu ante scelerisque vulputate.
3030
</p>
3131
</div>
32-
<h3><a href="#">Section 2</a></h3>
32+
<h3>Section 2</h3>
3333
<div>
3434
<p>
3535
Sed non urna. Donec et ante. Phasellus eu ligula. Vestibulum sit amet
@@ -38,7 +38,7 @@ <h3><a href="#">Section 2</a></h3>
3838
suscipit faucibus urna.
3939
</p>
4040
</div>
41-
<h3><a href="#">Section 3</a></h3>
41+
<h3>Section 3</h3>
4242
<div>
4343
<p>
4444
Nam enim risus, molestie et, porta ac, aliquam ac, risus. Quisque lobortis.
@@ -52,7 +52,7 @@ <h3><a href="#">Section 3</a></h3>
5252
<li>List item three</li>
5353
</ul>
5454
</div>
55-
<h3><a href="#">Section 4</a></h3>
55+
<h3>Section 4</h3>
5656
<div>
5757
<p>
5858
Cras dictum. Pellentesque habitant morbi tristique senectus et netus

‎demos/accordion/fillspace.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ <h3 class="docs">Resize the outer container:</h3>
3737
<div id="accordionResizer" style="padding:10px; width:350px; height:220px;" class="ui-widget-content">
3838

3939
<div id="accordion">
40-
<h3><a href="#">Section 1</a></h3>
40+
<h3>Section 1</h3>
4141
<div>
4242
<p>Mauris mauris ante, blandit et, ultrices a, suscipit eget, quam. Integer ut neque. Vivamus nisi metus, molestie vel, gravida in, condimentum sit amet, nunc. Nam a nibh. Donec suscipit eros. Nam mi. Proin viverra leo ut odio. Curabitur malesuada. Vestibulum a velit eu ante scelerisque vulputate.</p>
4343
</div>
44-
<h3><a href="#">Section 2</a></h3>
44+
<h3>Section 2</h3>
4545
<div>
4646
<p>Sed non urna. Donec et ante. Phasellus eu ligula. Vestibulum sit amet purus. Vivamus hendrerit, dolor at aliquet laoreet, mauris turpis porttitor velit, faucibus interdum tellus libero ac justo. Vivamus non quam. In suscipit faucibus urna. </p>
4747
</div>
48-
<h3><a href="#">Section 3</a></h3>
48+
<h3>Section 3</h3>
4949
<div>
5050
<p>Nam enim risus, molestie et, porta ac, aliquam ac, risus. Quisque lobortis. Phasellus pellentesque purus in massa. Aenean in pede. Phasellus ac libero ac tellus pellentesque semper. Sed ac felis. Sed commodo, magna quis lacinia ornare, quam ante aliquam nisi, eu iaculis leo purus venenatis dui. </p>
5151
<ul>
@@ -54,7 +54,7 @@ <h3><a href="#">Section 3</a></h3>
5454
<li>List item three</li>
5555
</ul>
5656
</div>
57-
<h3><a href="#">Section 4</a></h3>
57+
<h3>Section 4</h3>
5858
<div>
5959
<p>Cras dictum. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Aenean lacinia mauris vel est. </p><p>Suspendisse eu nisl. Nullam ut libero. Integer dignissim consequat lectus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. </p>
6060
</div>

‎demos/accordion/hoverintent.html

+10-6
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
$( this ).unbind( "mouseover", jQuery.event.special.hoverintent.handler );
3030
},
3131
handler: function( event ) {
32-
var self = this,
32+
var that = this,
3333
args = arguments,
3434
target = $( event.target ),
3535
cX, cY, pX, pY;
@@ -50,7 +50,11 @@
5050
if ( ( Math.abs( pX - cX ) + Math.abs( pY - cY ) ) < cfg.sensitivity ) {
5151
clear();
5252
event.type = "hoverintent";
53-
jQuery.event.handle.apply( self, args );
53+
// prevent accessing the original event since the new event
54+
// is fired asynchronously and the old event is no longer
55+
// usable (#6028)
56+
event.originalEvent = {};
57+
jQuery.event.handle.apply( that, args );
5458
} else {
5559
pX = cX;
5660
pY = cY;
@@ -69,7 +73,7 @@
6973
<div class="demo">
7074

7175
<div id="accordion">
72-
<h3><a href="#">Section 1</a></h3>
76+
<h3>Section 1</h3>
7377
<div>
7478
<p>
7579
Mauris mauris ante, blandit et, ultrices a, suscipit eget, quam. Integer
@@ -78,7 +82,7 @@ <h3><a href="#">Section 1</a></h3>
7882
odio. Curabitur malesuada. Vestibulum a velit eu ante scelerisque vulputate.
7983
</p>
8084
</div>
81-
<h3><a href="#">Section 2</a></h3>
85+
<h3>Section 2</h3>
8286
<div>
8387
<p>
8488
Sed non urna. Donec et ante. Phasellus eu ligula. Vestibulum sit amet
@@ -87,7 +91,7 @@ <h3><a href="#">Section 2</a></h3>
8791
suscipit faucibus urna.
8892
</p>
8993
</div>
90-
<h3><a href="#">Section 3</a></h3>
94+
<h3>Section 3</h3>
9195
<div>
9296
<p>
9397
Nam enim risus, molestie et, porta ac, aliquam ac, risus. Quisque lobortis.
@@ -101,7 +105,7 @@ <h3><a href="#">Section 3</a></h3>
101105
<li>List item three</li>
102106
</ul>
103107
</div>
104-
<h3><a href="#">Section 4</a></h3>
108+
<h3>Section 4</h3>
105109
<div>
106110
<p>
107111
Cras dictum. Pellentesque habitant morbi tristique senectus et netus

‎demos/accordion/index.html

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ <h4>Examples</h4>
1414
<li><a href="fillspace.html">Fill space</a></li>
1515
<li><a href="no-auto-height.html">No auto height</a></li>
1616
<li><a href="collapsible.html">Collapse content</a></li>
17-
<li><a href="mouseover.html">Open on mouseover</a></li>
1817
<li><a href="hoverintent.html">Open on hoverintent</a></li>
1918
<li><a href="custom-icons.html">Customize icons</a></li>
2019
<li><a href="sortable.html">Sortable</a></li>

‎demos/accordion/mouseover.html

-57
This file was deleted.

‎demos/accordion/no-auto-height.html

+3-4
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@
2222
<div class="demo">
2323

2424
<div id="accordion">
25-
<h3><a href="#section1">Section 1</a></h3>
25+
<h3>Section 1</h3>
2626
<div>
2727
<p>Mauris mauris ante, blandit et, ultrices a, susceros. Nam mi. Proin viverra leo ut odio. Curabitur malesuada. Vestibulum a velit eu ante scelerisque vulputate.</p>
2828
</div>
29-
<h3><a href="#section2">Section 2</a></h3>
29+
<h3>Section 2</h3>
3030
<div>
3131
<p>Sed non urna. Donec et ante. Phasellus eu ligula. Vestibulum sit amet purus. Vivamus hendrerit, dolor at aliquet laoreet, mauris turpis porttitor velit, faucibus interdum tellus libero ac justo. Vivamus non quam. In suscipit faucibus urna. </p>
3232
</div>
33-
<h3><a href="#section3">Section 3</a></h3>
33+
<h3>Section 3</h3>
3434
<div>
3535
<p>Nam enim risus, molestie et, porta ac, aliquam ac, risus. Quisque lobortis. Phasellus pellentesque purus in massa. Aenean in pede. Phasellus ac libero ac tellus pellentesque semper. Sed ac felis. Sed commodo, magna quis lacinia ornare, quam ante aliquam nisi, eu iaculis leo purus venenatis dui. </p>
3636
<ul>
@@ -42,7 +42,6 @@ <h3><a href="#section3">Section 3</a></h3>
4242
<li>List item</li>
4343
<li>List item</li>
4444
</ul>
45-
<a href="#othercontent">Link to other content</a>
4645
</div>
4746
</div>
4847

‎demos/accordion/sortable.html

+16-18
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,23 @@
1111
<script src="../../ui/jquery.ui.sortable.js"></script>
1212
<script src="../../ui/jquery.ui.accordion.js"></script>
1313
<link rel="stylesheet" href="../demos.css">
14+
<style>
15+
/* IE has layout issues when sorting (see #5413) */
16+
.group { zoom: 1 }
17+
</style>
1418
<script>
1519
$(function() {
16-
var stop = false;
17-
$( "#accordion h3" ).click(function( event ) {
18-
if ( stop ) {
19-
event.stopImmediatePropagation();
20-
event.preventDefault();
21-
stop = false;
22-
}
23-
});
2420
$( "#accordion" )
2521
.accordion({
2622
header: "> div > h3"
2723
})
2824
.sortable({
2925
axis: "y",
3026
handle: "h3",
31-
stop: function() {
32-
stop = true;
27+
stop: function( event, ui ) {
28+
// IE doesn't register the blur when sorting
29+
// so trigger focusout handlers to remove .ui-state-focus
30+
ui.item.children( "h3" ).triggerHandler( "focusout" );
3331
}
3432
});
3533
});
@@ -40,20 +38,20 @@
4038
<div class="demo">
4139

4240
<div id="accordion">
43-
<div>
44-
<h3><a href="#">Section 1</a></h3>
41+
<div class="group">
42+
<h3>Section 1</h3>
4543
<div>
4644
<p>Mauris mauris ante, blandit et, ultrices a, suscipit eget, quam. Integer ut neque. Vivamus nisi metus, molestie vel, gravida in, condimentum sit amet, nunc. Nam a nibh. Donec suscipit eros. Nam mi. Proin viverra leo ut odio. Curabitur malesuada. Vestibulum a velit eu ante scelerisque vulputate.</p>
4745
</div>
4846
</div>
49-
<div>
50-
<h3><a href="#">Section 2</a></h3>
47+
<div class="group">
48+
<h3>Section 2</h3>
5149
<div>
5250
<p>Sed non urna. Donec et ante. Phasellus eu ligula. Vestibulum sit amet purus. Vivamus hendrerit, dolor at aliquet laoreet, mauris turpis porttitor velit, faucibus interdum tellus libero ac justo. Vivamus non quam. In suscipit faucibus urna. </p>
5351
</div>
5452
</div>
55-
<div>
56-
<h3><a href="#">Section 3</a></h3>
53+
<div class="group">
54+
<h3>Section 3</h3>
5755
<div>
5856
<p>Nam enim risus, molestie et, porta ac, aliquam ac, risus. Quisque lobortis. Phasellus pellentesque purus in massa. Aenean in pede. Phasellus ac libero ac tellus pellentesque semper. Sed ac felis. Sed commodo, magna quis lacinia ornare, quam ante aliquam nisi, eu iaculis leo purus venenatis dui. </p>
5957
<ul>
@@ -63,8 +61,8 @@ <h3><a href="#">Section 3</a></h3>
6361
</ul>
6462
</div>
6563
</div>
66-
<div>
67-
<h3><a href="#">Section 4</a></h3>
64+
<div class="group">
65+
<h3>Section 4</h3>
6866
<div>
6967
<p>Cras dictum. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Aenean lacinia mauris vel est. </p><p>Suspendisse eu nisl. Nullam ut libero. Integer dignissim consequat lectus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. </p>
7068
</div>

‎demos/addClass/default.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<div class="demo">
3434

3535
<div class="toggler">
36-
<div id="effect" class=" ui-corner-all">
36+
<div id="effect" class="ui-corner-all">
3737
Etiam libero neque, luctus a, eleifend nec, semper at, lorem. Sed pede.
3838
</div>
3939
</div>

‎demos/autocomplete/categories.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
<script>
2323
$.widget( "custom.catcomplete", $.ui.autocomplete, {
2424
_renderMenu: function( ul, items ) {
25-
var self = this,
25+
var that = this,
2626
currentCategory = "";
2727
$.each( items, function( index, item ) {
2828
if ( item.category != currentCategory ) {
2929
ul.append( "<li class='ui-autocomplete-category'>" + item.category + "</li>" );
3030
currentCategory = item.category;
3131
}
32-
self._renderItem( ul, item );
32+
that._renderItem( ul, item );
3333
});
3434
}
3535
});

0 commit comments

Comments
 (0)