Skip to content

Commit f5aaf87

Browse files
scottgonzalezscottgonzalez
committed
Progressbar: Moved .ui-progressbar-indeterminate to main element. Added tests for markup structure.
1 parent 747d853 commit f5aaf87

File tree

3 files changed

+29
-3
lines changed

3 files changed

+29
-3
lines changed

‎tests/unit/progressbar/progressbar_core.js

+25
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,30 @@
11
module( "progressbar: core" );
22

3+
test( "markup structure", function() {
4+
expect( 5 );
5+
var element = $( "#progressbar" ).progressbar();
6+
ok( element.hasClass( "ui-progressbar" ), "main element is .ui-progressbar" );
7+
ok( !element.hasClass( "ui-progressbar-indeterminate" ),
8+
"main element is not .ui-progressbar-indeterminate" );
9+
equal( element.children().length, 1, "main element contains one child" );
10+
ok( element.children().eq( 0 ).hasClass( "ui-progressbar-value" ),
11+
"child is .ui-progressbar-value" );
12+
equal( element.children().children().length, 0, "no overlay div" );
13+
});
14+
15+
test( "markup structure - indeterminate", function() {
16+
expect( 5 );
17+
var element = $( "#progressbar" ).progressbar({ value: false });
18+
ok( element.hasClass( "ui-progressbar" ), "main element is .ui-progressbar" );
19+
ok( element.hasClass( "ui-progressbar-indeterminate" ),
20+
"main element is .ui-progressbar-indeterminate" );
21+
equal( element.children().length, 1, "main element contains one child" );
22+
ok( element.children().eq( 0 ).hasClass( "ui-progressbar-value" ),
23+
"child is .ui-progressbar-value" );
24+
equal( element.children().children( ".ui-progressbar-overlay" ).length, 1,
25+
".ui-progressbar-value has .ui-progressbar-overlay" );
26+
});
27+
328
test( "accessibility", function() {
429
expect( 11 );
530
var element = $( "#progressbar" ).progressbar();

‎themes/base/jquery.ui.progressbar.css

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
margin: -1px;
1818
height: 100%;
1919
}
20-
.ui-progressbar .ui-progressbar-value .ui-progressbar-overlay {
20+
.ui-progressbar .ui-progressbar-overlay {
2121
background: url("images/animated-overlay.gif");
2222
height: 100%;
2323
filter: alpha(opacity=25);
2424
opacity: 0.25;
2525
}
26-
.ui-progressbar .ui-progressbar-indeterminate {
26+
.ui-progressbar-indeterminate .ui-progressbar-value {
2727
background-image: none;
2828
}

‎ui/jquery.ui.progressbar.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,10 @@ $.widget( "ui.progressbar", {
112112
this.valueDiv
113113
.toggle( this.indeterminate || value > this.min )
114114
.toggleClass( "ui-corner-right", value === this.options.max )
115-
.toggleClass( "ui-progressbar-indeterminate", this.indeterminate )
116115
.width( percentage.toFixed(0) + "%" );
117116

117+
this.element.toggleClass( "ui-progressbar-indeterminate", this.indeterminate );
118+
118119
if ( this.indeterminate ) {
119120
this.element.removeAttr( "aria-valuenow" );
120121
if ( !this.overlayDiv ) {

0 commit comments

Comments
 (0)