Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(562)

Unified Diff: polymer_0.5.0/bower_components/paper-tabs/paper-tab.html

Issue 786953007: npm_modules: Fork bower_components into Polymer 0.4.0 and 0.5.0 versions (Closed) Base URL: https://chromium.googlesource.com/infra/third_party/npm_modules.git@master
Patch Set: Created 5 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: polymer_0.5.0/bower_components/paper-tabs/paper-tab.html
diff --git a/bower_components/paper-tabs/paper-tab.html b/polymer_0.5.0/bower_components/paper-tabs/paper-tab.html
similarity index 65%
rename from bower_components/paper-tabs/paper-tab.html
rename to polymer_0.5.0/bower_components/paper-tabs/paper-tab.html
index 8104a84e111f61f195cbc52224ab9c872d2b9bfd..725f69b83efd77b4f8018bfaba4c60e19505f52e 100644
--- a/bower_components/paper-tabs/paper-tab.html
+++ b/polymer_0.5.0/bower_components/paper-tabs/paper-tab.html
@@ -34,17 +34,13 @@ To change the ink color:
<link rel="import" href="../paper-ripple/paper-ripple.html">
-<polymer-element name="paper-tab" attributes="noink" role="tab">
+<polymer-element name="paper-tab" attributes="noink" role="tab" inline flex center-center horizontal layout>
<template>
<link rel="stylesheet" href="paper-tab.css">
- <div id="tabContainer" center-justified center horizontal layout>
-
- <div class="tab-content"><content></content></div>
- <paper-ripple id="ink" initialOpacity="0.95" opacityDecayVelocity="0.98"></paper-ripple>
-
- </div>
+ <div class="tab-content" flex auto center-center horizontal layout><content></content></div>
+ <paper-ripple id="ink" initialOpacity="0.95" opacityDecayVelocity="0.98"></paper-ripple>
</template>
<script>
@@ -58,7 +54,27 @@ To change the ink color:
* @type boolean
* @default false
*/
- noink: false
+ noink: false,
+
+ eventDelegates: {
+ down: 'downAction',
+ up: 'upAction'
+ },
+
+ downAction: function(e) {
+ if (this.noink || (this.parentElement && this.parentElement.noink)) {
+ return;
+ }
+ this.$.ink.downAction(e);
+ },
+
+ upAction: function() {
+ this.$.ink.upAction();
+ },
+
+ cancelRipple: function() {
+ this.$.ink.upAction();
+ }
});
« no previous file with comments | « polymer_0.5.0/bower_components/paper-tabs/paper-tab.css ('k') | polymer_0.5.0/bower_components/paper-tabs/paper-tabs.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698