Skip to content

Commit 12be355

Browse files
arschmitzarschmitz
committed
Progressbar: Style updates
Ref #14246
1 parent 5850a5c commit 12be355

File tree

6 files changed

+41
-39
lines changed

6 files changed

+41
-39
lines changed

‎tests/unit/progressbar/common.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ common.testWidget( "progressbar", {
1919
complete: null,
2020
create: null
2121
}
22-
});
22+
} );
2323

2424
} );

‎tests/unit/progressbar/core.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ test( "markup structure", function( assert ) {
1919
element.progressbar( "option", "value", 100 );
2020
assert.hasClasses( value, "ui-progressbar-complete ui-widget-header ui-progressbar-value" );
2121
equal( element.children().children().length, 0, "no overlay div" );
22-
});
22+
} );
2323

2424
test( "markup structure - indeterminate", function( assert ) {
2525
expect( 5 );
26-
var element = $( "#progressbar" ).progressbar({ value: false }),
26+
var element = $( "#progressbar" ).progressbar( { value: false } ),
2727
children = element.children();
2828

2929
assert.hasClasses( element, "ui-progressbar ui-progressbar-indeterminate ui-widget ui-widget-content" );
@@ -32,7 +32,7 @@ test( "markup structure - indeterminate", function( assert ) {
3232
assert.hasClasses( children[ 0 ], "ui-progressbar-value" );
3333
equal( children.children( ".ui-progressbar-overlay" ).length, 1,
3434
"Value has class ui-progressbar-overlay" );
35-
});
35+
} );
3636

3737
test( "accessibility", function() {
3838
expect( 11 );
@@ -59,6 +59,6 @@ test( "accessibility", function() {
5959
equal( element.attr( "aria-valuemin" ), 0, "aria-valuemin" );
6060
equal( element.attr( "aria-valuemax" ), 150, "aria-valuemax" );
6161
equal( element.attr( "aria-valuenow" ), null, "aria-valuenow" );
62-
});
62+
} );
6363

6464
} );

‎tests/unit/progressbar/events.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,36 +7,36 @@ module( "progressbar: events" );
77

88
test( "create", function() {
99
expect( 1 );
10-
$( "#progressbar" ).progressbar({
10+
$( "#progressbar" ).progressbar( {
1111
value: 5,
1212
create: function() {
1313
equal( $( this ).progressbar( "value" ), 5, "Correct value at create" );
1414
},
1515
change: function() {
1616
ok( false, "create has triggered change()" );
1717
}
18-
});
19-
});
18+
} );
19+
} );
2020

2121
test( "change", function() {
2222
expect( 2 );
2323
var element = $( "#progressbar" ).progressbar();
2424

2525
element.one( "progressbarchange", function() {
2626
equal( element.progressbar( "value" ), 5, "change triggered for middle value" );
27-
});
27+
} );
2828
element.progressbar( "value", 5 );
2929
element.one( "progressbarchange", function() {
3030
equal( element.progressbar( "value" ), 100, "change triggered for final value" );
31-
});
31+
} );
3232
element.progressbar( "value", 100 );
33-
});
33+
} );
3434

3535
test( "complete", function() {
3636
expect( 5 );
3737
var value,
3838
changes = 0,
39-
element = $( "#progressbar" ).progressbar({
39+
element = $( "#progressbar" ).progressbar( {
4040
change: function() {
4141
changes++;
4242
equal( element.progressbar( "value" ), value, "change at " + value );
@@ -45,14 +45,14 @@ test( "complete", function() {
4545
equal( changes, 3, "complete triggered after change and not on indeterminate" );
4646
equal( element.progressbar( "value" ), 100, "value is 100" );
4747
}
48-
});
48+
} );
4949

5050
value = 5;
5151
element.progressbar( "value", value );
5252
value = false;
5353
element.progressbar( "value", value );
5454
value = 100;
5555
element.progressbar( "value", value );
56-
});
56+
} );
5757

5858
} );

‎tests/unit/progressbar/methods.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ test( "destroy", function( assert ) {
99
expect( 1 );
1010
assert.domEqual( "#progressbar", function() {
1111
$( "#progressbar" ).progressbar().progressbar( "destroy" );
12-
});
13-
});
12+
} );
13+
} );
1414

1515
test( "disable", function( assert ) {
1616
expect( 3 );
@@ -20,23 +20,23 @@ test( "disable", function( assert ) {
2020
assert.hasClasses( element.progressbar( "widget" ), "ui-state-disabled" );
2121
ok( element.progressbar( "widget" ).attr( "aria-disabled" ), "element gets aria-disabled" );
2222
assert.hasClasses( element.progressbar( "widget" ), "ui-progressbar-disabled" );
23-
});
23+
} );
2424

