Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap-rubygem.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'assets/javascripts/bootstrap/util.js')
-rw-r--r--assets/javascripts/bootstrap/util.js39
1 files changed, 18 insertions, 21 deletions
diff --git a/assets/javascripts/bootstrap/util.js b/assets/javascripts/bootstrap/util.js
index 9eb542a..f51988e 100644
--- a/assets/javascripts/bootstrap/util.js
+++ b/assets/javascripts/bootstrap/util.js
@@ -1,24 +1,17 @@
/**
* --------------------------------------------------------------------------
- * Bootstrap (v4.0.0-beta.2): util.js
+ * Bootstrap (v4.0.0-beta.3): util.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
-var Util = function () {
+var Util = function ($) {
/**
* ------------------------------------------------------------------------
* Private TransitionEnd Helpers
* ------------------------------------------------------------------------
*/
var transition = false;
- var MAX_UID = 1000000;
- var TransitionEndEvent = {
- WebkitTransition: 'webkitTransitionEnd',
- MozTransition: 'transitionend',
- OTransition: 'oTransitionEnd otransitionend',
- transition: 'transitionend' // shoutout AngusCroll (https://goo.gl/pxwQGp)
-
- };
+ var MAX_UID = 1000000; // shoutout AngusCroll (https://goo.gl/pxwQGp)
function toType(obj) {
return {}.toString.call(obj).match(/\s([a-zA-Z]+)/)[1].toLowerCase();
@@ -43,17 +36,9 @@ var Util = function () {
return false;
}
- var el = document.createElement('bootstrap');
-
- for (var name in TransitionEndEvent) {
- if (typeof el.style[name] !== 'undefined') {
- return {
- end: TransitionEndEvent[name]
- };
- }
- }
-
- return false;
+ return {
+ end: 'transitionend'
+ };
}
function transitionEndEmulator(duration) {
@@ -79,6 +64,13 @@ var Util = function () {
$.event.special[Util.TRANSITION_END] = getSpecialTransitionEndEvent();
}
}
+
+ 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;
+ }
/**
* --------------------------------------------------------------------------
* Public Util Api
@@ -101,6 +93,11 @@ var Util = function () {
if (!selector || selector === '#') {
selector = element.getAttribute('href') || '';
+ } // if it's an ID
+
+
+ if (selector.charAt(0) === '#') {
+ selector = escapeId(selector);
}
try {