diff options
| author | Mark Otto <[email protected]> | 2013-12-18 13:06:47 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-18 13:06:47 -0800 |
| commit | 5bba8744679ddead8673c003997410c71fc47000 (patch) | |
| tree | 7cb520f428a788652871240a19a9fcc401ecf9f6 /js/transition.js | |
| parent | 6315043b1c11c6391f155e0c7299783a13cfee74 (diff) | |
| parent | 3f577ab86c4e07493d5d24f5fdd3dba30c199400 (diff) | |
| download | bootstrap-5bba8744679ddead8673c003997410c71fc47000.tar.xz bootstrap-5bba8744679ddead8673c003997410c71fc47000.zip | |
Merge branch 'master' into docs_derp
Diffstat (limited to 'js/transition.js')
| -rw-r--r-- | js/transition.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/js/transition.js b/js/transition.js index 5be3b01d4..1a842eb28 100644 --- a/js/transition.js +++ b/js/transition.js @@ -27,10 +27,10 @@ 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) { |