From 513116f783998b27adc9382a3c63a199add8cdbb Mon Sep 17 00:00:00 2001
From: Simon Eisenmann <simon@struktur.de>
Date: Mon, 20 Apr 2015 15:33:12 +0200
Subject: [PATCH] We finally have a ui controller.

---
 static/js/controllers/controllers.js                        | 6 +++---
 .../{mediastreamcontroller.js => uicontroller.js}           | 0
 static/js/directives/ui.js                                  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename static/js/controllers/{mediastreamcontroller.js => uicontroller.js} (100%)

diff --git a/static/js/controllers/controllers.js b/static/js/controllers/controllers.js
index 57c25a0c..f455e02d 100644
--- a/static/js/controllers/controllers.js
+++ b/static/js/controllers/controllers.js
@@ -23,16 +23,16 @@
 define([
 	'underscore',
 
-	'controllers/mediastreamcontroller',
+	'controllers/uicontroller',
 	'controllers/statusmessagecontroller',
 	'controllers/chatroomcontroller',
 	'controllers/usersettingscontroller',
 	'controllers/contactsmanagercontroller',
 	'controllers/contactsmanagereditcontroller',
-	'controllers/appcontroller'], function(_, MediastreamController, StatusmessageController, ChatroomController, UsersettingsController, ContactsmanagerController, ContactsmanagereditController, AppController) {
+	'controllers/appcontroller'], function(_, UiController, StatusmessageController, ChatroomController, UsersettingsController, ContactsmanagerController, ContactsmanagereditController, AppController) {
 
 	var controllers = {
-		MediastreamController: MediastreamController,
+		UiController: UiController,
 		StatusmessageController: StatusmessageController,
 		ChatroomController: ChatroomController,
 		UsersettingsController: UsersettingsController,
diff --git a/static/js/controllers/mediastreamcontroller.js b/static/js/controllers/uicontroller.js
similarity index 100%
rename from static/js/controllers/mediastreamcontroller.js
rename to static/js/controllers/uicontroller.js
diff --git a/static/js/directives/ui.js b/static/js/directives/ui.js
index 2d7d81fe..41a19725 100644
--- a/static/js/directives/ui.js
+++ b/static/js/directives/ui.js
@@ -29,7 +29,7 @@ define(['text!partials/ui.html'], function(template) {
 			restrict: 'E',
 			replace: true,
 			scope: false,
-			controller: 'MediastreamController',
+			controller: 'UiController',
 			template: template
 		}