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

Merge pull request #379 from jonathanKingston/better-sanity

Browse source 
Better sanity
This commit is contained in:
luke crouch 2017-03-15 10:50:10 -05:00 • committed by GitHub
commit 52ceef8586
3 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.eslintrc.js
View file

@ -16,7 +16,7 @@ module.exports = {
},
"plugins": [
"promise",
"unsafe-property-assignment"
"no-unescaped"
],
"root": true,
"rules": {
@ -29,8 +29,8 @@ module.exports = {
"promise/no-promise-in-callback": "warn",
"promise/no-return-wrap": "error",
"promise/param-names": "error",
"unsafe-property-assignment/no-key-assignment": ["error"],
"unsafe-property-assignment/enforce-tagged-template-protection": ["error"],
"no-unescaped/no-key-assignment": "error",
"no-unescaped/enforce": "error",
"eqeqeq": "error",
"indent": ["error", 2],

2
package.json
View file

@ -12,8 +12,8 @@
"addons-linter": "^0.15.14",
"deploy-txp": "^1.0.7",
"eslint": "^3.17.1",
"eslint-plugin-no-unescaped": "^1.1.0",
"eslint-plugin-promise": "^3.4.0",
"eslint-plugin-unsafe-property-assignment": "^1.0.2",
"htmllint-cli": "^0.0.5",
"jpm": "^1.2.2",
"npm-run-all": "^4.0.0",

29
webextension/js/popup.js
View file

@ -19,15 +19,15 @@ const P_CONTAINER_EDIT = "containerEdit";
const P_CONTAINER_DELETE = "containerDelete";
/**
* Escapes any occurances of &, ", < or > with XML entities.
* Escapes any occurances of &, ", <, > or / with XML entities.
*
* @param {string} str
* The string to escape.
* @return {string} The escaped string.
*/
function escapeXML(str) {
const replacements = {"&": "&amp;", "\"": "&quot;", "'": "&apos;", "<": "&lt;", ">": "&gt;"};
return String(str).replace(/[&"''<>]/g, m => replacements[m]);
const replacements = {"&": "&amp;", "\"": "&quot;", "'": "&apos;", "<": "&lt;", ">": "&gt;", "/": "&#x2F;"};
return String(str).replace(/[&"'<>/]/g, m => replacements[m]);
}
/**
@ -278,7 +278,8 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
data-identity-color="${identity.color}">
</div>
</div>
<div class="container-name">${identity.name}</div>`;
<div class="container-name"></div>`;
context.querySelector(".container-name").textContent = identity.name;
manage.innerHTML = "<img src='/img/container-arrow.svg' class='show-tabs pop-button-image-small' />";
fragment.appendChild(tr);
@ -353,7 +354,7 @@ Logic.registerPanel(P_CONTAINER_INFO, {
fragment.appendChild(incompatEl);
incompatEl.setAttribute("id", "container-info-movetabs-incompat");
incompatEl.innerText = "Incompatible with other Experiments.";
incompatEl.textContent = "Incompatible with other Experiments.";
incompatEl.classList.add("container-info-tab-row");
moveTabsEl.parentNode.insertBefore(fragment, moveTabsEl.nextSibling);
@ -377,7 +378,7 @@ Logic.registerPanel(P_CONTAINER_INFO, {
const identity = Logic.currentIdentity();
// Populating the panel: name and icon
document.getElementById("container-info-name").innerText = identity.name;
document.getElementById("container-info-name").textContent = identity.name;
const icon = document.getElementById("container-info-icon");
icon.setAttribute("data-identity-icon", identity.image);
@ -392,7 +393,7 @@ Logic.registerPanel(P_CONTAINER_INFO, {
hideShowIcon.src = identity.hasHiddenTabs ? CONTAINER_UNHIDE_SRC : CONTAINER_HIDE_SRC;
const hideShowLabel = document.getElementById("container-info-hideorshow-label");
hideShowLabel.innerText = identity.hasHiddenTabs ? "Show this container" : "Hide this container";
hideShowLabel.textContent = identity.hasHiddenTabs ? "Show this container" : "Hide this container";
// Let's remove all the previous tabs.
const table = document.getElementById("container-info-table");
@ -466,21 +467,23 @@ Logic.registerPanel(P_CONTAINERS_EDIT, {
data-identity-color="${identity.color}">
</div>
</div>
<div class="container-name">${identity.name}</div>
<div class="container-name"></div>
</td>
<td class="edit-container pop-button edit-container-icon">
<img
title="Edit ${identity.name} container"
src="/img/container-edit.svg"
class="pop-button-image" />
</td>
<td class="remove-container pop-button delete-container-icon" >
<img
title="Remove ${identity.name} container"
class="pop-button-image"
src="/img/container-delete.svg"
/>
</td>`;
tr.querySelector(".container-name").textContent = identity.name;
tr.querySelector(".edit-container .pop-button-image").setAttribute("title", `Edit ${identity.name} container`);
tr.querySelector(".remove-container .pop-button-image").setAttribute("title", `Edit ${identity.name} container`);
tr.addEventListener("click", e => {
if (e.target.matches(".edit-container-icon") || e.target.parentNode.matches(".edit-container-icon")) {
@ -552,7 +555,7 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
const colorRadioFieldset = document.getElementById("edit-container-panel-choose-color");
colors.forEach((containerColor) => {
const templateInstance = document.createElement("span");
// eslint-disable-next-line unsafe-property-assignment/enforce-tagged-template-protection
// eslint-disable-next-line no-unescaped/enforce
templateInstance.innerHTML = colorRadioTemplate(containerColor);
colorRadioFieldset.appendChild(templateInstance);
});
@ -565,7 +568,7 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
const iconRadioFieldset = document.getElementById("edit-container-panel-choose-icon");
icons.forEach((containerIcon) => {
const templateInstance = document.createElement("span");
// eslint-disable-next-line unsafe-property-assignment/enforce-tagged-template-protection
// eslint-disable-next-line no-unescaped/enforce
templateInstance.innerHTML = iconRadioTemplate(containerIcon);
iconRadioFieldset.appendChild(templateInstance);
});
@ -618,7 +621,7 @@ Logic.registerPanel(P_CONTAINER_DELETE, {
const identity = Logic.currentIdentity();
// Populating the panel: name and icon
document.getElementById("delete-container-name").innerText = identity.name;
document.getElementById("delete-container-name").textContent = identity.name;
const icon = document.getElementById("delete-container-icon");
icon.setAttribute("data-identity-icon", identity.image);