Changeset 5743

Timestamp:

06/21/2007 10:01:21 PM (17 years ago)

Author:

markjaquith

Message:

Upgrade to Prototype 1.5.1.1 (bugfix release). Props Nazgul. fixes #4502

Location:

trunk/wp-includes

Files:

• js/prototype.js (modified) (5 diffs)
• script-loader.php (modified) (1 diff)

trunk/wp-includes/js/prototype.js

@@ -1 @@
-/*  Prototype JavaScript framework, version 1.5.1
+/*  Prototype JavaScript framework, version 1.5.1.1
  *  (c) 2005-2007 Sam Stephenson
  *
@@ -8 +8 @@
 
 var Prototype = {
-  Version: '1.5.1',
+  Version: '1.5.1.1',
 
   Browser: {
@@ -25 +25 @@
   },
 
-  ScriptFragment: '<script[^>]*>([\\s\\S]*?)<\/script>', 
-  JSONFilter: /^\/\*-secure-\s*(.*)\s*\*\/\s*$/,
+  ScriptFragment: '<script[^>]*>([\\S\\s]*?)<\/script>',
+  JSONFilter: /^\/\*-secure-([\s\S]*)\*\/\s*$/,
 
   emptyFunction: function() { },
@@ -365 +365 @@
   },
 
+  isJSON: function() {
+    var str = this.replace(/\\./g, '@').replace(/"[^"\\\n\r]*"/g, '');
+    return (/^[,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t]*$/).test(str);
+  },
+
   evalJSON: function(sanitize) {
     var json = this.unfilterJSON();
     try {
-      if (!sanitize || (/^("(\\.|[^"\\\n\r])*?"|[,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t])+?$/.test(json)))
-        return eval('(' + json + ')');
+      if (!sanitize || json.isJSON()) return eval('(' + json + ')');
     } catch (e) { }
     throw new SyntaxError('Badly formed JSON string: ' + this.inspect());
@@ -1271 +1275 @@
 } else document.getElementsByClassName = function(className, parentElement) {
   var children = ($(parentElement) || document.body).getElementsByTagName('*');
-  var elements = [], child;
+  var elements = [], child, pattern = new RegExp("(^|\\s)" + className + "(\\s|$)");
   for (var i = 0, length = children.length; i < length; i++) {
     child = children[i];
-    if (Element.hasClassName(child, className))
+    var elementClassName = child.className;
+    if (elementClassName.length == 0) continue;
+    if (elementClassName == className || elementClassName.match(pattern))
       elements.push(Element.extend(child));
   }

trunk/wp-includes/script-loader.php

@@ -36 +36 @@
         $this->add( 'wp_tiny_mce', $mce_config, array('tiny_mce'), '20070528' );
 
-        $this->add( 'prototype', '/wp-includes/js/prototype.js', false, '1.5.1');
+        $this->add( 'prototype', '/wp-includes/js/prototype.js', false, '1.5.1.1');
 
         $this->add( 'autosave', '/wp-includes/js/autosave.js', array('prototype', 'sack'), '20070306');