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

Unified Diff: third_party/polymer/v1_0/components-chromium/app-layout/app-scroll-effects/effects/resize-snapped-title-extracted.js

Issue 2074813002: Roll Polymer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: chromium.patch Created 4 years, 6 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: third_party/polymer/v1_0/components-chromium/app-layout/app-scroll-effects/effects/resize-snapped-title-extracted.js
diff --git a/third_party/polymer/v1_0/components-chromium/app-layout/app-scroll-effects/effects/resize-snapped-title-extracted.js b/third_party/polymer/v1_0/components-chromium/app-layout/app-scroll-effects/effects/resize-snapped-title-extracted.js
index 37f656c9f86269cc037175460818d7139a690a13..741c03d2649454ab6440897bac08e00644c64a35 100644
--- a/third_party/polymer/v1_0/components-chromium/app-layout/app-scroll-effects/effects/resize-snapped-title-extracted.js
+++ b/third_party/polymer/v1_0/components-chromium/app-layout/app-scroll-effects/effects/resize-snapped-title-extracted.js
@@ -7,8 +7,8 @@
* @this Polymer.AppLayout.ElementWithBackground
*/
setUp: function setUp(config) {
- var title = Polymer.dom(this).querySelector('[title]');
- var condensedTitle = Polymer.dom(this).querySelector('[condensed-title]');
+ var title = this._getDOMRef('title');
+ var condensedTitle = this._getDOMRef('condensedTitle');
var duration = config.duration || '0.2s';
var fx = {};
@@ -25,19 +25,11 @@
title.style.transitionDuration = duration;
condensedTitle.style.transitionProperty = 'opacity';
condensedTitle.style.transitionDuration = duration;
-
fx.condensedTitle = condensedTitle;
fx.title = title;
this._fxResizeSnappedTitle = fx;
},
/** @this Polymer.AppLayout.ElementWithBackground */
- tearDown: function tearDown() {
- var fx = this._fxResizeSnappedTitle;
- fx.title.style.transition = '';
- fx.condensedTitle.style.transition = '';
- delete this._fxResizeSnappedTitle;
- },
- /** @this Polymer.AppLayout.ElementWithBackground */
run: function run(p, y) {
var fx = this._fxResizeSnappedTitle;
if (p > 0) {
@@ -47,5 +39,12 @@
fx.title.style.opacity = 1;
fx.condensedTitle.style.opacity = 0;
}
+ },
+ /** @this Polymer.AppLayout.ElementWithBackground */
+ tearDown: function tearDown() {
+ var fx = this._fxResizeSnappedTitle;
+ fx.title.style.transition = '';
+ fx.condensedTitle.style.transition = '';
+ delete this._fxResizeSnappedTitle;
}
});

Powered by Google App Engine
This is Rietveld 408576698