Changeset 1999 for trunk/expressoMail1_2/js/main.js

Timestamp:

02/10/10 15:37:22 (14 years ago)

Author:

amuller

Message:

Ticket #490 - #690 - Merge branches Expresso 2.2 com Trunk

File:

• trunk/expressoMail1_2/js/main.js (modified) (14 diffs)

trunk/expressoMail1_2/js/main.js

@@ -83 +83 @@
                         Element('tableDivAppbox').width = '100%';
                 else
-                        connector.createXMLHTTP();
+                        expresso.connector.createXMLHTTP();
                 Element('divStatusBar').innerHTML = '<table height="16px" border=0 width=100% cellspacing=0 cellpadding=2>' +
                 '<tr>' +
@@ -281 +281 @@
             // operação na applet
 
-            connector.showProgressBar();
+            expresso.connector.showProgressBar();
 
            // if ((msg_info.DispositionNotificationTo) && ((msg_info.Unseen == 'U') || (msg_info.Recent == 'N'))){
@@ -437 +437 @@
                         updateBoxBgColor(box.childNodes);
                 }
-                connector.purgeCache();
+                expresso.connector.purgeCache();
                 update_menu();
         }
@@ -583 +583 @@
                         updateBoxBgColor(box);
                 }
-                connector.purgeCache();
+                expresso.connector.purgeCache();
         }
 
@@ -641 +641 @@
                 if(typeof(data) == 'string')
                         if (data.match(/^(.*)TRYCREATE(.*)$/)){
-                                connector.loadScript('TreeS');
+                                expresso.connector.loadScript('TreeS');
                                 var move_to_folder = data.match(/^(.*)Spam(.*)$/) ? "Spam" : trashfolder;
                                 alert(get_lang('There is not %1 folder, Expresso is creating it for you... Please, repeat your request later.', move_to_folder));
-                                connector.loadScript('TreeShow');
+                                expresso.connector.loadScript('TreeShow');
                                 ttree.FOLDER = 'root';
                                 ttreeBox.new_past(move_to_folder);
@@ -797 +797 @@
                 var update_tree;
                 for (var i = 0; i < data.length; i++) {
-                        msg_info = connector.unserialize(data[i]);
+                        msg_info = expresso.connector.unserialize(data[i]);
                         if ( folder == 'INBOX/Lixeira/tmpMoveToLocal' ){
                                 msg_info.msg_folder += (Date.parse(new Date));
@@ -1199 +1199 @@
                                                 tmp = link_attachment.innerHTML.substring(0,link_attachment.innerHTML.lastIndexOf("("));
                                                 a_tmp[2] = "'"+tmp.substring(0,tmp.length-1)+"'";
-                                                s_tmp = escape(connector.serialize(a_tmp));
+                                                s_tmp = escape(expresso.connector.serialize(a_tmp));
 
                                                 divFiles.innerHTML += "<input style='border:0' type='CHECKBOX' name='forwarding_attachments[]' checked value=\""+s_tmp+"\"/>";
@@ -1305 +1305 @@
                                         tmp = link_attachment.innerHTML.substring(0,link_attachment.innerHTML.lastIndexOf("("));
                                         a_tmp[2] = "'"+tmp.substring(0,tmp.length-1)+"'";
-                                        s_tmp = escape(connector.serialize(a_tmp));
+                                        s_tmp = escape(expresso.connector.serialize(a_tmp));
                                         divFiles.innerHTML += "<input style='border:0' type='CHECKBOX' name='forwarding_attachments[]' checked value=\""+s_tmp+"\"/>";
                                         divFiles.appendChild(link_attachment);
@@ -1421 +1421 @@
                                 tmp = link_attachment.innerHTML.substring(0,link_attachment.innerHTML.lastIndexOf("("));
                                 a_tmp[2] = "'"+tmp.substring(0,tmp.length-1)+"'";
-                                s_tmp = escape(connector.serialize(a_tmp));
+                                s_tmp = escape(expresso.connector.serialize(a_tmp));
                                 divOriginalAttachments.innerHTML += "<input style='border:0' type='CHECKBOX' name='forwarding_attachments[]' checked value=\""+s_tmp+"\"/>";
                                 divOriginalAttachments.appendChild(link_attachment);
@@ -1515 +1515 @@
         }
         if(!expresso_offline)
-                connector.hideProgressBar();
+                expresso.connector.hideProgressBar();
 }
 
@@ -1530 +1530 @@
     if (!smime){ // Erro aconteceu ao assinar ou decifrar e-mail
         connector = new  cConnector();
-        connector.hideProgressBar();
+        expresso.connector.hideProgressBar();
         return;
     }
@@ -1713 +1713 @@
                         if (data.append.match(/^(.*)TRYCREATE(.*)$/))
                         {
-                                connector.loadScript('TreeS');
+                                expresso.connector.loadScript('TreeS');
                                 alert(get_lang('There is not %1 folder, Expresso is creating it for you... Please, repeat your request later.',draftsfolder));
-                                connector.loadScript('TreeShow');
+                                expresso.connector.loadScript('TreeShow');
                                 ttree.FOLDER = 'root';
                                 ttreeBox.new_past(draftsfolder);
@@ -1793 +1793 @@
                 };              
                 
-                var attach_files = connector.unserialize(data.files);
+                var attach_files = expresso.connector.unserialize(data.files);
                 if (attach_files != null) {
                         openTab.countFile[border_id] = attach_files.length;
@@ -1810 +1810 @@
                         var a_tmp = href.split(',');
                         a_tmp[2] = fileName;
-                        s_tmp = escape(connector.serialize(a_tmp));
+                        s_tmp = escape(expresso.connector.serialize(a_tmp));
                                         
                         var check_attachment = document.createElement("INPUT");