third_party/polymer/v1_0/components-chromium/iron-scroll-target-behavior/iron-scroll-target-behavior-extracted.js - Issue 1766433002: Roll Polymer to 1.3.1

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/iron-scroll-target-behavior/iron-scroll-target-behavior-extracted.js

Issue 1766433002: Roll Polymer to 1.3.1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 years, 9 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/iron-scroll-target-behavior/bower.json ('k') | third_party/polymer/v1_0/components-chromium/iron-selector/.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/iron-scroll-target-behavior/iron-scroll-target-behavior-extracted.js

diff --git a/third_party/polymer/v1_0/components-chromium/iron-scroll-target-behavior/iron-scroll-target-behavior-extracted.js b/third_party/polymer/v1_0/components-chromium/iron-scroll-target-behavior/iron-scroll-target-behavior-extracted.js

index 46192642ac48551b0f0b4ed8924f8d1477d5e5f2..6ab3521e82241216d1408d317b9cdad7f1c22053 100644

--- a/third_party/polymer/v1_0/components-chromium/iron-scroll-target-behavior/iron-scroll-target-behavior-extracted.js

+++ b/third_party/polymer/v1_0/components-chromium/iron-scroll-target-behavior/iron-scroll-target-behavior-extracted.js

@@ -62,9 +62,9 @@

// Support element id references

if (typeof scrollTarget === 'string') {

- var ownerRoot = Polymer.dom(this).getOwnerRoot();

- this.scrollTarget = (ownerRoot && ownerRoot.$) ?

- ownerRoot.$[scrollTarget] : Polymer.dom(this.ownerDocument).querySelector('#' + scrollTarget);

+ var host = this.domHost;

+ this.scrollTarget = host && host.$ ? host.$[scrollTarget] :

+ Polymer.dom(this.ownerDocument).querySelector('#' + scrollTarget);

} else if (this._scrollHandler) {

@@ -163,15 +163,15 @@

* Scrolls the content to a particular place.

* @method scroll

- * @param {number} top The top position

* @param {number} left The left position

+ * @param {number} top The top position

- scroll: function(top, left) {

+ scroll: function(left, top) {

if (this.scrollTarget === this._doc) {

- window.scrollTo(top, left);

+ window.scrollTo(left, top);

} else if (this._isValidScrollTarget()) {

- this.scrollTarget.scrollTop = top;

this.scrollTarget.scrollLeft = left;

+ this.scrollTarget.scrollTop = top;

}