library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2024-11-21 11:04:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Progressbar: cleanup.

Browse Source
This commit is contained in:
Scott González 2010-07-29 05:38:24 -04:00
parent ee1f5b54de
commit f00c03139b
2 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/unit/progressbar/progressbar_options.js
View File

@ -17,4 +17,18 @@ test("{ value : 5 }", function() {
same( 5, $("#progressbar").progressbar("value") );
});
test("{ value : -5 }", function() {
$("#progressbar").progressbar({
value: -5
});
same( 0, $("#progressbar").progressbar("value") );
});
test("{ value : 105 }", function() {
$("#progressbar").progressbar({
value: 105
});
same( 100, $("#progressbar").progressbar("value") );
});
})(jQuery);

37
ui/jquery.ui.progressbar.js vendored
View File

@ -17,13 +17,17 @@ $.widget( "ui.progressbar", {
options: {
value: 0
},
min: 0,
max: 100,
_create: function() {
this.element
.addClass( "ui-progressbar ui-widget ui-widget-content ui-corner-all" )
.attr({
role: "progressbar",
"aria-valuemin": this._valueMin(),
"aria-valuemax": this._valueMax(),
"aria-valuemin": this.min,
"aria-valuemax": this.max,
"aria-valuenow": this._value()
});
@ -56,12 +60,10 @@ $.widget( "ui.progressbar", {
},
_setOption: function( key, value ) {
switch ( key ) {
case "value":
this.options.value = value;
this._refreshValue();
this._trigger( "change" );
break;
if ( key === "value" ) {
this.options.value = value;
this._refreshValue();
this._trigger( "change" );
}
$.Widget.prototype._setOption.apply( this, arguments );
@ -73,28 +75,13 @@ $.widget( "ui.progressbar", {
if ( typeof val !== "number" ) {
val = 0;
}
if ( val < this._valueMin() ) {
val = this._valueMin();
}
if ( val > this._valueMax() ) {
val = this._valueMax();
}
return val;
},
_valueMin: function() {
return 0;
},
_valueMax: function() {
return 100;
return Math.min( this.max, Math.max( this.min, val ) );
},
_refreshValue: function() {
var value = this.value();
this.valueDiv
[ value === this._valueMax() ? "addClass" : "removeClass"]( "ui-corner-right" )
.toggleClass( "ui-corner-right", value === this.max )
.width( value + "%" );
this.element.attr( "aria-valuenow", value );
}