diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-04-19 02:25:38 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-04-19 02:25:38 +0200 |
| commit | 51722cd4fecb5c8c79a302f2771cad71535df5ea (patch) | |
| tree | 4771e6d114249bf48d1e843167bcf393de2b98a2 /tools | |
| parent | 3eb4310cd889e6c8d22c27f0326273acf0a3e8bf (diff) | |
| parent | de75f133a7ec654d2a7c5bf628b3aee9fc109730 (diff) | |
| download | UXP-51722cd4fecb5c8c79a302f2771cad71535df5ea.tar UXP-51722cd4fecb5c8c79a302f2771cad71535df5ea.tar.gz UXP-51722cd4fecb5c8c79a302f2771cad71535df5ea.tar.lz UXP-51722cd4fecb5c8c79a302f2771cad71535df5ea.tar.xz UXP-51722cd4fecb5c8c79a302f2771cad71535df5ea.zip | |
Merge branch 'Sync-weave'
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/lint/eslint/eslint-plugin-mozilla/lib/rules/import-browserjs-globals.js | 3 | ||||
| -rw-r--r-- | tools/lint/eslint/modules.json | 11 |
2 files changed, 2 insertions, 12 deletions
diff --git a/tools/lint/eslint/eslint-plugin-mozilla/lib/rules/import-browserjs-globals.js b/tools/lint/eslint/eslint-plugin-mozilla/lib/rules/import-browserjs-globals.js index 313af2d71..00a48f359 100644 --- a/tools/lint/eslint/eslint-plugin-mozilla/lib/rules/import-browserjs-globals.js +++ b/tools/lint/eslint/eslint-plugin-mozilla/lib/rules/import-browserjs-globals.js @@ -48,8 +48,7 @@ const SCRIPTS = [ "browser/base/content/browser-tabsintitlebar.js", "browser/base/content/browser-thumbnails.js", "browser/base/content/browser-trackingprotection.js", - "browser/base/content/browser-data-submission-info-bar.js", - "browser/base/content/browser-fxaccounts.js" + "browser/base/content/browser-data-submission-info-bar.js" ]; module.exports = function(context) { diff --git a/tools/lint/eslint/modules.json b/tools/lint/eslint/modules.json index 767b43db0..30b5d3968 100644 --- a/tools/lint/eslint/modules.json +++ b/tools/lint/eslint/modules.json @@ -82,15 +82,6 @@ "forms.jsm": ["FormData"], "frame.js": ["Collector", "Runner", "events", "runTestFile", "log", "timers", "persisted", "shutdownApplication"], "FrameScriptManager.jsm": ["getNewLoaderID"], - "fxa_utils.js": ["initializeIdentityWithTokenServerResponse"], - "fxaccounts.jsm": ["Authentication"], - "FxAccounts.jsm": ["fxAccounts", "FxAccounts"], - "FxAccountsOAuthGrantClient.jsm": ["FxAccountsOAuthGrantClient", "FxAccountsOAuthGrantClientError"], - "FxAccountsProfileClient.jsm": ["FxAccountsProfileClient", "FxAccountsProfileClientError"], - "FxAccountsPush.js": ["FxAccountsPushService"], - "FxAccountsStorage.jsm": ["FxAccountsStorageManagerCanStoreField", "FxAccountsStorageManager"], - "FxAccountsWebChannel.jsm": ["EnsureFxAccountsWebChannel"], - "FxaMigrator.jsm": ["fxaMigrator"], "gDevTools.jsm": ["gDevTools", "gDevToolsBrowser"], "gDevTools.jsm": ["gDevTools", "gDevToolsBrowser"], "Geometry.jsm": ["Point", "Rect"], @@ -228,7 +219,7 @@ "UpdateTelemetry.jsm": ["AUSTLMY"], "userapi.js": ["UserAPI10Client"], "util.js": ["getChromeWindow", "XPCOMUtils", "Services", "Utils", "Async", "Svc", "Str"], - "utils.js": ["applicationName", "assert", "Copy", "getBrowserObject", "getChromeWindow", "getWindows", "getWindowByTitle", "getWindowByType", "getWindowId", "getMethodInWindows", "getPreference", "saveDataURL", "setPreference", "sleep", "startTimer", "stopTimer", "takeScreenshot", "unwrapNode", "waitFor", "btoa", "encryptPayload", "isConfiguredWithLegacyIdentity", "ensureLegacyIdentityManager", "setBasicCredentials", "makeIdentityConfig", "makeFxAccountsInternalMock", "configureFxAccountIdentity", "configureIdentity", "SyncTestingInfrastructure", "waitForZeroTimer", "Promise", "add_identity_test", "MockFxaStorageManager", "AccountState", "sumHistogram", "CommonUtils", "CryptoUtils", "TestingUtils"], + "utils.js": ["applicationName", "assert", "Copy", "getBrowserObject", "getChromeWindow", "getWindows", "getWindowByTitle", "getWindowByType", "getWindowId", "getMethodInWindows", "getPreference", "saveDataURL", "setPreference", "sleep", "startTimer", "stopTimer", "takeScreenshot", "unwrapNode", "waitFor", "btoa", "encryptPayload", "isConfiguredWithLegacyIdentity", "ensureLegacyIdentityManager", "setBasicCredentials", "makeIdentityConfig", "configureIdentity", "SyncTestingInfrastructure", "waitForZeroTimer", "Promise", "add_identity_test", "MockFxaStorageManager", "AccountState", "sumHistogram", "CommonUtils", "CryptoUtils", "TestingUtils"], "Utils.jsm": ["Utils", "Logger", "PivotContext", "PrefCache", "SettingCache"], "VariablesView.jsm": ["VariablesView", "escapeHTML"], "VariablesViewController.jsm": ["VariablesViewController", "StackFrameUtils"], |