Skip to content

GitLab

T
tangled
Commit e0e4abeb authored by jlklein's avatar jlklein Committed by Commit bot
Browse files
Options

Update paper-drawer-panel to 0.8.4 to pick up some fixes. 

BUG=

Review URL: https://codereview.chromium.org/1131713006

Cr-Commit-Position: refs/heads/master@{#329698}
parent 012d0816
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 62 deletions
third_party/polymer/v0_8/components-chromium/paper-drawer-panel/.bower.json
View file @ e0e4abeb
{ {
"name": "paper-drawer-panel", "name": "paper-drawer-panel",
"version": "0.8.3", "version": "0.8.4",
"authors": [ "authors": [
"The Polymer Authors" "The Polymer Authors"
], ],
...@@ -27,11 +27,11 @@ ...@@ -27,11 +27,11 @@
"iron-doc-viewer": "PolymerElements/iron-doc-viewer#^0.8.0", "iron-doc-viewer": "PolymerElements/iron-doc-viewer#^0.8.0",
"paper-styles": "PolymerElements/paper-styles#^0.8.0" "paper-styles": "PolymerElements/paper-styles#^0.8.0"
}, },
"_release": "0.8.3", "_release": "0.8.4",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v0.8.3", "tag": "v0.8.4",
"commit": "48222bc964338c0291c21bbdf92a1b1d3d30b589" "commit": "362863ba324c41f67ad5104f6942efa04b3e4ea5"
}, },
"_source": "git://github.com/PolymerElements/paper-drawer-panel.git", "_source": "git://github.com/PolymerElements/paper-drawer-panel.git",
"_target": "^0.8.0", "_target": "^0.8.0",
......
third_party/polymer/v0_8/components-chromium/paper-drawer-panel/bower.json
View file @ e0e4abeb
{ {
"name": "paper-drawer-panel", "name": "paper-drawer-panel",
"version": "0.8.0", "version": "0.8.4",
"authors": [ "authors": [
"The Polymer Authors" "The Polymer Authors"
], ],
......
third_party/polymer/v0_8/components-chromium/paper-drawer-panel/paper-drawer-panel-extracted.js
View file @ e0e4abeb
...@@ -136,7 +136,8 @@ ...@@ -136,7 +136,8 @@
narrow: { narrow: {
reflectToAttribute: true, reflectToAttribute: true,
type: Boolean, type: Boolean,
value: false value: false,
notify: true
}, },
// Whether the drawer is peeking out from the edge. // Whether the drawer is peeking out from the edge.
...@@ -213,8 +214,8 @@ ...@@ -213,8 +214,8 @@
}, },
listeners: { listeners: {
click: 'onClick', tap: '_onTap',
track: 'onTrack' track: '_onTrack'
// TODO: Implement tap handlers when taps are supported. // TODO: Implement tap handlers when taps are supported.
// //
...@@ -257,7 +258,7 @@ ...@@ -257,7 +258,7 @@
return !narrow || disableEdgeSwipe; return !narrow || disableEdgeSwipe;
}, },
onTrack: function(event) { _onTrack: function(event) {
switch (event.detail.state) { switch (event.detail.state) {
case 'end': case 'end':
this.trackEnd(event); this.trackEnd(event);
...@@ -349,22 +350,21 @@ ...@@ -349,22 +350,21 @@
} }
}, },
// TODO: Implement tap handlers when taps are supported. _downHandler: function(e) {
// if (!this.dragging && this._isMainSelected() && this._isEdgeTouch(e)) {
// downHandler: function(e) { this._startEdgePeek();
// if (!this.dragging && this.isMainSelected() && this.isEdgeTouch(e)) { }
// this.startEdgePeek(); },
// }
// }, _upHandler: function(e) {
// this._stopEdgePeek();
// upHandler: function(e) { },
// this.stopEdgePeek();
// }, _onTap: function(e) {
var targetElement = Polymer.dom(e).localTarget;
onClick: function(e) { var isTargetToggleElement = targetElement &&
var isTargetToggleElement = e.target &&
this.drawerToggleAttribute && this.drawerToggleAttribute &&
e.target.hasAttribute(this.drawerToggleAttribute); targetElement.hasAttribute(this.drawerToggleAttribute);
if (isTargetToggleElement) { if (isTargetToggleElement) {
this.togglePanel(); this.togglePanel();
...@@ -461,11 +461,6 @@ ...@@ -461,11 +461,6 @@
} else { } else {
s.webkitTransform = this.transformForTranslateX(translateX); s.webkitTransform = this.transformForTranslateX(translateX);
} }
},
onSelect: function(e) {
e.preventDefault();
this.selected = e.detail.selected;
} }
}); });
......
third_party/polymer/v0_8/components-chromium/paper-drawer-panel/paper-drawer-panel.html
View file @ e0e4abeb
...@@ -232,11 +232,11 @@ To position the drawer to the right, add `rightDrawer` attribute. ...@@ -232,11 +232,11 @@ To position the drawer to the right, add `rightDrawer` attribute.
<iron-media-query on-query-matches-changed="onQueryMatchesChanged" query="[[_computeMediaQuery(forceNarrow, responsiveWidth)]]"> <iron-media-query on-query-matches-changed="onQueryMatchesChanged" query="[[_computeMediaQuery(forceNarrow, responsiveWidth)]]">
</iron-media-query> </iron-media-query>
<iron-selector attr-for-selected="id" class$="[[_computeIronSelectorClass(narrow, transition, dragging, rightDrawer)]]" on-iron-activate="onSelect" selected="[[selected]]"> <iron-selector attr-for-selected="id" class$="[[_computeIronSelectorClass(narrow, transition, dragging, rightDrawer)]]" activate-event="" selected="[[selected]]">
<div id="main" style$="[[_computeMainStyle(narrow, rightDrawer, drawerWidth)]]"> <div id="main" style$="[[_computeMainStyle(narrow, rightDrawer, drawerWidth)]]">
<content select="[main]"></content> <content select="[main]"></content>
<div id="scrim"></div> <div id="scrim" on-tap="closeDrawer"></div>
<div id="edgeSwipeOverlay" hidden$="[[_computeSwipeOverlayHidden(narrow, disableEdgeSwipe)]]"> <div id="edgeSwipeOverlay" hidden$="[[_computeSwipeOverlayHidden(narrow, disableEdgeSwipe)]]">
</div> </div>
</div> </div>
......
third_party/polymer/v0_8/components/paper-drawer-panel/.bower.json
View file @ e0e4abeb
{ {
"name": "paper-drawer-panel", "name": "paper-drawer-panel",
"version": "0.8.3", "version": "0.8.4",
"authors": [ "authors": [
"The Polymer Authors" "The Polymer Authors"
], ],
...@@ -27,11 +27,11 @@ ...@@ -27,11 +27,11 @@
"iron-doc-viewer": "PolymerElements/iron-doc-viewer#^0.8.0", "iron-doc-viewer": "PolymerElements/iron-doc-viewer#^0.8.0",
"paper-styles": "PolymerElements/paper-styles#^0.8.0" "paper-styles": "PolymerElements/paper-styles#^0.8.0"
}, },
"_release": "0.8.3", "_release": "0.8.4",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v0.8.3", "tag": "v0.8.4",
"commit": "48222bc964338c0291c21bbdf92a1b1d3d30b589" "commit": "362863ba324c41f67ad5104f6942efa04b3e4ea5"
}, },
"_source": "git://github.com/PolymerElements/paper-drawer-panel.git", "_source": "git://github.com/PolymerElements/paper-drawer-panel.git",
"_target": "^0.8.0", "_target": "^0.8.0",
......
third_party/polymer/v0_8/components/paper-drawer-panel/bower.json
View file @ e0e4abeb
{ {
"name": "paper-drawer-panel", "name": "paper-drawer-panel",
"version": "0.8.0", "version": "0.8.4",
"authors": [ "authors": [
"The Polymer Authors" "The Polymer Authors"
], ],
......
third_party/polymer/v0_8/components/paper-drawer-panel/paper-drawer-panel.html
View file @ e0e4abeb
...@@ -239,12 +239,12 @@ To position the drawer to the right, add `rightDrawer` attribute. ...@@ -239,12 +239,12 @@ To position the drawer to the right, add `rightDrawer` attribute.
<iron-selector <iron-selector
attr-for-selected="id" attr-for-selected="id"
class$="[[_computeIronSelectorClass(narrow, transition, dragging, rightDrawer)]]" class$="[[_computeIronSelectorClass(narrow, transition, dragging, rightDrawer)]]"
on-iron-activate="onSelect" activate-event=""
selected="[[selected]]"> selected="[[selected]]">
<div id="main" style$="[[_computeMainStyle(narrow, rightDrawer, drawerWidth)]]"> <div id="main" style$="[[_computeMainStyle(narrow, rightDrawer, drawerWidth)]]">
<content select="[main]"></content> <content select="[main]"></content>
<div id="scrim"></div> <div id="scrim" on-tap="closeDrawer"></div>
<div id="edgeSwipeOverlay" <div id="edgeSwipeOverlay"
hidden$="[[_computeSwipeOverlayHidden(narrow, disableEdgeSwipe)]]"> hidden$="[[_computeSwipeOverlayHidden(narrow, disableEdgeSwipe)]]">
</div> </div>
...@@ -397,7 +397,8 @@ To position the drawer to the right, add `rightDrawer` attribute. ...@@ -397,7 +397,8 @@ To position the drawer to the right, add `rightDrawer` attribute.
narrow: { narrow: {
reflectToAttribute: true, reflectToAttribute: true,
type: Boolean, type: Boolean,
value: false value: false,
notify: true
}, },
// Whether the drawer is peeking out from the edge. // Whether the drawer is peeking out from the edge.
...@@ -474,8 +475,8 @@ To position the drawer to the right, add `rightDrawer` attribute. ...@@ -474,8 +475,8 @@ To position the drawer to the right, add `rightDrawer` attribute.
}, },
listeners: { listeners: {
click: 'onClick', tap: '_onTap',
track: 'onTrack' track: '_onTrack'
// TODO: Implement tap handlers when taps are supported. // TODO: Implement tap handlers when taps are supported.
// //
...@@ -518,7 +519,7 @@ To position the drawer to the right, add `rightDrawer` attribute. ...@@ -518,7 +519,7 @@ To position the drawer to the right, add `rightDrawer` attribute.
return !narrow || disableEdgeSwipe; return !narrow || disableEdgeSwipe;
}, },
onTrack: function(event) { _onTrack: function(event) {
switch (event.detail.state) { switch (event.detail.state) {
case 'end': case 'end':
this.trackEnd(event); this.trackEnd(event);
...@@ -610,22 +611,21 @@ To position the drawer to the right, add `rightDrawer` attribute. ...@@ -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)) {
// downHandler: function(e) { this._startEdgePeek();
// if (!this.dragging && this.isMainSelected() && this.isEdgeTouch(e)) { }
// this.startEdgePeek(); },
// }
// }, _upHandler: function(e) {
// this._stopEdgePeek();
// upHandler: function(e) { },
// this.stopEdgePeek();
// }, _onTap: function(e) {
var targetElement = Polymer.dom(e).localTarget;
onClick: function(e) { var isTargetToggleElement = targetElement &&
var isTargetToggleElement = e.target &&
this.drawerToggleAttribute && this.drawerToggleAttribute &&
e.target.hasAttribute(this.drawerToggleAttribute); targetElement.hasAttribute(this.drawerToggleAttribute);
if (isTargetToggleElement) { if (isTargetToggleElement) {
this.togglePanel(); this.togglePanel();
...@@ -722,11 +722,6 @@ To position the drawer to the right, add `rightDrawer` attribute. ...@@ -722,11 +722,6 @@ To position the drawer to the right, add `rightDrawer` attribute.
} else { } else {
s.webkitTransform = this.transformForTranslateX(translateX); s.webkitTransform = this.transformForTranslateX(translateX);
} }
},
onSelect: function(e) {
e.preventDefault();
this.selected = e.detail.selected;
} }
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment