From 92b45ba789e6852a9d55622acf0ecda07be5b2fa Mon Sep 17 00:00:00 2001
From: Simon Eisenmann <simon@longsleep.org>
Date: Mon, 3 Mar 2014 00:55:43 +0100
Subject: [PATCH] Added url functions as mediaStream api.

Signed-off-by: Simon Eisenmann <simon@struktur.de>
---
 static/js/controllers/roomchangecontroller.js |  8 +++----
 static/js/services/mediastream.js             | 21 ++++++++++++++-----
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/static/js/controllers/roomchangecontroller.js b/static/js/controllers/roomchangecontroller.js
index ac1a005d..b4d00d07 100644
--- a/static/js/controllers/roomchangecontroller.js
+++ b/static/js/controllers/roomchangecontroller.js
@@ -25,11 +25,11 @@ define([], function() {
 
         console.log("Room change controller", $element, $scope.roomdata);
 
-        var baseurl = $window.location.protocol+'//'+$window.location.host+mediaStream.config.B;
-        var url = (mediaStream.config.B || "/") + "api/v1/rooms";
+        var url = mediaStream.url.api("rooms");
 
         var ctrl = this;
         ctrl.enabled = true;
+
         ctrl.getRoom = function(cb) {
             $http({
                 method: "POST",
@@ -65,10 +65,10 @@ define([], function() {
                     ctrl.getRoom(function(roomdata) {
                         console.info("Retrieved room data", roomdata);
                         $scope.roomdata = roomdata;
-                        roomdata.link = baseurl + encodeURI(roomdata.name);
+                        roomdata.link = mediaStream.url.room(roomdata.name);
                     });
                 }
-            }, 500);
+            }, 100);
         }
 
     }];
diff --git a/static/js/services/mediastream.js b/static/js/services/mediastream.js
index ce69dc5a..b63d5ecf 100644
--- a/static/js/services/mediastream.js
+++ b/static/js/services/mediastream.js
@@ -44,19 +44,19 @@ define([
         var td = null;
         $window.testDisconnect = function() {
             if (td) {
-                window.clearInterval(td);
+                $window.clearInterval(td);
                 td = null;
                 console.info("Stopped disconnector.");
                 return;
             }
-            td = window.setInterval(function() {
+            td = $window.setInterval(function() {
                 console.info("Test disconnect!");
                 connector.conn.close();
             }, 10000);
             console.info("Started disconnector.");
         };
 
-        return {
+        var mediaStream = {
             version: version,
             url: url,
             config: context.Cfg,
@@ -64,6 +64,15 @@ define([
             connector: connector,
             api: api,
             tokens: tokens,
+            url: {
+                room: function(id) {
+                    id = $window.encodeURIComponent(id);
+                    return $window.location.protocol+'//'+$window.location.host+context.Cfg.B+id;
+                },
+                api: function(path) {
+                    return (context.Cfg.B || "/") + "api/v1/" + path;
+                }
+            },
             initialize: function($rootScope, translation) {
 
                 var cont = false;
@@ -151,7 +160,7 @@ define([
                                 }
                             }, prompt);
                         };
-                        var url = (context.Cfg.B || "/") + "api/v1/tokens";
+                        var url = mediaStream.url.api("tokens");
                         var check = function(code) {
                             $http({
                                 method: "POST",
@@ -191,7 +200,9 @@ define([
                 });
 
             }
-        }
+        };
+
+        return mediaStream;
 
     }];