diff options
| author | Moonchild <moonchild@palemoon.org> | 2022-04-09 15:49:48 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2022-04-09 15:49:48 +0000 |
| commit | d90ce1e30a9046a48b22135672c4cf72cc840b37 (patch) | |
| tree | 896233f440e23e5dc6bdf08394e6d912637dea2f | |
| parent | f9caae6cfde7b22fd37370365a540ed23f772ed6 (diff) | |
| parent | bee1a6fe1c6e62e7ccbe89bb9bdcaf45e454fdd4 (diff) | |
| download | uxp-d90ce1e30a9046a48b22135672c4cf72cc840b37.tar.gz | |
Merge pull request 'Follow-up: Remove grid preference check from developer tools' (#1855) from FranklinDM/UXP-contrib:work_css-grid-pref-followup into master
Reviewed-on: https://repo.palemoon.org/MoonchildProductions/UXP/pulls/1855
| -rw-r--r-- | devtools/client/shared/output-parser.js | 4 | ||||
| -rw-r--r-- | devtools/server/actors/highlighters/css-grid.js | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/devtools/client/shared/output-parser.js b/devtools/client/shared/output-parser.js index b4fb1c6aa9..1bd3700134 100644 --- a/devtools/client/shared/output-parser.js +++ b/devtools/client/shared/output-parser.js @@ -17,7 +17,6 @@ const { const Services = require("Services"); const HTML_NS = "http://www.w3.org/1999/xhtml"; -const CSS_GRID_ENABLED_PREF = "layout.css.grid.enabled"; /** * This module is used to process text for output by developer tools. This means @@ -207,8 +206,7 @@ OutputParser.prototype = { if (options.expectCubicBezier && BEZIER_KEYWORDS.indexOf(token.text) >= 0) { this._appendCubicBezier(token.text, options); - } else if (Services.prefs.getBoolPref(CSS_GRID_ENABLED_PREF) && - options.expectDisplay && token.text === "grid" && + } else if (options.expectDisplay && token.text === "grid" && text === token.text) { this._appendGrid(token.text, options); } else if (colorOK() && diff --git a/devtools/server/actors/highlighters/css-grid.js b/devtools/server/actors/highlighters/css-grid.js index 0ed1ee9614..09fc090cfa 100644 --- a/devtools/server/actors/highlighters/css-grid.js +++ b/devtools/server/actors/highlighters/css-grid.js @@ -19,7 +19,6 @@ const { } = require("devtools/shared/layout/utils"); const { stringifyGridFragments } = require("devtools/server/actors/utils/css-grid-utils"); -const CSS_GRID_ENABLED_PREF = "layout.css.grid.enabled"; const ROWS = "rows"; const COLUMNS = "cols"; const GRID_LINES_PROPERTIES = { @@ -292,7 +291,7 @@ CssGridHighlighter.prototype = extend(AutoRefreshHighlighter.prototype, { }, _show() { - if (Services.prefs.getBoolPref(CSS_GRID_ENABLED_PREF) && !this.isGrid()) { + if (!this.isGrid()) { this.hide(); return false; } |