Merge pull request #7995 from Snuffleupagus/addon-eslint_consistent-return

[Firefox addon] Enable the `consistent-return` ESLint rule (issue 7957)
This commit is contained in:
Jonas Jenwald 2017-01-27 19:11:43 +01:00 committed by GitHub
commit 2b84fb79b4
3 changed files with 8 additions and 4 deletions

View File

@ -8,6 +8,9 @@
},
"rules": {
// Best Practices
"consistent-return": "error",
// Variables
"no-shadow": "error",
"no-unused-vars": ["error", {
@ -17,6 +20,7 @@
}],
// Stylistic Issues
"no-nested-ternary": "error",
"quotes": ["error", "double"],
"space-before-function-paren": ["error", "never"],

View File

@ -538,11 +538,11 @@ class ChromeActions {
break;
}
}
let result = JSON.stringify(currentPrefs);
if (sendResponse) {
sendResponse(JSON.stringify(currentPrefs));
} else {
return JSON.stringify(currentPrefs);
sendResponse(result);
}
return result;
}
}

View File

@ -152,7 +152,6 @@ var PdfjsChromeUtils = {
this._displayWarning(aMsg);
break;
case "PDFJS:Parent:updateControlState":
return this._updateControlState(aMsg);
case "PDFJS:Parent:addEventListener":
@ -160,6 +159,7 @@ var PdfjsChromeUtils = {
case "PDFJS:Parent:removeEventListener":
return this._removeEventListener(aMsg);
}
return undefined;
},
/*