Chromium Code Reviews| Index: chrome/browser/resources/settings/site_settings/site_list.js |
| diff --git a/chrome/browser/resources/settings/site_settings/site_list.js b/chrome/browser/resources/settings/site_settings/site_list.js |
| index 613008a45b174e9debbf7b4933dd693a7e82014e..0b0df22e37362dcd37a45f26fc18b7bf865fc932 100644 |
| --- a/chrome/browser/resources/settings/site_settings/site_list.js |
| +++ b/chrome/browser/resources/settings/site_settings/site_list.js |
| @@ -143,7 +143,9 @@ Polymer({ |
| this.computeCategoryExceptionsPrefName(this.category)); |
| var sites = pref.value; |
| for (var origin in sites) { |
| - if (sites[origin].setting == this.categorySubtype) { |
| + /** @type {{setting:Number}}*/ |
|
Dan Beam
2015/11/09 19:28:55
this @type doesn't make sense here, but this might
Finnur
2015/11/10 11:58:50
It is modeled after other code in the tree and did
Dan Beam
2015/11/11 07:01:39
i think it's just confusing the compiler into thin
|
| + var setting = sites[origin].setting; |
|
Finnur
2015/11/09 15:56:09
Is this (and the change in onOriginTap_) the right
Dan Beam
2015/11/09 19:28:55
Number -> number
Finnur
2015/11/10 11:58:50
Bah. That's unfortunate (Polymer wanting |Number|,
Dan Beam
2015/11/11 07:01:39
Polymer({
properties: {
doUseWrappers: {
|
| + if (setting == this.categorySubtype) { |
| var tokens = origin.split(','); |
| newList.push({url: tokens[0]}); |
| } |
| @@ -169,6 +171,7 @@ Polymer({ |
| * @private |
| */ |
| onOriginTap_: function(event) { |
| + /** @type {{model:Object}}*/ |
|
Dan Beam
2015/11/09 19:28:55
i don't understand what this is supposed to do? a
Finnur
2015/11/10 00:39:43
Um... I think so. Well, the error (as I recall, I'
Dan Beam
2015/11/10 05:58:58
have you actually been able to run the compiler?
Finnur
2015/11/10 11:58:50
Yes, couldn't be doing this without it -- got the
|
| this.selectedOrigin = event.model.item.url; |
| }, |
| @@ -182,7 +185,7 @@ Polymer({ |
| /** |
| * Returns the appropriate header value for display. |
| - * @param {array<string>} siteList The list of all sites to display for this |
| + * @param {Array<string>} siteList The list of all sites to display for this |
| * category subtype. |
| * @param {boolean} toggleState The state of the global toggle for this |
| * category. |
| @@ -213,7 +216,7 @@ Polymer({ |
| /** |
| * Returns whether to show the site list. |
| - * @param {array} siteList The list of all sites to display for this category |
| + * @param {Array} siteList The list of all sites to display for this category |
| * subtype. |
| * @param {boolean} toggleState The state of the global toggle for this |
| * category. |