Changeset 1661

Timestamp:

11/17/09 14:55:18 (14 years ago)

Author:

amuller

Message:

Ticket #490 - Criação dos códigos de unificação ajax

Location:

sandbox/expresso2.2

Files:

• expressoMail1_2/index.php (modified) (1 diff)
• expressoMail1_2/js/TreeShow.js (modified) (4 diffs)
• expressoMail1_2/js/abas.js (modified) (2 diffs)
• expressoMail1_2/js/connector.js (deleted)
• expressoMail1_2/js/draw_api.js (modified) (6 diffs)
• expressoMail1_2/js/main.js (modified) (15 diffs)
• phpgwapi/expressoAjax (added)
• phpgwapi/expressoAjax/coder.js (added)
• phpgwapi/expressoAjax/dom.js (added)
• phpgwapi/expressoAjax/dragdrop.js (added)
• phpgwapi/expressoAjax/expressoAjax.js (added)
• phpgwapi/expressoAjax/lang.js (added)
• phpgwapi/expressoAjax/xtools.js (added)
• phpgwapi/inc/class.common.inc.php (modified) (1 diff)

sandbox/expresso2.2/expressoMail1_2/index.php

@@ -195 +195 @@
 </body>
 </html>
-<script src="js/connector.js?<?=$update_version?>" type="text/javascript"></script>
 <script src="../phpgwapi/js/dftree/dftree.js?<?=$update_version?>" type="text/javascript"></script>
-<script language="Javascript">connector.updateVersion = "<?=$update_version?>";init();</script>
+<script language="Javascript">expresso.connector.updateVersion = "<?=$update_version?>";init();</script>
 <!-----Expresso Mail - Version Updated:<?=$update_version?>-------->

sandbox/expresso2.2/expressoMail1_2/js/TreeShow.js

@@ -7 +7 @@
                 this.name_folder = "";
                 this.name_func   = "";
-                connector.loadScript("TreeS");
+                expresso.connector.loadScript("TreeS");
         }
         Tree_Box.prototype.update_folder = function(){
@@ -175 +175 @@
                                         ttreeBox.name_folder = "root"; //or use var newpast
                                         this.name_func = "newpast";
-                                        connector.purgeCache();
+                                        expresso.connector.purgeCache();
                                         ttreeBox.update_folder();
                                 }
@@ -224 +224 @@
                         var handler_return = function(data)
                         {
-                                connector.purgeCache();
+                                expresso.connector.purgeCache();
                                 ttreeBox.name_folder = "root";
                                 ttreeBox.update_folder();
@@ -290 +290 @@
                                         alert(data);
                                 }else{
-                                        connector.purgeCache();
+                                        expresso.connector.purgeCache();
                                         ttreeBox.name_folder = "root";
                                         ttreeBox.update_folder();

sandbox/expresso2.2/expressoMail1_2/js/abas.js

@@ -35 +35 @@
                                         if (Element('viewsource_rt_checkbox').checked)
                                         {  
-                                                connector.loadScript("rich_text_editor");
+                                                expresso.connector.loadScript("rich_text_editor");
                                                 RichTextEditor.viewsource(false);
                                         }
@@ -60 +60 @@
                 try{
                         if(ID){
-                                connector.loadScript("rich_text_editor");
+                                expresso.connector.loadScript("rich_text_editor");
                                 RichTextEditor.loadEditor(ID);
                         }

sandbox/expresso2.2/expressoMail1_2/js/draw_api.js

@@ -311 +311 @@
                                         //Timeout to release HTTPRequest , loadScript and update tree folders.
                                         if(data)
-                                                setTimeout("connector.loadScript('TreeShow');ttreeBox.update_folder();",500);
+                                                setTimeout("expresso.connector.loadScript('TreeShow');ttreeBox.update_folder();",500);
                                 }
                                 cExecute("$this.imap_functions.create_extra_mailbox",handler_correct_folders,"nw_folders="+folder_create);
@@ -327 +327 @@
                 if ( data && data.imap_error )
                 {
-                        connector.newRequest('error.html', 'templates/'+template+'/error.html', 'GET',
+                        expresso.connector.newRequest('error.html', 'templates/'+template+'/error.html', 'GET',
                                 function(data)
                                 {
@@ -733 +733 @@
                                                         "TreeShow");
                                                         
-                connector.loadAllScripts(scripts);
+                expresso.connector.loadAllScripts(scripts);
         }
 }
@@ -2399 +2399 @@
     table_message.appendChild(tbody_message);
     form.appendChild(table_message);
-    connector.loadScript("rich_text_editor");
+    expresso.connector.loadScript("rich_text_editor");
     RichTextEditor.loadEditor(ID);
 //////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -2773 +2773 @@
 function draw_plugin_cc(ID, addrs)
 {
-        connector.loadScript("ccQuickAdd");
+        expresso.connector.loadScript("ccQuickAdd");
 
         var array_addrs = '';
@@ -2811 +2811 @@
 }
 function deny_email(email){
-        connector.loadScript("filter");
-        connector.loadScript("filters");
+        expresso.connector.loadScript("filter");
+        expresso.connector.loadScript("filters");
         var dn_em       = document.createElement("SPAN");
                 dn_em.id = "tt_d";

sandbox/expresso2.2/expressoMail1_2/js/main.js

@@ -38 +38 @@
 
                 if (preferences.use_local_messages==1) {
-                        connector.loadScript('mail_sync');
+                        expresso.connector.loadScript('mail_sync');
                         setTimeout('auto_archiving()', 30000);
                         if (expresso_local_messages.is_offline_installed()) {
@@ -80 +80 @@
                         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>' +
@@ -278 +278 @@
             // operação na applet
 
-            connector.showProgressBar();
+            expresso.connector.showProgressBar();
 
            // if ((msg_info.DispositionNotificationTo) && ((msg_info.Unseen == 'U') || (msg_info.Recent == 'N'))){
@@ -434 +434 @@
                         updateBoxBgColor(box.childNodes);
                 }
-                connector.purgeCache();
+                expresso.connector.purgeCache();
                 update_menu();
         }
@@ -580 +580 @@
                         updateBoxBgColor(box);
                 }
-                connector.purgeCache();
+                expresso.connector.purgeCache();
         }
 
@@ -638 +638 @@
                 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);
@@ -794 +794 @@
                 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));
@@ -1191 +1191 @@
                                                 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+"\"/>";
@@ -1297 +1297 @@
                                         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);
@@ -1413 +1413 @@
                                 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);
@@ -1507 +1507 @@
         }
         if(!expresso_offline)
-                connector.hideProgressBar();
+                expresso.connector.hideProgressBar();
 }
 
@@ -1522 +1522 @@
     if (!smime){ // Erro aconteceu ao assinar ou decifrar e-mail
         connector = new  cConnector();
-        connector.hideProgressBar();
+        expresso.connector.hideProgressBar();
         return;
     }
@@ -1705 +1705 @@
                         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);
@@ -1774 +1774 @@
                 divParent.appendChild(divFiles);
                 
-                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;
@@ -1790 +1790 @@
                         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");

sandbox/expresso2.2/phpgwapi/inc/class.common.inc.php

@@ -1219 +1219 @@
                         {
                                 echo parse_navbar();
-                        }
+                        } 
+                        echo "<script type='text/javascript' src='../phpgwapi/expressoAjax/expressoAjax.js'></script>";
+
                 }