2525
test( "value", function() {
2626
expect( 3 );
2727

28-
var element = $( "<div>" ).progressbar({ value: 20 });
28+
var element = $( "<div>" ).progressbar( { value: 20 } );
2929
equal( element.progressbar( "value" ), 20, "correct value as getter" );
3030
strictEqual( element.progressbar( "value", 30 ), element, "chainable as setter" );
3131
equal( element.progressbar( "option", "value" ), 30, "correct value after setter" );
32-
});
32+
} );
3333

3434
test( "widget", function() {
3535
expect( 2 );
3636
var element = $( "#progressbar" ).progressbar(),
3737
widgetElement = element.progressbar( "widget" );
3838
equal( widgetElement.length, 1, "one element" );
3939
strictEqual( widgetElement[ 0 ], element[ 0 ], "same element" );
40-
});
40+
} );
4141

4242
} );

‎tests/unit/progressbar/options.js

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ test( "{ value: 0 }, default", function() {
99
expect( 1 );
1010
$( "#progressbar" ).progressbar();
1111
equal( $( "#progressbar" ).progressbar( "value" ), 0 );
12-
});
12+
} );
1313

1414
// Ticket #7231 - valueDiv should be hidden when value is at 0%
1515
test( "value: visibility of valueDiv", function() {
1616
expect( 4 );
17-
var element = $( "#progressbar" ).progressbar({
17+
var element = $( "#progressbar" ).progressbar( {
1818
value: 0
19-
});
19+
} );
2020
ok( element.children( ".ui-progressbar-value" ).is( ":hidden" ),
2121
"valueDiv hidden when value is initialized at 0" );
2222
element.progressbar( "value", 1 );
@@ -28,52 +28,52 @@ test( "value: visibility of valueDiv", function() {
2828
element.progressbar( "value", 0 );
2929
ok( element.children( ".ui-progressbar-value" ).is( ":hidden" ),
3030
"valueDiv hidden when value is set to 0" );
31-
});
31+
} );
3232

3333
test( "{ value: 5 }", function() {
3434
expect( 1 );
35-
$( "#progressbar" ).progressbar({
35+
$( "#progressbar" ).progressbar( {
3636
value: 5
37-
});
37+
} );
3838
equal( $( "#progressbar" ).progressbar( "value" ), 5 );
39-
});
39+
} );
4040

4141
test( "{ value: -5 }", function() {
4242
expect( 1 );
43-
$( "#progressbar" ).progressbar({
43+
$( "#progressbar" ).progressbar( {
4444
value: -5
45-
});
45+
} );
4646
equal( $( "#progressbar" ).progressbar( "value" ), 0,
4747
"value constrained at min" );
48-
});
48+
} );
4949

5050
test( "{ value: 105 }", function() {
5151
expect( 1 );
52-
$( "#progressbar" ).progressbar({
52+
$( "#progressbar" ).progressbar( {
5353
value: 105
54-
});
54+
} );
5555
equal( $( "#progressbar" ).progressbar( "value" ), 100,
5656
"value constrained at max" );
57-
});
57+
} );
5858

5959
test( "{ value: 10, max: 5 }", function() {
6060
expect( 1 );
61-
$("#progressbar").progressbar({
61+
$( "#progressbar" ).progressbar( {
6262
max: 5,
6363
value: 10
64-
});
64+
} );
6565
equal( $( "#progressbar" ).progressbar( "value" ), 5,
6666
"value constrained at max" );
67-
});
67+
} );
6868

6969
test( "change max below value", function() {
7070
expect( 1 );
71-
$("#progressbar").progressbar({
71+
$( "#progressbar" ).progressbar( {
7272
max: 10,
7373
value: 10
74-
}).progressbar( "option", "max", 5 );
74+
} ).progressbar( "option", "max", 5 );
7575
equal( $( "#progressbar" ).progressbar( "value" ), 5,
7676
"value constrained at max" );
77-
});
77+
} );
7878

7979
} );

‎ui/widgets/progressbar.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ return $.widget( "ui.progressbar", {
100100
},
101101

102102
_setOptions: function( options ) {
103+
103104
// Ensure "value" option is set after other values (like max)
104105
var value = options.value;
105106
delete options.value;
@@ -112,6 +113,7 @@ return $.widget( "ui.progressbar", {
112113

113114
_setOption: function( key, value ) {
114115
if ( key === "max" ) {
116+
115117
// Don't allow a max less than min
116118
value = Math.max( this.min, value );
117119
}

0 commit comments

Comments
 (0)