[3851] - Feat/implement link mechanism to create rooms

js/activity.js

@@ -265,6 +265,9 @@ class Activity {
         // Flag to check if the helpful search widget is active or not (for "click" event handler purpose)
         this.isHelpfulSearchWidgetOn = false;
 
+        // ID for a specific room
+        this.room_id = null;
+
         this.beginnerMode = true;
         try {
             if (this.storage.beginnerMode === undefined) {
@@ -552,8 +555,8 @@ class Activity {
         }
 
         // Initialize the collaboration
-        this._initiateCollaboration = () => {
-            this.collaboration.startCollaboration();
+        this._initiateCollaboration = (ID) => {
+            this.collaboration.startCollaboration(ID);
             this.blocks.isLocalUpdate = true;
         };
 
@@ -5924,6 +5927,16 @@ class Activity {
 
             this._create2Ddrag();
 
+            setTimeout(() => {
+                console.log("dom is ready");
+                const urlParams = new URLSearchParams(window.location.search);
+                const room_id = urlParams.get('roomID');
+
+                if (room_id) {
+                    this.room_id = room_id;
+                    this._initiateCollaboration(this.room_id);
+                };
+            }, 7000);
             /*
             document.addEventListener("mousewheel", scrollEvent, false);
             document.addEventListener("DOMMouseScroll", scrollEvent, false);

js/blocks.js

@@ -3092,8 +3092,9 @@ class Blocks {
             if (emitMsg == EMIT_NEW_BLOCK_ADDED) {
                 this.hasEmittedBlockAddition = true;
             }
+            const room_id = this.activity.room_id;
             const update = this.activity.collaboration.convertBlockListToHtml();
-            this.activity.collaboration.socket.emit(emitMsg, update);
+            this.activity.collaboration.socket.emit(emitMsg, {room_id, update});
         };
 
         /**

js/collaboration/collaboration.js

@@ -44,14 +44,15 @@ class Collaboration {
     };
 
     // Make calls to the socket server
-    makeConnection = () => {
+    makeConnection = (ID) => {
         // connect to the local server
         const socket = io(this.PORT);
         socket.on("connect", () => {
             this.socket = socket;
             try {
                 console.log("connected to the server");
                 this.hasCollaborationStarted = true;
+                socket.emit("joinRoom", ID);
             } catch (error) {
                 console.log("Connection failed", error);
             }
@@ -85,8 +86,8 @@ class Collaboration {
     };
 
     // Start the collaboration
-    startCollaboration = () => {
-        this.makeConnection();
+    startCollaboration = (ID) => {
+        this.makeConnection(ID);
     };
 }
 

js/widgets/jseditor.js

@@ -409,7 +409,7 @@ class JSEditor {
     _setLinesCount(code) {
         if (!docById("editorLines")) return;
 
-        const linesCount = code.replace(/\n+$/, "\n").split("\n").length + 1;
+        const linesCount = code.replace(/\n+$/, "\n").split("\n").length;
         let text = "";
         for (let i = 1; i < linesCount; i++) {
             text += `${i}\n`;