update 1.4.0

Author: Chhekur

CHANGELOG.md

@@ -1,2 +1,3 @@
 ## Changelog
-- Fixed: when open a huge directory, it will make colon slow
+- Add: Real Time Code Sharing
+- Fixed: XSS Vulnerability

README.md

@@ -6,19 +6,19 @@ Colon is a flexible text editor, built on [Electron](https://github.com/electron
 
 ### macOS
 
-Download the latest [Colon release](https://github.com/Chhekur/colon-ide/releases/download/v1.3.1/Colon-1.3.1.dmg) for mac.
+Download the latest [Colon release](https://github.com/Chhekur/colon-ide/releases/download/v1.4.0/Colon-1.4.0.dmg) for mac.
 
 Colon will automatically update when a new release is available.
 
 ### Windows
 
-Download the latest [Colon installer](https://github.com/Chhekur/colon-ide/releases/download/v1.3.1/Colon-Setup-1.3.1.exe) for windows.
+Download the latest [Colon installer](https://github.com/Chhekur/colon-ide/releases/download/v1.4.0/Colon-Setup-1.4.0.exe) for windows.
 
 Colon will automatically update when a new release is available.
 
 ### Linux
 
-Download the latest [Colon installer](https://github.com/Chhekur/colon-ide/releases/download/v1.3.1/Colon-1.3.1-x86_64.AppImage) for linux.
+Download the latest [Colon installer](https://github.com/Chhekur/colon-ide/releases/download/v1.4.0/Colon-1.4.0-x86_64.AppImage) for linux.
 
 ## License
 

assets/js/editor.js

@@ -877,48 +877,59 @@ function openCodeSharingPanel(){
 
 // end here
 
+function isCurrentFileSaved(){
+    // if(file.path != undefined) return true
+    var data = editor.getValue();
+    // console.log(file.path);
+    ipc.send('save-data', data, file.path);
+    if(file.path != undefined) return true;
+    else return false;
+}
+
 // code sharing function
 
 function shareCode(){
-    $('#code-sharing-box').html('<h5>Waiting...</h5>');
-    app.listen(4000, function(){
-        // console.log('listening at 4000');
-        var tunnel = localtunnel(4000, function(err, tunnel) {
-            if (err) {
-                // console.log(err);
+    if(isCurrentFileSaved()){
+        $('#code-sharing-box').html('<h5>Waiting...</h5>');
+        app.listen(4000, function(){
+            // console.log('listening at 4000');
+            var tunnel = localtunnel(4000, function(err, tunnel) {
+                if (err) {
+                    // console.log(err);
+                    $('#code-sharing-box').html(err);
+                }
+             
+                // the assigned public url for your tunnel
+                // i.e. https://abcdefgjhij.localtunnel.me
+                $('#code-sharing-box').html('<h5>Share this url with whome you want to share</h5><br>');
+                $('#code-sharing-box').append('<h5>' + tunnel.url + '</h5><br>');
+                $('#code-sharing-box').append('<button class = "btn" id = "commit-changes-sender" onclick="commitChangesSender()">Commit Changes</button><br><br>');
+                $('#code-sharing-box').append('<button class = "btn" id = "disconnect" onclick="disconnect()">Disconnect</button>');
+                // console.log(tunnel.url);
+            });
+            tunnel.on('error', function(err) {
                 $('#code-sharing-box').html(err);
-            }
-         
-            // the assigned public url for your tunnel
-            // i.e. https://abcdefgjhij.localtunnel.me
-            $('#code-sharing-box').html('<h5>Share this url with whome you want to share</h5><br>');
-            $('#code-sharing-box').append('<h5>' + tunnel.url + '</h5><br>');
-            $('#code-sharing-box').append('<button class = "btn" id = "commit-changes-sender" onclick="commitChangesSender()">Commit Changes</button>');
-            $('#code-sharing-box').append('<button class = "btn" id = "disconnect" onclick="disconnect()">Disconnect</button><br><br>');
-            // console.log(tunnel.url);
+            });
         });
-        tunnel.on('error', function(err) {
-            $('#code-sharing-box').html(err);
+        // console.log(file);
+        io.on('connection', function (socket) {
+            clients.push(socket);
+          socket.emit('file', { id: file.id, name:file.name, remote_path:file.path, data:file.editor.getValue() });
+          socket.on('commit-changes', function (data) {
+            // console.log('hello');
+            if(file.id == data.id && file.path == data.path){
+                file.editor.setValue(data.data);
+                editor.setValue(data.data);
+            }
+            files['#' + data.id].editor.setValue(data.data);
+          });
         });
-    });
-    // console.log(file);
-    io.on('connection', function (socket) {
-        clients.push(socket);
-      socket.emit('file', { id: file.id, name:file.name, remote_path:file.path, data:file.editor.getValue() });
-      socket.on('commit-changes', function (data) {
-        // console.log('hello');
-        if(file.id == data.id && file.path == data.path){
-            file.editor.setValue(data.data);
-            editor.setValue(data.data);
-        }
-        files['#' + data.id].editor.setValue(data.data);
-      });
-    });
+    }
 }
 
 function connect(flag){
     if(!flag){
-        $('#code-sharing-box').html('<input class = "input-field" id = "url"><br> <br><button class ="btn" onclick = "connect(true)">Connect</button>');
+        $('#code-sharing-box').html('<input placeholder = "URL" class = "input-field" id = "url"><br> <br><button class ="btn" onclick = "connect(true)">Connect</button>');
     }else{
         let url = $('#url').val();
         $('#code-sharing-box').html('<h5>Waiting...</h5>');
@@ -927,7 +938,7 @@ function connect(flag){
             remoteFile = data;
             // newFileCount++;
             // newTab(undefined, newFileCount, path.basename(data.remote_path), data.data);
-            openFile(data.data, undefined, path.basename(data.remote_path), data.remote_path);
+            openFile(data.data, undefined, data.name, data.remote_path);
             // console.log(data);
             // socket.emit('my other event', { my: 'data' });
             $('#code-sharing-box').html('<button class = "btn" id = "commit_changes" onclick="commitChanges()">Commit Changes</button><br><br>');
@@ -949,6 +960,9 @@ function connect(flag){
                 }
             }
         });
+        socket.on('error', function(error){
+            $('#code-sharing-box').html(error);
+        });
     }
 }
 

main.js

@@ -31,7 +31,7 @@ function createWindow () {
 		slashes: true
 	}))
 	// Open the DevTools.
-	mainWindow.webContents.openDevTools()
+	// mainWindow.webContents.openDevTools()
 	// Emitted when the window is closed.
 	mainWindow.on('closed', function () {
 		// Dereference the window object, usually you would store windows

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Colon",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "description": "A flexible text editor",
   "author": "Harendra Chhekur <820121223505e@gmail.com>",
   "main": "main.js",

views/editor.html

@@ -131,12 +131,12 @@
 		</div>
 
 		<div class = "html-preview">
-			<iframe id=html-preview class="html-preview"></iframe>
+			<iframe id=html-preview class="html-preview" sandbox="allow-same-origin"></iframe>
 			<img style = "position: relative;float: left;bottom:70;right:30;float:right;" onclick = "updateHtmlPreview()" src = "../assets/icons/refresh-button.svg" width="40px"></img>
 		</div>
 		<div class = "markdown-preview">
 			<!-- <button onclick = "updateMarkdownPreview()">refresh</button> -->
-			<iframe id=markdown-preview class="markdown-preview"></iframe>
+			<iframe id=markdown-preview class="markdown-preview" sandbox="allow-same-origin"></iframe>
 			<img style = "position: relative;float: left;bottom:70;right:30;float:right;" onclick = "updateMarkdownPreview()" src = "../assets/icons/refresh-button.svg" width="40px"></img>
 		</div>