Skip to content

Commit b4d9eee

Browse files
scottgonzalezscottgonzalez
committed
Merge branch 'master' into selectmenu
2 parents 8c10c1e + 63215a6 commit b4d9eee

File tree

95 files changed

+2121
-1889
lines changed

Some content is hidden

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

95 files changed

+2121
-1889
lines changed

‎demos/accordion/collapsible.html

Lines changed: 4 additions & 4 deletions
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

Lines changed: 4 additions & 4 deletions
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

Lines changed: 4 additions & 4 deletions
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

Lines changed: 4 additions & 4 deletions
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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<div class="demo">
7474

7575
<div id="accordion">
76-
<h3><a href="#">Section 1</a></h3>
76+
<h3>Section 1</h3>
7777
<div>
7878
<p>
7979
Mauris mauris ante, blandit et, ultrices a, suscipit eget, quam. Integer
@@ -82,7 +82,7 @@ <h3><a href="#">Section 1</a></h3>
8282
odio. Curabitur malesuada. Vestibulum a velit eu ante scelerisque vulputate.
8383
</p>
8484
</div>
85-
<h3><a href="#">Section 2</a></h3>
85+
<h3>Section 2</h3>
8686
<div>
8787
<p>
8888
Sed non urna. Donec et ante. Phasellus eu ligula. Vestibulum sit amet
@@ -91,7 +91,7 @@ <h3><a href="#">Section 2</a></h3>
9191
suscipit faucibus urna.
9292
</p>
9393
</div>
94-
<h3><a href="#">Section 3</a></h3>
94+
<h3>Section 3</h3>
9595
<div>
9696
<p>
9797
Nam enim risus, molestie et, porta ac, aliquam ac, risus. Quisque lobortis.
@@ -105,7 +105,7 @@ <h3><a href="#">Section 3</a></h3>
105105
<li>List item three</li>
106106
</ul>
107107
</div>
108-
<h3><a href="#">Section 4</a></h3>
108+
<h3>Section 4</h3>
109109
<div>
110110
<p>
111111
Cras dictum. Pellentesque habitant morbi tristique senectus et netus

‎demos/accordion/index.html

Lines changed: 0 additions & 1 deletion
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

Lines changed: 0 additions & 57 deletions
This file was deleted.

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

Lines changed: 3 additions & 4 deletions
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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,19 @@
3939

4040
<div id="accordion">
4141
<div class="group">
42-
<h3><a href="#">Section 1</a></h3>
42+
<h3>Section 1</h3>
4343
<div>
4444
<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>
4545
</div>
4646
</div>
4747
<div class="group">
48-
<h3><a href="#">Section 2</a></h3>
48+
<h3>Section 2</h3>
4949
<div>
5050
<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>
5151
</div>
5252
</div>
5353
<div class="group">
54-
<h3><a href="#">Section 3</a></h3>
54+
<h3>Section 3</h3>
5555
<div>
5656
<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>
5757
<ul>
@@ -62,7 +62,7 @@ <h3><a href="#">Section 3</a></h3>
6262
</div>
6363
</div>
6464
<div class="group">
65-
<h3><a href="#">Section 4</a></h3>
65+
<h3>Section 4</h3>
6666
<div>
6767
<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>
6868
</div>

‎demos/position/cycler.html

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
</style>
1818
<script>
1919
$(function() {
20+
// TODO refactor into a widget and get rid of these plugin methods
2021
$.fn.position2 = function( options ) {
2122
return this.position( $.extend({
2223
of: window,
@@ -52,10 +53,6 @@
5253
});
5354
};
5455

55-
$( "img:eq(0)" ).left();
56-
$( "img:eq(1)" ).center();
57-
$( "img:eq(2)" ).right();
58-
5956
$( "body" ).css({
6057
overflow: "hidden"
6158
})
@@ -66,24 +63,30 @@
6663
position: "absolute",
6764
});
6865

66+
$( "img:eq(0)" ).left();
67+
$( "img:eq(1)" ).center();
68+
$( "img:eq(2)" ).right();
69+
6970
function animate( to ) {
70-
$(this).animate( to );
71+
$(this).stop( true, false ).animate( to );
7172
}
72-
function next() {
73+
function next( event ) {
74+
event.preventDefault();
7375
$( "img:eq(2)" ).center( animate );
7476
$( "img:eq(1)" ).left( animate )
7577
$( "img:eq(0)" ).right().appendTo( ".demo" );
7678
}
77-
function previous() {
79+
function previous( event ) {
80+
event.preventDefault();
7881
$( "img:eq(0)" ).center( animate );
7982
$( "img:eq(1)" ).right( animate );
8083
$( "img:eq(2)" ).left().prependTo( ".demo" );
8184
}
8285
$( "#previous" ).click( previous );
8386
$( "#next" ).click( next );
8487

85-
$( ".demo img" ).click(function() {
86-
$( ".demo img" ).index( this ) === 0 ? previous() : next();
88+
$( ".demo img" ).click(function( event ) {
89+
$( ".demo img" ).index( this ) === 0 ? previous( event ) : next( event );
8790
});
8891

8992
$( window ).resize(function() {
@@ -98,9 +101,9 @@
98101

99102
<div class="demo">
100103

101-
<img src="images/earth.jpg" />
102-
<img src="images/flight.jpg" />
103-
<img src="images/rocket.jpg" />
104+
<img src="images/earth.jpg" width="458" height="308" />
105+
<img src="images/flight.jpg" width="512" height="307" />
106+
<img src="images/rocket.jpg" width="300" height="353" />
104107

105108
<a id="previous" href="#">Previous</a>
106109
<a id="next" href="#">Next</a>

‎external/qunit.css

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/**
2-
* QUnit - A JavaScript Unit Testing Framework
2+
* QUnit v1.4.0pre - A JavaScript Unit Testing Framework
33
*
44
* http://docs.jquery.com/QUnit
55
*
6-
* Copyright (c) 2011 John Resig, Jörn Zaefferer
6+
* Copyright (c) 2012 John Resig, Jörn Zaefferer
77
* Dual licensed under the MIT (MIT-LICENSE.txt)
88
* or GPL (GPL-LICENSE.txt) licenses.
99
*/
@@ -54,6 +54,10 @@
5454
color: #fff;
5555
}
5656

57+
#qunit-header label {
58+
display: inline-block;
59+
}
60+
5761
#qunit-banner {
5862
height: 5px;
5963
}
@@ -186,6 +190,7 @@
186190
color: #710909;
187191
background-color: #fff;
188192
border-left: 26px solid #EE5757;
193+
white-space: pre;
189194
}
190195

191196
#qunit-tests > li:last-child {
@@ -222,4 +227,6 @@
222227
position: absolute;
223228
top: -10000px;
224229
left: -10000px;
230+
width: 1000px;
231+
height: 1000px;
225232
}

0 commit comments

Comments
 (0)