fix(modal): check for overflow hidden

Check if appendToElement has scrolling disabled before adding the scrollbar padding. Fixes #6037 Closes #6041
angular-ui · Jun 21, 2016 · 433e536 · 433e536
1 parent 1ec0997
commit 433e536
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/modal/modal.js b/src/modal/modal.js
@@ -487,9 +487,11 @@ angular.module('ui.bootstrap.modal', ['ui.bootstrap.stackedMap', 'ui.bootstrap.p
           }
           $compile(backdropDomEl)(backdropScope);
           $animate.enter(backdropDomEl, appendToElement);
-          scrollbarPadding = $uibPosition.scrollbarPadding(appendToElement);
-          if (scrollbarPadding.heightOverflow && scrollbarPadding.scrollbarWidth) {
-            appendToElement.css({paddingRight: scrollbarPadding.right + 'px'});
+          if ($uibPosition.isScrollable(appendToElement)) {
+            scrollbarPadding = $uibPosition.scrollbarPadding(appendToElement);
+            if (scrollbarPadding.heightOverflow && scrollbarPadding.scrollbarWidth) {
+              appendToElement.css({paddingRight: scrollbarPadding.right + 'px'});
+            }
           }
         }