Skip to content

GitLab

T
tangled
Commit 6aa40b6c authored by jlklein's avatar jlklein Committed by Commit bot
Browse files
Options

Lots of small fixes to help wire things together for the 0.8 upgrade. 

BUG=485381

Review URL: https://codereview.chromium.org/1138013005

Cr-Commit-Position: refs/heads/master@{#329733}
parent c681bac0
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 25 deletions
chrome/browser/resources/md_settings/md_settings.html
View file @ 6aa40b6c
......@@ -11,6 +11,6 @@
</head>
<body>
<cr-settings></cr-settings>
<script src="chrome://resources/js/i18n_template_polymer.js"></script>
<script src="chrome://resources/js/i18n_template.js"></script>
</body>
</html>
chrome/browser/resources/settings/prefs/prefs.js
View file @ 6aa40b6c
......@@ -83,7 +83,8 @@
let token = tokens[i];
if (!root.hasOwnProperty(token)) {
root[token] = {};
let path = 'settings.' + tokens.slice(0, i + 1).join('.');
this.setPathValue(path, {});
}
root = root[token];
}
......@@ -91,7 +92,8 @@
// NOTE: Do this copy rather than just a re-assignment, so that the
// ObjectObserver fires.
for (let objKey in prefObj) {
root[objKey] = prefObj[objKey];
let path = 'settings.' + prefObj.key + '.' + objKey;
this.setPathValue(path, prefObj[objKey]);
}
if (shouldObserve) {
......
chrome/browser/resources/settings/search_engines_page/search_engines_page.js
View file @ 6aa40b6c
......@@ -73,4 +73,5 @@ Polymer({
value: 'search',
readOnly: true
},
},
});
chrome/browser/resources/settings/settings_main/settings_main.html
View file @ 6aa40b6c
<link rel="import" href="chrome://resources/polymer/v0_8/polymer/polymer.html">
<link rel="import" href="chrome://resources/polymer/v0_8/iron-pages/iron-pages.html">
<link rel="import" href="chrome://md-settings/routes.html">
<!-- TODO: Uncomment pages as they are upgraded.
<link rel="import" href="chrome://md-settings/a11y_page/a11y_page.html">
<link rel="import" href="chrome://md-settings/date_time_page/date_time_page.html">
<link rel="import" href="chrome://md-settings/downloads_page/downloads_page.html">
<link rel="import" href="chrome://md-settings/internet_page/internet_page.html">
<link rel="import" href="chrome://md-settings/internet_page/internet_detail_page.html">
<link rel="import" href="chrome://md-settings/search_engines_page/search_engines_page.html">
<link rel="import" href="chrome://md-settings/search_page/search_page.html">
<!-- TODO: Uncomment pages as they are upgraded.
<link rel="import" href="chrome://md-settings/internet_page/internet_page.html">
<link rel="import" href="chrome://md-settings/internet_page/internet_detail_page.html">
-->
<dom-module id="cr-settings-main">
......@@ -34,29 +34,19 @@
</cr-settings-internet-detail-page>
-->
</if>
<!--
<cr-settings-a11y-page prefs="{{prefs}}" route="a11y">
</cr-settings-a11y-page>
-->
<if expr="chromeos">
<!--
<cr-settings-date-time-page prefs="{{prefs}}" route="dateTime">
</cr-settings-date-time-page>
</if>
-->
<!--
<cr-settings-downloads-page prefs="{{prefs}}" route="downloads">
</cr-settings-downloads-page>
-->
<!--
<cr-settings-search-page prefs="{{prefs}}" route="search">
</cr-settings-search-page>
-->
<!--
<cr-settings-search-engines-page prefs="{{prefs}}"
route="search-engines">
</cr-settings-search-engines-page>
-->
</iron-pages>
</more-route-selector>
</div>
......
chrome/browser/resources/settings/settings_main/settings_main.js
View file @ 6aa40b6c
......@@ -32,9 +32,14 @@ Polymer({
/**
* Pages that may be shown.
* @type {?Array<!HTMLElement>}
* @type {!Array<!HTMLElement>}
*/
pages: Array,
pages: {
type: Array,
value: function() { return []; },
notify: true,
readOnly: true,
},
/**
* Currently selected page.
......@@ -51,7 +56,8 @@ Polymer({
selectedPageId: {
type: String,
notify: true,
observe: 'selectedPageIdChanged_',
value: '',
observer: 'selectedPageIdChanged_',
},
},
......@@ -84,8 +90,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 +113,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_();
},
});
chrome/browser/resources/settings/settings_ui/settings_ui.html
View file @ 6aa40b6c
......@@ -8,7 +8,7 @@
<link rel="import" type="css" href="settings_ui.css">
<template>
<paper-drawer-panel drawer-width="280px">
<cr-settings-drawer drawer id="drawer" pages="{{pages}}"
<cr-settings-drawer drawer id="drawer" pages="[[pages]]"
selected-id="{{selectedPageId}}">
</cr-settings-drawer>
<cr-settings-main main pages="{{pages}}" prefs="{{prefs}}"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment