Changeset 6644

Timestamp:

05/01/07 04:19:46 (3 years ago)

Author:

sam

Message:

prototype: Merge -r6639:HEAD from branches/rel_1-5-1 into trunk.

Files:

• spinoffs/prototype/trunk/CHANGELOG (modified) (1 diff)
• spinoffs/prototype/trunk/src/base.js (modified) (1 diff)
• spinoffs/prototype/trunk/src/selector.js (modified) (1 diff)
• spinoffs/prototype/trunk/test/unit/selector.html (modified) (1 diff)

spinoffs/prototype/trunk/CHANGELOG

@@ -3 +3 @@
-* Add Function#curry, Function#delay, Function#defer, and Function#wrap.  Closes #8134.  [Andrew Dupont, Tobie Langel, sam]
-
-
+
+
+
+
+
-
-*1.5.1_rc4* (April 27, 2007)

spinoffs/prototype/trunk/src/base.js

@@ -78 +78 @@
-    var __method = this, args = $A(arguments), object = args.shift();
-    return function(event) {
-(event || window.event)].concat(args).concat($A(arguments)
+event || window.event].concat(args
-    }
-  },

spinoffs/prototype/trunk/src/selector.js

@@ -219 +219 @@
-    id:           /^#([\w\-\*]+)(\b|$)/,
-    className:    /^\.([\w\-\*]+)(\b|$)/,
-
+|(?=:)
-    attrPresence: /^\[([\w]+)\]/,
-    attr:         /\[((?:[\w-]*:)?[\w-]+)\s*(?:([!^$*~|]?=)\s*((['"])([^\]]*?)\4|([^'"][^\]]*?)))?\]/

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

@@ -325 +325 @@
-      assertEnumEqual([$('link_2')], $$('#p a:not(a[rel$=nofollow])'), 'attribute 3');
-      assertEnumEqual([$('em')], $$('#p a:not(a[rel$="nofollow"]) > em'), 'attribute 4')
+      assertEnumEqual([$('item_2')], $$('#list li:not(#item_1):not(#item_3)'), 'adjacent :not clauses');
-    }},
-