commit 7a3fd8df5061232e9d7e78acb1b5703da40e17cd
parent 53b9a6654d78aa7d628ba16e6b5568da1bec9645
Author: Alexandru Marc <amarc@mozilla.com>
Date: Mon, 27 Oct 2025 19:05:42 +0200
Revert "Bug 1996193 - [devtools] Move Disable JS option footnote to a sub label. r=devtools-reviewers,fluent-reviewers,bomsy,bolsson." for causing dt failures @ browser_dbg-pretty-print-inline-scripts.js
This reverts commit 54d9bcaeeb132187a225796c4f05b6411e472ee9.
Diffstat:
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/devtools/client/framework/toolbox-options.html b/devtools/client/framework/toolbox-options.html
@@ -266,11 +266,7 @@
</label>
<label data-l10n-id="options-disable-javascript-tooltip">
<input type="checkbox" id="devtools-disable-javascript" />
- <span data-l10n-id="options-disable-javascript-label-2"></span>
- <span
- class="option-secondary-label"
- data-l10n-id="options-context-triggers-page-refresh-temporary"
- ></span>
+ <span data-l10n-id="options-disable-javascript-label"></span>
</label>
<label data-l10n-id="options-enable-service-workers-http-tooltip">
<input
@@ -297,6 +293,11 @@
<input type="checkbox" data-pref="devtools.f12_enabled" />
<span data-l10n-id="options-enable-f12-label"></span>
</label>
+ <span
+ class="options-citation-label theme-comment"
+ id="triggers-page-refresh-label"
+ data-l10n-id="options-context-triggers-page-refresh"
+ ></span>
</fieldset>
</div>
</form>
diff --git a/devtools/client/framework/toolbox-options.js b/devtools/client/framework/toolbox-options.js
@@ -554,6 +554,11 @@ class OptionsPanel extends EventEmitter {
} else {
// Hide the checkbox and label
this.disableJSNode.parentNode.style.display = "none";
+
+ const triggersPageRefreshLabel = this.panelDoc.getElementById(
+ "triggers-page-refresh-label"
+ );
+ triggersPageRefreshLabel.style.display = "none";
}
}
diff --git a/devtools/client/locales/en-US/toolbox-options.ftl b/devtools/client/locales/en-US/toolbox-options.ftl
@@ -135,7 +135,7 @@ options-disable-http-cache-tooltip =
.title = Turning this option on will disable the HTTP cache for all tabs that have the toolbox open. Service Workers are not affected by this option.
# The label for checkbox that toggles JavaScript on or off
-options-disable-javascript-label-2 = Disable JavaScript
+options-disable-javascript-label = Disable JavaScript *
options-disable-javascript-tooltip =
.title = Turning this option on will disable JavaScript for the current tab. If the tab or the toolbox is closed then this setting will be forgotten.
@@ -170,9 +170,7 @@ options-source-maps-tooltip =
.title = If you enable this option sources will be mapped in the tools.
# The message shown for settings that trigger page reload and will only apply to the current session
-# This appears underneath the applicable options (e.g. options-disable-javascript-label-2).
-options-context-triggers-page-refresh-temporary = (current session only, reloads the page)
+options-context-triggers-page-refresh = * Current session only, reloads the page
# The message shown for settings that trigger page reload
-# This appears underneath the applicable options (e.g. options-show-user-agent-shadow-dom-label).
options-context-triggers-page-refresh-persists = (reloads the page)