jquery / jquery-ui

Source
Commits
Network (287)
Graphs
Tree: 1beb8a9

Downloads

The official jQuery user interface library. — Read more

This URL has Read+Write access

Add _superApply method and use it in a few places

jzaefferer (author)

Thu Jun 17 08:21:16 -0700 2010

commit 1beb8a95be96282fdf0d
tree 3813e4e03298d91d19f5
parent 79b5f066998688081dbf

Showing 8 changed files with 28 additions and 8 deletions.

M	tests/unit/widget/widget.js	16 •••••
M	ui/jquery.ui.accordion.js	2 ••
M	ui/jquery.ui.autocomplete.js	2 ••
M	ui/jquery.ui.button.js	4 ••••
M	ui/jquery.ui.progressbar.js	4 ••••
M	ui/jquery.ui.slider.js	2 ••
M	ui/jquery.ui.sortable.js	2 ••
M	ui/jquery.ui.widget.js	4 ••••

tests/unit/widget/widget.js

View file @ 1beb8a9

...	...	@@ -182,4 +182,20 @@ test("_super", function() {
182	182	$("<div></div>").child().child("log");
183	183	});
184	184
	185	+test("_superApply", function() {
	186	+ expect(2);
	187	+ $.widget("sup.parent", {
	188	+ log: function(a, b) {
	189	+ same( a, 1 );
	190	+ same( b, 2 );
	191	+ }
	192	+ });
	193	+ $.widget("sup.child", $.sup.parent, {
	194	+ log: function() {
	195	+ this._superApply("log", arguments);
	196	+ }
	197	+ });
	198	+ $("<div></div>").child().child("log", 1, 2);
	199	+});
	200	+
185	201	})(jQuery);

ui/jquery.ui.accordion.js

View file @ 1beb8a9

@@ -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

View file @ 1beb8a9

@@ -167,7 +167,7 @@ $.widget( "ui.autocomplete", {
   },
 
   _setOption: function( key ) {
-    $.Widget.prototype._setOption.apply( this, arguments );
+    this._superApply( "_setOption", arguments );
     if ( key === "source" ) {
       this._initSource();
     }

ui/jquery.ui.button.js

View file @ 1beb8a9

          
@@ -230,7 +230,7 @@ $.widget( "ui.button", {

   },

   _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() {

ui/jquery.ui.progressbar.js

View file @ 1beb8a9

          
@@ -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

View file @ 1beb8a9

@@ -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

View file @ 1beb8a9

@@ -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

View file @ 1beb8a9

@@ -151,6 +151,10 @@ $.Widget.prototype = {
     this.base[ method ].apply( this, Array.prototype.slice.call( arguments, 1 ) );
   },
   
+  _superApply: function( method, args ) {
+    this.base[ method ].apply( this, args );
+  },
+  
   destroy: function() {
     this.element
       .unbind( "." + this.widgetName )

0 notes on commit `1beb8a9` Show line notes below

Please log in to comment.

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

...	...	@@ -167,7 +167,7 @@ $.widget( "ui.autocomplete", {
167	167	},
168	168
169	169	_setOption: function( key ) {
170		- $.Widget.prototype._setOption.apply( this, arguments );
	170	+ this._superApply( "_setOption", arguments );
171	171	if ( key === "source" ) {
172	172	this._initSource();
173	173	}

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

...	...	@@ -151,6 +151,10 @@ $.Widget.prototype = {
151	151	this.base[ method ].apply( this, Array.prototype.slice.call( arguments, 1 ) );
152	152	},
153	153
	154	+ _superApply: function( method, args ) {
	155	+ this.base[ method ].apply( this, args );
	156	+ },
	157	+
154	158	destroy: function() {
155	159	this.element
156	160	.unbind( "." + this.widgetName )

jquery / jquery-ui

0 notes on commit `1beb8a9` Show line notes below

Your current locale selection: English. Choose another?

Keyboard Shortcuts

Site wide shortcuts

Commit list

Pull request list

Issues

Network Graph

...	...	@@ -230,7 +230,7 @@ $.widget( "ui.button", {
230	230	},
231	231
232	232	_setOption: function( key, value ) {
233		- $.Widget.prototype._setOption.apply( this, arguments );
	233	+ this._superApply( "_setOption", arguments );
234	234	if ( key === "disabled" ) {
235	235	if ( value ) {
236	236	this.element.attr( "disabled", true );
...	...	@@ -324,7 +324,7 @@ $.widget( "ui.buttonset", {
324	324	this.buttons.button( "option", key, value );
325	325	}
326	326
327		- $.Widget.prototype._setOption.apply( this, arguments );
	327	+ this._superApply( "_setOption", arguments );
328	328	},
329	329
330	330	refresh: function() {

...	...	@@ -43,7 +43,7 @@ $.widget( "ui.progressbar", {
43	43
44	44	this.valueDiv.remove();
45	45
46		- $.Widget.prototype.destroy.apply( this, arguments );
	46	+ this._superApply( "destroy", arguments );
47	47	},
48	48
49	49	value: function( newValue ) {
...	...	@@ -64,7 +64,7 @@ $.widget( "ui.progressbar", {
64	64	break;
65	65	}
66	66
67		- $.Widget.prototype._setOption.apply( this, arguments );
	67	+ this._superApply( "_setOption", arguments );
68	68	},
69	69
70	70	_value: function() {

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

jquery / jquery-ui

0 notes on commit 1beb8a9 Show line notes below

Your current locale selection: English. Choose another?

Keyboard Shortcuts

Site wide shortcuts

Commit list

Pull request list

Issues

Network Graph

0 notes on commit `1beb8a9` Show line notes below