|
|
@@ -1094,7 +1094,7 @@
|
|
|
|
|
|
let NOTES_WEB_STYLESHEET, MASK_WEB_STYLESHEET, HIGHLIGHTS_WEB_STYLESHEET;
|
|
|
let selectedNote, anchorElement, maskNoteElement, maskPageElement, highlightSelectionMode, removeHighlightMode, resizingNoteMode, movingNoteMode, highlightColor, collapseNoteTimeout, cuttingOuterMode, cuttingMode, cuttingTouchTarget, cuttingPath, cuttingPathIndex, previousContent;
|
|
|
- let removedElements = [], removedElementIndex = 0, initScriptContent, pageResources, pageUrl, pageCompressContent, includeInfobar, openInfobar, infobarPositionAbsolute, infobarPositionTop, infobarPositionBottom, infobarPositionLeft, infobarPositionRight;
|
|
|
+ let removedElements = [], removedElementIndex = 0, pageResources, pageUrl, pageCompressContent, includeInfobar, openInfobar, infobarPositionAbsolute, infobarPositionTop, infobarPositionBottom, infobarPositionLeft, infobarPositionRight;
|
|
|
|
|
|
globalThis.zip = singlefile.helper.zip;
|
|
|
initEventListeners();
|
|
|
@@ -1197,9 +1197,6 @@
|
|
|
infobarPositionLeft = message.infobarPositionLeft;
|
|
|
infobarPositionRight = message.infobarPositionRight;
|
|
|
let content = getContent(message.compressHTML);
|
|
|
- if (initScriptContent) {
|
|
|
- content = content.replace(/<script data-template-shadow-root src.*?<\/script>/g, initScriptContent);
|
|
|
- }
|
|
|
let filename;
|
|
|
const pageOptions = loadOptionsFromPage(document);
|
|
|
if (pageOptions) {
|
|
|
@@ -1242,7 +1239,9 @@
|
|
|
window.parent.postMessage(JSON.stringify({
|
|
|
method: "setContent",
|
|
|
content,
|
|
|
- filename
|
|
|
+ filename,
|
|
|
+ title: document.title,
|
|
|
+ url: pageUrl
|
|
|
}), "*");
|
|
|
}
|
|
|
}
|
|
|
@@ -1315,7 +1314,6 @@
|
|
|
const { docContent, origDocContent, resources, url } = await singlefile.helper.extract(content, {
|
|
|
password,
|
|
|
prompt,
|
|
|
- shadowRootScriptURL: new URL("/lib/single-file-extension-editor-init.js", document.baseURI).href,
|
|
|
zipOptions
|
|
|
});
|
|
|
pageResources = resources;
|
|
|
@@ -1323,6 +1321,8 @@
|
|
|
pageCompressContent = true;
|
|
|
const contentDocument = (new DOMParser()).parseFromString(docContent, "text/html");
|
|
|
if (detectSavedPage(contentDocument)) {
|
|
|
+ const { saveUrl } = singlefile.helper.extractInfobarData(contentDocument);
|
|
|
+ pageUrl = saveUrl;
|
|
|
await singlefile.helper.display(document, docContent, { disableFramePointerEvents: true });
|
|
|
singlefile.helper.fixInvalidNesting(document);
|
|
|
const infobarElement = document.querySelector(singlefile.helper.INFOBAR_TAGNAME);
|
|
|
@@ -1356,11 +1356,6 @@
|
|
|
}), "*");
|
|
|
}
|
|
|
} else {
|
|
|
- const initScriptContentMatch = content.match(/<script data-template-shadow-root.*<\/script>/);
|
|
|
- if (initScriptContentMatch && initScriptContentMatch[0]) {
|
|
|
- initScriptContent = initScriptContentMatch[0];
|
|
|
- }
|
|
|
- content = content.replace(/<script data-template-shadow-root.*<\/script>/g, "<script data-template-shadow-root src=/lib/single-file-extension-editor-init.js></script>");
|
|
|
const contentDocument = (new DOMParser()).parseFromString(content, "text/html");
|
|
|
if (detectSavedPage(contentDocument)) {
|
|
|
if (contentDocument.doctype) {
|
Gildas