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

Unified Diff: third_party/polymer/v0_8/components/paper-drawer-panel/paper-drawer-panel.html

Issue 1131713006: Update paper-drawer-panel to 0.8.4 to pick up some fixes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
« no previous file with comments | « third_party/polymer/v0_8/components/paper-drawer-panel/bower.json ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/polymer/v0_8/components/paper-drawer-panel/paper-drawer-panel.html
diff --git a/third_party/polymer/v0_8/components/paper-drawer-panel/paper-drawer-panel.html b/third_party/polymer/v0_8/components/paper-drawer-panel/paper-drawer-panel.html
index 20eac7e25fa1d2752c5121029aa2086fea6a4470..f97a293daefdb047423fd236c7f5e8733a9f79ba 100644
--- a/third_party/polymer/v0_8/components/paper-drawer-panel/paper-drawer-panel.html
+++ b/third_party/polymer/v0_8/components/paper-drawer-panel/paper-drawer-panel.html
@@ -239,12 +239,12 @@ To position the drawer to the right, add `rightDrawer` attribute.
<iron-selector
attr-for-selected="id"
class$="[[_computeIronSelectorClass(narrow, transition, dragging, rightDrawer)]]"
- on-iron-activate="onSelect"
+ activate-event=""
selected="[[selected]]">
<div id="main" style$="[[_computeMainStyle(narrow, rightDrawer, drawerWidth)]]">
<content select="[main]"></content>
- <div id="scrim"></div>
+ <div id="scrim" on-tap="closeDrawer"></div>
<div id="edgeSwipeOverlay"
hidden$="[[_computeSwipeOverlayHidden(narrow, disableEdgeSwipe)]]">
</div>
@@ -397,7 +397,8 @@ To position the drawer to the right, add `rightDrawer` attribute.
narrow: {
reflectToAttribute: true,
type: Boolean,
- value: false
+ value: false,
+ notify: true
},
// Whether the drawer is peeking out from the edge.
@@ -474,8 +475,8 @@ To position the drawer to the right, add `rightDrawer` attribute.
},
listeners: {
- click: 'onClick',
- track: 'onTrack'
+ tap: '_onTap',
+ track: '_onTrack'
// TODO: Implement tap handlers when taps are supported.
//
@@ -518,7 +519,7 @@ To position the drawer to the right, add `rightDrawer` attribute.
return !narrow || disableEdgeSwipe;
},
- onTrack: function(event) {
+ _onTrack: function(event) {
switch (event.detail.state) {
case 'end':
this.trackEnd(event);
@@ -610,22 +611,21 @@ To position the drawer to the right, add `rightDrawer` attribute.
}
},
- // TODO: Implement tap handlers when taps are supported.
- //
- // downHandler: function(e) {
- // if (!this.dragging && this.isMainSelected() && this.isEdgeTouch(e)) {
- // this.startEdgePeek();
- // }
- // },
- //
- // upHandler: function(e) {
- // this.stopEdgePeek();
- // },
-
- onClick: function(e) {
- var isTargetToggleElement = e.target &&
+ _downHandler: function(e) {
+ if (!this.dragging && this._isMainSelected() && this._isEdgeTouch(e)) {
+ this._startEdgePeek();
+ }
+ },
+
+ _upHandler: function(e) {
+ this._stopEdgePeek();
+ },
+
+ _onTap: function(e) {
+ var targetElement = Polymer.dom(e).localTarget;
+ var isTargetToggleElement = targetElement &&
this.drawerToggleAttribute &&
- e.target.hasAttribute(this.drawerToggleAttribute);
+ targetElement.hasAttribute(this.drawerToggleAttribute);
if (isTargetToggleElement) {
this.togglePanel();
@@ -722,11 +722,6 @@ To position the drawer to the right, add `rightDrawer` attribute.
} else {
s.webkitTransform = this.transformForTranslateX(translateX);
}
- },
-
- onSelect: function(e) {
- e.preventDefault();
- this.selected = e.detail.selected;
}
});
« no previous file with comments | « third_party/polymer/v0_8/components/paper-drawer-panel/bower.json ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698