[global] Remaps self.Common.settings
This CL changes references to self.Common.settings (the global
instance of SDK.Common.Settings) over to
Common.Settings.Settings.instance(). To keep both TypeScript and
Closure happy we must make a method on the Settings class itself,
since it only allows private constructors to be accessed by static
methods on the class.
Bug: 1058320
Change-Id: I04afc8caf64acf29cdda13ef03ad05cfff4786a1
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/2091450
Commit-Queue: Paul Lewis <[email protected]>
Reviewed-by: Tim van der Lippe <[email protected]>
diff --git a/front_end/console/ConsolePinPane.js b/front_end/console/ConsolePinPane.js
index 1aa4b25..65ff11a 100644
--- a/front_end/console/ConsolePinPane.js
+++ b/front_end/console/ConsolePinPane.js
@@ -24,7 +24,7 @@
/** @type {!Set<!ConsolePin>} */
this._pins = new Set();
- this._pinsSetting = self.Common.settings.createLocalSetting('consolePins', []);
+ this._pinsSetting = Common.Settings.Settings.instance().createLocalSetting('consolePins', []);
for (const expression of this._pinsSetting.get()) {
this.addPin(expression);
}
diff --git a/front_end/console/ConsolePrompt.js b/front_end/console/ConsolePrompt.js
index a5d2470..feb3101 100644
--- a/front_end/console/ConsolePrompt.js
+++ b/front_end/console/ConsolePrompt.js
@@ -35,7 +35,7 @@
this.element.appendChild(this._promptIcon);
this._iconThrottler = new Common.Throttler.Throttler(0);
- this._eagerEvalSetting = self.Common.settings.moduleSetting('consoleEagerEval');
+ this._eagerEvalSetting = Common.Settings.Settings.instance().moduleSetting('consoleEagerEval');
this._eagerEvalSetting.addChangeListener(this._eagerSettingChanged.bind(this));
this._eagerPreviewElement.classList.toggle('hidden', !this._eagerEvalSetting.get());
diff --git a/front_end/console/ConsoleSidebar.js b/front_end/console/ConsoleSidebar.js
index 0ab6bfc..b5583c6 100644
--- a/front_end/console/ConsoleSidebar.js
+++ b/front_end/console/ConsoleSidebar.js
@@ -24,7 +24,8 @@
this._selectedTreeElement = null;
/** @type {!Array<!FilterTreeElement>} */
this._treeElements = [];
- const selectedFilterSetting = self.Common.settings.createSetting('console.sidebarSelectedFilter', null);
+ const selectedFilterSetting =
+ Common.Settings.Settings.instance().createSetting('console.sidebarSelectedFilter', null);
const Levels = SDK.ConsoleModel.MessageLevel;
const consoleAPIParsedFilters =
diff --git a/front_end/console/ConsoleView.js b/front_end/console/ConsoleView.js
index e6a2399..5d07484 100644
--- a/front_end/console/ConsoleView.js
+++ b/front_end/console/ConsoleView.js
@@ -105,11 +105,12 @@
this._filterStatusText = new UI.Toolbar.ToolbarText();
this._filterStatusText.element.classList.add('dimmed');
- this._showSettingsPaneSetting = self.Common.settings.createSetting('consoleShowSettingsToolbar', false);
+ this._showSettingsPaneSetting =
+ Common.Settings.Settings.instance().createSetting('consoleShowSettingsToolbar', false);
this._showSettingsPaneButton = new UI.Toolbar.ToolbarSettingToggle(
this._showSettingsPaneSetting, 'largeicon-settings-gear', Common.UIString.UIString('Console settings'));
this._progressToolbarItem = new UI.Toolbar.ToolbarItem(createElement('div'));
- this._groupSimilarSetting = self.Common.settings.moduleSetting('consoleGroupSimilar');
+ this._groupSimilarSetting = Common.Settings.Settings.instance().moduleSetting('consoleGroupSimilar');
this._groupSimilarSetting.addChangeListener(() => this._updateMessageList());
const groupSimilarToggle =
new UI.Toolbar.ToolbarSettingCheckbox(this._groupSimilarSetting, Common.UIString.UIString('Group similar'));
@@ -134,7 +135,7 @@
rightToolbar.appendToolbarItem(this._showSettingsPaneButton);
this._preserveLogCheckbox = new UI.Toolbar.ToolbarSettingCheckbox(
- self.Common.settings.moduleSetting('preserveConsoleLog'),
+ Common.Settings.Settings.instance().moduleSetting('preserveConsoleLog'),
Common.UIString.UIString('Do not clear log on page reload / navigation'),
Common.UIString.UIString('Preserve log'));
this._hideNetworkMessagesCheckbox = new UI.Toolbar.ToolbarSettingCheckbox(
@@ -144,9 +145,10 @@
this._filter._filterByExecutionContextSetting,
Common.UIString.UIString('Only show messages from the current context (top, iframe, worker, extension)'),
Common.UIString.UIString('Selected context only'));
- const monitoringXHREnabledSetting = self.Common.settings.moduleSetting('monitoringXHREnabled');
- this._timestampsSetting = self.Common.settings.moduleSetting('consoleTimestampsEnabled');
- this._consoleHistoryAutocompleteSetting = self.Common.settings.moduleSetting('consoleHistoryAutocomplete');
+ const monitoringXHREnabledSetting = Common.Settings.Settings.instance().moduleSetting('monitoringXHREnabled');
+ this._timestampsSetting = Common.Settings.Settings.instance().moduleSetting('consoleTimestampsEnabled');
+ this._consoleHistoryAutocompleteSetting =
+ Common.Settings.Settings.instance().moduleSetting('consoleHistoryAutocomplete');
const settingsPane = new UI.Widget.HBox();
settingsPane.show(this._contentsElement);
@@ -165,12 +167,12 @@
settingsToolbarRight.makeVertical();
settingsToolbarRight.appendToolbarItem(new UI.Toolbar.ToolbarSettingCheckbox(monitoringXHREnabledSetting));
const eagerEvalCheckbox = new UI.Toolbar.ToolbarSettingCheckbox(
- self.Common.settings.moduleSetting('consoleEagerEval'), ls`Eagerly evaluate text in the prompt`);
+ Common.Settings.Settings.instance().moduleSetting('consoleEagerEval'), ls`Eagerly evaluate text in the prompt`);
settingsToolbarRight.appendToolbarItem(eagerEvalCheckbox);
settingsToolbarRight.appendToolbarItem(
new UI.Toolbar.ToolbarSettingCheckbox(this._consoleHistoryAutocompleteSetting));
- const userGestureCheckbox =
- new UI.Toolbar.ToolbarSettingCheckbox(self.Common.settings.moduleSetting('consoleUserActivationEval'));
+ const userGestureCheckbox = new UI.Toolbar.ToolbarSettingCheckbox(
+ Common.Settings.Settings.instance().moduleSetting('consoleUserActivationEval'));
settingsToolbarRight.appendToolbarItem(userGestureCheckbox);
if (!this._showSettingsPaneSetting.get()) {
settingsPane.element.classList.add('hidden');
@@ -227,7 +229,7 @@
this._consoleMessages = [];
this._viewMessageSymbol = Symbol('viewMessage');
- this._consoleHistorySetting = self.Common.settings.createLocalSetting('consoleHistory', []);
+ this._consoleHistorySetting = Common.Settings.Settings.instance().createLocalSetting('consoleHistory', []);
this._prompt = new ConsolePrompt();
this._prompt.show(this._promptElement);
@@ -1281,8 +1283,9 @@
this._filterChanged = filterChangedCallback;
this._messageLevelFiltersSetting = ConsoleViewFilter.levelFilterSetting();
- this._hideNetworkMessagesSetting = self.Common.settings.moduleSetting('hideNetworkMessages');
- this._filterByExecutionContextSetting = self.Common.settings.moduleSetting('selectedContextFilterEnabled');
+ this._hideNetworkMessagesSetting = Common.Settings.Settings.instance().moduleSetting('hideNetworkMessages');
+ this._filterByExecutionContextSetting =
+ Common.Settings.Settings.instance().moduleSetting('selectedContextFilterEnabled');
this._messageLevelFiltersSetting.addChangeListener(this._onFilterChanged.bind(this));
this._hideNetworkMessagesSetting.addChangeListener(this._onFilterChanged.bind(this));
@@ -1294,7 +1297,7 @@
this._textFilterUI = new UI.Toolbar.ToolbarInput(
Common.UIString.UIString('Filter'), '', 0.2, 1, Common.UIString.UIString('e.g. /event\\d/ -cdn url:a.com'),
this._suggestionBuilder.completions.bind(this._suggestionBuilder));
- this._textFilterSetting = self.Common.settings.createSetting('console.textFilter', '');
+ this._textFilterSetting = Common.Settings.Settings.instance().createSetting('console.textFilter', '');
if (this._textFilterSetting.get()) {
this._textFilterUI.setValue(this._textFilterSetting.get());
}
@@ -1345,7 +1348,8 @@
* @return {!Common.Settings.Setting}
*/
static levelFilterSetting() {
- return self.Common.settings.createSetting('messageLevelFilters', ConsoleFilter.defaultLevelsFilterValue());
+ return Common.Settings.Settings.instance().createSetting(
+ 'messageLevelFilters', ConsoleFilter.defaultLevelsFilterValue());
}
_updateCurrentFilter() {
diff --git a/front_end/console/ConsoleViewMessage.js b/front_end/console/ConsoleViewMessage.js
index 534ebb6..1cf5ec6 100644
--- a/front_end/console/ConsoleViewMessage.js
+++ b/front_end/console/ConsoleViewMessage.js
@@ -231,7 +231,7 @@
break;
case SDK.ConsoleModel.MessageType.Clear:
messageElement = createElementWithClass('span', 'console-info');
- if (self.Common.settings.moduleSetting('preserveConsoleLog').get()) {
+ if (Common.Settings.Settings.instance().moduleSetting('preserveConsoleLog').get()) {
messageElement.textContent =
Common.UIString.UIString('console.clear() was prevented due to \'Preserve log\'');
} else {
@@ -1015,7 +1015,7 @@
return;
}
- if (self.Common.settings.moduleSetting('consoleTimestampsEnabled').get()) {
+ if (Common.Settings.Settings.instance().moduleSetting('consoleTimestampsEnabled').get()) {
if (!this._timestampElement) {
this._timestampElement = createElementWithClass('span', 'console-timestamp');
}
