From 85f4efab46904fa23bf1e46205e31630b25837c1 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Thu, 30 Jul 2015 14:51:14 -0400 Subject: [PATCH] (fix) refactored to code --- UI/WebServerResources/js/Common/utils.js | 13 +++++++++++++ .../js/Contacts/AddressBookController.js | 11 +---------- .../js/Mailer/MailboxController.js | 11 +---------- 3 files changed, 15 insertions(+), 20 deletions(-) diff --git a/UI/WebServerResources/js/Common/utils.js b/UI/WebServerResources/js/Common/utils.js index 6168d3ca8..2014c73cb 100644 --- a/UI/WebServerResources/js/Common/utils.js +++ b/UI/WebServerResources/js/Common/utils.js @@ -173,6 +173,19 @@ String.prototype.asCSSIdentifier = function() { return newString; }; +String.prototype.timeInterval = function () { + var interval; + if (this == "once_per_hour") + interval = 3600; + else if (this == "every_minute") + interval = 60; + else { + interval = parseInt(this.substr(6)) * 60; + } + + return interval; +}; + Date.prototype.stringWithSeparator = function(separator) { var month = '' + (this.getMonth() + 1); var day = '' + this.getDate(); diff --git a/UI/WebServerResources/js/Contacts/AddressBookController.js b/UI/WebServerResources/js/Contacts/AddressBookController.js index a8bf32547..e28f2ad67 100644 --- a/UI/WebServerResources/js/Contacts/AddressBookController.js +++ b/UI/WebServerResources/js/Contacts/AddressBookController.js @@ -103,17 +103,8 @@ Preferences.ready().then(function() { var refreshViewCheck = Preferences.defaults.SOGoRefreshViewCheck; if (refreshViewCheck && refreshViewCheck != 'manually') { - var interval; - if (refreshViewCheck == "once_per_hour") - interval = 3600; - else if (refreshViewCheck == "every_minute") - interval = 60; - else { - interval = parseInt(refreshViewCheck.substr(6)) * 60; - } - var f = angular.bind(vm.selectedFolder, AddressBook.prototype.$reload); - $timeout(f, interval*1000); + $timeout(f, refreshViewCheck.timeInterval()*1000); } }); } diff --git a/UI/WebServerResources/js/Mailer/MailboxController.js b/UI/WebServerResources/js/Mailer/MailboxController.js index 1951b5899..d3410894d 100644 --- a/UI/WebServerResources/js/Mailer/MailboxController.js +++ b/UI/WebServerResources/js/Mailer/MailboxController.js @@ -92,17 +92,8 @@ Preferences.ready().then(function() { var refreshViewCheck = Preferences.defaults.SOGoRefreshViewCheck; if (refreshViewCheck && refreshViewCheck != 'manually') { - var interval; - if (refreshViewCheck == "once_per_hour") - interval = 3600; - else if (refreshViewCheck == "every_minute") - interval = 60; - else { - interval = parseInt(refreshViewCheck.substr(6)) * 60; - } - var f = angular.bind(vm.selectedFolder, Mailbox.prototype.$filter); - $timeout(f, interval*1000); + $timeout(f, refreshViewCheck.timeInterval()*1000); } }); }