Widget: Deep extend options when creating a new plugin. Fixes #5830 - Widget: Using inheritance overwrites the base classes options.

scottgonzalez · scottgonzalez · commit f24bc0fb1f63 · 2010-07-15T10:27:21.000-04:00
diff --git a/tests/unit/widget/widget.html b/tests/unit/widget/widget.html
@@ -13,7 +13,8 @@
 	<script type="text/javascript" src="../../jquery.simulate.js"></script>
 	<script type="text/javascript" src="../testsuite.js"></script>
 
-	<script type="text/javascript" src="widget.js"></script>
+	<script type="text/javascript" src="widget_core.js"></script>
+	<script type="text/javascript" src="widget_tickets.js"></script>
 </head>
 <body>
 
diff --git a/tests/unit/widget/widget_core.js b/tests/unit/widget/widget_core.js
diff --git a/tests/unit/widget/widget_tickets.js b/tests/unit/widget/widget_tickets.js
@@ -0,0 +1,46 @@
+/*
+ * widget unit tests
+ */
+(function($) {
+
+module('widget: tickets');
+
+test('#5830 - Widget: Using inheritance overwrites the base classes options', function() {
+	$.widget( "ui.testWidgetBase", {
+		options: {
+			obj: {
+				key1: "foo",
+				key2: "bar"
+			},
+			arr: [ "testing" ]
+		}
+	});
+	
+	$.widget( "ui.testWidgetExtension", $.ui.testWidgetBase, {
+		options: {
+			obj: {
+				key1: "baz"
+			},
+			arr: [ "alpha", "beta" ]
+		}
+	});
+	
+	same( $.ui.testWidgetBase.prototype.options.obj, {
+		key1: "foo",
+		key2: "bar"
+	}, "base class option object not overridden");
+	same( $.ui.testWidgetBase.prototype.options.arr, [ "testing" ],
+		"base class option array not overridden");
+
+	same( $.ui.testWidgetExtension.prototype.options.obj, {
+		key1: "baz",
+		key2: "bar"
+	}, "extension class option object extends base");
+	same( $.ui.testWidgetExtension.prototype.options.arr, [ "alpha", "beta" ],
+		"extension class option array overwrites base");
+	
+	delete $.ui.testWidgetBase;
+	delete $.ui.testWidgetExtension;
+});
+
+})(jQuery);
diff --git a/ui/jquery.ui.widget.js b/ui/jquery.ui.widget.js
@@ -57,7 +57,7 @@ $.widget = function( name, base, prototype ) {
 //			basePrototype[ key ] = $.extend( {}, val );
 //		}
 //	});
-	basePrototype.options = $.extend( {}, basePrototype.options );
+	basePrototype.options = $.extend( true, {}, basePrototype.options );
 	$[ namespace ][ name ].prototype = $.extend( true, basePrototype, {
 		namespace: namespace,
 		widgetName: name,
