Changeset 3364 for branches/2.2

Timestamp:

10/15/10 16:01:58 (14 years ago)

Author:

eduardoalex

Message:

Ticket #1231 - Arvore permanece expandida a menos que exita nova pasta para renderizar

File:

• branches/2.2/expressoMail1_2/js/mail_sync.js (modified) (8 diffs)

branches/2.2/expressoMail1_2/js/mail_sync.js

@@ -29 +29 @@
                 this.localServer = google.gears.factory.create('beta.localserver');
                 this.store = this.localServer.createStore('test-store');
+                this.update_folder = false;
         }
         
@@ -48 +49 @@
         
         mail_sync.prototype.start_sync = function() {
+                if (is_ie)
+                                connector.loadScript('TreeShow');
                 if(this.working) {
                         //Já está sincronizando...
@@ -97 +100 @@
                                 
                                 if (!rs2.isValidRow()) {
+                                        if((!preferences.hide_folders) || (preferences.hide_folders=="0"))
+                                                this.update_folder = true; //Precisa atualizar as pastas na arvore de pastas
                                         this.dbGears.execute("insert into folder (folder,uid_usuario) values (?,?)", [actual_check, account_id]);
                                 }
@@ -102 +107 @@
                                         actual_check += "/"+folders_to_check[parseInt(i)+1];
                         }
-                        ttreeBox.update_folder();
+                        
                         rs.next();
                 }
@@ -138 +143 @@
                         document.getElementById('main_title').innerHTML = get_lang("Deleting downloadeds msgs...");
                         expresso_mail_sync.remove_archived_mails();
-                        this.working=false;
-                        update_menu();
+                        if((!preferences.hide_folders) || (preferences.hide_folders=="0")) {
+                                if (expresso_mail_sync.update_folder) {
+                                        ttreeBox.update_folder();
+                                        expresso_mail_sync.update_folder = false;
+                                }
+                                else 
+                                        draw_tree_local_folders();
+                        }
+                        expresso_mail_sync.working=false;
                         return;
                 }
@@ -147 +159 @@
                 if(folder_to_sync[3]) { //Em caso de arquivamento normal, pode ser que a pasta inbox ainda não tenha sido criada.
                         expresso_mail_sync.open_conn()
-                        if(!expresso_mail_sync.has_local_mails()) {
+                        if(folder_to_sync[1]=="Inbox" && !expresso_mail_sync.has_inbox_folder()) {
+                                if((!preferences.hide_folders) || (preferences.hide_folders=="0"))
+                                        expresso_mail_sync.update_folder = true; //Precisa atualizar as pastas na arvore de pastas
                                 expresso_mail_sync.dbGears.execute("insert into folder (folder,uid_usuario) values (?,?)",["Inbox",account_id]);
                         }
                         expresso_mail_sync.dbGears.close();
-                        ttreeBox.update_folder();
+                        
                         
                 }
                 
                 var start_sync_mails = function(data) {
+                        if (!data) { //Erro ao pegar lista de e-mails a serem baixados
+                                write_msg(get_lang("Problems while downloading mails, please try later"));
+                                expresso_mail_sync.working=false;
+                                window.setTimeout("eval('document.getElementById(\"main_title\").innerHTML =\"Expresso Mail\"')",3000);
+                                return;
+                        }
                         expresso_mail_sync.messages=data;
                         if(expresso_mail_sync.is_auto)
@@ -338 +358 @@
         }
         
-        mail_sync.prototype.has_local_mails = function() {//This function considers that the connection with base is already opened.
-                var rs = this.dbGears.execute("select rowid from folder limit 0,1");
+        mail_sync.prototype.has_inbox_folder = function() {//This function considers that the connection with base is already opened.
+                var rs = this.dbGears.execute("select rowid from folder where folder='Inbox' and uid_usuario=?",[account_id]);
                 if(rs.isValidRow())
                         return true;
@@ -377 +397 @@
                                         Element('tot_m').innerHTML = parseInt(Element('tot_m').innerHTML) - data.msgs_number.length;
                                 }
-                                ttreeBox.update_folder();
+                                
                                 refresh();
                                 expresso_mail_sync.remove_archived_mails();