Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1599)

Unified Diff: polymer_0.5.4/bower_components/core-drawer-panel/core-drawer-panel.html

Issue 895523005: Added Polymer 0.5.4 (Closed) Base URL: https://chromium.googlesource.com/infra/third_party/npm_modules.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: polymer_0.5.4/bower_components/core-drawer-panel/core-drawer-panel.html
diff --git a/polymer_0.5.0/bower_components/core-drawer-panel/core-drawer-panel.html b/polymer_0.5.4/bower_components/core-drawer-panel/core-drawer-panel.html
similarity index 95%
copy from polymer_0.5.0/bower_components/core-drawer-panel/core-drawer-panel.html
copy to polymer_0.5.4/bower_components/core-drawer-panel/core-drawer-panel.html
index 2133687931ec1dab5f6ab6e65b9bfafd32576129..823a39c18e112c88e242f613776a5b061dbbe06d 100644
--- a/polymer_0.5.0/bower_components/core-drawer-panel/core-drawer-panel.html
+++ b/polymer_0.5.4/bower_components/core-drawer-panel/core-drawer-panel.html
@@ -90,6 +90,7 @@ To position the drawer to the right, add `rightDrawer` attribute.
<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 @@ To position the drawer to the right, add `rightDrawer` attribute.
* @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 @@ To position the drawer to the right, add `rightDrawer` attribute.
},
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) {

Powered by Google App Engine
This is Rietveld 408576698