Changeset 4813

Timestamp:

01/26/07 03:41:17 (2 years ago)

Author:

ryan

Message:

Update to prototype 1.5.0 and scriptaculous 1.7.0. Fix some AJAXy bits. Props mdawaffe. fixes #3645 #3676 #3519

Files:

• trunk/wp-includes/js/list-manipulation-js.php (modified) (3 diffs)
• trunk/wp-includes/js/prototype.js (modified) (75 diffs)
• trunk/wp-includes/js/scriptaculous/MIT-LICENSE (modified) (1 diff)
• trunk/wp-includes/js/scriptaculous/builder.js (modified) (5 diffs)
• trunk/wp-includes/js/scriptaculous/controls.js (modified) (16 diffs)
• trunk/wp-includes/js/scriptaculous/dragdrop.js (modified) (30 diffs)
• trunk/wp-includes/js/scriptaculous/effects.js (modified) (37 diffs)
• trunk/wp-includes/js/scriptaculous/prototype.js (modified) (75 diffs)
• trunk/wp-includes/js/scriptaculous/scriptaculous.js (modified) (2 diffs)
• trunk/wp-includes/js/scriptaculous/slider.js (modified) (6 diffs)
• trunk/wp-includes/js/scriptaculous/unittest.js (modified) (16 diffs)
• trunk/wp-includes/js/scriptaculous/wp-scriptaculous.js (added)
• trunk/wp-includes/js/wp-ajax-js.php (modified) (1 diff)
• trunk/wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-includes/js/list-manipulation-js.php

