From 7e1d92461a6d2e877699d65b50d4fda333035f7a Mon Sep 17 00:00:00 2001
From: Jonas Jenwald <jonas.jenwald@gmail.com>
Date: Wed, 25 Jan 2017 12:47:38 +0100
Subject: [PATCH] [Firefox addon] Enable the `consistent-return` ESLint rule
(issue 7957)
See http://eslint.org/docs/rules/consistent-return; it appears that I overlooked this rule in PR 7982.
Also adds the http://eslint.org/docs/rules/no-nested-ternary rule, which didn't require any code changes, since that rule is being enforced in mozilla-central.
Re: issue 7957.
---
extensions/firefox/.eslintrc | 4 ++++
extensions/firefox/content/PdfStreamConverter.jsm | 6 +++---
extensions/firefox/content/PdfjsChromeUtils.jsm | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/extensions/firefox/.eslintrc b/extensions/firefox/.eslintrc
index 9ab662ea3..89561cf5f 100644
--- a/extensions/firefox/.eslintrc
+++ b/extensions/firefox/.eslintrc
@@ -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"],
diff --git a/extensions/firefox/content/PdfStreamConverter.jsm b/extensions/firefox/content/PdfStreamConverter.jsm
index bcba3bb2d..428961c35 100644
--- a/extensions/firefox/content/PdfStreamConverter.jsm
+++ b/extensions/firefox/content/PdfStreamConverter.jsm
@@ -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;
}
}
diff --git a/extensions/firefox/content/PdfjsChromeUtils.jsm b/extensions/firefox/content/PdfjsChromeUtils.jsm
index 25e872470..1d6c3f8af 100644
--- a/extensions/firefox/content/PdfjsChromeUtils.jsm
+++ b/extensions/firefox/content/PdfjsChromeUtils.jsm
@@ -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;
},
/*