From f37b351288883cca4ea435827b10fe6d8475dc6e Mon Sep 17 00:00:00 2001 From: fat Date: Thu, 16 May 2013 18:15:34 -0700 Subject: [PATCH] only overlay dropdowns for mobile --- docs/assets/js/bootstrap.js | 28 ++++++++++++++++------------ docs/assets/js/bootstrap.min.js | 2 +- docs/assets/js/collapse.js | 4 ++-- docs/assets/js/dropdown.js | 6 +++++- docs/assets/js/modal.js | 2 +- docs/assets/js/tooltip.js | 16 ++++++++-------- js/dropdown.js | 6 +++++- 7 files changed, 38 insertions(+), 26 deletions(-) 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) { - $('