From ce234ab3c748d703157e39f9f01a8a6252d95194 Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Fri, 29 May 2020 17:14:38 +0200 Subject: [PATCH 1/2] Remove the `deprecatedInMozcentral` functionality from the `external/builder/builder.js` file This functionality has been completely unused ever since PR 9629 (two years ago). --- external/builder/builder.js | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/external/builder/builder.js b/external/builder/builder.js index a2d37a365..ebf55efc4 100644 --- a/external/builder/builder.js +++ b/external/builder/builder.js @@ -196,19 +196,13 @@ function preprocess(inFilename, outFilename, defines) { } exports.preprocess = preprocess; -var deprecatedInMozcentral = new RegExp( - "(^|\\W)(" + ["-moz-box-sizing", "-moz-grab", "-moz-grabbing"].join("|") + ")" -); - function preprocessCSS(mode, source, destination) { function hasPrefixedFirefox(line) { return /(^|\W)-(ms|o|webkit)-\w/.test(line); } function hasPrefixedMozcentral(line) { - return ( - /(^|\W)-(ms|o|webkit)-\w/.test(line) || deprecatedInMozcentral.test(line) - ); + return /(^|\W)-(ms|o|webkit)-\w/.test(line); } function expandImports(content, baseUrl) { From d7dee0ea1c1e9b3a572bebcfee8532c193c8059f Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Fri, 29 May 2020 17:18:16 +0200 Subject: [PATCH 2/2] Remove the `hasPrefixedFirefox` functionality from the `external/builder/builder.js` file This functionality has been completely unused ever since PR 9566 (two years ago). --- external/builder/builder.js | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/external/builder/builder.js b/external/builder/builder.js index ebf55efc4..9ae677594 100644 --- a/external/builder/builder.js +++ b/external/builder/builder.js @@ -197,10 +197,6 @@ function preprocess(inFilename, outFilename, defines) { exports.preprocess = preprocess; function preprocessCSS(mode, source, destination) { - function hasPrefixedFirefox(line) { - return /(^|\W)-(ms|o|webkit)-\w/.test(line); - } - function hasPrefixedMozcentral(line) { return /(^|\W)-(ms|o|webkit)-\w/.test(line); } @@ -269,11 +265,8 @@ function preprocessCSS(mode, source, destination) { var content = fs.readFileSync(source, "utf8").toString(); content = expandImports(content, source); - if (mode === "mozcentral" || mode === "firefox") { - content = removePrefixed( - content, - mode === "mozcentral" ? hasPrefixedMozcentral : hasPrefixedFirefox - ); + if (mode === "mozcentral") { + content = removePrefixed(content, hasPrefixedMozcentral); } fs.writeFileSync(destination, content); }