Fix ember-remodal doesn't remove padding-right when the modal closes …

…in some cases Fixes vodkabears#263.
nag5000 · May 2, 2017 · e2dcac7 · e2dcac7
1 parent ed63e53
commit e2dcac7
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/dist/remodal.js b/dist/remodal.js
@@ -252,16 +252,20 @@
 
     var $html = $('html');
     var lockedClass = namespacify('is-locked');
+    var scrollbarWidth;
     var paddingRight;
     var $body;
 
     if (!$html.hasClass(lockedClass)) {
       $body = $(document.body);
 
+      scrollbarWidth = getScrollbarWidth();
+
       // Zepto does not support '-=', '+=' in the `css` method
-      paddingRight = parseInt($body.css('padding-right'), 10) + getScrollbarWidth();
+      paddingRight = parseInt($body.css('padding-right'), 10) + scrollbarWidth;
 
       $body.css('padding-right', paddingRight + 'px');
+      $body.attr('data-scrollbar-width', scrollbarWidth);
       $html.addClass(lockedClass);
     }
   }
@@ -277,16 +281,20 @@
 
     var $html = $('html');
     var lockedClass = namespacify('is-locked');
+    var scrollbarWidth;
     var paddingRight;
     var $body;
 
     if ($html.hasClass(lockedClass)) {
       $body = $(document.body);
 
+      scrollbarWidth = Number($body.attr('data-scrollbar-width')) || 0;
+
       // Zepto does not support '-=', '+=' in the `css` method
-      paddingRight = parseInt($body.css('padding-right'), 10) - getScrollbarWidth();
+      paddingRight = parseInt($body.css('padding-right'), 10) - scrollbarWidth;
 
-      $body.css('padding-right', paddingRight + 'px');
+      $body.css('padding-right', paddingRight ? paddingRight + 'px' : '');
+      $body.removeAttr('data-scrollbar-width');
       $html.removeClass(lockedClass);
     }
   }

diff --git a/dist/remodal.min.js b/dist/remodal.min.js
diff --git a/src/remodal.js b/src/remodal.js
@@ -243,16 +243,20 @@
 
     var $html = $('html');
     var lockedClass = namespacify('is-locked');
+    var scrollbarWidth;
     var paddingRight;
     var $body;
 
     if (!$html.hasClass(lockedClass)) {
       $body = $(document.body);
 
+      scrollbarWidth = getScrollbarWidth();
+
       // Zepto does not support '-=', '+=' in the `css` method
-      paddingRight = parseInt($body.css('padding-right'), 10) + getScrollbarWidth();
+      paddingRight = parseInt($body.css('padding-right'), 10) + scrollbarWidth;
 
       $body.css('padding-right', paddingRight + 'px');
+      $body.attr('data-scrollbar-width', scrollbarWidth);
       $html.addClass(lockedClass);
     }
   }
@@ -268,16 +272,20 @@
 
     var $html = $('html');
     var lockedClass = namespacify('is-locked');
+    var scrollbarWidth;
     var paddingRight;
     var $body;
 
     if ($html.hasClass(lockedClass)) {
       $body = $(document.body);
 
+      scrollbarWidth = Number($body.attr('data-scrollbar-width')) || 0;
+
       // Zepto does not support '-=', '+=' in the `css` method
-      paddingRight = parseInt($body.css('padding-right'), 10) - getScrollbarWidth();
+      paddingRight = parseInt($body.css('padding-right'), 10) - scrollbarWidth;
 
-      $body.css('padding-right', paddingRight + 'px');
+      $body.css('padding-right', paddingRight ? paddingRight + 'px' : '');
+      $body.removeAttr('data-scrollbar-width');
       $html.removeClass(lockedClass);
     }
   }