From 76cfe1700248cd3c7086333b67050f418a897a03 Mon Sep 17 00:00:00 2001
From: Aleksey V Zapparov <ixti@member.fsf.org>
Date: Mon, 23 Jul 2012 20:55:27 +0200
Subject: Fix transition end name for opera 11+12

Fix transition end name for Opera 11 and Opera 12.
Should fix issues: #3896, #3897, #4157, #4158
---
 js/bootstrap-transition.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js')

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'
             }
-- 
cgit v1.2.3


From 614d52bd7f86591a0b0ab09e1c16ee888610d8a3 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Mon, 23 Jul 2012 18:17:43 -0700
Subject: delete this test for now - as affix is still heavily underdevelopment

---
 js/bootstrap-affix.js            | 2 +-
 js/tests/unit/bootstrap-affix.js | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'js')

diff --git a/js/bootstrap-affix.js b/js/bootstrap-affix.js
index a1cd10933..7563029b1 100644
--- a/js/bootstrap-affix.js
+++ b/js/bootstrap-affix.js
@@ -88,7 +88,7 @@
     $('[data-spy="affix"]').each(function () {
       var $spy = $(this)
         , data = $spy.data()
-  
+
       data.offset = data.offset || {}
 
       data.offsetX && (data.offset.x = data.offsetX)
diff --git a/js/tests/unit/bootstrap-affix.js b/js/tests/unit/bootstrap-affix.js
index 2d4419def..bc25df991 100644
--- a/js/tests/unit/bootstrap-affix.js
+++ b/js/tests/unit/bootstrap-affix.js
@@ -16,10 +16,4 @@ $(function () {
         ok(!$affix.hasClass('affix'), 'affix class was not added')
       })
 
-      test("should add affix class if scrolled to correct position", function () {
-        var $affix = $('<div></div>').appendTo('body').affix()
-        $('body').trigger('scroll')
-        ok($affix.hasClass('affix'), 'element has class affix')
-      })
-
 })
\ No newline at end of file
-- 
cgit v1.2.3


From 2a0cf0f1312ff9edf96bed047758eb6e295b18ff Mon Sep 17 00:00:00 2001
From: Jonathan Sampson <jjdsampson@gmail.com>
Date: Tue, 24 Jul 2012 01:50:38 -0400
Subject: IE10 uses 'transition' and 'transitionend'

msTransition, while supported in IE, should be ignored in favor of the
unprefixed property. Additionally, MSTransitionEnd should also be
ignored in favor of the unprefixed event transitionend.

Current unit test requires no attention in light of this change.

MSDN:
http://msdn.microsoft.com/en-us/library/ie/hh673535(v=vs.85).aspx#transitions_dom_events
---
 js/bootstrap-transition.js | 1 -
 1 file changed, 1 deletion(-)

(limited to 'js')

diff --git a/js/bootstrap-transition.js b/js/bootstrap-transition.js
index 0c37ebb18..c5b2674f3 100644
--- a/js/bootstrap-transition.js
+++ b/js/bootstrap-transition.js
@@ -37,7 +37,6 @@
                'WebkitTransition' : 'webkitTransitionEnd'
             ,  'MozTransition'    : 'transitionend'
             ,  'OTransition'      : 'oTransitionEnd otransitionend'
-            ,  'msTransition'     : 'MSTransitionEnd'
             ,  'transition'       : 'transitionend'
             }
           , name
-- 
cgit v1.2.3