Skip to content
This repository was archived by the owner on May 29, 2019. It is now read-only.

Commit 433e536

Browse files
committed
fix(modal): check for overflow hidden
Check if appendToElement has scrolling disabled before adding the scrollbar padding. Fixes #6037 Closes #6041
1 parent 1ec0997 commit 433e536

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

src/modal/modal.js

+5-3
Original file line numberDiff line numberDiff line change
@@ -487,9 +487,11 @@ angular.module('ui.bootstrap.modal', ['ui.bootstrap.stackedMap', 'ui.bootstrap.p
487487
}
488488
$compile(backdropDomEl)(backdropScope);
489489
$animate.enter(backdropDomEl, appendToElement);
490-
scrollbarPadding = $uibPosition.scrollbarPadding(appendToElement);
491-
if (scrollbarPadding.heightOverflow && scrollbarPadding.scrollbarWidth) {
492-
appendToElement.css({paddingRight: scrollbarPadding.right + 'px'});
490+
if ($uibPosition.isScrollable(appendToElement)) {
491+
scrollbarPadding = $uibPosition.scrollbarPadding(appendToElement);
492+
if (scrollbarPadding.heightOverflow && scrollbarPadding.scrollbarWidth) {
493+
appendToElement.css({paddingRight: scrollbarPadding.right + 'px'});
494+
}
493495
}
494496
}
495497

0 commit comments

Comments
 (0)