From 045888fa3887f5e65658499da11c8ad737222759 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Fri, 6 Jan 2017 08:38:04 -0800
Subject: version bump

---
 js/src/util.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/src/util.js')

diff --git a/js/src/util.js b/js/src/util.js
index 06424fbfe..515eba6d9 100644
--- a/js/src/util.js
+++ b/js/src/util.js
@@ -1,6 +1,6 @@
 /**
  * --------------------------------------------------------------------------
- * Bootstrap (v4.0.0-alpha.5): util.js
+ * Bootstrap (v4.0.0-alpha.6): util.js
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * --------------------------------------------------------------------------
  */
-- 
cgit v1.2.3


From f2f2e39a45039658c3ed7a39af834ca8dd802bdc Mon Sep 17 00:00:00 2001
From: Johann <johann.servoire@gmail.com>
Date: Sun, 19 Mar 2017 01:42:11 +0100
Subject: Fix getSelectorFromElement when # is a selector (#21615)

* Fix getSelectorFromElement when # is a selector

* Thanks to @vanduynslagerp remove regex to validate selector
---
 js/src/util.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'js/src/util.js')

diff --git a/js/src/util.js b/js/src/util.js
index 515eba6d9..3c0d02251 100644
--- a/js/src/util.js
+++ b/js/src/util.js
@@ -112,13 +112,16 @@ const Util = (($) => {
 
     getSelectorFromElement(element) {
       let selector = element.getAttribute('data-target')
-
-      if (!selector) {
+      if (!selector || selector === '#') {
         selector = element.getAttribute('href') || ''
-        selector = /^#[a-z]/i.test(selector) ? selector : null
       }
 
-      return selector
+      try {
+        const $selector = $(selector)
+        return $selector.length > 0 ? selector : null
+      } catch (error) {
+        return null
+      }
     },
 
     reflow(element) {
-- 
cgit v1.2.3