websocket url

Cybros · Jan 28, 2016 · beeb0ee · beeb0ee
1 parent 07980ca
commit beeb0ee
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/static/js/crowdsource.js b/static/js/crowdsource.js
@@ -67,6 +67,17 @@ function run($http, $rootScope, $window, $location, Authentication) {
     });
 
     $rootScope.theme = 'default';
+
+    $rootScope.getWebsocketUrl = function(){
+        var host = $location.host();
+        var protocol = $location.protocol();
+        var port = $location.port();
+
+        protocol = protocol.replace("http", "ws");
+
+        return protocol +"://"+ host + ":" + port;
+    };
+
     /*$rootScope.$on('oauth:error', function(event, rejection) {
      if ('invalid_grant' === rejection.data.error) {
      return;

diff --git a/static/js/task-feed/controllers/task-feed.controller.js b/static/js/task-feed/controllers/task-feed.controller.js
@@ -11,21 +11,21 @@
         .controller('TaskFeedController', TaskFeedController);
 
     TaskFeedController.$inject = ['$window', '$location', '$scope', '$mdToast', 'TaskFeed',
-        '$filter', 'Authentication', 'TaskWorker', 'Project', '$rootScope', '$routeParams', '$websocket', '$timeout'];
+        '$filter', 'Authentication', 'TaskWorker', 'Project', '$rootScope', '$routeParams', '$websocket'];
 
     /**
      * @namespace TaskFeedController
      */
     function TaskFeedController($window, $location, $scope, $mdToast, TaskFeed,
-                                $filter, Authentication, TaskWorker, Project, $rootScope, $routeParams, $websocket, $timeout) {
+                                $filter, Authentication, TaskWorker, Project, $rootScope, $routeParams, $websocket) {
         var userAccount = Authentication.getAuthenticatedAccount();
         if (!userAccount) {
             $location.path('/login');
             return;
         }
 
         var ws = $websocket.$new({
-            url: 'ws://localhost:8000/ws/foo?subscribe-broadcast',
+            url: $rootScope.getWebsocketUrl() + '/ws/foo?subscribe-broadcast',
             lazy: true,
             reconnect: true
         });