diff options
| author | Mark Otto <[email protected]> | 2014-03-09 16:11:04 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-03-09 16:11:04 -0700 |
| commit | b263a0197be84f4018c124b738e07e35c42d493f (patch) | |
| tree | c689aa917b65ee0ce661e52dc6388aab7e27a64a /dist | |
| parent | 2f7b04a192f271f63e83db9e2e6322b63abff252 (diff) | |
| parent | 68b3e3f3be1d326474a7f3d2fbc82f349f7815fc (diff) | |
| download | bootstrap-b263a0197be84f4018c124b738e07e35c42d493f.tar.xz bootstrap-b263a0197be84f4018c124b738e07e35c42d493f.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
Gruntfile.js
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/js/bootstrap.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index 10ce289be..e389c1960 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -25,10 +25,10 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re var el = document.createElement('bootstrap') var transEndEventNames = { - 'WebkitTransition' : 'webkitTransitionEnd', - 'MozTransition' : 'transitionend', - 'OTransition' : 'oTransitionEnd otransitionend', - 'transition' : 'transitionend' + WebkitTransition : 'webkitTransitionEnd', + MozTransition : 'transitionend', + OTransition : 'oTransitionEnd otransitionend', + transition : 'transitionend' } for (var name in transEndEventNames) { |