Merged in /branches/dev r3251:3620 (excluding autocomplete, modal, tooltip, menu; including menu static tests).

1 files changed, 16 insertions, 17 deletions

diff --git a/ui/jquery.ui.slider.js b/ui/jquery.ui.slider.js
index 0e3fa0170..ffd0f8475 100644
--- a/ui/jquery.ui.slider.js
+++ b/ui/jquery.ui.slider.js
@@ -19,8 +19,18 @@
 // (how many times can you page up/down to go through the whole range)
 var numPages = 5;
 
-$.widget("ui.slider", $.extend({}, $.ui.mouse, {
-
+$.widget("ui.slider", $.ui.mouse, {
+	options: {
+		animate: false,
+		distance: 0,
+		max: 100,
+		min: 0,
+		orientation: 'horizontal',
+		range: false,
+		step: 1,
+		value: 0,
+		values: null
+	},
 	_init: function() {
 
 		var self = this, o = this.options;
@@ -462,9 +472,9 @@ $.widget("ui.slider", $.extend({}, $.ui.mouse, {
 
 	},
 
-	_setData: function(key, value) {
+	_setOption: function(key, value) {
 
-		$.widget.prototype._setData.apply(this, arguments);
+		$.Widget.prototype._setOption.apply(this, arguments);
 
 		switch (key) {
 			case 'disabled':
@@ -594,22 +604,11 @@ $.widget("ui.slider", $.extend({}, $.ui.mouse, {
 
 	}
 	
-}));
+});
 
 $.extend($.ui.slider, {
 	version: "@VERSION",
-	eventPrefix: "slide",
-	defaults: $.extend({}, $.ui.mouse.defaults, {
-		animate: false,
-		distance: 0,
-		max: 100,
-		min: 0,
-		orientation: 'horizontal',
-		range: false,
-		step: 1,
-		value: 0,
-		values: null
-	})
+	eventPrefix: "slide"
 });
 
 })(jQuery);