From 90fb45dffafc2e891b1ebca948ad33e6b94de112 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Thu, 7 Jan 2010 03:19:50 +0000
Subject: Merged in /branches/dev r3251:3620 (excluding autocomplete, modal,
 tooltip, menu; including menu static tests).

---
 ui/jquery.ui.progressbar.js | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'ui/jquery.ui.progressbar.js')

diff --git a/ui/jquery.ui.progressbar.js b/ui/jquery.ui.progressbar.js
index 866bfb172..b5898c504 100644
--- a/ui/jquery.ui.progressbar.js
+++ b/ui/jquery.ui.progressbar.js
@@ -14,7 +14,9 @@
 (function($) {
 
 $.widget("ui.progressbar", {
-
+	options: {
+		value: 0
+	},
 	_init: function() {
 
 		this.element
@@ -51,7 +53,7 @@ $.widget("ui.progressbar", {
 
 		this.valueDiv.remove();
 
-		$.widget.prototype.destroy.apply(this, arguments);
+		$.Widget.prototype.destroy.apply(this, arguments);
 
 		return this;
 	},
@@ -61,11 +63,11 @@ $.widget("ui.progressbar", {
 			return this._value();
 		}
 		
-		this._setData('value', newValue);
+		this._setOption('value', newValue);
 		return this;
 	},
 
-	_setData: function(key, value) {
+	_setOption: function(key, value) {
 
 		switch (key) {
 			case 'value':
@@ -75,7 +77,7 @@ $.widget("ui.progressbar", {
 				break;
 		}
 
-		$.widget.prototype._setData.apply(this, arguments);
+		$.Widget.prototype._setOption.apply(this, arguments);
 
 	},
 
@@ -111,10 +113,7 @@ $.widget("ui.progressbar", {
 });
 
 $.extend($.ui.progressbar, {
-	version: "@VERSION",
-	defaults: {
-		value: 0
-	}
+	version: "@VERSION"
 });
 
 })(jQuery);
-- 
cgit v1.2.3