Merge pull request #1887 from thecodingmachine/master

Backporting cowebsites hot-fixes
2022-02-16 18:03:23 +01:00
parent a7264954ea 88bfd537cd
commit eae6c2c5e3
4 changed files with 35 additions and 12 deletions
@@ -159,9 +159,17 @@ class CoWebsiteManager {
        });

        buttonSwipe.addEventListener("click", () => {
+            const mainCoWebsite = this.getMainCoWebsite();
            const highlightedEmbed = get(highlightedEmbedScreen);
            if (highlightedEmbed?.type === "cowebsite") {
                this.goToMain(highlightedEmbed.embed);
+
+                if (mainCoWebsite) {
+                    highlightedEmbedScreen.toggleHighlight({
+                        type: "cowebsite",
+                        embed: mainCoWebsite,
+                    });
+                }
            }
        });
    }
@@ -553,6 +561,13 @@ class CoWebsiteManager {
        coWebsites.remove(coWebsite);
        coWebsites.add(coWebsite, 0);

+        if (mainCoWebsite) {
+            const iframe = mainCoWebsite.getIframe();
+            if (iframe) {
+                iframe.style.display = "block";
+            }
+        }
+
        if (
            isMediaBreakpointDown("lg") &&
            get(embedScreenLayout) === LayoutMode.Presentation &&
@@ -596,12 +611,20 @@ class CoWebsiteManager {
            .load()
            .then(() => {
                const mainCoWebsite = this.getMainCoWebsite();
-                if (mainCoWebsite && mainCoWebsite.getId() === coWebsite.getId()) {
-                    this.openMain();
+                const highlightedEmbed = get(highlightedEmbedScreen);
+                if (mainCoWebsite) {
+                    if (mainCoWebsite.getId() === coWebsite.getId()) {
+                        this.openMain();

-                    setTimeout(() => {
-                        this.fire();
-                    }, animationTime);
+                        setTimeout(() => {
+                            this.fire();
+                        }, animationTime);
+                    } else if (!highlightedEmbed) {
+                        highlightedEmbedScreen.toggleHighlight({
+                            type: "cowebsite",
+                            embed: coWebsite,
+                        });
+                    }
                }
                this.resizeAllIframes();
            })