diff --git a/1.3.0/bootstrap-alerts.js b/1.3.0/bootstrap-alerts.js index 82bcac52..de52da9b 100644 --- a/1.3.0/bootstrap-alerts.js +++ b/1.3.0/bootstrap-alerts.js @@ -18,7 +18,7 @@ * ========================================================== */ -(function( $ ){ +!function( $ ){ /* CSS TRANSITION SUPPORT (https://gist.github.com/373874) * ======================================================= */ @@ -101,4 +101,4 @@ new Alert($('body'), '.alert-message[data-alert] .close') }) -})( window.jQuery || window.ender ) \ No newline at end of file +}( window.jQuery || window.ender ) \ No newline at end of file diff --git a/1.3.0/bootstrap-dropdown.js b/1.3.0/bootstrap-dropdown.js index ca2daf1f..6c2f7030 100644 --- a/1.3.0/bootstrap-dropdown.js +++ b/1.3.0/bootstrap-dropdown.js @@ -18,7 +18,7 @@ * ============================================================ */ -(function( $ ){ +!function( $ ){ var d = 'a.menu, .dropdown-toggle' @@ -47,4 +47,4 @@ }) } -})( window.jQuery || window.ender ) \ No newline at end of file +}( window.jQuery || window.ender ) \ No newline at end of file diff --git a/1.3.0/bootstrap-modal.js b/1.3.0/bootstrap-modal.js index d3e293ca..2335c39d 100644 --- a/1.3.0/bootstrap-modal.js +++ b/1.3.0/bootstrap-modal.js @@ -18,7 +18,7 @@ * ========================================================= */ -(function( $ ){ +!function( $ ){ /* CSS TRANSITION SUPPORT (https://gist.github.com/373874) * ======================================================= */ @@ -85,11 +85,13 @@ .appendTo(document.body) .show() - setTimeout(function () { - that.$element - .addClass('in') - .trigger('shown') - }, 0) + if ($.support.transition && that.$element.hasClass('fade')) { + that.$backdrop[0].offsetWidth // force reflow + } + + that.$element + .addClass('in') + .trigger('shown') }) return this @@ -132,6 +134,8 @@ var that = this , animate = this.$element.hasClass('fade') ? 'fade' : '' if ( this.isShown && this.settings.backdrop ) { + var doAnimate = $.support.transition && animate + this.$backdrop = $('