fix(OffCanvas): some tweaks

BowlingX · Mar 7, 2016 · 7c129eb · 7c129eb
1 parent 89dff43
commit 7c129eb
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 37 deletions.
diff --git a/build/js/flexcss.js b/build/js/flexcss.js
diff --git a/build/js/flexcss.min.js b/build/js/flexcss.min.js
diff --git a/build/js/modal.js b/build/js/modal.js
diff --git a/build/js/modal.min.js b/build/js/modal.min.js
diff --git a/build/maps/flexcss.map b/build/maps/flexcss.map
diff --git a/build/maps/flexcss.min.map b/build/maps/flexcss.min.map
diff --git a/build/maps/form.map b/build/maps/form.map
diff --git a/build/maps/form.min.map b/build/maps/form.min.map
diff --git a/build/maps/modal.map b/build/maps/modal.map
diff --git a/build/maps/modal.min.map b/build/maps/modal.min.map
diff --git a/src/main/OffCanvas.js b/src/main/OffCanvas.js
@@ -123,6 +123,7 @@ class OffCanvas {
                 const bounds = target.getBoundingClientRect();
                 const compare = factor > 0 ? calcX <= 0 : calcX >= 0;
                 if (compare) {
+                    e.preventDefault();
                     style.transition = 'transform 0s ease';
                     style.webkitTransition = '-webkit-transform 0s ease';
                     target.mustHide = factor > 0 ? calcX * -1 >

diff --git a/src/main/lib/FixedWindow.js b/src/main/lib/FixedWindow.js
@@ -145,15 +145,11 @@ export default class FixedWindow {
                     return false;
                 }
 
-                if (!shouldNotMoveDown && isScrollingDown) {
-                    e.stopImmediatePropagation();
-                }
-
-                if (shouldNotMoveDown && !isScrollingDown) {
-                    e.stopImmediatePropagation();
-                }
-
-                if (!shouldNotMoveDown && !shouldNotMoveUp && !isScrollingDown) {
+                if ((!shouldNotMoveDown && isScrollingDown) ||
+                    (shouldNotMoveDown && !isScrollingDown) ||
+                    (!shouldNotMoveDown && !shouldNotMoveUp && !isScrollingDown) ||
+                    (shouldNotMoveDown && shouldNotMoveUp && isScrollingDown)
+                ) {
                     e.stopImmediatePropagation();
                 }