Changeset 1338

Timestamp:

11/12/07 22:22:58 (6 years ago)

Author:

amachang

Message:

lang/javascript/javascript-xpath/trunk: Release 0.1.3

Location:

lang/javascript/javascript-xpath/trunk

Files:

• ChangeLog (modified) (1 diff)
• release/javascript-xpath-0.1.3.js (added)
• release/javascript-xpath-latest.js (modified) (4 diffs)
• src/functionCall.js (modified) (2 diffs)
• src/pathExpr.js (modified) (1 diff)
• version.txt (modified) (1 diff)

lang/javascript/javascript-xpath/trunk/ChangeLog

@@ +1 @@
+== 0.1.3 / 2007-11-12  amachang <seijro@gmail.com>
+
+        * fix Opera's substring problem
+        * fix Safari2's element.contains problem
+
 == 0.1.2 / 2007-11-12  amachang <seijro@gmail.com>
 

lang/javascript/javascript-xpath/trunk/release/javascript-xpath-latest.js

@@ -1 @@
-/*  JavaScript-XPath 0.1.2
+/*  JavaScript-XPath 0.1.3
  *  (c) 2007 Cybozu Labs, Inc.
  *
@@ -684 +684 @@
         if (!step.needContextPosition && step.axis == 'following') {
             for (node = iter(); next = iter(); node = next) {
-                try { if (!node.contains(next)) break }
-                catch(e) { if (!(next.compareDocumentPosition(node) & 8)) break }
+
+                // Safari 2 node.contains problem
+                if (uai.applewebkit4) {
+                    var contains = false;
+                    var ancestor = next;
+                    do {
+                        if (ancestor == node) {
+                            contains = true;
+                            break;
+                        }
+                    } while (ancestor = ancestor.parentNode);
+                    if (!contains) break;
+                }
+                else {
+                    try { if (!node.contains(next)) break }
+                    catch(e) { if (!(next.compareDocumentPosition(node) & 8)) break }
+                }
             }
             nodeset = step.evaluate(new Ctx(node));
@@ -1854 +1869 @@
 
     substring: [function(s, n1, n2) {
+        var a1, a2;
         s = s.string(this);
         n1 = n1.number(this);
@@ -1869 +1885 @@
         n1 = Math.round(n1);
         n2 = Math.round(n2);
-        return s.substring(n1 - 1, n1 + n2 - 1)
+        a1 = n1 - 1;
+        a2 = n1 + n2 - 1;
+        if (a2 == Infinity) {
+            return s.substring(a1 < 0 ? 0 : a1);
+        }
+        else {
+            return s.substring(a1 < 0 ? 0 : a1, a2)
+        }
     }, 'string', false, []],
 

lang/javascript/javascript-xpath/trunk/src/functionCall.js

@@ -196 +196 @@
 
     substring: [function(s, n1, n2) {
+        var a1, a2;
         s = s.string(this);
         n1 = n1.number(this);
@@ -211 +212 @@
         n1 = Math.round(n1);
         n2 = Math.round(n2);
-        return s.substring(n1 - 1, n1 + n2 - 1)
+        a1 = n1 - 1;
+        a2 = n1 + n2 - 1;
+        if (a2 == Infinity) {
+            return s.substring(a1 < 0 ? 0 : a1);
+        }
+        else {
+            return s.substring(a1 < 0 ? 0 : a1, a2)
+        }
     }, 'string', false, []],
 

lang/javascript/javascript-xpath/trunk/src/pathExpr.js

@@ -77 +77 @@
         if (!step.needContextPosition && step.axis == 'following') {
             for (node = iter(); next = iter(); node = next) {
-                try { if (!node.contains(next)) break }
-                catch(e) { if (!(next.compareDocumentPosition(node) & 8)) break }
+
+                // Safari 2 node.contains problem
+                if (uai.applewebkit4) {
+                    var contains = false;
+                    var ancestor = next;
+                    do {
+                        if (ancestor == node) {
+                            contains = true;
+                            break;
+                        }
+                    } while (ancestor = ancestor.parentNode);
+                    if (!contains) break;
+                }
+                else {
+                    try { if (!node.contains(next)) break }
+                    catch(e) { if (!(next.compareDocumentPosition(node) & 8)) break }
+                }
             }
             nodeset = step.evaluate(new Ctx(node));

lang/javascript/javascript-xpath/trunk/version.txt

@@ -1 @@
-0.1.2
+0.1.3