introduce revised views, port over changes from multiple_views branch

1 files changed, 28 insertions, 23 deletions

diff --git a/web/src/js/connection.js b/web/src/js/connection.js
index 3edbfc20..64d550bf 100644
--- a/web/src/js/connection.js
+++ b/web/src/js/connection.js
@@ -1,33 +1,38 @@
-function _Connection(url) {
-    this.url = url;
+function Connection(url) {
+    if(url[0] != "/"){
+        this.url = url;
+    } else {
+        this.url = location.origin.replace("http", "ws") + url;
+    }
+    var ws = new WebSocket(this.url);
+    ws.onopen = function(){
+        this.onopen.apply(this, arguments);
+    }.bind(this);
+    ws.onmessage = function(){
+        this.onmessage.apply(this, arguments);
+    }.bind(this);
+    ws.onerror = function(){
+        this.onerror.apply(this, arguments);
+    }.bind(this);
+    ws.onclose = function(){
+        this.onclose.apply(this, arguments);
+    }.bind(this);
+    this.ws = ws;
 }
-_Connection.prototype.init = function () {
-    this.openWebSocketConnection();
-};
-_Connection.prototype.openWebSocketConnection = function () {
-    this.ws = new WebSocket(this.url.replace("http", "ws"));
-    var ws = this.ws;
-
-    ws.onopen = this.onopen.bind(this);
-    ws.onmessage = this.onmessage.bind(this);
-    ws.onerror = this.onerror.bind(this);
-    ws.onclose = this.onclose.bind(this);
-};
-_Connection.prototype.onopen = function (open) {
+Connection.prototype.onopen = function (open) {
     console.debug("onopen", this, arguments);
 };
-_Connection.prototype.onmessage = function (message) {
-    //AppDispatcher.dispatchServerAction(...);
-    var m = JSON.parse(message.data);
-    AppDispatcher.dispatchServerAction(m);
+Connection.prototype.onmessage = function (message) {
+    console.warn("onmessage (not implemented)", this, message.data);
 };
-_Connection.prototype.onerror = function (error) {
+Connection.prototype.onerror = function (error) {
     EventLogActions.add_event("WebSocket Connection Error.");
     console.debug("onerror", this, arguments);
 };
-_Connection.prototype.onclose = function (close) {
+Connection.prototype.onclose = function (close) {
     EventLogActions.add_event("WebSocket Connection closed.");
     console.debug("onclose", this, arguments);
 };
-
-var Connection = new _Connection(location.origin + "/updates");
+Connection.prototype.close = function(){
+    this.ws.close();
+};
\ No newline at end of file