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

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'js/dist/util.js')
-rw-r--r--js/dist/util.js38
1 files changed, 13 insertions, 25 deletions
diff --git a/js/dist/util.js b/js/dist/util.js
index 0cb4b614e0..1bb7fcc31e 100644
--- a/js/dist/util.js
+++ b/js/dist/util.js
@@ -1,37 +1,27 @@
-'use strict';
-
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-beta): util.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
-
var Util = function () {
-
/**
* ------------------------------------------------------------------------
* Private TransitionEnd Helpers
* ------------------------------------------------------------------------
*/
-
var transition = false;
-
var MAX_UID = 1000000;
-
var TransitionEndEvent = {
WebkitTransition: 'webkitTransitionEnd',
MozTransition: 'transitionend',
OTransition: 'oTransitionEnd otransitionend',
- transition: 'transitionend'
+ transition: 'transitionend' // shoutout AngusCroll (https://goo.gl/pxwQGp)
- // shoutout AngusCroll (https://goo.gl/pxwQGp)
- };function toType(obj) {
- return {}.toString.call(obj).match(/\s([a-zA-Z]+)/)[1].toLowerCase();
- }
+ };
- function isElement(obj) {
- return (obj[0] || obj).nodeType;
+ function toType(obj) {
+ return {}.toString.call(obj).match(/\s([a-zA-Z]+)/)[1].toLowerCase();
}
function getSpecialTransitionEndEvent() {
@@ -42,6 +32,7 @@ var Util = function () {
if ($(event.target).is(this)) {
return event.handleObj.handler.apply(this, arguments); // eslint-disable-line prefer-rest-params
}
+
return undefined; // eslint-disable-line no-undefined
}
};
@@ -69,49 +60,45 @@ var Util = function () {
var _this = this;
var called = false;
-
$(this).one(Util.TRANSITION_END, function () {
called = true;
});
-
setTimeout(function () {
if (!called) {
Util.triggerTransitionEnd(_this);
}
}, duration);
-
return this;
}
function setTransitionEndSupport() {
transition = transitionEndTest();
-
$.fn.emulateTransitionEnd = transitionEndEmulator;
if (Util.supportsTransitionEnd()) {
$.event.special[Util.TRANSITION_END] = getSpecialTransitionEndEvent();
}
}
-
/**
* --------------------------------------------------------------------------
* Public Util Api
* --------------------------------------------------------------------------
*/
- var Util = {
+ var Util = {
TRANSITION_END: 'bsTransitionEnd',
-
getUID: function getUID(prefix) {
do {
// eslint-disable-next-line no-bitwise
prefix += ~~(Math.random() * MAX_UID); // "~~" acts like a faster Math.floor() here
} while (document.getElementById(prefix));
+
return prefix;
},
getSelectorFromElement: function getSelectorFromElement(element) {
var selector = element.getAttribute('data-target');
+
if (!selector || selector === '#') {
selector = element.getAttribute('href') || '';
}
@@ -132,23 +119,24 @@ var Util = function () {
supportsTransitionEnd: function supportsTransitionEnd() {
return Boolean(transition);
},
+ isElement: function isElement(obj) {
+ return (obj[0] || obj).nodeType;
+ },
typeCheckConfig: function typeCheckConfig(componentName, config, configTypes) {
for (var property in configTypes) {
if (Object.prototype.hasOwnProperty.call(configTypes, property)) {
var expectedTypes = configTypes[property];
var value = config[property];
- var valueType = value && isElement(value) ? 'element' : toType(value);
+ var valueType = value && Util.isElement(value) ? 'element' : toType(value);
if (!new RegExp(expectedTypes).test(valueType)) {
- throw new Error(componentName.toUpperCase() + ': ' + ('Option "' + property + '" provided type "' + valueType + '" ') + ('but expected type "' + expectedTypes + '".'));
+ throw new Error(componentName.toUpperCase() + ": " + ("Option \"" + property + "\" provided type \"" + valueType + "\" ") + ("but expected type \"" + expectedTypes + "\"."));
}
}
}
}
};
-
setTransitionEndSupport();
-
return Util;
}(jQuery);
//# sourceMappingURL=util.js.map \ No newline at end of file