fixes #38

googlearchive · Dec 17, 2014 · 2b78db0 · fredj · Dec 18, 2014 · 2b78db0
1 parent 77fb17b
commit 2b78db0
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/core-drawer-panel.css b/core-drawer-panel.css
@@ -92,6 +92,19 @@ polyfill-next-selector { content: '#main > [main]'; }
   transition: opacity ease-in-out 0.38s, visibility ease-in-out 0.38s;
 }
 
+#edgeSwipeOverlay {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  width: 20px;
+}
+
+.right-drawer > #main > #edgeSwipeOverlay {
+  right: 0;
+  left: auto;
+}
+
 /*
 narrow layout
 */

diff --git a/core-drawer-panel.html b/core-drawer-panel.html
@@ -90,6 +90,7 @@
     <div id="main" _style="left: {{ narrow || rightDrawer ? '0' : drawerWidth }}; right: {{ rightDrawer ? (narrow ? '' : drawerWidth) : '' }};">
       <content select="[main]"></content>
       <div id="scrim" on-tap="{{togglePanel}}"></div>
+      <div id="edgeSwipeOverlay" hidden?="{{!narrow || disableEdgeSwipe}}"></div>
     </div>
 
     <div id="drawer" _style="width: {{ drawerWidth }}">
@@ -199,7 +200,16 @@
        * @type boolean
        * @default false
        */
-      forceNarrow: false
+      forceNarrow: false,
+
+      /**
+       * If true, swipe from the edge is disable.
+       *
+       * @attribute disableEdgeSwipe
+       * @type boolean
+       * @default false
+       */
+      disableEdgeSwipe: false
     },
 
     eventDelegates: {
@@ -327,9 +337,10 @@
     },
 
     isEdgeTouch: function(e) {
-      return this.swipeAllowed() && (this.rightDrawer ?
-        e.pageX >= this.offsetWidth - this.edgeSwipeSensitivity :
-        e.pageX <= this.edgeSwipeSensitivity);
+      return !this.disableEdgeSwipe && this.swipeAllowed() &&
+        (this.rightDrawer ?
+          e.pageX >= this.offsetWidth - this.edgeSwipeSensitivity :
+          e.pageX <= this.edgeSwipeSensitivity);
     },
 
     trackStart : function(e) {