summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authorjlklein <jlklein@chromium.org>2015-05-13 12:41:39 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-13 19:41:58 +0000
commite0e4abeb0f15b9c539b403cdf278ccd41e1bfc33 (patch)
treee620a6a43c9cb6cb3f876693130e1b56c0aef53a /third_party
parent012d08168d857edb81ef821f92281b200a491aa2 (diff)
downloadchromium_src-e0e4abeb0f15b9c539b403cdf278ccd41e1bfc33.zip
chromium_src-e0e4abeb0f15b9c539b403cdf278ccd41e1bfc33.tar.gz
chromium_src-e0e4abeb0f15b9c539b403cdf278ccd41e1bfc33.tar.bz2
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}
Diffstat (limited to 'third_party')
-rw-r--r--third_party/polymer/v0_8/components-chromium/paper-drawer-panel/.bower.json8
-rw-r--r--third_party/polymer/v0_8/components-chromium/paper-drawer-panel/bower.json2
-rw-r--r--third_party/polymer/v0_8/components-chromium/paper-drawer-panel/paper-drawer-panel-extracted.js43
-rw-r--r--third_party/polymer/v0_8/components-chromium/paper-drawer-panel/paper-drawer-panel.html4
-rw-r--r--third_party/polymer/v0_8/components/paper-drawer-panel/.bower.json8
-rw-r--r--third_party/polymer/v0_8/components/paper-drawer-panel/bower.json2
-rw-r--r--third_party/polymer/v0_8/components/paper-drawer-panel/paper-drawer-panel.html47
7 files changed, 52 insertions, 62 deletions
diff --git a/third_party/polymer/v0_8/components-chromium/paper-drawer-panel/.bower.json b/third_party/polymer/v0_8/components-chromium/paper-drawer-panel/.bower.json
index b09ad58..3c20df7 100644
--- a/third_party/polymer/v0_8/components-chromium/paper-drawer-panel/.bower.json
+++ b/third_party/polymer/v0_8/components-chromium/paper-drawer-panel/.bower.json
@@ -1,6 +1,6 @@
{
"name": "paper-drawer-panel",
- "version": "0.8.3",
+ "version": "0.8.4",
"authors": [
"The Polymer Authors"
],
@@ -27,11 +27,11 @@
"iron-doc-viewer": "PolymerElements/iron-doc-viewer#^0.8.0",
"paper-styles": "PolymerElements/paper-styles#^0.8.0"
},
- "_release": "0.8.3",
+ "_release": "0.8.4",
"_resolution": {
"type": "version",
- "tag": "v0.8.3",
- "commit": "48222bc964338c0291c21bbdf92a1b1d3d30b589"
+ "tag": "v0.8.4",
+ "commit": "362863ba324c41f67ad5104f6942efa04b3e4ea5"
},
"_source": "git://github.com/PolymerElements/paper-drawer-panel.git",
"_target": "^0.8.0",
diff --git a/third_party/polymer/v0_8/components-chromium/paper-drawer-panel/bower.json b/third_party/polymer/v0_8/components-chromium/paper-drawer-panel/bower.json
index 32ed2e4..73421c2 100644
--- a/third_party/polymer/v0_8/components-chromium/paper-drawer-panel/bower.json
+++ b/third_party/polymer/v0_8/components-chromium/paper-drawer-panel/bower.json
@@ -1,6 +1,6 @@
{
"name": "paper-drawer-panel",
- "version": "0.8.0",
+ "version": "0.8.4",
"authors": [
"The Polymer Authors"
],
diff --git a/third_party/polymer/v0_8/components-chromium/paper-drawer-panel/paper-drawer-panel-extracted.js b/third_party/polymer/v0_8/components-chromium/paper-drawer-panel/paper-drawer-panel-extracted.js
index 2e1071f..a514a88 100644
--- a/third_party/polymer/v0_8/components-chromium/paper-drawer-panel/paper-drawer-panel-extracted.js
+++ b/third_party/polymer/v0_8/components-chromium/paper-drawer-panel/paper-drawer-panel-extracted.js
@@ -136,7 +136,8 @@
narrow: {
reflectToAttribute: true,
type: Boolean,
- value: false
+ value: false,
+ notify: true
},
// Whether the drawer is peeking out from the edge.
@@ -213,8 +214,8 @@
},
listeners: {
- click: 'onClick',
- track: 'onTrack'
+ tap: '_onTap',
+ track: '_onTrack'
// TODO: Implement tap handlers when taps are supported.
//
@@ -257,7 +258,7 @@
return !narrow || disableEdgeSwipe;
},
- onTrack: function(event) {
+ _onTrack: function(event) {
switch (event.detail.state) {
case 'end':
this.trackEnd(event);
@@ -349,22 +350,21 @@
}
},
- // 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();
@@ -461,11 +461,6 @@
} else {
s.webkitTransform = this.transformForTranslateX(translateX);
}
- },
-
- onSelect: function(e) {
- e.preventDefault();
- this.selected = e.detail.selected;
}
});
diff --git a/third_party/polymer/v0_8/components-chromium/paper-drawer-panel/paper-drawer-panel.html b/third_party/polymer/v0_8/components-chromium/paper-drawer-panel/paper-drawer-panel.html
index 107006c..4497e50 100644
--- a/third_party/polymer/v0_8/components-chromium/paper-drawer-panel/paper-drawer-panel.html
+++ b/third_party/polymer/v0_8/components-chromium/paper-drawer-panel/paper-drawer-panel.html
@@ -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>
- <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)]]">
<content select="[main]"></content>
- <div id="scrim"></div>
+ <div id="scrim" on-tap="closeDrawer"></div>
<div id="edgeSwipeOverlay" hidden$="[[_computeSwipeOverlayHidden(narrow, disableEdgeSwipe)]]">
</div>
</div>
diff --git a/third_party/polymer/v0_8/components/paper-drawer-panel/.bower.json b/third_party/polymer/v0_8/components/paper-drawer-panel/.bower.json
index b09ad58..3c20df7 100644
--- a/third_party/polymer/v0_8/components/paper-drawer-panel/.bower.json
+++ b/third_party/polymer/v0_8/components/paper-drawer-panel/.bower.json
@@ -1,6 +1,6 @@
{
"name": "paper-drawer-panel",
- "version": "0.8.3",
+ "version": "0.8.4",
"authors": [
"The Polymer Authors"
],
@@ -27,11 +27,11 @@
"iron-doc-viewer": "PolymerElements/iron-doc-viewer#^0.8.0",
"paper-styles": "PolymerElements/paper-styles#^0.8.0"
},
- "_release": "0.8.3",
+ "_release": "0.8.4",
"_resolution": {
"type": "version",
- "tag": "v0.8.3",
- "commit": "48222bc964338c0291c21bbdf92a1b1d3d30b589"
+ "tag": "v0.8.4",
+ "commit": "362863ba324c41f67ad5104f6942efa04b3e4ea5"
},
"_source": "git://github.com/PolymerElements/paper-drawer-panel.git",
"_target": "^0.8.0",
diff --git a/third_party/polymer/v0_8/components/paper-drawer-panel/bower.json b/third_party/polymer/v0_8/components/paper-drawer-panel/bower.json
index 32ed2e4..73421c2 100644
--- a/third_party/polymer/v0_8/components/paper-drawer-panel/bower.json
+++ b/third_party/polymer/v0_8/components/paper-drawer-panel/bower.json
@@ -1,6 +1,6 @@
{
"name": "paper-drawer-panel",
- "version": "0.8.0",
+ "version": "0.8.4",
"authors": [
"The Polymer Authors"
],
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 20eac7e..f97a293 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;
}
});