Chromium Code Reviews| Index: chrome/browser/resources/settings/settings_main/settings_main.js |
| diff --git a/chrome/browser/resources/settings/settings_main/settings_main.js b/chrome/browser/resources/settings/settings_main/settings_main.js |
| index 3e020709bb10fe9c1513251feca560212bf82e43..1af0efbca6453d0400f29db1f0c74039b77ae5d2 100644 |
| --- a/chrome/browser/resources/settings/settings_main/settings_main.js |
| +++ b/chrome/browser/resources/settings/settings_main/settings_main.js |
| @@ -32,9 +32,15 @@ Polymer({ |
| /** |
| * Pages that may be shown. |
| - * @type {?Array<!HTMLElement>} |
| + * @type {!Array<!HTMLElement>} |
| */ |
| - pages: Array, |
| + pages: { |
| + type: Array, |
| + value: function() { return []; }, |
| + notify: true, |
| + readOnly: true, |
| + observer: 'pagesChanged_', |
|
michaelpg
2015/05/13 19:59:19
pagesChanged_ is undefined?
Jeremy Klein
2015/05/13 21:13:56
Ah I had added that for debugging and then removed
|
| + }, |
| /** |
| * Currently selected page. |
| @@ -51,7 +57,8 @@ Polymer({ |
| selectedPageId: { |
| type: String, |
| notify: true, |
| - observe: 'selectedPageIdChanged_', |
| + value: '', |
| + observer: 'selectedPageIdChanged_', |
| }, |
| }, |
| @@ -84,8 +91,7 @@ Polymer({ |
| * @private |
| */ |
| onIronSelect_: function(event) { |
| - if (event.target != this.$.pageContainer || !event.detail.isSelected || |
| - event.detail.item.subpage) { |
| + if (event.target != this.$.pageContainer || event.detail.item.subpage) { |
| return; |
| } |
| this.selectedPageId = event.detail.item.PAGE_ID; |
| @@ -108,9 +114,9 @@ Polymer({ |
| * @private |
| */ |
| pageContainerUpdated_: function() { |
| - this.pages = this.$.pageContainer.items.filter(function(item) { |
| + this._setPages(this.$.pageContainer.items.filter(function(item) { |
| return !item.subpage; |
| - }); |
| + })); |
| this.ensureSelection_(); |
| }, |
| }); |