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

Unified Diff: third_party/polymer/v1_0/components-chromium/app-route/app-route-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-route/app-route-extracted.js
diff --git a/third_party/polymer/v1_0/components-chromium/app-route/app-route-extracted.js b/third_party/polymer/v1_0/components-chromium/app-route/app-route-extracted.js
index 39f4230c482c9a8c216ffd6dd5d5ee2543b4fe1a..059fa60f3e81cfb122d4adb20c8f1d84296bad59 100644
--- a/third_party/polymer/v1_0/components-chromium/app-route/app-route-extracted.js
+++ b/third_party/polymer/v1_0/components-chromium/app-route/app-route-extracted.js
@@ -87,20 +87,6 @@
this.linkPaths('tail.__queryParams', 'route.__queryParams');
},
- // IE Object.assign polyfill
- __assign: function(target, source) {
- if (Object.assign) {
- return Object.assign(target, source);
- }
- if (source != null) {
- for (var key in source) {
- target[key] = source[key];
- }
- }
-
- return target;
- },
-
/**
* Deal with the query params object being assigned to wholesale.
* @export
@@ -113,8 +99,31 @@
return;
}
+ // Copy queryParams and track whether there are any differences compared
+ // to the existing query params.
+ var copyOfQueryParams = {};
+ var anythingChanged = false;
+ for (var key in queryParams) {
+ copyOfQueryParams[key] = queryParams[key];
+ if (anythingChanged ||
+ !this.queryParams ||
+ queryParams[key] !== this.queryParams[key]) {
+ anythingChanged = true;
+ }
+ }
+ // Need to check whether any keys were deleted
+ for (var key in this.queryParams) {
+ if (anythingChanged || !(key in queryParams)) {
+ anythingChanged = true;
+ break;
+ }
+ }
+
+ if (!anythingChanged) {
+ return;
+ }
this._queryParamsUpdating = true;
- this.set('queryParams', this.__assign({}, queryParams));
+ this.set('queryParams', copyOfQueryParams);
this._queryParamsUpdating = false;
}
},

Powered by Google App Engine
This is Rietveld 408576698