diff options
| author | Jacob Thornton <jacobthornton@gmail.com> | 2012-01-29 00:08:41 +0400 |
|---|---|---|
| committer | Jacob Thornton <jacobthornton@gmail.com> | 2012-01-29 00:08:41 +0400 |
| commit | 12d3c2fe74bbe2570e47a2c8d7154a3011bd0770 (patch) | |
| tree | 8805a449345adbee6ac434a45bc8b4c2882c959b /js | |
| parent | c2c02d104c5e5a96330cf00a727d62687d863e02 (diff) | |
fix z-index issue with modals for popovers,tooltips,and dropdowns
Diffstat (limited to 'js')
| -rw-r--r-- | js/bootstrap-modal.js | 4 | ||||
| -rw-r--r-- | js/bootstrap-tooltip.js | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js index 91daa8af67..ba64368b2d 100644 --- a/js/bootstrap-modal.js +++ b/js/bootstrap-modal.js @@ -44,6 +44,8 @@ if (this.isShown) return + $('body').addClass('modal-open') + this.isShown = true this.$element.trigger('show') @@ -77,6 +79,8 @@ var that = this this.isShown = false + $('body').removeClass('modal-open') + escape.call(this) this.$element diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js index 67fca5e143..21f2311fb2 100644 --- a/js/bootstrap-tooltip.js +++ b/js/bootstrap-tooltip.js @@ -145,8 +145,6 @@ break } - if (this.options['z-index']) tp['z-index'] = this.options['z-index'] - $tip .css(tp) .addClass(placement) @@ -267,7 +265,6 @@ , trigger: 'hover' , title: '' , template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>' - , 'z-index': false } }( window.jQuery ) |