Changeset 6723

Timestamp:

05/12/07 04:32:30 (1 year ago)

Author:

sam

Message:

prototype: Refactor Element.extend and eliminate Element.extend.cache.

Files:

• spinoffs/prototype/trunk/CHANGELOG (modified) (1 diff)
• spinoffs/prototype/trunk/src/base.js (modified) (1 diff)
• spinoffs/prototype/trunk/src/dom.js (modified) (4 diffs)
• spinoffs/prototype/trunk/test/unit/base.html (modified) (1 diff)
• spinoffs/prototype/trunk/test/unit/form.html (modified) (1 diff)

spinoffs/prototype/trunk/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Refactor Element.extend and eliminate Element.extend.cache.  [sam]
-
-* Add Function#curry, Function#delay, Function#defer, and Function#wrap.  Closes #8134.  [Andrew Dupont, Tobie Langel, sam]

spinoffs/prototype/trunk/src/base.js

@@ -101 +101 @@
-      return wrapper.apply(this, [__method.bind(this)].concat($A(arguments))); 
-    }
+  },
+  
+  methodize: function() {
+    if (this._methodized) return this._methodized;
+    var __method = this;
+    return this._methodized = function() {
+      return __method.apply(null, [this].concat($A(arguments)));
+    };
-  }
-});

spinoffs/prototype/trunk/src/dom.js

@@ -39 +39 @@
-
-if (!window.Element) var Element = {};
-
-Element.extend = function(element) {
-  var F = Prototype.BrowserFeatures;
-  if (!element || !element.tagName || element.nodeType == 3 || 
-   element._extended || F.SpecificElementExtensions || element == window) 
-    return element;
-
-  var methods = {}, tagName = element.tagName, cache = Element.extend.cache, 
-   T = Element.Methods.ByTag;
-
-  // extend methods for all tags (Safari doesn't need this)
-  if (!F.ElementExtensions) {
-    Object.extend(methods, Element.Methods), 
-    Object.extend(methods, Element.Methods.Simulated);      
-  }
-
-  // extend methods for specific tags
-  if (T[tagName]) Object.extend(methods, T[tagName]);
-
-  for (var property in methods) {
-    var value = methods[property];
-    if (typeof value == 'function' && !(property in element))
-      element[property] = cache.findOrStore(value);
-  }
-
-  element._extended = Prototype.emptyFunction;
-  return element;
-};
-
-Element.extend.cache = {
-  findOrStore: function(value) {
-    return this[value] = this[value] || function() {
-      return value.apply(null, [this].concat($A(arguments)));
-    }
-  }
-};
-
-Element.Methods = {
@@ -573 +537 @@
-Object.extend(Element, Element.Methods);
-
+Element.extend = (function() {
+  if (Prototype.BrowserFeatures.SpecificElementExtensions)
+    return Prototype.K;
+  
+  var Methods = {}, ByTag = Element.Methods.ByTag;
+  
+  var extend = Object.extend(function(element) {
+    if (!element || element._extendedByPrototype || 
+        element.nodeType != 1 || element == window) return element;
+
+    var methods = Object.clone(Methods),
+      tagName = element.tagName, property, value;
+    
+    // extend methods for specific tags
+    if (ByTag[tagName]) Object.extend(methods, ByTag[tagName]);
+    
+    for (property in methods) {
+      value = methods[property];
+      if (typeof value == 'function' && !(property in element))
+        element[property] = value.methodize();
+    }
+    
+    element._extendedByPrototype = Prototype.emptyFunction;
+    return element;
+    
+  }, { 
+    refresh: function() {
+      // extend methods for all tags (Safari doesn't need this)
+      if (!Prototype.BrowserFeatures.ElementExtensions) {
+        Object.extend(Methods, Element.Methods);
+        Object.extend(Methods, Element.Methods.Simulated);
+      }
+    }
+  });
+  
+  extend.refresh();
+  return extend;
+})();
+
-if (!Prototype.BrowserFeatures.ElementExtensions && 
-
+   
-  window.HTMLElement = {};
-  window.HTMLElement.prototype = document.createElement('div').__proto__;
@@ -619 +622 @@
-  function copy(methods, destination, onlyIfAbsent) {
-    onlyIfAbsent = onlyIfAbsent || false;
-    var cache = Element.extend.cache;
-    for (var property in methods) {
-      var value = methods[property];
+      if (typeof value != 'function') continue;
-      if (!onlyIfAbsent || !(property in destination))
-cache.findOrStore(value
+value.methodize(
-    }
-  }
@@ -667 +670 @@
-  Object.extend(Element, Element.Methods);
-  delete Element.ByTag;
+  
+  if (Element.extend.refresh) Element.extend.refresh();
-};
-

spinoffs/prototype/trunk/test/unit/base.html

@@ -135 +135 @@
-        assert(window.deferred);
-      });
+    }},
+    
+    testFunctionMethodize: function() { with(this) {
+      var Foo = { bar: function(baz) { return baz } };
+      var baz = { quux: Foo.bar.methodize() };
+      
+      assertEqual(Foo.bar.methodize(), baz.quux);
+      assertEqual(baz, Foo.bar(baz));
+      assertEqual(baz, baz.quux());
-    }},
-

spinoffs/prototype/trunk/test/unit/form.html

@@ -346 +346 @@
-      Element.addMethods('SELECT', { aSelectMethod: function(select) { return 'select' } });
-
-
-
+ByPrototype
+ByPrototype
-
-      assert($('tf_text').anInputMethod);