Changeset 1985

Timestamp:

02/05/10 10:16:24 (14 years ago)

Author:

eduardoalex

Message:

Ticket #888 - Replicando no branch 2.1 a correcao descrita no ticket em questao.

Location:

branches/2.1/expressoMail1_2/js

Files:

• local_messages.js (modified) (4 diffs)
• main.js (modified) (3 diffs)

branches/2.1/expressoMail1_2/js/local_messages.js

@@ -7 +7 @@
                 this.localServer = null;
                 this.store = null;
-                this.fileSubmitter = null;
         }
 
@@ -118 +117 @@
                 else return false;
         }
-        local_messages.prototype.init_local_messages = function(){
+        
+        local_messages.prototype.create_objects = function(){
                 if(this.dbGears == null)
                         this.dbGears = google.gears.factory.create('beta.database');
@@ -124 +124 @@
                         this.localServer = google.gears.factory.create('beta.localserver');
                 if(this.store==null)
-                        this.store = this.localServer.createStore('test-store');                        
-                
+                        this.store = this.localServer.createStore('test-store');
+        }
+        
+        local_messages.prototype.init_local_messages = function(){
+                                        
+                if(this.dbGears==null || this.localServer==null || this.store == null) 
+                        this.create_objects(); 
+        
                 var db_in_other_use = true;
                 var start_trying = new Date().getTime();
@@ -1590 +1596 @@
         var expresso_local_messages;
         expresso_local_messages = new local_messages();
+        expresso_local_messages.create_objects(); 

branches/2.1/expressoMail1_2/js/main.js

@@ -11 +11 @@
         var save_contacts = function(data){
                 contacts = data;
-                expresso_local_messages.capt_url('controller.php?action=$this.db_functions.get_dropdown_contacts_to_cache');
+                
+                if (preferences.use_local_messages == 1 && window.google && google.gears)  
+                        if (expresso_local_messages.is_offline_installed())  
+                                expresso_local_messages.capt_url('controller.php?action=$this.db_functions.get_dropdown_contacts_to_cache');
         }
         var save_preferences = function(data){
@@ -53 +56 @@
         }
         // Fim da inserção da applet
-
+                cExecute ("$this.db_functions.get_dropdown_contacts", save_contacts); //Save contacts needs preferences. 
                 cExecute ("$this.imap_functions.get_folders_list&onload=true", update_menu);
         }
@@ -68 +71 @@
         cyrus_delimiter = Element('cyrus_delimiter').value;
 
-        cExecute ("$this.db_functions.get_dropdown_contacts", save_contacts);
         cExecute ("$this.functions.get_preferences", save_preferences);
         setTimeout('auto_refresh()', time_refresh);