summaryrefslogtreecommitdiffstats
path: root/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.js
diff options
context:
space:
mode:
Diffstat (limited to 'polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.js')
-rw-r--r--polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.js42
1 files changed, 4 insertions, 38 deletions
diff --git a/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.js b/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.js
index ec98ad8778..916f97f423 100644
--- a/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.js
+++ b/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.js
@@ -65,8 +65,6 @@
},
_accountNameMutable: Boolean,
_accountInfoChanged: Boolean,
- /** @type {?} */
- _diffPrefs: Object,
_changeTableColumnsNotDisplayed: Array,
/** @type {?} */
_localPrefs: {
@@ -93,10 +91,8 @@
type: Boolean,
value: false,
},
- _diffPrefsChanged: {
- type: Boolean,
- value: false,
- },
+ /** @type {?} */
+ _diffPrefsChanged: Boolean,
/** @type {?} */
_editPrefsChanged: Boolean,
_menuChanged: {
@@ -150,7 +146,6 @@
observers: [
'_handlePrefsChanged(_localPrefs.*)',
- '_handleDiffPrefsChanged(_diffPrefs.*)',
'_handleMenuChanged(_localMenu.splices)',
'_handleChangeTableChanged(_localChangeTableColumns, _showNumber)',
],
@@ -167,6 +162,7 @@
this.$.httpPass.loadData(),
this.$.identities.loadData(),
this.$.editPrefs.loadData(),
+ this.$.diffPrefs.loadData(),
];
promises.push(this.$.restAPI.getPreferences().then(prefs => {
@@ -177,10 +173,6 @@
this._cloneChangeTableColumns();
}));
- promises.push(this.$.restAPI.getDiffPreferences().then(prefs => {
- this._diffPrefs = prefs;
- }));
-
promises.push(this.$.restAPI.getConfig().then(config => {
this._serverConfig = config;
const configPromises = [];
@@ -278,11 +270,6 @@
this._prefsChanged = true;
},
- _handleDiffPrefsChanged() {
- if (this._isLoading()) { return; }
- this._diffPrefsChanged = true;
- },
-
_handleShowSizeBarsInFileListChanged() {
this.set('_localPrefs.size_bar_in_change_table',
this.$.showSizeBarsInFileList.checked);
@@ -319,24 +306,6 @@
});
},
- _handleDiffLineWrappingChanged() {
- this.set('_diffPrefs.line_wrapping', this.$.diffLineWrapping.checked);
- },
-
- _handleDiffShowTabsChanged() {
- this.set('_diffPrefs.show_tabs', this.$.diffShowTabs.checked);
- },
-
- _handleShowTrailingWhitespaceChanged() {
- this.set('_diffPrefs.show_whitespace_errors',
- this.$.showTrailingWhitespace.checked);
- },
-
- _handleDiffSyntaxHighlightingChanged() {
- this.set('_diffPrefs.syntax_highlighting',
- this.$.diffSyntaxHighlighting.checked);
- },
-
_handleSaveChangeTable() {
this.set('prefs.change_table', this._localChangeTableColumns);
this.set('prefs.legacycid_in_change_table', this._showNumber);
@@ -347,10 +316,7 @@
},
_handleSaveDiffPreferences() {
- return this.$.restAPI.saveDiffPreferences(this._diffPrefs)
- .then(() => {
- this._diffPrefsChanged = false;
- });
+ this.$.diffPrefs.save();
},
_handleSaveEditPreferences() {