Changed the configurable variable SOGoMailMessageCheck to a general refresh associated to the current view

This commit is contained in:
Alexandre Cloutier
2014-08-29 13:16:30 -04:00
parent 126a05d391
commit d62c504763
37 changed files with 316 additions and 267 deletions
+23
View File
@@ -11,6 +11,8 @@ var Contact = {
currentContactId: null
};
var refreshViewCheckTimer;
function openContactsFolder(contactsFolder, reload, idx) {
if ((contactsFolder && contactsFolder != Contact.currentAddressBook)
|| reload) {
@@ -1363,6 +1365,7 @@ function initContacts(event) {
configureAddressBooks();
configureDraggables();
updateAddressBooksMenus();
initRefreshViewCheckTimer();
var table = $("contactsList");
if (table) {
@@ -1625,4 +1628,24 @@ function onContactsReload () {
openContactsFolder(Contact.currentAddressBook, true);
}
function initRefreshViewCheckTimer() {
var refreshViewCheck = UserDefaults["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;
}
refreshViewCheckTimer = window.setInterval(onRefreshViewCheckCallback,
interval * 1000);
}
}
function onRefreshViewCheckCallback(event) {
onContactsReload();
}
document.observe("dom:loaded", initContacts);
+15 -11
View File
@@ -31,7 +31,7 @@ var pageContent = $("pageContent");
var deleteMessageRequestCount = 0;
var messageCheckTimer;
var refreshViewCheckTimer;
// Variables for feature threadsCollapsing
var displayThreadElement = false;
@@ -2072,7 +2072,7 @@ function initMailer(event) {
configureMessageListEvents();
initMailboxTree();
initMessageCheckTimer();
initRefreshViewCheckTimer();
Event.observe(document, "keydown", onDocumentKeydown);
@@ -2092,23 +2092,27 @@ function initMailer(event) {
Event.observe(window, "resize", onWindowResize);
}
function initMessageCheckTimer() {
var messageCheck = UserDefaults["SOGoMailMessageCheck"];
if (messageCheck && messageCheck != "manually") {
function initRefreshViewCheckTimer() {
// TEMPORARY : to be erase
var refreshViewCheck = UserDefaults["SOGoMailMessageCheck"];
if (refreshViewCheck == null)
refreshViewCheck = UserDefaults["SOGoRefreshViewCheck"];
if (refreshViewCheck && refreshViewCheck != "manually") {
var interval;
if (messageCheck == "once_per_hour")
if (refreshViewCheck == "once_per_hour")
interval = 3600;
else if (messageCheck == "every_minute")
else if (refreshViewCheck == "every_minute")
interval = 60;
else {
interval = parseInt(messageCheck.substr(6)) * 60;
interval = parseInt(refreshViewCheck.substr(6)) * 60;
}
messageCheckTimer = window.setInterval(onMessageCheckCallback,
interval * 1000);
refreshViewCheckTimer = window.setInterval(onRefreshViewCheckCallback,
interval * 1000);
}
}
function onMessageCheckCallback(event) {
function onRefreshViewCheckCallback(event) {
refreshMailbox();
}
+22
View File
@@ -35,6 +35,7 @@ var categoriesStyleSheet = null;
var clipboard = null;
var eventsToCopy = [];
var refreshViewCheckTimer;
// This should probably go in the generic.js
function printView() {
@@ -1440,6 +1441,26 @@ function refreshEventsAndTasks() {
refreshTasks();
}
function initRefreshViewCheckTimer() {
var refreshViewCheck = UserDefaults["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;
}
refreshViewCheckTimer = window.setInterval(onRefreshViewCheckCallback,
interval * 1000);
}
}
function onRefreshViewCheckCallback(event) {
onCalendarReload();
}
function onCalendarReload() {
if (!reloadWebCalendars()) {
refreshEventsAndTasks();
@@ -3887,6 +3908,7 @@ function initScheduler() {
$("calendarView").on("click", "#listCollapse", onListCollapse);
Event.observe(document, "keydown", onDocumentKeydown);
}
initRefreshViewCheckTimer()
onWindowResize.defer();
Event.observe(window, "resize", onWindowResize);
+1 -1
View File
@@ -144,7 +144,7 @@ function prototypeIfyFilters() {
function _setupEvents() {
var widgets = [ "timezone", "shortDateFormat", "longDateFormat",
"timeFormat", "weekStartDay", "dayStartTime", "dayEndTime",
"firstWeek", "messageCheck", "sortByThreads", "displayRemoteInlineImages",
"firstWeek", "refreshViewCheck", "sortByThreads", "displayRemoteInlineImages",
"subscribedFoldersOnly", "language", "defaultCalendar",
"enableVacation" ];
for (var i = 0; i < widgets.length; i++) {