From 0fbb5f8ec681094ed2b3c0024a10fa959cba9a4d Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Fri, 9 Sep 2016 13:32:03 +0200
Subject: [PATCH] Only use web socket channel if web socket connection is
 already established.

---
 .../app/lib/app_post/_collection_base.coffee   |  2 +-
 .../app_post/overview_list_collection.coffee   | 18 +++++++++---------
 .../app/lib/app_post/websocket.coffee          |  3 ++-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/app/lib/app_post/_collection_base.coffee b/app/assets/javascripts/app/lib/app_post/_collection_base.coffee
index 2baace9e2..91b278a70 100644
--- a/app/assets/javascripts/app/lib/app_post/_collection_base.coffee
+++ b/app/assets/javascripts/app/lib/app_post/_collection_base.coffee
@@ -49,7 +49,7 @@ class App._CollectionSingletonBase
     delete @callbacks[counter]
 
   fetch: =>
-    if App.WebSocket.support()
+    if App.WebSocket.support() && App.WebSocket.channel()
       App.WebSocket.send(event: @event)
       return
 
diff --git a/app/assets/javascripts/app/lib/app_post/overview_list_collection.coffee b/app/assets/javascripts/app/lib/app_post/overview_list_collection.coffee
index 26679bac5..5dc34ca8b 100644
--- a/app/assets/javascripts/app/lib/app_post/overview_list_collection.coffee
+++ b/app/assets/javascripts/app/lib/app_post/overview_list_collection.coffee
@@ -33,20 +33,20 @@ class _Singleton
     delete @callbacks[counter]
 
   fetch: (view) =>
-    if App.WebSocket.support()
-      App.WebSocket.send(
-        event: 'ticket_overview_list'
-        view: view
-      )
-      return
+    #if App.WebSocket.support() && App.WebSocket.channel()
+    #  App.WebSocket.send(
+    #    event: 'ticket_overview_list'
+    #    view: view
+    #  )
+    #  return
 
     App.OverviewIndexCollection.fetch()
     return if @fetchActive[view]
     @fetchActive[view] = true
     App.Ajax.request(
-      id:   'ticket_overview_' + view
-      type:  'GET',
-      url:   App.Config.get('api_path') + '/ticket_overviews',
+      id:   "ticket_overview_#{view}"
+      type: 'GET'
+      url:  "#{App.Config.get('api_path')}/ticket_overviews"
       data:
         view: view
       processData: true,
diff --git a/app/assets/javascripts/app/lib/app_post/websocket.coffee b/app/assets/javascripts/app/lib/app_post/websocket.coffee
index b421e2388..06e461cc3 100644
--- a/app/assets/javascripts/app/lib/app_post/websocket.coffee
+++ b/app/assets/javascripts/app/lib/app_post/websocket.coffee
@@ -106,7 +106,8 @@ class _webSocketSingleton extends App.Controller
     )
 
   channel: ->
-    @backend
+    return @backend if @connectionEstablished
+    undefined
 
   support: ->
     @supported