diff --git a/.eslintignore b/.eslintignore index a6b0d12e645b..3f5d11707735 100644 --- a/.eslintignore +++ b/.eslintignore @@ -191,32 +191,20 @@ mobile/android/installer/ mobile/android/locales/ # TODO - Bug 1881094: temporarily ignored for firefox-android migration -mobile/android/android-components/components/browser/engine-system/src/main/res/raw/domain_blocklist.json -mobile/android/android-components/components/browser/engine-system/src/main/res/raw/domain_safelist.json mobile/android/android-components/components/browser/errorpages/src/main/assets/errorPageScripts.js -mobile/android/android-components/components/browser/errorpages/src/main/assets/error_page_js.html mobile/android/android-components/components/browser/icons/src/main/assets/extensions/browser-icons/icons.js -mobile/android/android-components/components/browser/session-storage/src/androidTest/assets/index.html -mobile/android/android-components/components/concept/engine/src/test/resources/manifests/example_mdn.json -mobile/android/android-components/components/concept/engine/src/test/resources/manifests/invalid_json.json -mobile/android/android-components/components/concept/engine/src/test/resources/manifests/spec_typical.json -mobile/android/android-components/components/concept/engine/src/test/resources/manifests/twitter_mobile.json mobile/android/android-components/components/feature/accounts/src/main/assets/extensions/fxawebchannel/background.js mobile/android/android-components/components/feature/accounts/src/main/assets/extensions/fxawebchannel/fxawebchannel.js -mobile/android/android-components/components/feature/addons/src/test/resources/collection.json -mobile/android/android-components/components/feature/addons/src/test/resources/collection_with_empty_values.json -mobile/android/android-components/components/feature/addons/src/test/resources/localized_collection.json mobile/android/android-components/components/feature/readerview/src/main/assets/extensions/readerview/ mobile/android/android-components/components/feature/search/src/main/assets/extensions/ads/adsTelemetry.js mobile/android/android-components/components/feature/search/src/main/assets/extensions/search/searchTelemetry.js -mobile/android/android-components/components/feature/webcompat-reporter/src/main/assets/ mobile/android/android-components/components/feature/webcompat/src/main/assets/extensions/webcompat/ +mobile/android/android-components/docs/assets/js/icon-js.js mobile/android/android-components/samples/browser/src/main/assets/extensions/test/background.js mobile/android/fenix/app/src/androidTest/assets/ mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/syncintegration/ mobile/android/fenix/app/src/main/assets/ mobile/android/focus-android/app/src/androidTest/assets/ -mobile/android/android-components/docs/assets/js/icon-js.js # Pre-processed/pref files modules/libpref/greprefs.js diff --git a/mobile/.eslintrc.js b/mobile/.eslintrc.js deleted file mode 100644 index bde25b202314..000000000000 --- a/mobile/.eslintrc.js +++ /dev/null @@ -1,11 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -"use strict"; - -module.exports = { - rules: { - "prefer-const": "error", - }, -}; diff --git a/mobile/android/android-components/components/browser/errorpages/src/main/assets/errorPageScripts.js b/mobile/android/android-components/components/browser/errorpages/src/main/assets/errorPageScripts.js index 09804908f790..1feafbfe3791 100644 --- a/mobile/android/android-components/components/browser/errorpages/src/main/assets/errorPageScripts.js +++ b/mobile/android/android-components/components/browser/errorpages/src/main/assets/errorPageScripts.js @@ -66,12 +66,10 @@ function updateShowSSL(queryMap) { const showSSL = queryMap.showSSL; if (typeof document.addCertException === "undefined") { document.getElementById("advancedButton").style.display = "none"; + } else if (showSSL === "true") { + document.getElementById("advancedButton").style.display = "block"; } else { - if (showSSL === "true") { - document.getElementById("advancedButton").style.display = "block"; - } else { - document.getElementById("advancedButton").style.display = "none"; - } + document.getElementById("advancedButton").style.display = "none"; } } diff --git a/mobile/android/android-components/components/browser/icons/src/main/assets/extensions/browser-icons/icons.js b/mobile/android/android-components/components/browser/icons/src/main/assets/extensions/browser-icons/icons.js index bc2c6ee35ebe..f1f05c9cd9b8 100644 --- a/mobile/android/android-components/components/browser/icons/src/main/assets/extensions/browser-icons/icons.js +++ b/mobile/android/android-components/components/browser/icons/src/main/assets/extensions/browser-icons/icons.js @@ -76,7 +76,7 @@ collect_meta_name_icons(icons, "msapplication-TileImage"); let message = { url: document.location.href, - icons: icons, + icons, }; browser.runtime.sendNativeMessage("MozacBrowserIcons", message); diff --git a/mobile/android/android-components/components/feature/readerview/src/main/assets/extensions/readerview/readerview.js b/mobile/android/android-components/components/feature/readerview/src/main/assets/extensions/readerview/readerview.js index ddea9218b0cb..9057b1eda259 100644 --- a/mobile/android/android-components/components/feature/readerview/src/main/assets/extensions/readerview/readerview.js +++ b/mobile/android/android-components/components/feature/readerview/src/main/assets/extensions/readerview/readerview.js @@ -296,7 +296,7 @@ function fetchDocument(url) { function getPreparedDocument(id, url) { return new Promise((resolve, reject) => { browser.runtime - .sendMessage({ action: "getSerializedDoc", id: id }) + .sendMessage({ action: "getSerializedDoc", id }) .then(serializedDoc => { if (serializedDoc) { let doc = new JSDOMParser().parse(serializedDoc, url); @@ -361,7 +361,7 @@ function connectNativePort() { break; case "checkReaderState": port.postMessage({ - baseUrl: baseUrl, + baseUrl, activeUrl: articleUrl, readerable: true, }); diff --git a/mobile/android/android-components/components/feature/search/src/main/assets/extensions/ads/adsTelemetry.js b/mobile/android/android-components/components/feature/search/src/main/assets/extensions/ads/adsTelemetry.js index 07787993262a..94f85ab48d5a 100644 --- a/mobile/android/android-components/components/feature/search/src/main/assets/extensions/ads/adsTelemetry.js +++ b/mobile/android/android-components/components/feature/search/src/main/assets/extensions/ads/adsTelemetry.js @@ -52,8 +52,8 @@ function getCookies() { value = value.join("="); result.push({ - name: name, - value: value, + name, + value, }); }); diff --git a/mobile/android/android-components/components/feature/search/src/main/assets/extensions/search/searchTelemetry.js b/mobile/android/android-components/components/feature/search/src/main/assets/extensions/search/searchTelemetry.js index 355f378b9cb6..caa85e0332eb 100644 --- a/mobile/android/android-components/components/feature/search/src/main/assets/extensions/search/searchTelemetry.js +++ b/mobile/android/android-components/components/feature/search/src/main/assets/extensions/search/searchTelemetry.js @@ -31,8 +31,8 @@ function getCookies() { value = value.join("="); result.push({ - name: name, - value: value, + name, + value, }); }); diff --git a/mobile/android/android-components/docs/assets/js/icon-js.js b/mobile/android/android-components/docs/assets/js/icon-js.js index 41ace3daf78b..da370befd781 100644 --- a/mobile/android/android-components/docs/assets/js/icon-js.js +++ b/mobile/android/android-components/docs/assets/js/icon-js.js @@ -86,11 +86,8 @@ function getFile(iconName, downloadUrl) { addSingleItemToTable("Loading"); let promises = []; for (let i = 0; i < response.length; i++) { - let iconName = response[i]["name"].substr( - 0, - response[i]["name"].length - 4 - ); - promises.push(getFile(iconName, response[i]["download_url"])); + let iconName = response[i].name.substr(0, response[i].name.length - 4); + promises.push(getFile(iconName, response[i].download_url)); } Promise.all(promises).then(values => { document.querySelector("#preview_table > tbody").innerHTML = ""; diff --git a/mobile/android/fenix/app/src/androidTest/assets/pages/refresh.html b/mobile/android/fenix/app/src/androidTest/assets/pages/refresh.html index 1951f917bbfa..0872938c71e8 100644 --- a/mobile/android/fenix/app/src/androidTest/assets/pages/refresh.html +++ b/mobile/android/fenix/app/src/androidTest/assets/pages/refresh.html @@ -24,10 +24,9 @@ if (currentCookie.localeCompare("REFRESHED") == 0) { setCookie("DEFAULT"); return "DEFAULT"; - } else { - setCookie("REFRESHED"); - return "REFRESHED"; } + setCookie("REFRESHED"); + return "REFRESHED"; } var textToShow = valSwap(); diff --git a/mobile/android/fenix/app/src/androidTest/assets/pages/trackingPage.html b/mobile/android/fenix/app/src/androidTest/assets/pages/trackingPage.html index e1ce445860e6..cf2a6efb0466 100644 --- a/mobile/android/fenix/app/src/androidTest/assets/pages/trackingPage.html +++ b/mobile/android/fenix/app/src/androidTest/assets/pages/trackingPage.html @@ -75,7 +75,7 @@ updateCookieStatus(event.data, list); } }); - }, false); + }); diff --git a/mobile/android/fenix/app/src/main/assets/lowMediumErrorPages.js b/mobile/android/fenix/app/src/main/assets/lowMediumErrorPages.js index 23a3fe91b4fd..b65c9db8650e 100644 --- a/mobile/android/fenix/app/src/main/assets/lowMediumErrorPages.js +++ b/mobile/android/fenix/app/src/main/assets/lowMediumErrorPages.js @@ -67,12 +67,10 @@ function updateShowSSL(queryMap) { const showSSL = queryMap.showSSL; if (typeof document.addCertException === "undefined") { document.getElementById("advancedButton").style.display = "none"; + } else if (showSSL === "true") { + document.getElementById("advancedButton").style.display = "block"; } else { - if (showSSL === "true") { - document.getElementById("advancedButton").style.display = "block"; - } else { - document.getElementById("advancedButton").style.display = "none"; - } + document.getElementById("advancedButton").style.display = "none"; } }