From 8fbde7a43b4f838df0379fdb4acd791713b639b7 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Sun, 15 Dec 2013 14:00:42 +0100 Subject: more options to get webUI through proxy working --- pyload/web/app/scripts/views/headerView.js | 36 +++++++++++++++++------------- 1 file changed, 21 insertions(+), 15 deletions(-) (limited to 'pyload/web/app/scripts/views') diff --git a/pyload/web/app/scripts/views/headerView.js b/pyload/web/app/scripts/views/headerView.js index 49298d450..7d892bf01 100644 --- a/pyload/web/app/scripts/views/headerView.js +++ b/pyload/web/app/scripts/views/headerView.js @@ -62,21 +62,27 @@ define(['jquery', 'underscore', 'backbone', 'app', 'models/ServerStatus', 'colle }); // TODO: button to start stop refresh - var ws = App.openWebSocket('/async'); - ws.onopen = function() { - ws.send(JSON.stringify('start')); - }; - // TODO compare with polling - ws.onmessage = _.bind(this.onData, this); - ws.onerror = function(error) { - console.log(error); - alert('WebSocket error' + error); - }; - ws.onclose = function() { - alert('WebSocket was closed'); - }; - - this.ws = ws; + // TODO: catch ws errors / switch into ws less mode + try { + var ws = App.openWebSocket('/async'); + ws.onopen = function() { + ws.send(JSON.stringify('start')); + }; + // TODO compare with polling + ws.onmessage = _.bind(this.onData, this); + ws.onerror = function(error) { + console.log(error); + alert('WebSocket error ' + error); + }; + ws.onclose = function() { + alert('WebSocket was closed'); + }; + + this.ws = ws; + + } catch (e) { + alert('Could not open WebSocket: ' + e); + } }, gotoDashboard: function() { -- cgit v1.2.3