From: fat Date: Fri, 17 May 2013 01:15:34 +0000 (-0700) Subject: only overlay dropdowns for mobile X-Git-Tag: v3.0.0-rc1~350 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f37b351288883cca4ea435827b10fe6d8475dc6e;p=thirdparty%2Fbootstrap.git only overlay dropdowns for mobile --- diff --git a/docs/assets/js/bootstrap.js b/docs/assets/js/bootstrap.js index a8501d592d..6fa1d6d2cb 100644 --- a/docs/assets/js/bootstrap.js +++ b/docs/assets/js/bootstrap.js @@ -507,7 +507,7 @@ } this.$element[dimension](0) - this.transition('addClass', $.Event('bs:collapse:show'), 'shown') + this.transition('addClass', $.Event('bs:collapse:show'), 'bs:collapse:shown') if ($.support.transition) this.$element[dimension](this.$element[0][scroll]) } @@ -536,7 +536,7 @@ Collapse.prototype.transition = function (method, startEvent, completeEvent) { var that = this var complete = function () { - if (startEvent.type == 'show') that.reset() + if (startEvent.type == 'bs:collapse:show') that.reset() that.transitioning = 0 that.$element.trigger(completeEvent) } @@ -647,7 +647,10 @@ clearMenus() if (!isActive) { - $('