mirrors/remark42
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix NPE when sending message to detached frame

Browse Source
This commit is contained in:
VeselovAlex
2021-02-21 13:51:02 -06:00
committed by Umputun
parent 111b7a86eb
commit 5ec871fd37
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/app/embed.ts
+11 -4
View File
@@ -300,17 +300,21 @@ function createInstance(config: typeof window.remark_config) {
}
function postTitleToIframe(title: string) {
iframe.contentWindow!.postMessage(JSON.stringify({ title }), '*');
if (iframe.contentWindow) {
iframe.contentWindow.postMessage(JSON.stringify({ title }), '*');
}
}
function postClickOutsideToIframe(e: MouseEvent) {
if (!iframe.contains(e.target as Node)) {
iframe.contentWindow!.postMessage(JSON.stringify({ clickOutside: true }), '*');
if (iframe.contentWindow && !iframe.contains(e.target as Node)) {
iframe.contentWindow.postMessage(JSON.stringify({ clickOutside: true }), '*');
}
}
function changeTheme(theme: Theme) {
iframe.contentWindow!.postMessage(JSON.stringify({ theme }), '*');
if (iframe.contentWindow) {
iframe.contentWindow.postMessage(JSON.stringify({ theme }), '*');
}
}
function destroy() {
@@ -324,6 +328,9 @@ function createInstance(config: typeof window.remark_config) {
if (titleObserver) {
titleObserver.disconnect();
// Allow browser to drop observer and iframe captured in callback
// to prevent attempts to send messages to detached frame
titleObserver = null;
}
iframe.remove();