update components

2015-07-13 17:26:11 -04:00
parent 697257670c
commit 02ae9ec81e
123 changed files with 13600 additions and 531 deletions
@@ -128,15 +128,29 @@

            var pageCount = pages.querySelectorAll('neon-animatable').length;

+            function allowSwipeOn(elem) {
+
+                if (elem.tagName == 'PAPER-SLIDER') {
+                    return false;
+                }
+
+                if (elem.classList) {
+                    return !elem.classList.contains('hiddenScrollX') && !elem.classList.contains('smoothScrollX');
+                }
+
+                return true;
+            }
+
            function allowSwipe(e) {

                var target = e.target;

-                if (target.classList.contains('noSwipe')) {
-                    return false;
-                }
-                if ($(target).parents('.noSwipe').length) {
-                    return false;
+                var parent = target.parentNode;
+                while (parent != null) {
+                    if (!allowSwipeOn(parent)) {
+                        return false;
+                    }
+                    parent = parent.parentNode;
                }

                return true;