Browse Source

We finally have a ui controller.

pull/194/head
Simon Eisenmann 10 years ago
parent
commit
513116f783
  1. 6
      static/js/controllers/controllers.js
  2. 0
      static/js/controllers/uicontroller.js
  3. 2
      static/js/directives/ui.js

6
static/js/controllers/controllers.js

@ -23,16 +23,16 @@
define([ define([
'underscore', 'underscore',
'controllers/mediastreamcontroller', 'controllers/uicontroller',
'controllers/statusmessagecontroller', 'controllers/statusmessagecontroller',
'controllers/chatroomcontroller', 'controllers/chatroomcontroller',
'controllers/usersettingscontroller', 'controllers/usersettingscontroller',
'controllers/contactsmanagercontroller', 'controllers/contactsmanagercontroller',
'controllers/contactsmanagereditcontroller', 'controllers/contactsmanagereditcontroller',
'controllers/appcontroller'], function(_, MediastreamController, StatusmessageController, ChatroomController, UsersettingsController, ContactsmanagerController, ContactsmanagereditController, AppController) { 'controllers/appcontroller'], function(_, UiController, StatusmessageController, ChatroomController, UsersettingsController, ContactsmanagerController, ContactsmanagereditController, AppController) {
var controllers = { var controllers = {
MediastreamController: MediastreamController, UiController: UiController,
StatusmessageController: StatusmessageController, StatusmessageController: StatusmessageController,
ChatroomController: ChatroomController, ChatroomController: ChatroomController,
UsersettingsController: UsersettingsController, UsersettingsController: UsersettingsController,

0
static/js/controllers/mediastreamcontroller.js → static/js/controllers/uicontroller.js

2
static/js/directives/ui.js

@ -29,7 +29,7 @@ define(['text!partials/ui.html'], function(template) {
restrict: 'E', restrict: 'E',
replace: true, replace: true,
scope: false, scope: false,
controller: 'MediastreamController', controller: 'UiController',
template: template template: template
} }

Loading…
Cancel
Save