From f8b6864553ca25e3a96a7f88d40727fb20b5f46d Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Wed, 22 Jul 2015 17:27:46 -0400
Subject: [PATCH] (js) Remove Mailbox dependency in Preferences

---
 .../js/Preferences/Preferences.service.js                | 5 +----
 .../js/Preferences/PreferencesController.js              | 9 +++++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/UI/WebServerResources/js/Preferences/Preferences.service.js b/UI/WebServerResources/js/Preferences/Preferences.service.js
index caaad333f..6ae0d76fc 100644
--- a/UI/WebServerResources/js/Preferences/Preferences.service.js
+++ b/UI/WebServerResources/js/Preferences/Preferences.service.js
@@ -13,8 +13,6 @@
     this.defaults = {};
     this.settings = {};
 
-    this.mailboxes = Preferences.$Mailbox.$find({ id: 0 });
-
     this.defaultsPromise = Preferences.$$resource.fetch("jsonDefaults").then(function(data) {
         // We swap $key -> _$key to avoid an Angular bug (https://github.com/angular/angular.js/issues/6266)
         var labels = _.object(_.map(data.SOGoMailLabelsColors, function(value, key) {
@@ -58,14 +56,13 @@
    * @desc The factory we'll use to register with Angular
    * @returns the Preferences constructor
    */
-  Preferences.$factory = ['$q', '$timeout', '$log', 'sgSettings', 'Resource', 'Mailbox', 'User', function($q, $timeout, $log, Settings, Resource, Mailbox, User) {
+  Preferences.$factory = ['$q', '$timeout', '$log', 'sgSettings', 'Resource', 'User', function($q, $timeout, $log, Settings, Resource, User) {
     angular.extend(Preferences, {
       $q: $q,
       $timeout: $timeout,
       $log: $log,
       $$resource: new Resource(Settings.activeUser.folderURL, Settings.activeUser),
       activeUser: Settings.activeUser,
-      $Mailbox: Mailbox,
       $User: User
     });
 
diff --git a/UI/WebServerResources/js/Preferences/PreferencesController.js b/UI/WebServerResources/js/Preferences/PreferencesController.js
index a947a642f..bc4566142 100644
--- a/UI/WebServerResources/js/Preferences/PreferencesController.js
+++ b/UI/WebServerResources/js/Preferences/PreferencesController.js
@@ -7,8 +7,8 @@
   /**
    * @ngInject
    */
-  PreferencesController.$inject = ['$scope', '$timeout', '$q', '$mdDialog', 'User', 'statePreferences', 'Authentication'];
-  function PreferencesController($scope, $timeout, $q, $mdDialog, User, statePreferences, Authentication) {
+  PreferencesController.$inject = ['$scope', '$timeout', '$q', '$mdDialog', 'User', 'Mailbox', 'statePreferences', 'Authentication'];
+  function PreferencesController($scope, $timeout, $q, $mdDialog, User, Mailbox, statePreferences, Authentication) {
     var vm = this;
 
     vm.preferences = statePreferences;
@@ -33,6 +33,7 @@
     vm.timeZonesList = window.timeZonesList;
     vm.timeZonesListFilter = timeZonesListFilter;
     vm.timeZonesSearchText = '';
+    vm.mailboxes = Mailbox.$find({ id: 0 });
     
     function addCalendarCategory() {
       vm.preferences.defaults.SOGoCalendarCategoriesColors["New category"] = "#aaa";
@@ -121,7 +122,7 @@
         targetEvent: ev,
         locals: {
           filter: filter,
-          mailboxes: vm.preferences.mailboxes,
+          mailboxes: vm.mailboxes,
           labels: vm.preferences.defaults.SOGoMailLabelsColors
         }
       });
@@ -136,7 +137,7 @@
         targetEvent: null,
         locals: {
           filter: filter,
-          mailboxes: vm.preferences.mailboxes,
+          mailboxes: vm.mailboxes,
           labels: vm.preferences.defaults.SOGoMailLabelsColors
         }
       }).then(function() {