Kezdőlap Felfedezés Súgó
Regisztráció Bejelentkezés
packages
/
websocket
0
0
Másolás 0
Fájlok Problémák 0 Beolvasztási kérések 0 Wiki
Forráskód Böngészése

Improve examples

- Remove jQuery dependency in command example.
- Fix auto scroll on new content in chat and command example.
- Update chat and command example to use a static HTML file.
Gary Burd 8 éve
szülő
804cb600d0
commit
5ade364dff
4 módosított fájl, 37 hozzáadás és 37 törlés
Osztott Nézet Diff Statisztika Mutatása
  1. 2 2
      examples/chat/home.html
  2. 1 4
      examples/chat/main.go
  3. 31 25
      examples/command/home.html
  4. 3 6
      examples/command/main.go

+ 2 - 2
examples/chat/home.html
Fájl Megtekintése 

@@ -9,7 +9,7 @@ window.onload = function () {
 
     var log = document.getElementById("log");
 
 
     function appendLog(item) {
 
-        var doScroll = log.scrollTop === log.scrollHeight - log.clientHeight;
 
+        var doScroll = log.scrollTop > log.scrollHeight - log.clientHeight - 1;
 
         log.appendChild(item);
 
         if (doScroll) {
 
             log.scrollTop = log.scrollHeight - log.clientHeight;
 
@@ -29,7 +29,7 @@ window.onload = function () {
 
     };
 
 
     if (window["WebSocket"]) {
 
-        conn = new WebSocket("ws://{{$}}/ws");
 
+        conn = new WebSocket("ws://" + document.location.host + "/ws");
 
         conn.onclose = function (evt) {
 
             var item = document.createElement("div");
 
             item.innerHTML = "<b>Connection closed.</b>";

+ 1 - 4
examples/chat/main.go
Fájl Megtekintése 

@@ -6,13 +6,11 @@ package main
 
 
 import (
 
 	"flag"
 
-	"html/template"
 
 	"log"
 
 	"net/http"
 
 )
 
 
 var addr = flag.String("addr", ":8080", "http service address")
 
-var homeTemplate = template.Must(template.ParseFiles("home.html"))
 
 
 func serveHome(w http.ResponseWriter, r *http.Request) {
 
 	log.Println(r.URL)
 
@@ -24,8 +22,7 @@ func serveHome(w http.ResponseWriter, r *http.Request) {
 
 		http.Error(w, "Method not allowed", 405)
 
 		return
 
 	}
 
-	w.Header().Set("Content-Type", "text/html; charset=utf-8")
 
-	homeTemplate.Execute(w, r.Host)
 
+	http.ServeFile(w, r, "home.html")
 
 }
 
 
 func main() {

+ 31 - 25
examples/command/home.html
Fájl Megtekintése 

@@ -2,47 +2,53 @@
 
 <html lang="en">
 
 <head>
 
 <title>Command Example</title>
 
-<script src="//ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
 
 <script type="text/javascript">
 
-    $(function() {
 
-
 
+window.onload = function () {
 
     var conn;
 
-    var msg = $("#msg");
 
-    var log = $("#log");
 
+    var msg = document.getElementById("msg");
 
+    var log = document.getElementById("log");
 
 
-    function appendLog(msg) {
 
-        var d = log[0]
 
-        var doScroll = d.scrollTop == d.scrollHeight - d.clientHeight;
 
-        msg.appendTo(log)
 
+    function appendLog(item) {
 
+        var doScroll = log.scrollTop > log.scrollHeight - log.clientHeight - 1;
 
+        log.appendChild(item);
 
         if (doScroll) {
 
-            d.scrollTop = d.scrollHeight - d.clientHeight;
 
+            log.scrollTop = log.scrollHeight - log.clientHeight;
 
         }
 
     }
 
 
-    $("#form").submit(function() {
 
+    document.getElementById("form").onsubmit = function () {
 
         if (!conn) {
 
             return false;
 
         }
 
-        if (!msg.val()) {
 
+        if (!msg.value) {
 
             return false;
 
         }
 
-        conn.send(msg.val());
 
-        msg.val("");
 
-        return false
 
-    });
 
+        conn.send(msg.value);
 
+        msg.value = "";
 
+        return false;
 
+    };
 
 
     if (window["WebSocket"]) {
 
-        conn = new WebSocket("ws://{{$}}/ws");
 
-        conn.onclose = function(evt) {
 
-            appendLog($("<div><b>Connection closed.</b></div>"))
 
-        }
 
-        conn.onmessage = function(evt) {
 
-            appendLog($("<pre/>").text(evt.data))
 
-        }
 
+        conn = new WebSocket("ws://" + document.location.host + "/ws");
 
+        conn.onclose = function (evt) {
 
+            var item = document.createElement("div");
 
+            item.innerHTML = "<b>Connection closed.</b>";
 
+            appendLog(item);
 
+        };
 
+        conn.onmessage = function (evt) {
 
+            var messages = evt.data.split('\n');
 
+            for (var i = 0; i < messages.length; i++) {
 
+                var item = document.createElement("div");
 
+                item.innerText = messages[i];
 
+                appendLog(item);
 
+            }
 
+        };
 
     } else {
 
-        appendLog($("<div><b>Your browser does not support WebSockets.</b></div>"))
 
+        var item = document.createElement("div");
 
+        item.innerHTML = "<b>Your browser does not support WebSockets.</b>";
 
+        appendLog(item);
 
     }
 
-    });
 
+};
 
 </script>
 
 <style type="text/css">
 
 html {

+ 3 - 6
examples/command/main.go
Fájl Megtekintése 

@@ -7,7 +7,6 @@ package main
 
 import (
 
 	"bufio"
 
 	"flag"
 
-	"html/template"
 
 	"io"
 
 	"log"
 
 	"net/http"
 
@@ -19,9 +18,8 @@ import (
 
 )
 
 
 var (
 
-	addr      = flag.String("addr", "127.0.0.1:8080", "http service address")
 
-	cmdPath   string
 
-	homeTempl = template.Must(template.ParseFiles("home.html"))
 
+	addr    = flag.String("addr", "127.0.0.1:8080", "http service address")
 
+	cmdPath string
 
 )
 
 
 const (
 
@@ -176,8 +174,7 @@ func serveHome(w http.ResponseWriter, r *http.Request) {
 
 		http.Error(w, "Method not allowed", 405)
 
 		return
 
 	}
 
-	w.Header().Set("Content-Type", "text/html; charset=utf-8")
 
-	homeTempl.Execute(w, r.Host)
 
+	http.ServeFile(w, r, "home.html")
 
 }
 
 
 func main() {