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 b09ad58876d3b6..3c20df7c1f2eb1 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 32ed2e4c634a6e..73421c22795be7 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 2e1071f9c347a4..a514a88e133c43 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 107006cc68851a..4497e50f507fe6 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 @@ - +
-
+
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 b09ad58876d3b6..3c20df7c1f2eb1 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 32ed2e4c634a6e..73421c22795be7 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 20eac7e25fa1d2..f97a293daefdb0 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 @@
-
+
@@ -397,7 +397,8 @@ narrow: { reflectToAttribute: true, type: Boolean, - value: false + value: false, + notify: true }, // Whether the drawer is peeking out from the edge. @@ -474,8 +475,8 @@ }, listeners: { - click: 'onClick', - track: 'onTrack' + tap: '_onTap', + track: '_onTrack' // TODO: Implement tap handlers when taps are supported. // @@ -518,7 +519,7 @@ return !narrow || disableEdgeSwipe; }, - onTrack: function(event) { + _onTrack: function(event) { switch (event.detail.state) { case 'end': this.trackEnd(event); @@ -610,22 +611,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(); @@ -722,11 +722,6 @@ } else { s.webkitTransform = this.transformForTranslateX(translateX); } - }, - - onSelect: function(e) { - e.preventDefault(); - this.selected = e.detail.selected; } });