Fixed regression in full embedding document replacement due to timing changes.

This commit is contained in:
hackademix 2019-06-15 20:41:26 +02:00
parent 04baf1a3f8
commit a4f088211e
2 changed files with 25 additions and 4 deletions

View File

@ -119,10 +119,14 @@ var PlaceHolder = (() => {
let replacement = createHTMLElement("a");
replacement.className = "__NoScript_PlaceHolder__";
cloneStyle(element, replacement);
replacement.style.backgroundImage = `url(${ICON_URL})`;
let setImage = () => replacement.style.backgroundImage = `url(${ICON_URL})`;
if (ns.embeddingDocument) {
replacement.classList.add("document");
window.stop();
setTimeout(setImage, 0); // defer to bypass window.stop();
} else {
setImage();
}
replacement.href = url;

View File

@ -1,5 +1,5 @@
if (ns.embeddingDocument) {
ns.on("capabilities", () => {
let replace = () => {
for (let policyType of ["object", "media"]) {
let request = {
id: `noscript-${policyType}-doc`,
@ -8,7 +8,7 @@ if (ns.embeddingDocument) {
documentUrl: document.URL,
embeddingDocument: true,
};
if (ns.allows(policyType)) {
let handler = PlaceHolder.handlerFor(policyType);
if (handler && handler.selectFor(request).length > 0) {
@ -19,9 +19,26 @@ if (ns.embeddingDocument) {
if (ph.replacements.size > 0) {
debug(`Created placeholder for ${policyType} at ${document.URL}`);
seen.record({policyType, request, allowed: false});
break;
}
}
}
};
ns.on("capabilities", () => {
if (!document.body.firstChild) { // we've been called early
setTimeout(replace, 0);
let types = {
"media": /^(?:video|audio)\//i,
"object": /^application\//i,
}
for (let [type, rx] of Object.entries(types)) {
if (rx.test(document.contentType) && !ns.allows(type)) {
window.stop();
break;
}
}
} else {
replace();
}
});
}