Changeset 7270

Timestamp:

08/04/07 07:20:45 (3 years ago)

Author:

sam

Message:

prototype: Merge -r7242:HEAD from ../branches/1-6-0-events. Adds support for DOM-based custom events with Event.fire/Element.Methods.fire, cross-browser DOMContentLoaded support, extended and normalized event objects, and improvements to the observe and stopObserving APIs.

Files:

• spinoffs/prototype/trunk/CHANGELOG (modified) (1 diff)
• spinoffs/prototype/trunk/src/dom.js (modified) (15 diffs)
• spinoffs/prototype/trunk/src/event.js (modified) (3 diffs)
• spinoffs/prototype/trunk/test/lib/unittest.js (modified) (1 diff)
• spinoffs/prototype/trunk/test/unit/event.html (copied) (copied from spinoffs/prototype/branches/1-6-0-events/test/unit/event.html)

spinoffs/prototype/trunk/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Make the eventName and handler arguments to Event.stopObserving optional.  If no handler is specified, all handlers for the given event are unregistered.  If no event name is specified, all observed events on the element are unregistered.  [sam]
+
+* Add cross-support for the DOMContentLoaded event through a Prototype custom event on document called "contentloaded".  The DOMContentLoaded event fires before window.load, when the entire HTML document, but not necessarily its images, stylesheets or other assets, has loaded.  Based on [6596].  [sam, Mislav Marohnić] 
+  Example:
+    document.observe("contentloaded", function() {
+      $$("a").invoke("identify"); // give all <a> tags an ID
+    });
+
+* Add Event.fire and Element.Methods.fire for firing custom events.  Prototype custom events piggyback on a real DOM event ("ondataavailable"), so they bubble and cancel.  You can fire custom events from any element, or fire global events on the document object.  Observe custom events just as you'd observe a regular DOM event.  [sam, Seth Dillingham]
+
+* Extend the event object with methods from Event.Methods and normalize it in IE.  [sam, Mislav Marohnić]
+
+* Remove support for observing the capturing phase of DOM events, since we can't support it in all browsers.  [sam]
-
-* Add Ajax.Response object which supports the following methods: responseJSON, headerJSON, getHeader, getAllHeaders and handles browser discrepancies in the other response methods. Add sanitizeJSON, evalJS and evalJSON to Ajax.Request. Closes #8122, #8006, #7295. [Tobie Langel]

spinoffs/prototype/trunk/src/dom.js

@@ -23 +23 @@
-/*--------------------------------------------------------------------------*/
-
+if (!window.Node)
+  var Node = { };
+  
+Object.extend(Node, {
+  ELEMENT_NODE: 1,
+  ATTRIBUTE_NODE: 2,
+  TEXT_NODE: 3,
+  CDATA_SECTION_NODE: 4,
+  ENTITY_REFERENCE_NODE: 5,
+  ENTITY_NODE: 6,
+  PROCESSING_INSTRUCTION_NODE: 7,
+  COMMENT_NODE: 8,
+  DOCUMENT_NODE: 9,
+  DOCUMENT_TYPE_NODE: 10,
+  DOCUMENT_FRAGMENT_NODE: 11,
+  NOTATION_NODE: 12
+});
+
-(function() {
-  var element = this.Element;
-  this.Element = function(tagName, attributes) {
-
+ 
-    tagName = tagName.toLowerCase();
-    var cache = Element.cache;
@@ -37 +55 @@
-    return Element.writeAttribute(cache[tagName].cloneNode(false), attributes);
-  };
-
+ 
-}).call(window);
-
-
+ 
-
-Element.Methods = {
@@ -128 +146 @@
-    element = $(element);
-    if (Object.isElement(wrapper))
-
+ 
-    else if (typeof wrapper == 'string') wrapper = new Element(wrapper, attributes);
-    else wrapper = new Element('div', wrapper);
@@ -260 +278 @@
-  writeAttribute: function(element, name, value) {
-    element = $(element);
-
+ 
-    
-    if (typeof name == 'object') attributes = name;
@@ -314 +332 @@
-    return element[element.hasClassName(className) ?
-      'removeClassName' : 'addClassName'](className);
-  },
-  
-  observe: function() {
-    Event.observe.apply(Event, arguments);
-    return $A(arguments).first();
-  },
-  
-  stopObserving: function() {
-    Event.stopObserving.apply(Event, arguments);
-    return $A(arguments).first();
-  },
-  
@@ -586 +594 @@
-      offsetTop:  0,
-      offsetLeft: 0
-
+ 
-
-    // find page position of source
@@ -664 +672 @@
-      htmlFor:   'for'      
-    }, 
-
+ 
-  }
-};
@@ -869 +877 @@
-        element.appendChild(n);
-        element.removeChild(n);
-
+ 
-    
-    return element;
@@ -1020 +1028 @@
-};
-
-
+ 
-
-Object.extend(Element, Element.Methods);
@@ -1026 +1034 @@
-if (!Prototype.BrowserFeatures.ElementExtensions && 
-    document.createElement('div').__proto__) {
-
+ 
-  window.HTMLElement.prototype = document.createElement('div').__proto__;
-  Prototype.BrowserFeatures.ElementExtensions = true;
@@ -1035 +1043 @@
-    return Prototype.K;
-  
-
+ 
-  
-  var extend = Object.extend(function(element) {
@@ -1094 +1102 @@
-  }
-  
-
+ 
-  else {
-    if (Object.isArray(tagName)) tagName.each(extend);
@@ -1103 +1111 @@
-    tagName = tagName.toUpperCase();
-    if (!Element.Methods.ByTag[tagName])
-
+ 
-    Object.extend(Element.Methods.ByTag[tagName], methods);
-  }
@@ -1137 +1145 @@
-    if (window[klass]) return window[klass];
-    
-
+ 
-    window[klass].prototype = document.createElement(tagName).__proto__;
-    return window[klass];
@@ -1159 +1167 @@
-  
-  if (Element.extend.refresh) Element.extend.refresh();
-
+ 
-};

spinoffs/prototype/trunk/src/event.js

@@ -1 @@
-
-
-
+
-
-Object.extend(Event, {
@@ -17 +15 @@
-  KEY_PAGEUP:   33,
-  KEY_PAGEDOWN: 34,
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  element: function(event) {
-
+
+
+
+
+
+
+
-  },
-
@@ -27 +53 @@
-  },
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-  stop: function(event) {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    } else {
-
-
+
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+

spinoffs/prototype/trunk/test/lib/unittest.js

@@ -166 +166 @@
-    this.currentTest = 0;
-    this.logger = new Test.Unit.Logger(this.options.testLog);
-
+
+
+
-  },
-  parseResultsURLQueryParameter: function() {