renamed options

cli/README.MD

@@ -71,9 +71,9 @@ This is a **work in progress**.
 
   - Convert a MAFF file (e.g. `wikipedia.maff`) into `wikipedia.html` with Firefox installed in the folder "~/firefox-56.0.2/" (Linux/Unix/BSD etc.) or "C:\Program Files\Mozilla Firefox 56.0.2\" (Windows)
 
-  `$ ./single-file.js file:///home/gildas/wikipedia.maff wikipedia.html --enable-MAFF  --load-deferred-images=false --back-end=webdriver-firefox --browser-executable-path=~/firefox-56.0.2/firefox` (Linux/Unix/BSD etc.)
+  `$ ./single-file.js file:///home/gildas/wikipedia.maff wikipedia.html --enable-MAFF  --load-deferred-images=false --back-end=webdriver-gecko --browser-executable-path=~/firefox-56.0.2/firefox` (Linux/Unix/BSD etc.)
   
-  `> node single-file.js file:///C:/Users/Gildas/wikipedia.maff wikipedia.html --enable-MAFF  --load-deferred-images=false --back-end=webdriver-firefox --browser-executable-path="C:\Program Files\Mozilla Firefox 56.0.2\firefox"` (Windows)
+  `> node single-file.js file:///C:/Users/Gildas/wikipedia.maff wikipedia.html --enable-MAFF  --load-deferred-images=false --back-end=webdriver-gecko --browser-executable-path="C:\Program Files\Mozilla Firefox 56.0.2\firefox"` (Windows)
   
 ## License
 

cli/single-file.js

@@ -62,18 +62,18 @@ const args = require("yargs")
 		"web-driver-executable-path": ""
 	})
 	.options("back-end", { description: "Back-end to use" })
-	.choices("back-end", ["jsdom", "puppeteer", "webdriver-chrome", "webdriver-firefox"])
-	.options("browser-headless", { description: "Run the browser in headless mode (puppeteer, webdriver-firefox, webdriver-chrome)" })
+	.choices("back-end", ["jsdom", "puppeteer", "webdriver-chromium", "webdriver-gecko"])
+	.options("browser-headless", { description: "Run the browser in headless mode (puppeteer, webdriver-gecko, webdriver-chromium)" })
 	.boolean("browser-headless")
-	.options("browser-executable-path", { description: "Path to chrome/chromium executable (puppeteer, webdriver-firefox, webdriver-chrome)" })
+	.options("browser-executable-path", { description: "Path to chrome/chromium executable (puppeteer, webdriver-gecko, webdriver-chromium)" })
 	.string("browser-executable-path")
 	.options("browser-width", { description: "Width of the browser viewport in pixels" })
 	.number("browser-width")
 	.options("browser-height", { description: "Height of the browser viewport in pixels" })
 	.number("browser-height")
-	.options("browser-wait-until", { description: "When to consider the page is loaded (puppeteer, webdriver-firefox, webdriver-chrome)" })
+	.options("browser-wait-until", { description: "When to consider the page is loaded (puppeteer, webdriver-gecko, webdriver-chromium)" })
 	.choices("browser-wait-until", ["networkidle0", "networkidle2", "load", "domcontentloaded"])
-	.options("enable-MAFF", { description: "Enables support of MAFF pages with Firefox < 57 (webdriver-firefox)" })
+	.options("enable-MAFF", { description: "Enables support of MAFF pages with Firefox < 57 (webdriver-gecko)" })
 	.boolean("enable-MAFF")
 	.options("compress-CSS", { description: "Compress CSS stylesheets" })
 	.boolean("compress-CSS")
@@ -83,9 +83,9 @@ const args = require("yargs")
 	.string("filename-template")
 	.options("group-duplicate-images", { description: "Group duplicate images into CSS custom properties" })
 	.boolean("compress-HTML")
-	.options("load-deferred-images", { description: "Load deferred (a.k.a. lazy-loaded) images (puppeteer, webdriver-firefox, webdriver-chrome)" })
+	.options("load-deferred-images", { description: "Load deferred (a.k.a. lazy-loaded) images (puppeteer, webdriver-gecko, webdriver-chromium)" })
 	.boolean("load-deferred-images")
-	.options("load-deferred-images-max-idle-time", { description: "Maximum delay of time to wait for deferred images (puppeteer, webdriver-firefox, webdriver-chrome)" })
+	.options("load-deferred-images-max-idle-time", { description: "Maximum delay of time to wait for deferred images (puppeteer, webdriver-gecko, webdriver-chromium)" })
 	.number("load-deferred-images")
 	.options("max-resource-size-enabled", { description: "Enable removal of embedded resources exceeding a given size" })
 	.boolean("max-resource-size-enabled")
@@ -97,7 +97,7 @@ const args = require("yargs")
 	.number("remove-unused-styles")
 	.options("remove-unused-fonts", { description: "Remove unused CSS font rules" })
 	.number("remove-unused-fonts")
-	.options("remove-frames", { description: "Remove frames (puppeteer, webdriver-firefox, webdriver-chrome)" })
+	.options("remove-frames", { description: "Remove frames (puppeteer, webdriver-gecko, webdriver-chromium)" })
 	.number("remove-frames")
 	.options("remove-imports", { description: "Remove HTML imports" })
 	.number("remove-imports")
@@ -113,17 +113,17 @@ const args = require("yargs")
 	.number("remove-alternative-medias")
 	.options("remove-alternative-images", { description: "Remove images for alternative sizes of screen" })
 	.number("remove-alternative-images")
-	.options("save-raw-page", { description: "Save the original page without interpreting it into the browser (puppeteer, webdriver-firefox, webdriver-chrome)" })
+	.options("save-raw-page", { description: "Save the original page without interpreting it into the browser (puppeteer, webdriver-gecko, webdriver-chromium)" })
 	.number("save-raw-page")
-	.options("web-driver-executable-path", { description: "Path to Selenium WebDriver executable (webdriver-firefox, webdriver-chrome)" })
+	.options("web-driver-executable-path", { description: "Path to Selenium WebDriver executable (webdriver-gecko, webdriver-chromium)" })
 	.string("web-driver-executable-path")
 	.argv;
 
 const backEnds = {
 	jsdom: "./back-ends/jsdom.js",
 	puppeteer: "./back-ends/puppeteer.js",
-	"webdriver-chrome": "./back-ends/webdriver-chrome.js",
-	"webdriver-firefox": "./back-ends/webdriver-firefox.js"
+	"webdriver-chromium": "./back-ends/webdriver-chromium.js",
+	"webdriver-gecko": "./back-ends/webdriver-gecko.js"
 };
 require(backEnds[args.backEnd]).getPageData(args).then(pageData => {
 	if (args.output) {