| Index: third_party/polymer/v1_0/components/paper-ripple/paper-ripple.html
|
| diff --git a/third_party/polymer/v1_0/components/paper-ripple/paper-ripple.html b/third_party/polymer/v1_0/components/paper-ripple/paper-ripple.html
|
| index 704738c87a7bc2618a5663ef72bf0769910b1a78..08d3da1ac003c4210f7143fa07f263aa007b10b3 100644
|
| --- a/third_party/polymer/v1_0/components/paper-ripple/paper-ripple.html
|
| +++ b/third_party/polymer/v1_0/components/paper-ripple/paper-ripple.html
|
| @@ -392,6 +392,7 @@ Apply `circle` class to make the rippling effect within a circle.
|
| this.wave.style.transform = 'scale3d(' + scale + ',' + scale + ',1)';
|
| },
|
|
|
| + /** @param {Event=} event */
|
| downAction: function(event) {
|
| var xCenter = this.containerMetrics.width / 2;
|
| var yCenter = this.containerMetrics.height / 2;
|
| @@ -436,6 +437,7 @@ Apply `circle` class to make the rippling effect within a circle.
|
| this.waveContainer.style.height = this.containerMetrics.size + 'px';
|
| },
|
|
|
| + /** @param {Event=} event */
|
| upAction: function(event) {
|
| if (!this.isMouseDown) {
|
| return;
|
| @@ -559,11 +561,9 @@ Apply `circle` class to make the rippling effect within a circle.
|
| var ownerRoot = Polymer.dom(this).getOwnerRoot();
|
| var target;
|
|
|
| - if (ownerRoot) {
|
| + if (this.parentNode.nodeType == 11) { // DOCUMENT_FRAGMENT_NODE
|
| target = ownerRoot.host;
|
| - }
|
| -
|
| - if (!target) {
|
| + } else {
|
| target = this.parentNode;
|
| }
|
|
|
| @@ -577,8 +577,8 @@ Apply `circle` class to make the rippling effect within a circle.
|
| },
|
|
|
| attached: function() {
|
| - this._listen(this.target, 'up', this.upAction.bind(this));
|
| - this._listen(this.target, 'down', this.downAction.bind(this));
|
| + this.listen(this.target, 'up', 'upAction');
|
| + this.listen(this.target, 'down', 'downAction');
|
|
|
| if (!this.target.hasAttribute('noink')) {
|
| this.keyEventTarget = this.target;
|
| @@ -604,6 +604,7 @@ Apply `circle` class to make the rippling effect within a circle.
|
| }, 1);
|
| },
|
|
|
| + /** @param {Event=} event */
|
| downAction: function(event) {
|
| if (this.holdDown && this.ripples.length > 0) {
|
| return;
|
| @@ -618,6 +619,7 @@ Apply `circle` class to make the rippling effect within a circle.
|
| }
|
| },
|
|
|
| + /** @param {Event=} event */
|
| upAction: function(event) {
|
| if (this.holdDown) {
|
| return;
|
|
|