Progressbar: Rename indeterminate class, return default value to 0, use NaN for the indeterminate value, replace animated gif and DRY code by moving much of it to _refreshValue

Author: kborchers

themes/base/images/pbar-ani.gif

@@ -10,4 +10,4 @@
  */
 .ui-progressbar { height:2em; text-align: left; overflow: hidden; }
 .ui-progressbar .ui-progressbar-value { margin: -1px; height:100%; }
-.ui-progressbar .ui-progressbar-animated { background: url("images/ui-bg_animated_progress_50x50.gif"); }
+.ui-progressbar .ui-progressbar-indeterminate { background: url("images/pbar-ani.gif"); }

themes/base/images/ui-bg_animated_progress_50x50.gif

@@ -17,31 +17,25 @@
 $.widget( "ui.progressbar", {
 	version: "@VERSION",
 	options: {
-		value: false,
+		value: 0,
 		max: 100
 	},
 
 	min: 0,
 
 	_create: function() {
+		var val = this._value();
 		this.element
 			.addClass( "ui-progressbar ui-widget ui-widget-content ui-corner-all" )
 			.attr({
 				role: "progressbar",
 				"aria-valuemin": this.min,
-				"aria-valuemax": this.options.max,
-				"aria-valuenow": this._value()
+				"aria-valuemax": this.options.max
 			});
 
 		this.valueDiv = $( "<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>" )
 			.appendTo( this.element );
 
-		if ( this.options.value !== false ) {
-			this.oldValue = this._value();
-		} else {
-			this.oldValue = false;
-			this.valueDiv.addClass( "ui-progressbar-animated" );
-		}
 		this._refreshValue();
 	},
 
@@ -68,11 +62,7 @@ $.widget( "ui.progressbar", {
 	_setOption: function( key, value ) {
 		if ( key === "value" ) {
 			this.options.value = value;
-			if ( value !== false ) {
-				this.valueDiv.removeClass( "ui-progressbar-animated" );
-			} else {
-				this.valueDiv.addClass( "ui-progressbar-animated" );
-			}
+
 			this._refreshValue();
 			if ( this._value() === this.options.max ) {
 				this._trigger( "complete" );
@@ -88,29 +78,36 @@ $.widget( "ui.progressbar", {
 		if ( typeof val !== "number" && val !== false ) {
 			val = 0;
 		} else if( val === false ) {
-			val = 100;
+			val = NaN;
 		}
 		return Math.min( this.options.max, Math.max( this.min, val ) );
 	},
 
 	_percentage: function() {
-		return 100 * this._value() / this.options.max;
+		var val = this._value();
+		return isNaN( val ) ? 100 : 100 * val / this.options.max;
 	},
 
 	_refreshValue: function() {
 		var value = this.value(),
 			percentage = this._percentage();
 
+		this.valueDiv.toggleClass( "ui-progressbar-indeterminate", isNaN( value ) );
+
 		if ( this.oldValue !== value ) {
 			this.oldValue = value;
 			this._trigger( "change" );
 		}
 
 		this.valueDiv
-			.toggle( value > this.min )
+			.toggle( isNaN( value ) || value > this.min )
 			.toggleClass( "ui-corner-right", value === this.options.max )
 			.width( percentage.toFixed(0) + "%" );
-		this.element.attr( "aria-valuenow", value );
+		if ( isNaN( value ) ) {
+			this.element.removeAttr( "aria-valuenow" );
+		} else {
+			this.element.attr( "aria-valuenow", value );
+		}
 	}
 });