From 99f3a4f81bcae587e0828dc08517cbb259d4facc Mon Sep 17 00:00:00 2001
From: Simon Eisenmann <simon@longsleep.org>
Date: Sat, 30 Aug 2014 23:05:52 +0200
Subject: [PATCH] Correctly decode room from url and cleaned up old code.

---
 static/js/services/mediastream.js | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/static/js/services/mediastream.js b/static/js/services/mediastream.js
index 7845dcde..fca50a74 100644
--- a/static/js/services/mediastream.js
+++ b/static/js/services/mediastream.js
@@ -280,21 +280,11 @@ define([
 
 				// Room selector.
 				$rootScope.$on("$locationChangeSuccess", function(event) {
-					/*var defaultRoom, room;
-					room = defaultRoom = $rootScope.roomid || "";
-					if ($route.current) {
-						room = $route.current.params.room;
-					} else {
-						room = "";
-					}
-					if (!ready && room !== defaultRoom && !room) {
-						// First start.
-						$location.path("/" + defaultRoom).replace();
-						return;
-					}*/
+
 					var room;
 					if ($route.current) {
 						room = $route.current.params.room;
+						room = $window.decodeURIComponent(room);
 					} else {
 						room = "";
 					}