Skip to content

Commit b71492a

Browse files
committed
Remove unused load detection
Suggested by: John Bieling (a reviewer)
1 parent c1aea10 commit b71492a

File tree

1 file changed

+39
-47
lines changed

1 file changed

+39
-47
lines changed

experiments/displayReceivedHeader.js

+39-47
Original file line numberDiff line numberDiff line change
@@ -16,59 +16,51 @@ var displayReceivedHeader = class extends ExtensionCommon.ExtensionAPI {
1616
}
1717

1818
function addHeadersToWindowById(windowId, tabIndex) {
19-
function addHeaders(document) {
20-
const expandedHeaders2 = document
21-
.getElementById(majorVersion < 100 ? "expandedHeaders2" : "extraHeadersArea");
22-
23-
if (expandedHeaders2) {
24-
const element = document.createElement(majorVersion < 100 ? "tr" : "div");
25-
element.hidden = true;
26-
element.id = "expandedReceivedRow";
27-
element.classList.add("message-header-row");
28-
29-
const headerRowTitleLabel = document.createXULElement("label");
30-
headerRowTitleLabel.id = "expandedReceivedLabel";
31-
headerRowTitleLabel.classList.add(majorVersion < 100
32-
? "headerName"
33-
: "message-header-label");
34-
headerRowTitleLabel.value = "Received";
35-
headerRowTitleLabel.control = "receivedReceivedHeader";
36-
37-
if (majorVersion < 100) {
38-
const headerRowTitle = document.createElement("th");
39-
headerRowTitle.appendChild(headerRowTitleLabel);
40-
element.appendChild(headerRowTitle);
41-
} else {
42-
element.appendChild(headerRowTitleLabel);
43-
}
19+
const document = getDocumentByTabIndex(windowId, tabIndex);
20+
const expandedHeaders2 = document
21+
.getElementById(majorVersion < 100 ? "expandedHeaders2" : "extraHeadersArea");
22+
23+
if (expandedHeaders2) {
24+
const element = document.createElement(majorVersion < 100 ? "tr" : "div");
25+
element.hidden = true;
26+
element.id = "expandedReceivedRow";
27+
element.classList.add("message-header-row");
28+
29+
const headerRowTitleLabel = document.createXULElement("label");
30+
headerRowTitleLabel.id = "expandedReceivedLabel";
31+
headerRowTitleLabel.classList.add(majorVersion < 100
32+
? "headerName"
33+
: "message-header-label");
34+
headerRowTitleLabel.value = "Received";
35+
headerRowTitleLabel.control = "receivedReceivedHeader";
36+
37+
if (majorVersion < 100) {
38+
const headerRowTitle = document.createElement("th");
39+
headerRowTitle.appendChild(headerRowTitleLabel);
40+
element.appendChild(headerRowTitle);
41+
} else {
42+
element.appendChild(headerRowTitleLabel);
43+
}
4444

45-
const expandedReceivedBox = document.createElement("div");
46-
expandedReceivedBox.id = "expandedReceivedBox";
45+
const expandedReceivedBox = document.createElement("div");
46+
expandedReceivedBox.id = "expandedReceivedBox";
4747

48-
const headerRowValue = document.createElement("div");
49-
headerRowValue.id = "receivedReceivedHeader";
48+
const headerRowValue = document.createElement("div");
49+
headerRowValue.id = "receivedReceivedHeader";
5050

51-
expandedReceivedBox.appendChild(headerRowValue);
52-
element.appendChild(expandedReceivedBox);
53-
expandedHeaders2.appendChild(element);
51+
expandedReceivedBox.appendChild(headerRowValue);
52+
element.appendChild(expandedReceivedBox);
53+
expandedHeaders2.appendChild(element);
5454

55-
if (majorVersion >= 100) {
56-
expandedReceivedBox.addEventListener("contextmenu", (event) => {
57-
const popup = document.getElementById("simpleCopyPopup");
58-
popup.headerField = event.target;
59-
popup.openPopupAtScreen(event.screenX, event.screenY, true);
60-
});
61-
}
62-
} else {
63-
throw Error("Could not find the expandedHeaders2 element");
55+
if (majorVersion >= 100) {
56+
expandedReceivedBox.addEventListener("contextmenu", (event) => {
57+
const popup = document.getElementById("simpleCopyPopup");
58+
popup.headerField = event.target;
59+
popup.openPopupAtScreen(event.screenX, event.screenY, true);
60+
});
6461
}
65-
}
66-
67-
const document = getDocumentByTabIndex(windowId, tabIndex);
68-
if (majorVersion < 111 || document.readyState === "complete") {
69-
addHeaders(document);
7062
} else {
71-
document.onload = () => addHeaders(document);
63+
throw Error("Could not find the expandedHeaders2 element");
7264
}
7365
}
7466

0 commit comments

Comments
 (0)