(js) Remove Mailbox dependency in Preferences
This commit is contained in:
parent
01f213e65e
commit
f8b6864553
|
@ -13,8 +13,6 @@
|
||||||
this.defaults = {};
|
this.defaults = {};
|
||||||
this.settings = {};
|
this.settings = {};
|
||||||
|
|
||||||
this.mailboxes = Preferences.$Mailbox.$find({ id: 0 });
|
|
||||||
|
|
||||||
this.defaultsPromise = Preferences.$$resource.fetch("jsonDefaults").then(function(data) {
|
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)
|
// 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) {
|
var labels = _.object(_.map(data.SOGoMailLabelsColors, function(value, key) {
|
||||||
|
@ -58,14 +56,13 @@
|
||||||
* @desc The factory we'll use to register with Angular
|
* @desc The factory we'll use to register with Angular
|
||||||
* @returns the Preferences constructor
|
* @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, {
|
angular.extend(Preferences, {
|
||||||
$q: $q,
|
$q: $q,
|
||||||
$timeout: $timeout,
|
$timeout: $timeout,
|
||||||
$log: $log,
|
$log: $log,
|
||||||
$$resource: new Resource(Settings.activeUser.folderURL, Settings.activeUser),
|
$$resource: new Resource(Settings.activeUser.folderURL, Settings.activeUser),
|
||||||
activeUser: Settings.activeUser,
|
activeUser: Settings.activeUser,
|
||||||
$Mailbox: Mailbox,
|
|
||||||
$User: User
|
$User: User
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -7,8 +7,8 @@
|
||||||
/**
|
/**
|
||||||
* @ngInject
|
* @ngInject
|
||||||
*/
|
*/
|
||||||
PreferencesController.$inject = ['$scope', '$timeout', '$q', '$mdDialog', 'User', 'statePreferences', 'Authentication'];
|
PreferencesController.$inject = ['$scope', '$timeout', '$q', '$mdDialog', 'User', 'Mailbox', 'statePreferences', 'Authentication'];
|
||||||
function PreferencesController($scope, $timeout, $q, $mdDialog, User, statePreferences, Authentication) {
|
function PreferencesController($scope, $timeout, $q, $mdDialog, User, Mailbox, statePreferences, Authentication) {
|
||||||
var vm = this;
|
var vm = this;
|
||||||
|
|
||||||
vm.preferences = statePreferences;
|
vm.preferences = statePreferences;
|
||||||
|
@ -33,6 +33,7 @@
|
||||||
vm.timeZonesList = window.timeZonesList;
|
vm.timeZonesList = window.timeZonesList;
|
||||||
vm.timeZonesListFilter = timeZonesListFilter;
|
vm.timeZonesListFilter = timeZonesListFilter;
|
||||||
vm.timeZonesSearchText = '';
|
vm.timeZonesSearchText = '';
|
||||||
|
vm.mailboxes = Mailbox.$find({ id: 0 });
|
||||||
|
|
||||||
function addCalendarCategory() {
|
function addCalendarCategory() {
|
||||||
vm.preferences.defaults.SOGoCalendarCategoriesColors["New category"] = "#aaa";
|
vm.preferences.defaults.SOGoCalendarCategoriesColors["New category"] = "#aaa";
|
||||||
|
@ -121,7 +122,7 @@
|
||||||
targetEvent: ev,
|
targetEvent: ev,
|
||||||
locals: {
|
locals: {
|
||||||
filter: filter,
|
filter: filter,
|
||||||
mailboxes: vm.preferences.mailboxes,
|
mailboxes: vm.mailboxes,
|
||||||
labels: vm.preferences.defaults.SOGoMailLabelsColors
|
labels: vm.preferences.defaults.SOGoMailLabelsColors
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -136,7 +137,7 @@
|
||||||
targetEvent: null,
|
targetEvent: null,
|
||||||
locals: {
|
locals: {
|
||||||
filter: filter,
|
filter: filter,
|
||||||
mailboxes: vm.preferences.mailboxes,
|
mailboxes: vm.mailboxes,
|
||||||
labels: vm.preferences.defaults.SOGoMailLabelsColors
|
labels: vm.preferences.defaults.SOGoMailLabelsColors
|
||||||
}
|
}
|
||||||
}).then(function() {
|
}).then(function() {
|
||||||
|
|
Loading…
Reference in a new issue