mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-17 02:54:01 +02:00
Code Issues Releases Wiki Activity

js grunt

Browse Source
This commit is contained in:
Mark Otto
2015-08-18 20:28:28 -07:00
parent 1c19ded8c1
commit 3dd48b8d47
21 changed files with 97 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
js/dist/collapse.js vendored
View File

@@ -175,7 +175,8 @@ var Collapse = (function ($) {
return;
}
var scrollSize = 'scroll' + (dimension[0].toUpperCase() + dimension.slice(1));
var capitalizedDimension = dimension[0].toUpperCase() + dimension.slice(1);
var scrollSize = 'scroll' + capitalizedDimension;
$(this._element).one(Util.TRANSITION_END, complete).emulateTransitionEnd(TRANSITION_DURATION);
@@ -221,7 +222,8 @@ var Collapse = (function ($) {
this._element.style[dimension] = 0;
if (!Util.supportsTransitionEnd()) {
return complete();
complete();
return;
}
$(this._element).one(Util.TRANSITION_END, complete).emulateTransitionEnd(TRANSITION_DURATION);
@@ -249,7 +251,7 @@ var Collapse = (function ($) {
key: '_getConfig',
value: function _getConfig(config) {
config = $.extend({}, Default, config);
config.toggle = !!config.toggle; // coerce string values
config.toggle = Boolean(config.toggle); // coerce string values
Util.typeCheckConfig(NAME, config, DefaultType);
return config;
}
@@ -335,7 +337,6 @@ var Collapse = (function ($) {
event.preventDefault();
var target = Collapse._getTargetFromElement(this);
var data = $(target).data(DATA_KEY);
var config = data ? 'toggle' : $(this).data();