From 19890e928d266d84995d2ee1fd5e47cf78554678 Mon Sep 17 00:00:00 2001 From: Brett O'Donnell Date: Sun, 8 Jun 2014 13:07:02 +0930 Subject: [PATCH 1/2] prevent page jerking due to scrollbars --- css/bootstrap-modal.css | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/css/bootstrap-modal.css b/css/bootstrap-modal.css index 76e3be2..f42c290 100644 --- a/css/bootstrap-modal.css +++ b/css/bootstrap-modal.css @@ -10,7 +10,12 @@ .modal-open { overflow: hidden; } - +.modal-open body { + overflow-y:scroll; +} +.modal-open .navbar-fixed-top, .modal-open .navbar-fixed-bottom { + left: -17px; +} /* add a scroll bar to stop page from jerking around */ .modal-open.page-overflow .page-container, From 576e1ce103a772a7e659c0ef03c850355001bb35 Mon Sep 17 00:00:00 2001 From: Brett O'Donnell Date: Sun, 8 Jun 2014 13:09:48 +0930 Subject: [PATCH 2/2] prevent page jerking due to scrollbars --- js/bootstrap-modalmanager.js | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/js/bootstrap-modalmanager.js b/js/bootstrap-modalmanager.js index c966515..ab974e7 100644 --- a/js/bootstrap-modalmanager.js +++ b/js/bootstrap-modalmanager.js @@ -67,10 +67,9 @@ modal.isShown = true; var transition = $.support.transition && modal.$element.hasClass('fade'); - - that.$element - .toggleClass('modal-open', that.hasOpenModal()) - .toggleClass('page-overflow', $(window).height() < that.$element.height()); + + $('html').toggleClass('modal-open', that.hasOpenModal()); + that.$element.toggleClass('page-overflow', $(window).height() < that.$element.height()); modal.$parent = modal.$element.parent(); @@ -165,7 +164,7 @@ var hasOpenModal = this.hasOpenModal(); - this.$element.toggleClass('modal-open', hasOpenModal); + $('html').toggleClass('modal-open', hasOpenModal); if (!hasOpenModal){ this.$element.removeClass('page-overflow'); @@ -307,9 +306,8 @@ loading: function (callback) { callback = callback || function () { }; - this.$element - .toggleClass('modal-open', !this.isLoading || this.hasOpenModal()) - .toggleClass('page-overflow', $(window).height() < this.$element.height()); + $('html').toggleClass('modal-open', that.hasOpenModal()); + this.$element.toggleClass('page-overflow', $(window).height() < this.$element.height()); if (!this.isLoading) {