rowan/multi-account-containers
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #488 from jonathanKingston/move-to-no-unescaped-eslint

Browse source 
Move to the Mozilla backed no-unsanitized ESLint plugin
This commit is contained in:
luke crouch 2017-05-09 11:07:40 -05:00 • committed by GitHub
commit 26e6efd611
3 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
.eslintrc.js
View file

@ -5,9 +5,6 @@ module.exports = {
"node": true, "node": true,
"webextensions": true "webextensions": true
}, },
"extends": [
"eslint:recommended"
],
"globals": { "globals": {
"CustomizableUI": true, "CustomizableUI": true,
"CustomizableWidgets": true, "CustomizableWidgets": true,
@ -16,7 +13,10 @@ module.exports = {
}, },
"plugins": [ "plugins": [
"promise", "promise",
"no-unescaped" "no-unsanitized"
],
"extends": [
"eslint:recommended"
], ],
"root": true, "root": true,
"rules": { "rules": {
@ -29,8 +29,18 @@ module.exports = {
"promise/no-promise-in-callback": "warn", "promise/no-promise-in-callback": "warn",
"promise/no-return-wrap": "error", "promise/no-return-wrap": "error",
"promise/param-names": "error", "promise/param-names": "error",
"no-unescaped/no-key-assignment": "error",
"no-unescaped/enforce": "error", "no-unsanitized/method": [
"error"
],
"no-unsanitized/property": [
"error",
{
"escape": {
"taggedTemplates": ["escaped"]
}
}
],
"eqeqeq": "error", "eqeqeq": "error",
"indent": ["error", 2], "indent": ["error", 2],

2
package.json
View file

@ -12,7 +12,7 @@
"addons-linter": "^0.15.14", "addons-linter": "^0.15.14",
"deploy-txp": "^1.0.7", "deploy-txp": "^1.0.7",
"eslint": "^3.17.1", "eslint": "^3.17.1",
"eslint-plugin-no-unescaped": "^1.1.0", "eslint-plugin-no-unsanitized": "^2.0.0",
"eslint-plugin-promise": "^3.4.0", "eslint-plugin-promise": "^3.4.0",
"htmllint-cli": "^0.0.5", "htmllint-cli": "^0.0.5",
"jpm": "^1.2.2", "jpm": "^1.2.2",

4
webextension/js/popup.js
View file

@ -577,7 +577,7 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
const colorRadioFieldset = document.getElementById("edit-container-panel-choose-color"); const colorRadioFieldset = document.getElementById("edit-container-panel-choose-color");
colors.forEach((containerColor) => { colors.forEach((containerColor) => {
const templateInstance = document.createElement("span"); const templateInstance = document.createElement("span");
// eslint-disable-next-line no-unescaped/enforce // eslint-disable-next-line no-unsanitized/property
templateInstance.innerHTML = colorRadioTemplate(containerColor); templateInstance.innerHTML = colorRadioTemplate(containerColor);
colorRadioFieldset.appendChild(templateInstance); colorRadioFieldset.appendChild(templateInstance);
}); });
@ -590,7 +590,7 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
const iconRadioFieldset = document.getElementById("edit-container-panel-choose-icon"); const iconRadioFieldset = document.getElementById("edit-container-panel-choose-icon");
icons.forEach((containerIcon) => { icons.forEach((containerIcon) => {
const templateInstance = document.createElement("span"); const templateInstance = document.createElement("span");
// eslint-disable-next-line no-unescaped/enforce // eslint-disable-next-line no-unsanitized/property
templateInstance.innerHTML = iconRadioTemplate(containerIcon); templateInstance.innerHTML = iconRadioTemplate(containerIcon);
iconRadioFieldset.appendChild(templateInstance); iconRadioFieldset.appendChild(templateInstance);
}); });