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:
authorMark Otto <markdotto@gmail.com>2015-08-19 06:28:28 +0300
committerMark Otto <markdotto@gmail.com>2015-08-19 06:28:28 +0300
commit3dd48b8d475f727cb5aa63b09388a3a3553629be (patch)
tree2eb043bf46073141674c106672ee0ac77614c1aa /js/dist/util.js
parent1c19ded8c14cc9caca8ca2992834e2900dbbb4e5 (diff)
js grunt
Diffstat (limited to 'js/dist/util.js')
-rw-r--r--js/dist/util.js37
1 files changed, 21 insertions, 16 deletions
diff --git a/js/dist/util.js b/js/dist/util.js
index a2ae5f299a..934bad697a 100644
--- a/js/dist/util.js
+++ b/js/dist/util.js
@@ -1,4 +1,3 @@
-
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0): util.js
@@ -53,9 +52,9 @@ var Util = (function ($) {
var el = document.createElement('bootstrap');
- for (var name in TransitionEndEvent) {
- if (el.style[name] !== undefined) {
- return { end: TransitionEndEvent[name] };
+ for (var _name in TransitionEndEvent) {
+ if (el.style[_name] !== undefined) {
+ return { end: TransitionEndEvent[_name] };
}
}
@@ -101,7 +100,9 @@ var Util = (function ($) {
TRANSITION_END: 'bsTransitionEnd',
getUID: function getUID(prefix) {
- do { prefix += ~ ~(Math.random() * 1000000); } while (document.getElementById(prefix));
+ do {
+ prefix += ~ ~(Math.random() * 1000000);
+ } while (document.getElementById(prefix));
return prefix;
},
@@ -125,24 +126,28 @@ var Util = (function ($) {
},
supportsTransitionEnd: function supportsTransitionEnd() {
- return !!transition;
+ return Boolean(transition);
},
typeCheckConfig: function typeCheckConfig(componentName, config, configTypes) {
-
for (var property in configTypes) {
- var expectedTypes = configTypes[property];
- var value = config[property];
- var valueType = undefined;
-
- if (value && isElement(value)) valueType = 'element';else valueType = toType(value);
-
- if (!new RegExp(expectedTypes).test(valueType)) {
- throw new Error(componentName.toUpperCase() + ': ' + ('Option "' + property + '" provided type "' + valueType + '" ') + ('but expected type "' + expectedTypes + '".'));
+ if (configTypes.hasOwnProperty(property)) {
+ var expectedTypes = configTypes[property];
+ var value = config[property];
+ var valueType = undefined;
+
+ if (value && isElement(value)) {
+ valueType = 'element';
+ } else {
+ valueType = toType(value);
+ }
+
+ if (!new RegExp(expectedTypes).test(valueType)) {
+ throw new Error(componentName.toUpperCase() + ': ' + ('Option "' + property + '" provided type "' + valueType + '" ') + ('but expected type "' + expectedTypes + '".'));
+ }
}
}
}
-
};
setTransitionEndSupport();