Index: chrome/browser/resources/settings/settings_drawer/settings_drawer.js |
diff --git a/chrome/browser/resources/settings/settings_drawer/settings_drawer.js b/chrome/browser/resources/settings/settings_drawer/settings_drawer.js |
index 7cbd9da99f82244f2eedbee2ae58b8a70e44590a..16d7f31aea0caf90093cbb47f225599ed82506d2 100644 |
--- a/chrome/browser/resources/settings/settings_drawer/settings_drawer.js |
+++ b/chrome/browser/resources/settings/settings_drawer/settings_drawer.js |
@@ -9,50 +9,48 @@ |
* |
* Example: |
* |
- * <core-drawer-panel> |
- * <cr-settings-drawer drawer selectedId="{{selectedId}}" |
- * pages="{{pages}}"> |
+ * <paper-drawer-panel> |
+ * <cr-settings-drawer drawer selected-id="{{selectedId}}" |
+ * pages="[[pages]]"> |
* </cr-settings-drawer> |
- * <cr-settings-main main selectedId="{{selectedId}}" pages="{{pages}}"> |
+ * <cr-settings-main main selected-id="{{selectedId}}" pages="[[pages]]"> |
* </cr-settings-main> |
- * </core-drawer-panel> |
+ * </paper-drawer-panel> |
* |
* @group Chrome Settings Elements |
* @element cr-settings-drawer |
*/ |
-Polymer('cr-settings-drawer', { |
- publish: { |
+Polymer({ |
+ is: 'cr-settings-drawer', |
+ |
+ properties: { |
/** |
* Pages to include in the navigation. |
* |
Kyle Horimoto
2015/05/12 18:14:55
nit/question: I've seen some files include a blank
michaelpg
2015/05/12 18:37:12
Good point. I generally don't include the blank li
|
- * @attribute pages |
- * @type Array<!Object> |
- * @default null |
+ * @type {Array<!Object>} |
Jeremy Klein
2015/05/12 18:06:41
nit: ?Array or initialize to [] and make non-null.
Kyle Horimoto
2015/05/12 18:14:55
IMO, let's always initialize to [] and make non-nu
michaelpg
2015/05/12 18:37:12
hmm, why bother? This element expects |pages| to b
Kyle Horimoto
2015/05/12 18:39:16
You're right - looks like this is a case where the
James Hawkins
2015/05/12 18:39:46
So you can make it non-null, which is safer than a
michaelpg
2015/05/12 19:37:52
Done.
|
*/ |
- pages: null, |
+ pages: Array, |
/** |
* ID of the currently selected page. |
* |
- * @attribute selectedId |
- * @type string |
- * default '' |
+ * @type {string} |
*/ |
- selectedId: '', |
- }, |
- |
- /** @override */ |
- created: function() { |
- this.pages = []; |
+ selectedId: { |
+ type: String, |
+ notify: true, |
+ }, |
}, |
- /** |
- * @type {Object} |
- * TODO(michaelpg): Create custom element and data source for user card. |
- */ |
- user: { |
- name: 'Chrome User', |
- email: 'user@example.com', |
- iconUrl: 'chrome://theme/IDR_PROFILE_AVATAR_23@1x', |
+ ready: function() { |
+ /** |
+ * @type {Object} |
+ * TODO(michaelpg): Create custom element and data source for user card. |
+ */ |
+ this.user_ = { |
michaelpg
2015/05/12 15:05:17
How do I set user_ as a property on the object, wi
Jeremy Klein
2015/05/12 18:06:41
Advice from the Polymer team is just to put it in
michaelpg
2015/05/12 18:37:12
Done.
|
+ name: 'Chrome User', |
+ email: 'user@example.com', |
+ iconUrl: 'chrome://theme/IDR_PROFILE_AVATAR_23@1x', |
+ }; |
}, |
}); |