From 017d0f0057c98180dc75bf25be44b59bb9db7d42 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 4 Mar 2016 22:43:47 -0500 Subject: [PATCH] restore paper-drawer-panel.html changes --- .../paper-drawer-panel/paper-drawer-panel.html | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dashboard-ui/bower_components/paper-drawer-panel/paper-drawer-panel.html b/dashboard-ui/bower_components/paper-drawer-panel/paper-drawer-panel.html index dfa8d94718..fc2290d9bf 100644 --- a/dashboard-ui/bower_components/paper-drawer-panel/paper-drawer-panel.html +++ b/dashboard-ui/bower_components/paper-drawer-panel/paper-drawer-panel.html @@ -756,6 +756,12 @@ Custom property | Description | Default } this._setPeeking(false); } + var dy = event.detail.dy; + var absDy = Math.abs(dy); + if (absDy >= 70) { + // Ignore trackx until we move past the edge peek. + return; + } this._moveDrawer(this._translateXForDeltaX(dx)); } @@ -770,10 +776,13 @@ Custom property | Description | Default sharedPanel = null; this._moveDrawer(null); + var dx = event.detail.dx; + var dy = event.detail.dy; + var absDy = Math.abs(dy); if (this.rightDrawer) { - this[xDirection ? 'closeDrawer' : 'openDrawer'](); + this[xDirection ? 'closeDrawer' : 'openDrawer'](); } else { - this[xDirection ? 'openDrawer' : 'closeDrawer'](); + this[xDirection || dx > -80 || absDy >= 70 ? 'openDrawer' : 'closeDrawer'](); } } },