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

Merge pull request #2 from Aishat-Akinyemi/revert-1-#outreachy-Aishat-Akinyemi-patch-1-fixes-#1513

Browse source 
Revert "Refactoring pop.js to use DOMParser instead of innerHTML fixes #1513"
This commit is contained in:
Aishat-Akinyemi 2019-10-11 12:32:18 +01:00 • committed by GitHub
commit 467bc58cff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
src/js/popup.js
View file

@ -610,15 +610,7 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
const siteSettings = await Logic.getAssignment(currentTab);
this.setupAssignmentCheckbox(siteSettings, currentTabUserContextId);
const currentPage = document.getElementById("current-page");
//using DOMParser to modify innerHTML
const htmlText = escaped`<span class="page-title truncate-text">${currentTab.title}</span>`;
const parser = new DOMParser();
const parsed = parser.parseFromString(htmlText, `text/html`);
const tags = parsed.getElementsByTagName(`body`)
for (const tag of tags) {
currentPage.appendChild(tag)
}
currentPage.innerHTML = escaped`<span class="page-title truncate-text">${currentTab.title}</span>`;
const favIconElement = Utils.createFavIconElement(currentTab.favIconUrl || "");
currentPage.prepend(favIconElement);
@ -648,7 +640,7 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
manage.title = escaped`View ${identity.name} container`;
context.setAttribute("tabindex", "0");
context.title = escaped`Create ${identity.name} tab`;
const htmlText = escaped`
context.innerHTML = escaped`
<div class="userContext-icon-wrapper open-newtab">
<div class="usercontext-icon"
data-identity-icon="${identity.icon}"
@ -656,13 +648,6 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
</div>
</div>
<div class="container-name truncate-text"></div>`;
const parser = new DOMParser()
const parsed = parser.parseFromString(htmlText, `text/html`)
const tags = parsed.getElementsByTagName(`body`)
for (const tag of tags) {
currentPage.appendChild(tag)
}
context.querySelector(".container-name").textContent = identity.name;
manage.innerHTML = "<img src='/img/container-arrow.svg' class='show-tabs pop-button-image-small' />";
@ -818,16 +803,9 @@ Logic.registerPanel(P_CONTAINER_INFO, {
const tr = document.createElement("tr");
fragment.appendChild(tr);
tr.classList.add("container-info-tab-row");
const htmlText= escaped`
tr.innerHTML = escaped`
<td></td>
<td class="container-info-tab-title truncate-text" title="${tab.url}" ><div class="container-tab-title">${tab.title}</div></td>`;
const parser = new DOMParser()
const parsed = parser.parseFromString(htmlText, `text/html`)
const tags = parsed.getElementsByTagName(`body`)
for (const tag of tags) {
tr.appendChild(tag)
}
tr.querySelector("td").appendChild(Utils.createFavIconElement(tab.favIconUrl));
document.getElementById("container-info-table").appendChild(fragment);
@ -888,7 +866,7 @@ Logic.registerPanel(P_CONTAINERS_EDIT, {
const tr = document.createElement("tr");
fragment.appendChild(tr);
tr.classList.add("container-panel-row");
const htmlText = escaped`
tr.innerHTML = escaped`
<td class="userContext-wrapper">
<div class="userContext-icon-wrapper">
<div class="usercontext-icon"
@ -909,13 +887,6 @@ Logic.registerPanel(P_CONTAINERS_EDIT, {
src="/img/container-delete.svg"
/>
</td>`;
const parser = new DOMParser()
const parsed = parser.parseFromString(htmlText, `text/html`)
const tags = parsed.getElementsByTagName(`body`)
for (const tag of tags) {
tr.appendChild(tag)
}
tr.querySelector(".container-name").textContent = identity.name;
tr.querySelector(".edit-container").setAttribute("title", `Edit ${identity.name} container`);
tr.querySelector(".remove-container").setAttribute("title", `Remove ${identity.name} container`);
@ -1015,7 +986,7 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
/* As we don't have the full or correct path the best we can assume is the path is HTTPS and then replace with a broken icon later if it doesn't load.
This is pending a better solution for favicons from web extensions */
const assumedUrl = `https://${site.hostname}/favicon.ico`;
const htmlText = escaped`
trElement.innerHTML = escaped`
<div class="favicon"></div>
<div title="${site.hostname}" class="truncate-text hostname">
${site.hostname}
@ -1024,13 +995,6 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
class="pop-button-image delete-assignment"
src="/img/container-delete.svg"
/>`;
const parser = new DOMParser()
const parsed = parser.parseFromString(htmlText, `text/html`)
const tags = parsed.getElementsByTagName(`body`)
for (const tag of tags) {
trElement.appendChild(tag)
}
trElement.getElementsByClassName("favicon")[0].appendChild(Utils.createFavIconElement(assumedUrl));
const deleteButton = trElement.querySelector(".delete-assignment");
const that = this;
@ -1060,14 +1024,7 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
const templateInstance = document.createElement("div");
templateInstance.classList.add("radio-container");
// eslint-disable-next-line no-unsanitized/property
const htmlText = colorRadioTemplate(containerColor);
const parser = new DOMParser()
const parsed = parser.parseFromString(htmlText, `text/html`)
const tags = parsed.getElementsByTagName(`body`)
for (const tag of tags) {
templateInstance.appendChild(tag)
}
templateInstance.innerHTML = colorRadioTemplate(containerColor);
colorRadioFieldset.appendChild(templateInstance);
});
@ -1081,14 +1038,7 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
const templateInstance = document.createElement("div");
templateInstance.classList.add("radio-container");
// eslint-disable-next-line no-unsanitized/property
const htmlText= iconRadioTemplate(containerIcon);
const parser = new DOMParser()
const parsed = parser.parseFromString(htmlText, `text/html`)
const tags = parsed.getElementsByTagName(`body`)
for (const tag of tags) {
templateInstance.appendChild(tag)
}
templateInstance.innerHTML = iconRadioTemplate(containerIcon);
iconRadioFieldset.appendChild(templateInstance);
});
},