Fix querySelector/querySelectorAll patch to convert input into a stri…

…ng as browsers do
WebReflection · Jun 21, 2018 · 93925df · 93925df
1 parent 237b406
commit 93925df
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/build/dom4.js b/build/dom4.js
diff --git a/build/dom4.max.js b/build/dom4.max.js
@@ -743,7 +743,7 @@ THE SOFTWARE.
         node.setAttribute(dataScope, null);
         var result = method.call(
           node,
-          css.replace(
+          String(css).replace(
             /(^|,\s*)(:scope([ >]|$))/g,
             function ($0, $1, $2, $3) {
               return $1 + '[' + dataScope + ']' + ($3 || ' ');
@@ -755,7 +755,8 @@ THE SOFTWARE.
       }
     }());
   }
-}(window));(function (global){'use strict';
+}(window));
+(function (global){'use strict';
 
   // a WeakMap fallback for DOM nodes only used as key
   var DOMMap = global.WeakMap || (function () {

diff --git a/src/dom4.js b/src/dom4.js
@@ -721,7 +721,7 @@
         node.setAttribute(dataScope, null);
         var result = method.call(
           node,
-          css.replace(
+          String(css).replace(
             /(^|,\s*)(:scope([ >]|$))/g,
             function ($0, $1, $2, $3) {
               return $1 + '[' + dataScope + ']' + ($3 || ' ');
@@ -733,4 +733,4 @@
       }
     }());
   }
-}(window));
+}(window));
diff --git a/test/dom4.js b/test/dom4.js
@@ -611,6 +611,16 @@ wru.test([
         findInResult(result, div.childNodes[2]) &&
         findInResult(result, div.childNodes[3].childNodes[0])
       );
+
+      // should take any value as a string
+      result = div.querySelectorAll([':scope > p', ':scope li', 'h1', 'div > b']);
+      wru.assert('correct length', result.length === 4);
+      wru.assert('correct results',
+        findInResult(result, div.childNodes[0]) &&
+        findInResult(result, div.childNodes[1]) &&
+        findInResult(result, div.childNodes[2]) &&
+        findInResult(result, div.childNodes[3].childNodes[0])
+      );
     }
   }
-]);
+]);