merge develop into main

2021-05-17 14:49:18 +02:00
parent 3e66a541e3 aac5676765
commit 16aa859844
131 changed files with 4034 additions and 2920 deletions
@@ -1,5 +1,5 @@
 import {coWebsiteManager} from "../WebRtc/CoWebsiteManager";
-import {discussionManager} from "../WebRtc/DiscussionManager";
+// import {discussionManager} from "../WebRtc/DiscussionManager";


 class ScriptUtils {
@@ -13,16 +13,16 @@ class ScriptUtils {

    }

+    public openCoWebsite(url: string, base: string) {
+           coWebsiteManager.loadCoWebsite(url, base);
+    }
+
    public closeCoWebSite(){
        coWebsiteManager.closeCoWebsite();
    }

-    public openCoWebsite(url : string){
-            coWebsiteManager.loadCoWebsite(url,url);
-    }
-
    public closeChatMessage(){
-        discussionManager.hideDiscussion();
+       // discussionManager.hideDiscussion();
    }
 }