Refactor isScrollable.

giannissc · Apr 23, 2019 · b9bcfff · b9bcfff
1 parent f70e83a
commit b9bcfff
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 13 deletions.
diff --git a/dist/muuri.js b/dist/muuri.js
@@ -944,21 +944,27 @@
     return offsetDiff;
   }
 
+  var styleOverflow = 'overflow';
+  var styleOverflowX = 'overflow-x';
+  var styleOverflowY = 'overflow-y';
+  var overflowAuto = 'auto';
+  var overflowScroll = 'scroll';
+
   /**
    * Check if an element is scrollable.
    *
    * @param {HTMLElement} element
    * @returns {Boolean}
    */
   function isScrollable(element) {
-    var overflow = getStyle(element, 'overflow');
-    if (overflow === 'auto' || overflow === 'scroll') return true;
+    var overflow = getStyle(element, styleOverflow);
+    if (overflow === overflowAuto || overflow === overflowScroll) return true;
 
-    overflow = getStyle(element, 'overflow-x');
-    if (overflow === 'auto' || overflow === 'scroll') return true;
+    overflow = getStyle(element, styleOverflowX);
+    if (overflow === overflowAuto || overflow === overflowScroll) return true;
 
-    overflow = getStyle(element, 'overflow-y');
-    if (overflow === 'auto' || overflow === 'scroll') return true;
+    overflow = getStyle(element, styleOverflowY);
+    if (overflow === overflowAuto || overflow === overflowScroll) return true;
 
     return false;
   }

diff --git a/dist/muuri.min.js b/dist/muuri.min.js
diff --git a/src/utils/isScrollable.js b/src/utils/isScrollable.js
@@ -6,21 +6,27 @@
 
 import getStyle from './getStyle';
 
+var styleOverflow = 'overflow';
+var styleOverflowX = 'overflow-x';
+var styleOverflowY = 'overflow-y';
+var overflowAuto = 'auto';
+var overflowScroll = 'scroll';
+
 /**
  * Check if an element is scrollable.
  *
  * @param {HTMLElement} element
  * @returns {Boolean}
  */
 export default function isScrollable(element) {
-  var overflow = getStyle(element, 'overflow');
-  if (overflow === 'auto' || overflow === 'scroll') return true;
+  var overflow = getStyle(element, styleOverflow);
+  if (overflow === overflowAuto || overflow === overflowScroll) return true;
 
-  overflow = getStyle(element, 'overflow-x');
-  if (overflow === 'auto' || overflow === 'scroll') return true;
+  overflow = getStyle(element, styleOverflowX);
+  if (overflow === overflowAuto || overflow === overflowScroll) return true;
 
-  overflow = getStyle(element, 'overflow-y');
-  if (overflow === 'auto' || overflow === 'scroll') return true;
+  overflow = getStyle(element, styleOverflowY);
+  if (overflow === overflowAuto || overflow === overflowScroll) return true;
 
   return false;
 }