| 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();
|
| + }
|
|
|
| });
|
|
|
|
|