From d674ac9e0c830551ae1057ee8fffc85e1b2f3f41 Mon Sep 17 00:00:00 2001 From: jonny Date: Sat, 1 May 2021 17:43:31 +0200 Subject: [PATCH] fixed url cannot be relative --- front/src/Api/IframeListener.ts | 8 ++++++-- front/src/Api/ScriptUtils.ts | 3 +-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/front/src/Api/IframeListener.ts b/front/src/Api/IframeListener.ts index c875ebbb..3479a454 100644 --- a/front/src/Api/IframeListener.ts +++ b/front/src/Api/IframeListener.ts @@ -86,8 +86,12 @@ class IframeListener { else if(payload.type === 'goToPage' && isGoToPageEvent(payload.data)) { scriptUtils.goToPage(payload.data.url); } - else if(payload.type === 'openCoWebSite' && isOpenCoWebsite(payload.data)) { - scriptUtils.openCoWebsite(payload.data.url); + else if (payload.type === 'openCoWebSite' && isOpenCoWebsite(payload.data)) { + const scriptUrl = [...this.scripts.keys()].find(key => { + return this.scripts.get(key)?.contentWindow == message.source + }) + + scriptUtils.openCoWebsite(payload.data.url, scriptUrl || payload.data.url); } else if(payload.type === 'closeCoWebSite') { scriptUtils.closeCoWebSite(); diff --git a/front/src/Api/ScriptUtils.ts b/front/src/Api/ScriptUtils.ts index 1a7fed0f..8a5cb2c9 100644 --- a/front/src/Api/ScriptUtils.ts +++ b/front/src/Api/ScriptUtils.ts @@ -11,8 +11,7 @@ class ScriptUtils { } - public openCoWebsite(url : string){ - coWebsiteManager.loadCoWebsite(url,url); + public openCoWebsite(url: string, base: string) { } public closeCoWebSite(){