lib/socketmanager/socketmanager.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"net/http"
 
 	"github.com/JustKato/FreePad/lib/objects"
 	"github.com/gin-gonic/gin"
@@ -33,14 +34,13 @@ func BindSocket(router *gin.RouterGroup) {
 		// Get the name of the pad to assign to this socket
 		padName := ctx.Param("pad")
 		// Upgrade the socket connection
-		webSocketUpgrade(ctx, padName)
+		webSocketUpgrade(ctx.Writer, ctx.Request, padName)
 	})
 
 }
 
-func webSocketUpgrade(ctx *gin.Context, padName string) {
-
-	conn, err := wsUpgrader.Upgrade(ctx.Writer, ctx.Request, ctx.Request.Header)
+func webSocketUpgrade(w http.ResponseWriter, r *http.Request, padName string) {
+	conn, err := wsUpgrader.Upgrade(w, r, nil)
 	if err != nil {
 		fmt.Printf("Failed to set websocket upgrade: %v\n", err)
 		return

static/css/main.css

@@ -45,24 +45,6 @@ main#main-card {
     tab-size: 2;
 
     font-family: 'Roboto Mono', monospace !important;
-
-    padding-top: 2rem;
-}
-
-#padTitle {
-    padding: .3rem .75rem !important;
-    border-radius: .25rem;
-    display: inline-block;
-}
-
-.dark #padTitle {
-    color: #db3384;
-    background-color: rgba(0, 0, 0, 0.10);
-}
-
-.light #padTitle {
-    color: #555273;
-    border: 1px solid rgba(0, 0, 0, 0.15);
 }
 
 #pad-content-area {
@@ -72,16 +54,11 @@ main#main-card {
     flex-flow: column;
 }
 
-.light .edit-content-text {
-    color: white !important;
-}
-
 .edit-content-text {
     display: none;
 }
 
 .read-only-content .edit-content-text {
-    margin-top: 1rem;
     display: block !important;
 }
 
@@ -101,9 +78,6 @@ main#main-card {
     max-height: calc(17rem + 30vh);
     min-height: 17rem;
     overflow: auto;
-
-    padding-top: 2rem;
-    margin-top: 1rem;
 }
 
 textarea:focus,

static/js/pad-scripts.js

@@ -138,10 +138,7 @@ function renderArchivesSelection() {
             let resp = confirm("Load contents of pad from memory? This will overwrite the current pad for everyone.");
 
             if (!!resp) {
-                // Update visually for the client
-                updatePadContent(a.content);
-                // Send the update
-                window.socket.sendPadUpdate();
+                document.getElementById(`pad-content`).value = a.content;
             }
         })
 
@@ -213,8 +210,6 @@ function setTextareaPreview(t = true) {
 
         padContentArea.classList.add(`read-only-content`);
 
-        prev.scrollTop = prev.scrollHeight;
-
         textarea.classList.add(`hidden`);
     } else {
         // Toggle edit mode

static/js/ws.js

@@ -31,14 +31,8 @@ class PadSocket {
 
         // Check if a connection URL was mentioned
         if ( connUrl == null ) {
-
-            let connProtocol = `ws://`;
-            if ( window.location.protocol == `https:` ) {
-                connProtocol = `wss://`;
-            }
-
             // Try and connect to the local websocket
-            connUrl = connProtocol + window.location.host + `/ws/get/${padName}`;
+            connUrl = `ws://` + window.location.host + `/ws/get/${padName}`;
         }
 
         // Connect to the websocket
@@ -51,13 +45,9 @@ class PadSocket {
             updateStatus(`Established`, `text-success`);
         }
 
-        function onFail() {
-            updateStatus(`Connection Failed`, `text-dangerous`);
-        }
-
         // Try and reconnect on failure
-        ws.onclose = onFail;
-        ws.onerror = onFail;
+        ws.onclose = connectSocket;
+        ws.onerror = connectSocket;
         
         // Assign the websocket
         this.ws = ws;
@@ -186,34 +176,10 @@ class PadSocket {
  */
 function updatePadContent(newContent, textArea = true) {
     // Update the textarea
-    if ( textArea ) {
-        document.getElementById(`pad-content`).value = newContent;
-    }
-    
+    if ( textArea ) document.getElementById(`pad-content`).value = newContent;
     // Update the preview
-    const prev = document.getElementById(`textarea-preview`);
-    const shouldScroll = prev.scrollTop >= (prev.scrollHeight - Number(getComputedStyle(prev).height.replace(/px/g, ''))) * 0.98;
-
-    prev.innerHTML = escapeHtml(newContent);
-
-    prev.classList.remove(`language-undefined`);
-
-    prev.classList.forEach( c => {
-        if ( c.indexOf(`language-`) != -1 ) {
-            prev.classList.remove(c);
-        }
-    })
-
-    try { // highlights
-        hljs.highlightElement(document.getElementById(`textarea-preview`));
-    } catch ( err ) {
-        console.err(err);
-    }
-
-    // Check if we should follow the bottom scrolling
-    if (shouldScroll) {
-        prev.scrollTop = prev.scrollHeight;
-    }
+    document.getElementById(`textarea-preview`).innerHTML = newContent;
+    // TODO: Re-run the syntax highlight
 
 }
 
@@ -245,17 +211,4 @@ function connectSocket() {
 // wait for the whole window to load
 window.addEventListener(`load`, e => {
     connectSocket()
-})
-
-
-// lol
-function escapeHtml(html){
-    const text = document.createTextNode(html);
-    const p = document.createElement('p');
-
-    p.appendChild(text);
-    const content = p.innerHTML;
-    p.remove();
-
-    return content;
-  }
+})

templates/pages/page.html

@@ -35,9 +35,7 @@
 
         </div>
 
-        <h2 class="mb-4" id="padTitle">
-            {{.title}}
-        </h2>
+        <h2 class="mb-4">{{.title}}</h2>
 
         <div id="pad-content-area">
             <div class="btn-sm btn" id="pad-content-toggler" onclick="toggleTextareaPreview()">