Changeset 7228 for branches/2.4/expressoMail1_2/js/doiMenuData.js

Timestamp:

09/17/12 14:30:47 (12 years ago)

Author:

douglas

Message:

Ticket #0000 - Copiadas as alterações do Trunk. Versão final da 2.4.2.

Location:

branches/2.4

Files:

• . (modified) (1 prop)
• expressoMail1_2/js/doiMenuData.js (modified) (8 diffs)

branches/2.4/expressoMail1_2/js/doiMenuData.js

@@ -97 +97 @@
 
 /**
- *      Carrega o menu de opção de uma mensagem
+ *      Carrega o menu de opção de uma mensagem
  */
 function loadMenu(){
@@ -113 +113 @@
                                 labeledMessages(isLabel[1]);
                         }
-                        selectAllFolderMsgs(false); 
+                        selectAllFolderMsgs(false);
                 },
                 items: {
@@ -140 +140 @@
                 "i02": {"name": get_lang("Search"), "icon": "search-mail", callback: function(key, opt){ search_emails(""); }},
                 "103": {"name": get_lang("Edit filters"), "icon": "filter", callback: filterbox2 },
-                "i04": {"name": get_lang("Edit folders"), "icon": "edit-folder", callback: folderbox },
                 "i05": {"name": get_lang("Share mailbox"), "icon": "share-mailbox", callback: sharebox },
                 "i06": {"name": get_lang("Labels"), "icon": "tag", callback: configureLabels }, 
@@ -153 +152 @@
 } else {
         var menuToolsItems = {
-                "i01": {"name": get_lang("Search"), "icon": "search-mail", callback: function(key, opt){ search_emails(""); }},
-                "i02": {"name": get_lang("Edit folders"), "icon": "edit-folder", callback: folderbox }
+                "i01": {"name": get_lang("Search"), "icon": "search-mail", callback: function(key, opt){ search_emails(""); }}
         }
 }
@@ -210 +208 @@
 function updateLabelsColumn(messageInfo) {
         var msg_number = messageInfo.msg_number;
-        //uid é o numero da mensagem quando os dados são carregados na busca rapida.
+        //uid é o numero da mensagem quando os dados são carregados na busca rapida.
         if(messageInfo.uid != '' && messageInfo.uid != 'undefined' && messageInfo.uid != null){
                 msg_number = messageInfo.uid;
@@ -268 +266 @@
             .appendTo(this);
                 $(this).find('span.removeLabeled').click(function(){
-                        //TODO Mudar quando API abstrair atualizações no cache
+                        //TODO Mudar quando API abstrair atualizações no cache
                         DataLayer.remove('labeled', false);
                         DataLayer.get('labeled');
@@ -306 +304 @@
 
 function loadExtraLDAPBox(data, element){
+
+    if(!!data[0]){
+        var decoded = {};
+
+        $.each(data, function(i, e){
+            decoded[e.name] = e.value;
+        });
+
+        data = decoded;
+    }
+
         menuItensLabel = {};
-        menuItensLabel["Name"] = {name: "<b>"+data[0].value+"</b>", disabled: true};            
-        menuItensLabel["Email"] = {name: data[1].value, disabled: true};        
-        if(data[2].value){
+        menuItensLabel["Name"] = {name: "<b>"+data.name+"</b>", disabled: true};
+        menuItensLabel["Email"] = {name: data.email, disabled: true};
+        if(!!data.telephone){
                 menuItensLabel["TelefoneLabel"] = {name: "<b>"+get_lang("Telephone")+"</b>", disabled: true};
-                menuItensLabel["TelefoneValue"] = {name: data[2].value, disabled: true};
-        }
-        if(data[3]){
-                if(data[3].value == "TRUE"){
+                menuItensLabel["TelefoneValue"] = {name: data.telephone, disabled: true};
+        }
+        if(data.vacationActive){
+                if(data.vacationActive == "TRUE"){
                         menuItensLabel["outOffice"] = {name: "<b>"+get_lang("Out of office")+"</b>", disabled: true};
-                        menuItensLabel["outOfficeValue"] = {name: data[4].value.substring(0, 20), disabled: true};
+                        menuItensLabel["outOfficeValue"] = {name: data.vacationInfo.substring(0, 20), disabled: true};
                 }
         }
@@ -337 +346 @@
                 for(var item in data.itens){
                         if(parseInt(item) <= 4){
-                                ctcName = data.itens[item].data[0].value; 
-                        ctcName = ctcName.length > 2 ? ctcName : data.itens[item].data[2].value.substr(0,data.itens[item].data[2].value.indexOf("@")); 
-                        menuItensLabel["ContactGroupLabel"+item] = {name: "<b>"+ctcName+"</b>", disabled: true}; 
+                                ctcName = data.itens[item].data[0].value;
+                                ctcName = ctcName.length > 2 ? ctcName : data.itens[item].data[2].value.substr(0,data.itens[item].data[2].value.indexOf("@"));
+                                menuItensLabel["ContactGroupLabel"+item] = {name: "<b>"+ctcName+"</b>", disabled: true};
                                 menuItensLabel["ContactGroupValue"+item] = {name: data.itens[item].data[2].value, disabled: true};
                         }else{