aboutsummaryrefslogtreecommitdiffstats
path: root/src/selector
diff options
context:
space:
mode:
authorJohn Resig <jeresig@gmail.com>2007-05-01 21:31:26 +0000
committerJohn Resig <jeresig@gmail.com>2007-05-01 21:31:26 +0000
commitc512984303f3d2148c4a755ccb1f41bfcbcf9527 (patch)
treee3540a6f338e6c4f750bc0447610782be05cc6b7 /src/selector
parentc0cc8edd5dc9742291dcf353e31fe02125146793 (diff)
downloadjquery-c512984303f3d2148c4a755ccb1f41bfcbcf9527.tar.gz
jquery-c512984303f3d2148c4a755ccb1f41bfcbcf9527.zip
We're not adding new selector features in until a new full release. Please discuss features like this in the dev mailing list, and in the bug tracker, before committing code.
Diffstat (limited to 'src/selector')
-rw-r--r--src/selector/selector.js5
-rw-r--r--src/selector/selectorTest.js5
2 files changed, 2 insertions, 8 deletions
diff --git a/src/selector/selector.js b/src/selector/selector.js
index 472b4ab35..863148aa1 100644
--- a/src/selector/selector.js
+++ b/src/selector/selector.js
@@ -56,9 +56,6 @@ jQuery.extend({
"$=": "z&&z.substr(z.length - m[4].length,m[4].length)==m[4]",
"*=": "z&&z.indexOf(m[4])>=0",
"": "z",
- // these are for evaling in a regexp.
- "=~": "eval(m[4]).test(z)",
- "!~": "!eval(m[4]).test(z)",
_resort: function(m){
return ["", m[1], m[3], m[2], m[5]];
},
@@ -70,7 +67,7 @@ jQuery.extend({
// The regular expressions that power the parsing engine
parse: [
// Match: [@value='test'], [@foo]
- /^\[ *(@)([\w-]+) *([!*$^=!~]*) *('?"?)(.*?)\4 *\]/,
+ /^\[ *(@)([\w-]+) *([!*$^=]*) *('?"?)(.*?)\4 *\]/,
// Match: [div], [div p]
/^(\[)\s*(.*?(\[.*?\])?[^[]*?)\s*\]/,
diff --git a/src/selector/selectorTest.js b/src/selector/selectorTest.js
index 2a00b5c79..6cea55bcd 100644
--- a/src/selector/selectorTest.js
+++ b/src/selector/selectorTest.js
@@ -181,7 +181,7 @@ test("pseudo (:) selectors", function() {
});
test("basic xpath", function() {
- expect(18);
+ expect(15);
ok( jQuery.find("//*").length >= 30, "All Elements (//*)" );
t( "All Div Elements", "//div", ["main","foo"] );
t( "Absolute Path", "/html/body", ["body"] );
@@ -192,9 +192,6 @@ test("basic xpath", function() {
t( "All Children, Implicit", "//code/", ["anchor1","anchor2"] );
t( "Attribute Exists", "//a[@title]", ["google"] );
t( "Attribute Equals", "//a[@rel='bookmark']", ["simon1"] );
- t( "Attribute RegExp", "//a[@rel=~/BooKmaRk/i]", ["simon1"] );
- t( "Attribute RegExp w/enclosed braces", "//a[@rel=~/B[okm]+aRk/i]", ["simon1"] );
- t( "Attribute Inverse RegExp", "//a[@id!~/mon/]", ["google","groups","anchor1","mark","yahoo","anchor2"] );
t( "Parent Axis", "//p/..", ["main","foo"] );
t( "Sibling Axis", "//p/../", ["firstp","ap","foo","first","firstUL","empty","form","floatTest","iframe","lengthtest","sndp","en","sap"] );
t( "Sibling Axis", "//p/../*", ["firstp","ap","foo","first","firstUL","empty","form","floatTest","iframe","lengthtest","sndp","en","sap"] );