fomantic-ui 2.10.0-beta.33 → 2.10.0-beta.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fomantic-ui",
-  "version": "2.10.0-beta.33+b6c2fa7",
+  "version": "2.10.0-beta.34+f83a7e7",
   "description": "Fomantic empowers designers and developers by creating a shared vocabulary for UI.",
   "keywords": [
     "fomantic-ui",

package/src/definitions/modules/flyout.js

@@ -81,7 +81,8 @@
             let ignoreRepeatedEvents = false;
             let isBody = $context[0] === $body[0];
             let initialBodyMargin = '';
-            let tempBodyMargin = '';
+            let initialBodyMarginInt = 0;
+            let tempBodyMargin = 0;
             let hadScrollbar = false;
             let windowRefocused = false;
 
@@ -936,9 +937,9 @@
                     },
                     bodyMargin: function () {
                         initialBodyMargin = $context.css((isBody ? 'margin-' : 'padding-') + (module.can.leftBodyScrollbar() ? 'left' : 'right'));
-                        let bodyMarginRightPixel = parseInt(initialBodyMargin.replace(/[^\d.]/g, ''), 10);
+                        initialBodyMarginInt = parseInt(initialBodyMargin.replace(/[^\d.]/g, ''), 10);
                         let bodyScrollbarWidth = isBody ? window.innerWidth - document.documentElement.clientWidth : $context[0].offsetWidth - $context[0].clientWidth;
-                        tempBodyMargin = bodyMarginRightPixel + bodyScrollbarWidth;
+                        tempBodyMargin = initialBodyMarginInt + bodyScrollbarWidth;
                     },
                 },
 
@@ -1008,7 +1009,7 @@
                     },
                     bodyMargin: function () {
                         let position = module.can.leftBodyScrollbar() ? 'left' : 'right';
-                        $context.css((isBody ? 'margin-' : 'padding-') + position, initialBodyMargin);
+                        $context.css((isBody ? 'margin-' : 'padding-') + position, initialBodyMarginInt === 0 ? '' : initialBodyMargin);
                         $context.find(selector.bodyFixed.replace('right', position)).each(function () {
                             let el = $(this);
                             let attribute = el.css('position') === 'fixed' ? 'padding-' + position : position;

package/src/definitions/modules/modal.js

@@ -82,7 +82,8 @@
             let initialMouseDownInModal;
             let initialMouseDownInScrollbar;
             let initialBodyMargin = '';
-            let tempBodyMargin = '';
+            let initialBodyMarginInt = 0;
+            let tempBodyMargin = 0;
             let keepScrollingClass = false;
             let hadScrollbar = false;
             let windowRefocused = false;
@@ -779,9 +780,9 @@
                     },
                     bodyMargin: function () {
                         initialBodyMargin = $context.css((isBody ? 'margin-' : 'padding-') + (module.can.leftBodyScrollbar() ? 'left' : 'right'));
-                        let bodyMarginRightPixel = parseInt(initialBodyMargin.replace(/[^\d.]/g, ''), 10);
+                        initialBodyMarginInt = parseInt(initialBodyMargin.replace(/[^\d.]/g, ''), 10);
                         let bodyScrollbarWidth = isBody ? window.innerWidth - document.documentElement.clientWidth : $context[0].offsetWidth - $context[0].clientWidth;
-                        tempBodyMargin = bodyMarginRightPixel + bodyScrollbarWidth;
+                        tempBodyMargin = initialBodyMarginInt + bodyScrollbarWidth;
                     },
                 },
 
@@ -793,7 +794,7 @@
                     },
                     bodyMargin: function () {
                         let position = module.can.leftBodyScrollbar() ? 'left' : 'right';
-                        $context.css((isBody ? 'margin-' : 'padding-') + position, initialBodyMargin);
+                        $context.css((isBody ? 'margin-' : 'padding-') + position, initialBodyMarginInt === 0 ? '' : initialBodyMargin);
                         $context.find(selector.bodyFixed.replace('right', position)).each(function () {
                             let el = $(this);
                             let attribute = el.css('position') === 'fixed' ? 'padding-' + position : position;

package/src/definitions/modules/sidebar.js

@@ -78,7 +78,8 @@
             let id;
             let currentScroll;
             let initialBodyMargin = '';
-            let tempBodyMargin = '';
+            let initialBodyMarginInt = 0;
+            let tempBodyMargin = 0;
             let hadScrollbar = false;
 
             let module;
@@ -325,9 +326,9 @@
                 save: {
                     bodyMargin: function () {
                         initialBodyMargin = $context.css((isBody ? 'margin-' : 'padding-') + (module.can.leftBodyScrollbar() ? 'left' : 'right'));
-                        let bodyMarginRightPixel = parseInt(initialBodyMargin.replace(/[^\d.]/g, ''), 10);
+                        initialBodyMarginInt = parseInt(initialBodyMargin.replace(/[^\d.]/g, ''), 10);
                         let bodyScrollbarWidth = isBody ? window.innerWidth - document.documentElement.clientWidth : $context[0].offsetWidth - $context[0].clientWidth;
-                        tempBodyMargin = bodyMarginRightPixel + bodyScrollbarWidth;
+                        tempBodyMargin = initialBodyMarginInt + bodyScrollbarWidth;
                     },
                 },
                 show: function (callback) {
@@ -626,7 +627,7 @@
                 restore: {
                     bodyMargin: function () {
                         let position = module.can.leftBodyScrollbar() ? 'left' : 'right';
-                        $context.css((isBody ? 'margin-' : 'padding-') + position, initialBodyMargin);
+                        $context.css((isBody ? 'margin-' : 'padding-') + position, initialBodyMarginInt === 0 ? '' : initialBodyMargin);
                         $context.find(selector.bodyFixed.replace('right', position)).each(function () {
                             let el = $(this);
                             let attribute = el.css('position') === 'fixed' ? 'padding-' + position : position;