Changeset 8736

Timestamp:

01/26/08 08:17:42 (5 months ago)

Author:

madrobby

Message:

script.aculo.us: bump Prototype to 1.6.0.2

Files:

• spinoffs/scriptaculous/CHANGELOG (modified) (1 diff)
• spinoffs/scriptaculous/lib/prototype.js (modified) (32 diffs)

spinoffs/scriptaculous/CHANGELOG

@@ +1 @@
+* Update to Prototype 1.6.0.2 final
+
-* Fix an issue with Effect.ScrollTo that caused Firefox to scroll to the wrong offset in some situations. Closes #10245.  [nik.wakelin]
-

spinoffs/scriptaculous/lib/prototype.js

@@ -1 @@
-1
+2
- *  (c) 2005-2007 Sam Stephenson
- *
@@ -8 +8 @@
-
-var Prototype = {
-1
+2
-
-  Browser: {
@@ -111 +111 @@
-      if (Object.isUndefined(object)) return 'undefined';
-      if (object === null) return 'null';
-object.toString(
+String(object
-    } catch (e) {
-      if (e instanceof RangeError) return '...';
@@ -172 +172 @@
-
-  isArray: function(object) {
-
+
+
-  },
-
@@ -579 +580 @@
-
-      return before + String.interpret(ctx);
-.bind(this)
+
-  }
-});
@@ -813 +814 @@
-
-if (Prototype.Browser.WebKit) {
-function $A
+$A = function
-    if (!iterable) return [];
-    if (!(Object.isFunction(iterable) && iterable == '[object NodeList]') &&
@@ -820 +821 @@
-    while (length--) results[length] = iterable[length];
-    return results;
-
+;
-}
-
@@ -1299 +1300 @@
-      var contentType = response.getHeader('Content-type');
-      if (this.options.evalJS == 'force'
-
+this.isSameOrigin() && 
-          && contentType.match(/^\s*(text|application)\/(x-)?(java|ecma)script(;.*)?\s*$/i)))
-        this.evalResponse();
@@ -1317 +1318 @@
-  },
-
+  isSameOrigin: function() {
+    var m = this.url.match(/^\s*https?:\/\/[^\/]*/);
+    return !m || (m[0] == '#{protocol}//#{domain}#{port}'.interpolate({
+      protocol: location.protocol,
+      domain: document.domain,
+      port: location.port ? ':' + location.port : ''
+    }));
+  },
+
-  getHeader: function(name) {
-    try {
@@ -1392 +1402 @@
-    json = decodeURIComponent(escape(json));
-    try {
-
+
+
-    } catch (e) {
-      this.request.dispatchException(e);
@@ -1405 +1416 @@
-          return null;
-    try {
-
+
+
-    } catch (e) {
-      this.request.dispatchException(e);
@@ -1611 +1623 @@
-    var content, insert, tagName, childNodes;
-
-
+var 
-      content  = insertions[position];
-      position = position.toLowerCase();
@@ -1675 +1687 @@
-
-  descendants: function(element) {
-getElementsBySelector
+select
-  },
-
@@ -1864 +1876 @@
-        while (!(nextAncestor = ancestor.nextSibling) && ancestor.parentNode);
-      }
-
+
+
-    }
-
@@ -2008 +2021 @@
-        if (element.tagName == 'BODY') break;
-        var p = Element.getStyle(element, 'position');
-== 'relative' || p == 'absolute
+!== 'static
-      }
-    } while (element);
@@ -2201 +2214 @@
-
-else if (Prototype.Browser.IE) {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    Element.Methods[method] = Element.Methods[method].wrap(
-      function(proceed, element) {
-        element = $(element);
-        var position = element.getStyle('position');
-
+
+
+
+
+
+
-        element.setStyle({ position: 'relative' });
-        var value = proceed(element);
@@ -2288 +2320 @@
-
-  Element._attributeTranslations.write = {
-
+
+
+
+
-    values: {
-      checked: function(element, value) {
@@ -2408 +2443 @@
-}
-
-document.createElement('div').outerHTML
+'outerHTML' in document.createElement('div')
-  Element.Methods.replace = function(element, content) {
-    element = $(element);
@@ -2902 +2937 @@
-
-  criteria: {
-
-
-
-
+   
+   
+   
+, c
-    attr: function(m) {
-      m[3] = (m[5] || m[6]);
-
+, c
-    },
-    pseudo: function(m) {
@@ -2958 +2993 @@
-    attr: function(element, matches) {
-      var nodeValue = Element.readAttribute(element, matches[1]);
-Selector.operators[matches[2]](nodeValue, matches[3
+nodeValue && Selector.operators[matches[2]](nodeValue, matches[5] || matches[6
-    }
-  },
@@ -2973 +3008 @@
-    // marks an array of nodes for counting
-    mark: function(nodes) {
+      var _true = Prototype.emptyFunction;
-      for (var i = 0, node; node = nodes[i]; i++)
- = 
+ByPrototype = _
-      return nodes;
-    },
@@ -2980 +3016 @@
-    unmark: function(nodes) {
-      for (var i = 0, node; node = nodes[i]; i++)
-
+ByPrototype
-      return nodes;
-    },
@@ -2988 +3024 @@
-    // rather than nth-child
-    index: function(parentNode, reverse, ofType) {
- = true
+ByPrototype = Prototype.emptyFunction
-      if (reverse) {
-        for (var nodes = parentNode.childNodes, i = nodes.length - 1, j = 1; i >= 0; i--) {
-          var node = nodes[i];
-
+ByPrototype
-        }
-      } else {
-        for (var i = 0, j = 1, nodes = parentNode.childNodes; node = nodes[i]; i++)
-
+ByPrototype
-      }
-    },
@@ -3005 +3041 @@
-      var results = [], n;
-      for (var i = 0, l = nodes.length; i < l; i++)
-
- = true
+ByPrototype
+ByPrototype = Prototype.emptyFunction
-          results.push(Element.extend(n));
-        }
@@ -3118 +3154 @@
-    },
-
-
+, combinator
-      if (!nodes) nodes = root.getElementsByTagName("*");
+      if (nodes && combinator) nodes = this[combinator](nodes);
-      var results = [];
-      for (var i = 0, node; node = nodes[i]; i++)
@@ -3126 +3163 @@
-    },
-
-
+, combinator
-      if (!nodes) nodes = root.getElementsByTagName("*");
+      if (nodes && combinator) nodes = this[combinator](nodes);
-      var handler = Selector.operators[operator], results = [];
-      for (var i = 0, node; node = nodes[i]; i++) {
@@ -3206 +3244 @@
-      h.mark(nodes);
-      for (var i = 0, node; node = nodes[i]; i++) {
-
+ByPrototype
-          h.index(node.parentNode, reverse, ofType);
-          indexed.push(node.parentNode);
@@ -3244 +3282 @@
-      h.mark(exclusions);
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-
+ByPrototype
-      h.unmark(exclusions);
-      return results;
@@ -3278 +3316 @@
-  },
-
+  split: function(expression) {
+    var expressions = [];
+    expression.scan(/(([\w#:.~>+()\s-]+|\*|\[.*?\])+)\s*(,|$)/, function(m) {
+      expressions.push(m[1].strip());
+    });
+    return expressions;
+  },
+
-  matchElements: function(elements, expression) {
-new Selector(expression).findElements(
+$$(expression
-    h.mark(matches);
-    for (var i = 0, results = [], element; element = elements[i]; i++)
-
+ByPrototype
-    h.unmark(matches);
-    return results;
@@ -3295 +3341 @@
-
-  findChildElements: function(element, expressions) {
-
-
-
-
-
+
-    var results = [], h = Selector.handlers;
-    for (var i = 0, l = expressions.length, selector; i < l; i++) {
@@ -3310 +3352 @@
-
-if (Prototype.Browser.IE) {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -3794 +3845 @@
-
-  function getEventID(element) {
-eventID) return element._eventID
+prototypeEventID) return element._prototypeEventID[0]
-    arguments.callee.id = arguments.callee.id || 1;
-eventID = ++arguments.callee.id
+prototypeEventID = [++arguments.callee.id]
-  }
-