Merge branch 'widget-super' into devpreview

Author: jzaefferer

tests/unit/widget/widget.js

@@ -165,4 +165,37 @@ test(".widget() - overriden", function() {
 	same(wrapper[0], $("<div></div>").testWidget().testWidget("widget")[0]);
 });
 
+test("_super", function() {
+	expect(2);
+	$.widget("sup.parent", {
+		log: function() {
+			ok( this.called );
+		}
+	});
+	$.widget("sup.child", $.sup.parent, {
+		log: function() {
+			this.called = true;
+			ok( true );
+			this._super("log");
+		}
+	});
+	$("<div></div>").child().child("log");
+});
+
+test("_superApply", function() {
+	expect(2);
+	$.widget("sup.parent", {
+		log: function(a, b) {
+			same( a, 1 );
+			same( b, 2 );
+		}
+	});
+	$.widget("sup.child", $.sup.parent, {
+		log: function() {
+			this._superApply("log", arguments);
+		}
+	});
+	$("<div></div>").child().child("log", 1, 2);
+});
+
 })(jQuery);

ui/jquery.ui.accordion.js

@@ -151,7 +151,7 @@ $.widget("ui.accordion", {
 	},
 
 	_setOption: function(key, value) {
-		$.Widget.prototype._setOption.apply(this, arguments);
+		this._superApply( "_setOption", arguments );
 
 		if (key == "active") {
 			this.activate(value);

ui/jquery.ui.autocomplete.js

@@ -166,11 +166,11 @@ $.widget( "ui.autocomplete", {
 			.removeAttr( "aria-autocomplete" )
 			.removeAttr( "aria-haspopup" );
 		this.menu.element.remove();
-		$.Widget.prototype.destroy.call( this );
+		this._super( "destroy" );
 	},
 
 	_setOption: function( key ) {
-		$.Widget.prototype._setOption.apply( this, arguments );
+		this._superApply( "_setOption", arguments );
 		if ( key === "source" ) {
 			this._initSource();
 		}

ui/jquery.ui.button.js

@@ -226,11 +226,11 @@ $.widget( "ui.button", {
 			this.buttonElement.removeAttr( "title" );
 		}
 
-		$.Widget.prototype.destroy.call( this );
+		this._super( "destroy" );
 	},
 
 	_setOption: function( key, value ) {
-		$.Widget.prototype._setOption.apply( this, arguments );
+		this._superApply( "_setOption", arguments );
 		if ( key === "disabled" ) {
 			if ( value ) {
 				this.element.attr( "disabled", true );
@@ -324,7 +324,7 @@ $.widget( "ui.buttonset", {
 			this.buttons.button( "option", key, value );
 		}
 
-		$.Widget.prototype._setOption.apply( this, arguments );
+		this._superApply( "_setOption", arguments );
 	},
 
 	refresh: function() {
@@ -358,7 +358,7 @@ $.widget( "ui.buttonset", {
 			.end()
 			.button( "destroy" );
 
-		$.Widget.prototype.destroy.call( this );
+		this._super( "destroy" );
 	}
 });
 

ui/jquery.ui.progressbar.js

@@ -43,7 +43,7 @@ $.widget( "ui.progressbar", {
 
 		this.valueDiv.remove();
 
-		$.Widget.prototype.destroy.apply( this, arguments );
+		this._superApply( "destroy", arguments );
 	},
 
 	value: function( newValue ) {
@@ -64,7 +64,7 @@ $.widget( "ui.progressbar", {
 				break;
 		}
 
-		$.Widget.prototype._setOption.apply( this, arguments );
+		this._superApply( "_setOption", arguments );
 	},
 
 	_value: function() {

ui/jquery.ui.slider.js

@@ -511,7 +511,7 @@ $.widget( "ui.slider", $.ui.mouse, {
 			valsLength = this.options.values.length;
 		}
 
-		$.Widget.prototype._setOption.apply( this, arguments );
+		this._superApply( "_setOption", arguments );
 
 		switch ( key ) {
 			case "disabled":

ui/jquery.ui.sortable.js

@@ -81,7 +81,7 @@ $.widget("ui.sortable", $.ui.mouse, {
 				[ value ? "addClass" : "removeClass"]( "ui-sortable-disabled" );
 		} else {
 			// Don't call widget base _setOption for disable as it adds ui-state-disabled class
-			$.Widget.prototype._setOption.apply(this, arguments);
+			this._superApply( "_setOption", arguments );
 		}
 	},
 

ui/jquery.ui.widget.js

@@ -62,7 +62,8 @@ $.widget = function( name, base, prototype ) {
 		namespace: namespace,
 		widgetName: name,
 		widgetEventPrefix: $[ namespace ][ name ].prototype.widgetEventPrefix || name,
-		widgetBaseClass: fullName
+		widgetBaseClass: fullName,
+		base: base.prototype
 	}, prototype );
 
 	$.widget.bridge( name, $[ namespace ][ name ] );
@@ -145,7 +146,15 @@ $.Widget.prototype = {
 	},
 	_create: function() {},
 	_init: function() {},
-
+	
+	_super: function( method ) {
+		return this.base[ method ].apply( this, Array.prototype.slice.call( arguments, 1 ) );
+	},
+	
+	_superApply: function( method, args ) {
+		return this.base[ method ].apply( this, args );
+	},
+	
 	destroy: function() {
 		this.element
 			.unbind( "." + this.widgetName )