Escape ID in Util.getSelectorFromElement (#24700)

1 files changed, 13 insertions, 0 deletions

diff --git a/js/src/util.js b/js/src/util.js
index 71f93a7c50..ef2cc3c57f 100644
--- a/js/src/util.js
+++ b/js/src/util.js
@@ -87,6 +87,14 @@ const Util = (($) => {
     }
   }
 
+  function escapeId(selector) {
+    // we escape IDs in case of special selectors (selector = '#myId:something')
+    // $.escapeSelector does not exist in jQuery < 3
+    selector = typeof $.escapeSelector === 'function' ? $.escapeSelector(selector).substr(1) :
+      selector.replace(/(:|\.|\[|\]|,|=|@)/g, '\\$1')
+
+    return selector
+  }
 
   /**
    * --------------------------------------------------------------------------
@@ -112,6 +120,11 @@ const Util = (($) => {
         selector = element.getAttribute('href') || ''
       }
 
+      // if it's an ID
+      if (selector.charAt(0) === '#') {
+        selector = escapeId(selector)
+      }
+
       try {
         const $selector = $(document).find(selector)
         return $selector.length > 0 ? selector : null