LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

(js) Remove Mailbox dependency in Preferences

pull/91/head
Francis Lachapelle 2015-07-22 17:27:46 -04:00
parent 01f213e65e
commit f8b6864553
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
UI/WebServerResources/js/Preferences/Preferences.service.js
View File

@ -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
});

9
UI/WebServerResources/js/Preferences/PreferencesController.js
View File

@ -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() {