Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Widget: Added _setOptions method for handling normalized options sett…

…ing. Fixes #6114 - Widget: Add _setOptions() method.
  • Loading branch information...
commit 9d88b565d6f65dc1aaebfaf99699f6155370949c 1 parent 0b6710a
@scottgonzalez scottgonzalez authored
Showing with 33 additions and 5 deletions.
  1. +24 −1 tests/unit/widget/widget_core.js
  2. +9 −4 ui/jquery.ui.widget.js
View
25 tests/unit/widget/widget_core.js
@@ -209,7 +209,30 @@ test( ".option() - getter", function() {
"modifying returned options hash does not modify plugin instance" );
});
-test( ".option() - setter", function() {
+test( ".option() - delegate to ._setOptions()", function() {
+ var calls = [];
+ $.widget( "ui.testWidget", {
+ _create: function() {},
+ _setOptions: function( options ) {
+ calls.push( options );
+ }
+ });
+ var div = $( "<div></div>" ).testWidget();
+
+ calls = [];
+ div.testWidget( "option", "foo", "bar" );
+ same( calls, [{ foo: "bar" }], "_setOptions called for single option" );
+
+ calls = [];
+ div.testWidget( "option", {
+ bar: "qux",
+ quux: "quuux"
+ });
+ same( calls, [{ bar: "qux", quux: "quuux" }],
+ "_setOptions called with multiple options" );
+});
+
+test( ".option() - delegate to ._setOption()", function() {
var calls = [];
$.widget( "ui.testWidget", {
_create: function() {},
View
13 ui/jquery.ui.widget.js
@@ -176,12 +176,11 @@ $.Widget.prototype = {
},
option: function( key, value ) {
- var options = key,
- self = this;
+ var options = key;
if ( arguments.length === 0 ) {
// don't return a reference to the internal hash
- return $.extend( {}, self.options );
+ return $.extend( {}, this.options );
}
if (typeof key === "string" ) {
@@ -192,11 +191,17 @@ $.Widget.prototype = {
options[ key ] = value;
}
+ this._setOptions( options );
+
+ return this;
+ },
+ _setOptions: function( options ) {
+ var self = this;
$.each( options, function( key, value ) {
self._setOption( key, value );
});
- return self;
+ return this;
},
_setOption: function( key, value ) {
this.options[ key ] = value;
Please sign in to comment.
Something went wrong with that request. Please try again.