Merge pull request #9244 from Snuffleupagus/firefox-DEFAULT_PREFERENCES-eslint-disable-semi

[Firefox addon] Temporarily disable the ESLint `semi` rule, around the `DEFAULT_PREFERENCES` declaration, to prevent mozilla-central test errors
This commit is contained in:
Brendan Dahl 2017-12-07 08:45:22 -08:00 committed by GitHub
commit 518da6c6a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 3 deletions

View File

@ -45,11 +45,13 @@ function log(str) {
}
function initializeDefaultPreferences() {
/* eslint-disable semi */
var DEFAULT_PREFERENCES =
//#include ../../web/default_preferences.json
//#if false
"end of DEFAULT_PREFERENCES";
"end of DEFAULT_PREFERENCES"
//#endif
/* eslint-enable semi */
var defaultBranch = Services.prefs.getDefaultBranch(EXT_PREFIX + ".");
var defaultValue;

View File

@ -79,11 +79,13 @@ function isDefaultHandler() {
}
function initializeDefaultPreferences() {
/* eslint-disable semi */
var DEFAULT_PREFERENCES =
//#include ../../../web/default_preferences.json
//#if false
"end of DEFAULT_PREFERENCES";
"end of DEFAULT_PREFERENCES"
//#endif
/* eslint-enable semi */
var defaultBranch = Services.prefs.getDefaultBranch(PREF_PREFIX + ".");
var defaultValue;

View File

@ -33,11 +33,13 @@ XPCOMUtils.defineLazyServiceGetter(Svc, "mime",
"@mozilla.org/mime;1",
"nsIMIMEService");
/* eslint-disable semi */
var DEFAULT_PREFERENCES =
//#include ../../../web/default_preferences.json
//#if false
"end of DEFAULT_PREFERENCES";
"end of DEFAULT_PREFERENCES"
//#endif
/* eslint-enable semi */
var PdfjsChromeUtils = {
// For security purposes when running remote, we restrict preferences