diff options
| author | Mark Otto <[email protected]> | 2012-01-28 12:43:45 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-28 12:43:45 -0800 |
| commit | 698d4b414c234f74ae93384a8d83c14c15ab2cc9 (patch) | |
| tree | cc4e20b82963c0e51c2df122d24eaa9afee33aae /js | |
| parent | 2bfda031cebcde7361797dd54badeb91d4cb98cf (diff) | |
| parent | f768242759903151c9957a493c5349f931d882ef (diff) | |
| download | bootstrap-698d4b414c234f74ae93384a8d83c14c15ab2cc9.tar.xz bootstrap-698d4b414c234f74ae93384a8d83c14c15ab2cc9.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
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 91daa8af6..ba64368b2 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 67fca5e14..21f2311fb 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 ) |