aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author♒∆✝ <[email protected]>2012-07-23 17:58:38 -0700
committer♒∆✝ <[email protected]>2012-07-23 17:58:38 -0700
commit685785d2c2d0f6b61978e9fd76aed82de7e05aba (patch)
tree72e30743615c6236bdfeec9913d1fc837d577df3
parente25bcb93fca98797629e689f11dba5f20432714a (diff)
parent76cfe1700248cd3c7086333b67050f418a897a03 (diff)
downloadbootstrap-685785d2c2d0f6b61978e9fd76aed82de7e05aba.tar.xz
bootstrap-685785d2c2d0f6b61978e9fd76aed82de7e05aba.zip
Merge pull request #4159 from ixti/opera11-transitions-fix
Fix transition end name for opera 11+12
-rw-r--r--js/bootstrap-transition.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/bootstrap-transition.js b/js/bootstrap-transition.js
index 2f15dd009..0c37ebb18 100644
--- a/js/bootstrap-transition.js
+++ b/js/bootstrap-transition.js
@@ -36,7 +36,7 @@
, transEndEventNames = {
'WebkitTransition' : 'webkitTransitionEnd'
, 'MozTransition' : 'transitionend'
- , 'OTransition' : 'otransitionend'
+ , 'OTransition' : 'oTransitionEnd otransitionend'
, 'msTransition' : 'MSTransitionEnd'
, 'transition' : 'transitionend'
}