Merge pull request #46 from Polymer/fix-scroll-bar-click

Scroll by clicking on scrollbar. Fixes #44
googlearchive · Oct 1, 2014 · d437c4a · d437c4a
2 parents 4591362 + e41c3c2
commit d437c4a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 17 deletions.
diff --git a/paper-menu-button.css b/paper-menu-button.css
@@ -57,20 +57,20 @@ core-icon::shadow svg {
 }
 
 .paper-menu-button-overlay-ink {
-	position: absolute;
-	top: 0;
-	left: 0;
-	width: 40px;
-	height: 40px;
-	border-radius: 20px;
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 40px;
+  height: 40px;
+  border-radius: 20px;
   opacity: 0;
   transform: scale(0);
   -webkit-transform: scale(0);
 }
 
 :host([halign="right"]) .paper-menu-button-overlay-ink {
-	left: auto;
-	right: 0;
+  left: auto;
+  right: 0;
 }
 
 :host([valign="bottom"]) .paper-menu-button-overlay-ink {
@@ -79,13 +79,14 @@ core-icon::shadow svg {
 }
 
 .paper-menu-button-overlay-bg {
-	position: absolute;
-	top: 0;
-	left: 0;
-	bottom: 0;
-	right: 0;
-	border-radius: 3px;
+  position: absolute;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  right: 0;
+  border-radius: 3px;
   opacity: 0;
+  z-index: -1;
 }
 
 :host([noTransition]) .paper-menu-button-overlay-bg {

diff --git a/paper-menu-button.html b/paper-menu-button.html
@@ -76,13 +76,13 @@
   })();
 </script>
 
-<polymer-element name="paper-menu-button" extends="paper-focusable" attributes="src icon opened halign valign slow" on-tap="{{tapAction}}">
+<polymer-element name="paper-menu-button" extends="paper-focusable" attributes="src icon opened halign valign slow">
   <template>
 
     <link rel="stylesheet" href="paper-menu-button.css">
     <core-style ref="paper-menu-button"></core-style>
 
-    <core-icon src="{{src}}" icon="{{icon}}"></core-icon>
+    <core-icon src="{{src}}" icon="{{icon}}" on-tap="{{tapAction}}"></core-icon>
 
     <core-dropdown id="dropdown" relatedTarget="{{}}" opened="{{opened}}" halign="{{halign}}" valign="{{valign}}" transition="{{noTransition ? '' : transition}}" on-core-transitionend="{{transitionEndAction}}">
 
@@ -92,7 +92,7 @@
       <div id="overlayBg" class="paper-menu-button-overlay-bg"></div>
 
       <div class="paper-menu-button-menu-container">
-        <core-menu id="menu" selected="{{selected}}" selectedItem="{{selectedItem}}" selectedClass="{{selectedClass}}" valueattr="{{valueattr}}" selectedProperty="{{selectedProperty}}" selectedAttribute="{{selectedAttribute}}" on-core-select="{{selectAction}}">
+        <core-menu id="menu" selected="{{selected}}" selectedItem="{{selectedItem}}" selectedClass="{{selectedClass}}" valueattr="{{valueattr}}" selectedProperty="{{selectedProperty}}" selectedAttribute="{{selectedAttribute}}" on-core-select="{{selectAction}}" on-core-activate="{{activateAction}}">
           <content></content>
         </core-menu>
       </div>
@@ -184,6 +184,10 @@
         this.$.shadow.z = 1;
       },
 
+      activateAction: function() {
+        this.opened = false;
+      },
+
       /**
        * Toggle the opened state of the menu.
        *