Handle non-elements, like text nodes

94bcba74 · JC Brand · 9c812157 · 94bcba74 · 94bcba74
Commit 94bcba74 authored Dec 17, 2018 by JC Brand
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

dist/converse.js dist/converse.js +2 -1

src/headless/utils/core.js src/headless/utils/core.js +3 -2

No files found.
--- a/dist/converse.js
+++ b/dist/converse.js
@@ -69716,7 +69716,8 @@ u.matchesSelector = function (el, selector) {
   *      (DOMElement) el - The DOM element
   *      (String) selector - The selector
   */
-  return (el.matches || el.matchesSelector || el.msMatchesSelector || el.mozMatchesSelector || el.webkitMatchesSelector || el.oMatchesSelector).call(el, selector);
+  const match = el.matches || el.matchesSelector || el.msMatchesSelector || el.mozMatchesSelector || el.webkitMatchesSelector || el.oMatchesSelector;
+  return match ? match.call(el, selector) : false;
 };

 u.queryChildren = function (el, selector) {
--- a/src/headless/utils/core.js
+++ b/src/headless/utils/core.js
@@ -179,14 +179,15 @@ u.matchesSelector = function (el, selector) {
     *      (DOMElement) el - The DOM element
     *      (String) selector - The selector
     */
-    return (
+    const match = (
        el.matches ||
        el.matchesSelector ||
        el.msMatchesSelector ||
        el.mozMatchesSelector ||
        el.webkitMatchesSelector ||
        el.oMatchesSelector
-    ).call(el, selector);
+    );
+    return match ? match.call(el, selector) : false;
 };

 u.queryChildren = function (el, selector) {