Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 04:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1321509 - allow non devtools prefs to be loaded in webpack prefs loader;r=tromey

Browse Source 
MozReview-Commit-ID: IVWK16kvWzw

--HG--
extra : rebase_source : ef864848933984cac0677f0b7a3f9a10c3a875be
This commit is contained in:
Julian Descottes 2016-11-22 16:47:15 +01:00
parent 3f0ff25997
commit 54c3ef166c
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
devtools/client/inspector/webpack/prefs-loader.js
View File

@ -6,7 +6,20 @@
"use strict";
const PREF_RX = new RegExp("^ *pref\\(\"devtools");
const PREF_WHITELIST = [
"devtools",
"layout.css.grid.enabled"
];
const acceptLine = function (line) {
let matches = line.match(/^ *pref\("([^"]+)"/);
if (!matches || !matches[1]) {
return false;
}
let [, prefName] = matches;
return PREF_WHITELIST.some(filter => prefName.startsWith(filter));
};
module.exports = function (content) {
this.cacheable && this.cacheable();
@ -47,7 +60,7 @@ module.exports = function (content) {
}
}
if (continuation || (!ignoring && PREF_RX.test(line))) {
if (continuation || (!ignoring && acceptLine(line))) {
newLines.push(line);
// The call to pref(...); might span more than one line.