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}
cbchan · May 13, 2015 · e0e4abe · e0e4abe
1 parent 012d081
commit e0e4abe
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 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
@@ -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
@@ -1,6 +1,6 @@
 {
   "name": "paper-drawer-panel",
-  "version": "0.8.0",
+  "version": "0.8.4",
   "authors": [
     "The Polymer Authors"
   ],

diff --git a/...party/polymer/v0_8/components-chromium/paper-drawer-panel/paper-drawer-panel-extracted.js b/...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
@@ -232,11 +232,11 @@
     <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
@@ -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
@@ -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
@@ -239,12 +239,12 @@
     <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 @@
         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;
       }
 
     });