jQuery UI Development

Timestamp:

08/26/08 19:44:12 (19 months ago)

Author:

scott.gonzalez

Message:

Core: Fixed #3257: Added option method to widget factory.

Files:

• trunk/ui/ui.core.js (modified) (4 diffs)

trunk/ui/ui.core.js

@@ -53 +53 @@
 // taking some boilerplate code out of the plugin code
 // created by Scott González and Jörn Zaefferer
-function getter(namespace, plugin, method) {
-        var methods = $[namespace][plugin].getter || [];
-        methods = (typeof methods == "string" ? methods.split(/,?\s+/) : methods);
+function getter(namespace, plugin, method, args) {
+        function getMethods(type) {
+                var methods = $[namespace][plugin][type] || [];
+                return (typeof methods == 'string' ? methods.split(/,?\s+/) : methods);
+        }
+        
+        var methods = getMethods('getter');
+        if (args.length == 1 && typeof args[0] == 'string') {
+                methods = methods.concat(getMethods('getterSetter'));
+        }
         return ($.inArray(method, methods) != -1);
 }
@@ -74 +81 @@
                 
                 // handle getter methods
-                if (isMethodCall && getter(namespace, name, options)) {
+                if (isMethodCall && getter(namespace, name, options, args)) {
                         var instance = $.data(this[0], name);
                         return (instance ? instance[options].apply(instance, args)
@@ -121 +128 @@
         // add widget prototype
         $[namespace][name].prototype = $.extend({}, $.widget.prototype, prototype);
+        
+        // TODO: merge getter and getterSetter properties from widget prototype
+        // and plugin prototype
+        $[namespace][name].getterSetter = 'option';
 };
 
@@ -129 +140 @@
         },
         
+        option: function(key, value) {
+                var options = key,
+                        self = this;
+                
+                if (typeof key == "string") {
+                        if (value === undefined) {
+                                return this._getData(key);
+                        }
+                        options = {};
+                        options[key] = value;
+                }
+                
+                $.each(options, function(key, value) {
+                        self._setData(key, value);
+                });
+        },
         _getData: function(key) {
                 return this.options[key];