Monotone-Parent: 2fdf0ead0781ef2362dd389811d5db44ca4cc84a

Monotone-Revision: c91eef7edcfd08d414664c25a590b6268a7e58e2

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-11-29T04:19:32
Monotone-Branch: ca.inverse.sogo

UI/WebServerResources/MailerUI.js

@@ -647,7 +647,7 @@ function messageListCallback(http) {
     var div = $('mailboxContent');
     var table = $('messageList');
 
-    var columnsOrder = UserSettings["SOGoMailListViewColumnsOrder"];
+    var columnsOrder = UserDefaults["SOGoMailListViewColumnsOrder"];
     if ( typeof(columnsOrder) == "undefined" ) {
         columnsOrder = defaultColumnsOrder;
     }
@@ -1524,7 +1524,7 @@ function configureMessageListBodyEvents(table) {
             // 4 => Unread
             // 5 => Date
             // 6 => Priority
-            var columnsOrder = UserSettings["SOGoMailListViewColumnsOrder"];
+            var columnsOrder = UserDefaults["SOGoMailListViewColumnsOrder"];
             if ( typeof(columnsOrder) == "undefined" ) {
                 columnsOrder = defaultColumnsOrder;
             }
@@ -1646,7 +1646,7 @@ function initMailer(event) {
 }
 
 function initMessageCheckTimer() {
-    var messageCheck = UserDefaults["MessageCheck"];
+    var messageCheck = UserDefaults["SOGoMailMessageCheck"];
     if (messageCheck && messageCheck != "manually") {
         var interval;
         if (messageCheck == "once_per_hour")

UI/WebServerResources/SchedulerUI.js

@@ -7,7 +7,7 @@ var listFilter = 'view_today';
 var listOfSelection = null;
 var selectedCalendarCell;
 
-var showCompletedTasks;;
+var showCompletedTasks;
 
 var currentDay = '';
 
@@ -1402,6 +1402,10 @@ function refreshEvents() {
 
 function refreshTasks(setUserDefault) {
     var url = "taskslist?show-completed=" + showCompletedTasks;
+    /* TODO: the logic behind this should be reimplemented properly:
+       the "taskslist" method should save the status when the 'show-completed'
+       is set to true and revert to the current status when that parameter is
+       NOT passed via the url. */
     if (setUserDefault == 1)
       url += "&setud=1";
     refreshAlarms();
@@ -2100,7 +2104,7 @@ function onFolderSubscribeCB(folderData) {
         appendCalendar(folderData["folderName"], folderData["folder"]);
         refreshEvents();
         refreshTasks();
-        changeCalendarDisplay();		
+        changeCalendarDisplay();
     }
 }
 
@@ -2276,6 +2280,8 @@ function drawNowLine () {
 function initCalendars() {
     sorting["attribute"] = "start";
     sorting["ascending"] = true;
+    /* FIXME: does this work at all? ShowCompletedTasks is in
+       UserSettings["Calendar"]... */
     showCompletedTasks = UserDefaults['ShowCompletedTasks'];
   
     if (!$(document.body).hasClassName("popup")) {

UI/WebServerResources/UIxMailEditor.js

@@ -235,7 +235,7 @@ function onTextFocus(event) {
     if (MailEditor.textFirstFocus) {
         // On first focus, position the caret at the proper position
         var content = this.getValue();
-        var replyPlacement = UserDefaults["ReplyPlacement"];
+        var replyPlacement = UserDefaults["SOGoMailReplyPlacement"];
         if (replyPlacement == "above" || !mailIsReply) { // for forwards, place caret at top unconditionally
             this.setCaretTo(0);
         }
@@ -337,7 +337,7 @@ function initMailEditor() {
         if (sigLimit > -1)
             MailEditor.signatureLength = (textContent.length - sigLimit);
     }
-    if (UserDefaults["ReplyPlacement"] != "above") {
+    if (UserDefaults["SOGoMailReplyPlacement"] != "above") {
         textarea.scrollTop = textarea.scrollHeight;
     }
     textarea.observe("focus", onTextFocus);
@@ -359,7 +359,7 @@ function initMailEditor() {
 
     initializePriorityMenu();
 
-    var composeMode = UserDefaults["ComposeMessagesType"];
+    var composeMode = UserDefaults["SOGoMailComposeMessageType"];
     if (composeMode == "html") {
         CKEDITOR.replace('text',
                          {
@@ -470,7 +470,7 @@ function lineBreakCount(str){
 
 function hasSignature() {
     try {
-        return(UserDefaults["MailSignature"].length > 0);
+        return(UserDefaults["SOGoMailSignature"].length > 0);
     } catch(e) {
         return false;
     }
@@ -548,7 +548,7 @@ function onWindowResize(event) {
     textarea.setStyle({ 'top': hr.offsetTop + 'px' });
 
     // Resize the textarea (message content)
-    var composeMode = UserDefaults["ComposeMessagesType"];
+    var composeMode = UserDefaults["SOGoMailComposeMessageType"];
     if (composeMode == "html") {
         var editor = $('cke_text');
         if (editor == null) {