diff options
Diffstat (limited to 'js')
| -rw-r--r-- | js/bootstrap-affix.js | 2 | ||||
| -rw-r--r-- | js/bootstrap-transition.js | 3 | ||||
| -rw-r--r-- | js/tests/unit/bootstrap-affix.js | 6 |
3 files changed, 2 insertions, 9 deletions
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/bootstrap-transition.js b/js/bootstrap-transition.js index 2f15dd009..c5b2674f3 100644 --- a/js/bootstrap-transition.js +++ b/js/bootstrap-transition.js @@ -36,8 +36,7 @@ , transEndEventNames = { 'WebkitTransition' : 'webkitTransitionEnd' , 'MozTransition' : 'transitionend' - , 'OTransition' : 'otransitionend' - , 'msTransition' : 'MSTransitionEnd' + , 'OTransition' : 'oTransitionEnd otransitionend' , 'transition' : 'transitionend' } , name 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 |