amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-09-27 16:10:35 +00:00
Code Issues Projects Releases Wiki Activity

(fix) move refresh timeout to service classes and enabled repeating timers

Browse Source
This commit is contained in:
Ludovic Marcotte
2015-07-30 19:47:53 -04:00
parent 85f4efab46
commit 65b8382020
4 changed files with 47 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/js/Contacts/AddressBook.service.js
+31 -3
View File
@@ -32,7 +32,7 @@
* @desc The factory we'll use to register with Angular
* @returns the AddressBook constructor
*/
AddressBook.$factory = ['$q', '$timeout', '$log', 'sgSettings', 'Resource', 'Card', 'Acl', function($q, $timeout, $log, Settings, Resource, Card, Acl) {
AddressBook.$factory = ['$q', '$timeout', '$log', 'sgSettings', 'Resource', 'Card', 'Acl', 'Preferences', function($q, $timeout, $log, Settings, Resource, Card, Acl, Preferences) {
angular.extend(AddressBook, {
$q: $q,
$timeout: $timeout,
@@ -40,8 +40,10 @@
$$resource: new Resource(Settings.activeUser.folderURL + 'Contacts', Settings.activeUser),
$Card: Card,
$$Acl: Acl,
$Preferences: Preferences,
activeUser: Settings.activeUser,
selectedFolder: null
selectedFolder: null,
$refreshTimeout: null
});
return AddressBook; // return constructor
@@ -102,7 +104,7 @@
/**
* @memberof AddressBook
* @desc Set or get the list of addressbooks. Will instanciate a new AddressBook object for each item.
* @desc Set or get the list of addressbooks. Will instantiate a new AddressBook object for each item.
* @param {array} [data] - the metadata of the addressbooks
* @returns the list of addressbooks
*/
@@ -210,6 +212,27 @@
return count;
};
/**
* @function $startRefreshTimeout
* @memberof AddressBook.prototype
* @desc Starts the refresh timeout for the current selected address book
* /
AddressBook.prototype.$startRefreshTimeout = function() {
var _this = this;
if (AddressBook.$refreshTimeout)
AddressBook.$timeout.cancel(AddressBook.$refreshTimeout);
AddressBook.$Preferences.ready().then(function() {
// Restart the refresh timer, if needed
var refreshViewCheck = AddressBook.$Preferences.defaults.SOGoRefreshViewCheck;
if (refreshViewCheck && refreshViewCheck != 'manually') {
var f = angular.bind(_this, AddressBook.prototype.$reload);
AddressBook.$refreshTimeout = AddressBook.$timeout(f, refreshViewCheck.timeInterval()*1000);
}
});
};
/**
* @function $reload
* @memberof AddressBook.prototype
@@ -219,6 +242,8 @@
AddressBook.prototype.$reload = function() {
var _this = this;
this.$startRefreshTimeout();
return AddressBook.$$resource.fetch(this.id, 'view')
.then(function(response) {
var index, card,
@@ -441,6 +466,9 @@
});
// Instanciate Acl object
_this.$acl = new AddressBook.$$Acl('Contacts/' + _this.id);
_this.$startRefreshTimeout();
return _this;
});
}, function(data) {
UI/WebServerResources/js/Contacts/AddressBookController.js
+2 -11
View File
@@ -6,8 +6,8 @@
/**
* @ngInject
*/
AddressBookController.$inject = ['$scope', '$state', '$timeout', '$mdDialog', 'sgFocus', 'Card', 'AddressBook', 'Dialog', 'Preferences', 'sgSettings', 'stateAddressbooks', 'stateAddressbook'];
function AddressBookController($scope, $state, $timeout, $mdDialog, focus, Card, AddressBook, Dialog, Preferences, Settings, stateAddressbooks, stateAddressbook) {
AddressBookController.$inject = ['$scope', '$state', '$timeout', '$mdDialog', 'sgFocus', 'Card', 'AddressBook', 'Dialog', 'sgSettings', 'stateAddressbooks', 'stateAddressbook'];
function AddressBookController($scope, $state, $timeout, $mdDialog, focus, Card, AddressBook, Dialog, Settings, stateAddressbooks, stateAddressbook) {
var vm = this;
AddressBook.selectedFolder = stateAddressbook;
@@ -98,15 +98,6 @@
vm.mode.search = false;
vm.selectedFolder.$filter('');
}
// Start the address book refresh timer based on user's preferences
Preferences.ready().then(function() {
var refreshViewCheck = Preferences.defaults.SOGoRefreshViewCheck;
if (refreshViewCheck && refreshViewCheck != 'manually') {
var f = angular.bind(vm.selectedFolder, AddressBook.prototype.$reload);
$timeout(f, refreshViewCheck.timeInterval()*1000);
}
});
}
angular