third_party/polymer/v1_0/components-chromium/paper-scroll-header-panel/paper-scroll-header-panel-extracted.js - Issue 1187823002: Update Polymer components and re-run reproduce.sh

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/polymer/v1_0/components-chromium/paper-scroll-header-panel/paper-scroll-header-panel-extracted.js

Issue 1187823002: Update Polymer components and re-run reproduce.sh (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 5 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

« no previous file with comments | « third_party/polymer/v1_0/components-chromium/paper-scroll-header-panel/paper-scroll-header-panel.html ('k') | third_party/polymer/v1_0/components-chromium/paper-slider/.bower.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/polymer/v1_0/components-chromium/paper-scroll-header-panel/paper-scroll-header-panel-extracted.js

diff --git a/third_party/polymer/v1_0/components-chromium/paper-scroll-header-panel/paper-scroll-header-panel-extracted.js b/third_party/polymer/v1_0/components-chromium/paper-scroll-header-panel/paper-scroll-header-panel-extracted.js

index f7aa1f8a47e721c2f4c59ceb49f92b3ecbd3275b..9178d3b1778401491b1ce4b297dcf90e1e5b43f1 100644

--- a/third_party/polymer/v1_0/components-chromium/paper-scroll-header-panel/paper-scroll-header-panel-extracted.js

+++ b/third_party/polymer/v1_0/components-chromium/paper-scroll-header-panel/paper-scroll-header-panel-extracted.js

@@ -227,7 +227,7 @@

_condenseHeader: function(y) {

var reset = (y === null);

- // adjust top bar in core-header so the top bar stays at the top

+ // adjust top bar in paper-header so the top bar stays at the top

if (!this.scrollAwayTopbar && this.header.$ && this.header.$.topBar) {

this._translateY(this.header.$.topBar.style,

reset ? null : Math.min(y, this._headerMargin));

@@ -255,6 +255,7 @@

setTransform(s, t);

+ /** @param {Event=} event */

_scroll: function(event) {

if (!this.header) {

return;

@@ -281,7 +282,7 @@

this._y = y;

if (event) {

- this.fire('content-scroll', {target: this.scroller}, this, false);

+ this.fire('content-scroll', {target: this.scroller}, {cancelable: false});

}