@@ -33 +33 @@
-        if ( ajaxAdd.notInitialized() )
-            return true;
-
+
+
+
-        var tempObj=this;
-        ajaxAdd.addOnComplete( function(transport) {
@@ -80 +82 @@
-            return true;
-        var tempObj = this;
-
+
+
-        var idName = what.replace('-as-spam','') + '-' + id;
-        ajaxDel.addOnComplete( function(transport) {
-            Element.update(ajaxDel.myResponseElement,'');
-
+Id
-            if( tempObj.delComplete && typeof tempObj.delComplete == 'function' )
-                tempObj.delComplete( what, id, transport );
-        });
-
-+= '&action=' + action + this.inputData
+Id
+= $H(ajaxDel.options.parameters).merge({action: action, id: id}).merge(this.inputData.toQueryParams())
-        ajaxDel.request(ajaxDel.url);
-
+Id
-        tempObj.removeListItem( idName );
-        return false;
@@ -103 +106 @@
-            return true;
-        var tempObj = this;
-
+
+
-        var idName = what + '-' + id;
-        ajaxDim.addOnComplete( function(transport) {
-            Element.update(ajaxDim.myResponseElement,'');
-
+Id
-            if ( tempObj.dimComplete && typeof tempObj.dimComplete == 'function' )
-                tempObj.dimComplete( what, id, dimClass, transport );
-        });
-
-+= '&action=' + action + this.inputData
+Id
+= $H(ajaxDim.options.parameters).merge({action: action, id: id}).merge(this.inputData.toQueryParams())
-        ajaxDim.request(ajaxDim.url);
-
+Id
-        this.dimItem( idName, dimClass );
-        return false;

trunk/wp-includes/js/prototype.js

@@ -1 @@
-_rc0
- Sam Stephenson <sam@conio.net>
+
+-2007 Sam Stephenson
- *
- *  Prototype is freely distributable under the terms of an MIT-style license.
@@ -8 +8 @@
-
-var Prototype = {
-
+
+
+
+
+
-  ScriptFragment: '(?:<script.*?>)((\n|\r|.)*?)(?:<\/script>)',
-
-  emptyFunction: function() {},
-return x
+ return x 
-}
-
@@ -32 +35 @@
-}
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-Function.prototype.bind = function() {
@@ -51 +74 @@
-
-Function.prototype.bindAsEventListener = function(object) {
-
+, args = $A(arguments), object = args.shift()
-  return function(event) {
-call(object, event || window.event
+apply(object, [( event || window.event)].concat(args).concat($A(arguments))
-  }
-}
@@ -78 +101 @@
-    var returnValue;
-
-; i < arguments.
+, length = arguments.length; i < 
-      var lambda = arguments[i];
-      try {
@@ -103 +126 @@
-
-  registerCallback: function() {
-
+
+
+
+
+
+
+
-  },
-
@@ -110 +139 @@
-      try {
-        this.currentlyExecuting = true;
-
+this
-      } finally {
-        this.currentlyExecuting = false;
@@ -117 +146 @@
-  }
-}
+String.interpret = function(value){
+  return value == null ? '' : String(value);
+}
+
-Object.extend(String.prototype, {
-  gsub: function(pattern, replacement) {
@@ -125 +158 @@
-      if (match = source.match(pattern)) {
-        result += source.slice(0, match.index);
-(replacement(match) || '').toString(
+String.interpret(replacement(match)
-        source  = source.slice(match.index + match[0].length);
-      } else {
@@ -190 +223 @@
-    var div = document.createElement('div');
-    div.innerHTML = this.stripTags();
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    });
-  },
@@ -206 +252 @@
-  },
-
+  succ: function() {
+    return this.slice(0, this.length - 1) +
+      String.fromCharCode(this.charCodeAt(this.length - 1) + 1);
+  },
+
-  camelize: function() {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-});
@@ -247 +312 @@
-      var before = match[1];
-      if (before == '\\') return match[2];
-(object[match[3]] || '').toString(
+String.interpret(object[match[3]]
-    });
-  }
@@ -269 +334 @@
-      if (e != $break) throw e;
-    }
+    return this;
+  },
+
+  eachSlice: function(number, iterator) {
+    var index = -number, slices = [], array = this.toArray();
+    while ((index += number) < array.length)
+      slices.push(array.slice(index, index+number));
+    return slices.map(iterator);
-  },
-
@@ -281 +354 @@
-
-  any: function(iterator) {
-tru
+fals
-    this.each(function(value, index) {
-      if (result = !!(iterator || Prototype.K)(value, index))
@@ -292 +365 @@
-    var results = [];
-    this.each(function(value, index) {
-iterator
+(iterator || Prototype.K)
-    });
-    return results;
-  },
-
- 
+
-    var result;
-    this.each(function(value, index) {
@@ -338 +411 @@
-  },
-
+  inGroupsOf: function(number, fillWith) {
+    fillWith = fillWith === undefined ? null : fillWith;
+    return this.eachSlice(number, function(slice) {
+      while(slice.length < number) slice.push(fillWith);
+      return slice;
+    });
+  },
+
-  inject: function(memo, iterator) {
-    this.each(function(value, index) {
@@ -347 +428 @@
-  invoke: function(method) {
-    var args = $A(arguments).slice(1);
-collect
+map
-      return value[method].apply(value, args);
-    });
@@ -399 +480 @@
-
-  sortBy: function(iterator) {
-collect
+map
-      return {value: value, criteria: iterator(value, index)};
-    }).sort(function(left, right) {
@@ -408 +489 @@
-
-  toArray: function() {
-collect(Prototype.K
+map(
-  },
-
@@ -420 +501 @@
-      return iterator(collections.pluck(index));
-    });
+  },
+
+  size: function() {
+    return this.toArray().length;
-  },
-
@@ -440 +525 @@
-  } else {
-    var results = [];
-; i < iterable.
+, length = iterable.length; i < 
-      results.push(iterable[i]);
-    return results;
@@ -453 +538 @@
-Object.extend(Array.prototype, {
-  _each: function(iterator) {
-; i < this.
+, length = this.length; i < 
-      iterator(this[i]);
-  },
@@ -472 +557 @@
-  compact: function() {
-    return this.select(function(value) {
-undefined || value != 
+
-    });
-  },
@@ -491 +576 @@
-
-  indexOf: function(object) {
-; i < this.
+, length = this.length; i < 
-      if (this[i] == object) return i;
-    return -1;
@@ -500 +585 @@
-  },
-
+  reduce: function() {
+    return this.length > 1 ? this : this[0];
+  },
+
+  uniq: function() {
+    return this.inject([], function(array, value) {
+      return array.include(value) ? array : array.concat([value]);
+    });
+  },
+
+  clone: function() {
+    return [].concat(this);
+  },
+
+  size: function() {
+    return this.length;
+  },
+
-  inspect: function() {
-    return '[' + this.map(Object.inspect).join(', ') + ']';
-  }
-});
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  _each: function(iterator) {
-    for (var key in this) {
-      var value = this[key];
-typeof value == 'function'
+value && value == Hash.prototype[key]
-
-      var pair = [key, value];
@@ -526 +684 @@
-
-  merge: function(hash) {
-$H(this)
+this
-      mergedHash[pair.key] = pair.value;
-      return mergedHash;
@@ -532 +690 @@
-  },
-
+  remove: function() {
+    var result;
+    for(var i = 0, length = arguments.length; i < length; i++) {
+      var value = this[arguments[i]];
+      if (value !== undefined){
+        if (result === undefined) result = value;
+        else {
+          if (result.constructor != Array) result = [result];
+          result.push(value)
+        }
+      }
+      delete this[arguments[i]];
+    }
+    return result;
+  },
+
-  toQueryString: function() {
-
-
-
+
-  },
-
@@ -543 +715 @@
-    }).join(', ') + '}>';
-  }
-
+);
-
-function $H(object) {
-
-
-
-
-
+
+
+
-ObjectRange = Class.create();
-Object.extend(ObjectRange.prototype, Enumerable);
@@ -562 +732 @@
-  _each: function(iterator) {
-    var value = this.start;
-do
+while (this.include(value))
-      iterator(value);
-      value = value.succ();
- while (this.include(value));
+
-  },
-
@@ -600 +770 @@
-  },
-
-ToAdd
-ToAdd
-ToAdd
-
-
-ToRemove
-ToRemove
+
+
+
+
+
+
+
-  },
-
-  dispatch: function(callback, request, transport, json) {
-    this.each(function(responder) {
-responder[callback] && 
+
-        try {
-          responder[callback].apply(responder, [request, transport, json]);
@@ -626 +796 @@
-    Ajax.activeRequestCount++;
-  },
-
-  onComplete: function() {
-    Ajax.activeRequestCount--;
@@ -639 +808 @@
-      asynchronous: true,
-      contentType:  'application/x-www-form-urlencoded',
+      encoding:     'UTF-8',
-      parameters:   ''
-    }
-    Object.extend(this.options, options || {});
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-  }
-}
@@ -660 +824 @@
-
-Ajax.Request.prototype = Object.extend(new Ajax.Base(), {
+  _complete: false,
+
-  initialize: function(url, options) {
-    this.transport = Ajax.getTransport();
@@ -667 +833 @@
-
-  request: function(url) {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    try {
-      this.url = url;
-      if (this.options.method == 'get' && parameters.length > 0)
-        this.url += (this.url.match(/\?/) ? '&' : '?') + parameters;
-
-      Ajax.Responders.dispatch('onCreate', this, this.transport);
-
-options.method
+method.toUpperCase()
-        this.options.asynchronous);
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      }
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    } catch (e) {
-      this.dispatchException(e);
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    try {
-      return this.transport.getResponseHeader(name);
-
+ return null 
-  },
-
-  evalJSON: function() {
-    try {
-
-
+
+
+
-  },
-
@@ -745 +975 @@
-  },
-
-  respondToReadyState: function(readyState) {
-    var event = Ajax.Request.Events[readyState];
-    var transport = this.transport, json = this.evalJSON();
-
-    if (event == 'Complete') {
-      try {
-        (this.options['on' + this.transport.status]
-         || this.options['on' + (this.responseIsSuccess() ? 'Success' : 'Failure')]
-         || Prototype.emptyFunction)(transport, json);
-      } catch (e) {
-        this.dispatchException(e);
-      }
-
-      if ((this.header('Content-type') || '').match(/^text\/javascript/i))
-        this.evalResponse();
-    }
-
-    try {
-      (this.options['on' + event] || Prototype.emptyFunction)(transport, json);
-      Ajax.Responders.dispatch('on' + event, this, transport, json);
-    } catch (e) {
-      this.dispatchException(e);
-    }
-
-    /* Avoid memory leak in MSIE: clean up the oncomplete event handler */
-    if (event == 'Complete')
-      this.transport.onreadystatechange = Prototype.emptyFunction;
-  },
-
-  dispatchException: function(exception) {
-    (this.options.onException || Prototype.emptyFunction)(this, exception);
@@ -784 +985 @@
-Object.extend(Object.extend(Ajax.Updater.prototype, Ajax.Request.prototype), {
-  initialize: function(container, url, options) {
-
-
-
-
+
+
+
-    }
-
@@ -794 +994 @@
-
-    var onComplete = this.options.onComplete || Prototype.emptyFunction;
-object
+param
-      this.updateContent();
-object
+param
-    }).bind(this);
-
@@ -803 +1003 @@
-
-  updateContent: function() {
-
-
+
-    var response = this.transport.responseText;
-
-
-
-
-
-
+
+
+
+
-        new this.options.insertion(receiver, response);
-
-
-
-
-
-
+
+
+
+
+
-      if (this.onComplete)
-        setTimeout(this.onComplete.bind(this), 10);
@@ -847 +1044 @@
-
-  stop: function() {
-
+ptions.o
-    clearTimeout(this.timer);
-    (this.onComplete || Prototype.emptyFunction).apply(this, arguments);
@@ -867 +1064 @@
-  }
-});
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-document.getElementsByClassName = function(className, parentElement) {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    return elements;
-);
-
+
+;
-
-/*--------------------------------------------------------------------------*/
@@ -893 +1108 @@
-
-Element.extend = function(element) {
-
-
+
-
-  if (!element._extended && element.tagName && element != window) {
-
-
+
+
+
+
+
+
+
+
+
+
-      var value = methods[property];
-
+ && !(property in element)
-        element[property] = cache.findOrStore(value);
-    }
@@ -907 +1129 @@
-  element._extended = true;
-  return element;
-
+;
-
-Element.extend.cache = {
@@ -915 +1137 @@
-    }
-  }
-
+;
-
-Element.Methods = {
@@ -922 +1144 @@
-  },
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  },
-
@@ -946 +1163 @@
-    element = $(element);
-    element.parentNode.removeChild(element);
+    return element;
-  },
-
-  update: function(element, html) {
+    html = typeof html == 'undefined' ? '' : html.toString();
-    $(element).innerHTML = html.stripScripts();
-    setTimeout(function() {html.evalScripts()}, 10);
+    return element;
-  },
-
-  replace: function(element, html) {
-    element = $(element);
+    html = typeof html == 'undefined' ? '' : html.toString();
-    if (element.outerHTML) {
-      element.outerHTML = html.stripScripts();
@@ -964 +1185 @@
-    }
-    setTimeout(function() {html.evalScripts()}, 10);
+    return element;
+  },
+
+  inspect: function(element) {
+    element = $(element);
+    var result = '<' + element.tagName.toLowerCase();
+    $H({'id': 'id', 'className': 'class'}).each(function(pair) {
+      var property = pair.first(), attribute = pair.last();
+      var value = (element[property] || '').toString();
+      if (value) result += ' ' + attribute + '=' + value.inspect(true);
+    });
+    return result + '>';
+  },
+
+  recursivelyCollect: function(element, property) {
+    element = $(element);
+    var elements = [];
+    while (element = element[property])
+      if (element.nodeType == 1)
+        elements.push(Element.extend(element));
+    return elements;
+  },
+
+  ancestors: function(element) {
+    return $(element).recursivelyCollect('parentNode');
+  },
+
+  descendants: function(element) {
+    return $A($(element).getElementsByTagName('*'));
+  },
+
+  immediateDescendants: function(element) {
+    if (!(element = $(element).firstChild)) return [];
+    while (element && element.nodeType != 1) element = element.nextSibling;
+    if (element) return [element].concat($(element).nextSiblings());
+    return [];
+  },
+