From 561b6cfb0c6a91990bc993cfd73db034993ce465 Mon Sep 17 00:00:00 2001 From: Mark Banner Date: Fri, 3 Mar 2017 09:29:14 +0000 Subject: [PATCH] Bug 1344027 - Fix most of the remaining ESLint no-undef issues in browser/components. r=jaws MozReview-Commit-ID: DUnxVITvZgh --HG-- extra : rebase_source : abe5adf3b024a45c2804d048f078c6a59a936242 --- .eslintignore | 4 ++-- browser/base/content/test/siteIdentity/.eslintrc.js | 7 +++++++ .../components/customizableui/content/.eslintrc.js | 11 +++++++++++ browser/components/newtab/PlacesProvider.jsm | 1 - browser/components/nsBrowserGlue.js | 3 ++- .../test/browser/browser_firstPartyIsolation.js | 3 +++ browser/components/places/content/.eslintrc.js | 12 ++++++++++++ .../components/places/content/bookmarkProperties.js | 2 ++ .../components/places/content/browserPlacesViews.js | 2 ++ .../components/places/content/editBookmarkOverlay.js | 8 ++++++-- browser/components/places/content/places.js | 4 ++++ browser/components/places/content/places.xul | 6 ++---- browser/components/places/content/placesOverlay.xul | 7 ++++--- ...rowser_privatebrowsing_context_and_chromeFlags.js | 2 ++ browser/components/search/content/search.xml | 6 ++++++ browser/components/syncedtabs/sidebar.js | 2 +- .../components/translation/translation-infobar.xml | 2 ++ browser/components/uitour/UITour-lib.js | 1 + browser/components/uitour/content-UITour.js | 1 + browser/components/uitour/test/head.js | 6 ++++++ toolkit/.eslintrc.js | 8 +++++++- 21 files changed, 83 insertions(+), 15 deletions(-) create mode 100644 browser/base/content/test/siteIdentity/.eslintrc.js create mode 100644 browser/components/customizableui/content/.eslintrc.js create mode 100644 browser/components/places/content/.eslintrc.js diff --git a/.eslintignore b/.eslintignore index 62511ef6398f..d482f09903e5 100644 --- a/.eslintignore +++ b/.eslintignore @@ -63,8 +63,8 @@ browser/base/content/newtab/** browser/components/downloads/** browser/components/sessionstore/** browser/components/tabview/** -# generated files in cld2 -browser/components/translation/cld2/cld-worker.js +# generated & special files in cld2 +browser/components/translation/cld2/** browser/extensions/pdfjs/content/build** browser/extensions/pdfjs/content/web** # generated or library files in pocket diff --git a/browser/base/content/test/siteIdentity/.eslintrc.js b/browser/base/content/test/siteIdentity/.eslintrc.js new file mode 100644 index 000000000000..7c80211924ef --- /dev/null +++ b/browser/base/content/test/siteIdentity/.eslintrc.js @@ -0,0 +1,7 @@ +"use strict"; + +module.exports = { + "extends": [ + "../../../../../testing/mochitest/browser.eslintrc.js" + ] +}; diff --git a/browser/components/customizableui/content/.eslintrc.js b/browser/components/customizableui/content/.eslintrc.js new file mode 100644 index 000000000000..1be6746d5a7d --- /dev/null +++ b/browser/components/customizableui/content/.eslintrc.js @@ -0,0 +1,11 @@ +"use strict"; + +module.exports = { // eslint-disable-line no-undef + "env": { + "mozilla/browser-window": true, + }, + + "plugins": [ + "mozilla", + ] +}; diff --git a/browser/components/newtab/PlacesProvider.jsm b/browser/components/newtab/PlacesProvider.jsm index 1a0e99141270..2f39d6f98b92 100644 --- a/browser/components/newtab/PlacesProvider.jsm +++ b/browser/components/newtab/PlacesProvider.jsm @@ -242,4 +242,3 @@ let PlacesProvider = { // Kept only for backwards-compatibility XPCOMUtils.defineLazyGetter(PlacesProvider, "LinkChecker", () => NewTabUtils.linkChecker); - diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js index a780dcf02329..195bd9fa65a0 100644 --- a/browser/components/nsBrowserGlue.js +++ b/browser/components/nsBrowserGlue.js @@ -23,7 +23,8 @@ XPCOMUtils.defineLazyServiceGetter(this, "AlertsService", "@mozilla.org/alerts-s AsyncShutdown:false, AutoCompletePopup:false, BookmarkHTMLUtils:false, BookmarkJSONUtils:false, BrowserUITelemetry:false, BrowserUsageTelemetry:false, ContentClick:false, ContentPrefServiceParent:false, ContentSearch:false, - DateTimePickerHelper:false, DirectoryLinksProvider:false, Feeds:false, + DateTimePickerHelper:false, DirectoryLinksProvider:false, + ExtensionsUI:false, Feeds:false, FileUtils:false, FormValidationHandler:false, Integration:false, LightweightThemeManager:false, LoginHelper:false, LoginManagerParent:false, NetUtil:false, NewTabMessages:false, NewTabUtils:false, OS:false, diff --git a/browser/components/originattributes/test/browser/browser_firstPartyIsolation.js b/browser/components/originattributes/test/browser/browser_firstPartyIsolation.js index 1f2e82263003..6c6a0a786724 100644 --- a/browser/components/originattributes/test/browser/browser_firstPartyIsolation.js +++ b/browser/components/originattributes/test/browser/browser_firstPartyIsolation.js @@ -1,3 +1,6 @@ +// This file spawns content tasks. +/* eslint-env mozilla/frame-script */ + const BASE_URL = "http://mochi.test:8888/browser/browser/components/originattributes/test/browser/"; const BASE_DOMAIN = "mochi.test"; diff --git a/browser/components/places/content/.eslintrc.js b/browser/components/places/content/.eslintrc.js new file mode 100644 index 000000000000..8e8266ed8849 --- /dev/null +++ b/browser/components/places/content/.eslintrc.js @@ -0,0 +1,12 @@ +"use strict"; + +module.exports = { + "env": { + // Everything in this directory is loaded alongside the places overlay. + "mozilla/places-overlay": true + }, + + "plugins": [ + "mozilla", + ] +}; diff --git a/browser/components/places/content/bookmarkProperties.js b/browser/components/places/content/bookmarkProperties.js index fd37c04a4f57..7cb21848d334 100644 --- a/browser/components/places/content/bookmarkProperties.js +++ b/browser/components/places/content/bookmarkProperties.js @@ -57,6 +57,8 @@ * been performed by the dialog. */ +/* import-globals-from editBookmarkOverlay.js */ + Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "PrivateBrowsingUtils", "resource://gre/modules/PrivateBrowsingUtils.jsm"); diff --git a/browser/components/places/content/browserPlacesViews.js b/browser/components/places/content/browserPlacesViews.js index e6b74ad81a5a..1a40b334bceb 100644 --- a/browser/components/places/content/browserPlacesViews.js +++ b/browser/components/places/content/browserPlacesViews.js @@ -2,6 +2,8 @@ * 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/. */ +/* eslint-env mozilla/browser-window */ + Components.utils.import("resource://gre/modules/AppConstants.jsm"); Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); Components.utils.import("resource://gre/modules/Services.jsm"); diff --git a/browser/components/places/content/editBookmarkOverlay.js b/browser/components/places/content/editBookmarkOverlay.js index 4fc0b7893100..003f38fad868 100644 --- a/browser/components/places/content/editBookmarkOverlay.js +++ b/browser/components/places/content/editBookmarkOverlay.js @@ -286,9 +286,13 @@ var gEditItemOverlay = { // Note: since all controls are collapsed by default, we don't get the // default XUL dialog behavior, that selects the first control, so we set // the focus explicitly. + // Note: If focusedElement === "preferred", this file expects gPrefService + // to be defined in the global scope. let elt; if (focusedElement === "preferred") { + /* eslint-disable no-undef */ elt = this._element(gPrefService.getCharPref("browser.bookmarks.editDialog.firstEditField")); + /* eslint-enable no-undef */ } else if (focusedElement === "first") { elt = document.querySelector("textbox:not([collapsed=true])"); } @@ -899,7 +903,7 @@ var gEditItemOverlay = { let tagsInField = this._getTagsArrayFromTagsInputField(); let allTags = PlacesUtils.tagging.allTags; - for (tag of allTags) { + for (let tag of allTags) { let elt = document.createElement("listitem"); elt.setAttribute("type", "checkbox"); elt.setAttribute("label", tag); @@ -1064,7 +1068,7 @@ var gEditItemOverlay = { // menulist has been changed, we need to update the label of its // representing element. let menupopup = this._folderMenuList.menupopup; - for (menuitem of menupopup.childNodes) { + for (let menuitem of menupopup.childNodes) { if ("folderId" in menuitem && menuitem.folderId == aItemId) { menuitem.label = aNewTitle; break; diff --git a/browser/components/places/content/places.js b/browser/components/places/content/places.js index d416d6f1d7bd..6dc8a2ae9e08 100644 --- a/browser/components/places/content/places.js +++ b/browser/components/places/content/places.js @@ -3,6 +3,10 @@ * 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/. */ +/* import-globals-from editBookmarkOverlay.js */ +// Via downloadsViewOverlay.xul -> allDownloadsViewOverlay.xul +/* import-globals-from ../../../../toolkit/content/contentAreaUtils.js */ + Components.utils.import("resource://gre/modules/AppConstants.jsm"); Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); Components.utils.import("resource://gre/modules/TelemetryStopwatch.jsm"); diff --git a/browser/components/places/content/places.xul b/browser/components/places/content/places.xul index 16c3385cbf78..24e18b607a0b 100644 --- a/browser/components/places/content/places.xul +++ b/browser/components/places/content/places.xul @@ -44,8 +44,6 @@