Changeset 1982

Timestamp:

02/04/10 16:42:53 (14 years ago)

Author:

eduardoalex

Message:

Ticket #888 - Atualizando a lista de contato apenas se o usuario possui o expresso offline instalado

Location:

trunk/expressoMail1_2/js

Files:

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

trunk/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');
-                if(this.localServer==null)
+                if(this.localServer == null)
                         this.localServer = google.gears.factory.create('beta.localserver');
-                if(this.store==null)
-                        this.store = this.localServer.createStore('test-store');                        
+                if(this.store == null)
+                        this.store = this.localServer.createStore('test-store');
+        }
+
+        local_messages.prototype.init_local_messages = function(){ //starts only database operations
+                
+                if(this.dbGears==null || this.localServer==null || this.store == null)
+                        this.create_objects();
                 
                 var db_in_other_use = true;
@@ -139 +145 @@
                         }
                 }
-                
-                /*var db_is_opened = true;
-                while (db_is_opened) {
-                        try {
-                                this.dbGears.open('database-test');
-                                db_is_opened = true;
-                        } 
-                        catch (ex) {
-                                db_is_opened=false;
-                        }
-                }*/
-                
+                        
 //              this.dbGears.open('database-test');
                 this.dbGears.execute('create table if not exists folder (folder text,uid_usuario int,unique(folder,uid_usuario))');
@@ -1595 +1590 @@
         var expresso_local_messages;
         expresso_local_messages = new local_messages();
+        expresso_local_messages.create_objects();

trunk/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){
@@ -54 +57 @@
         // 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);
+                
         }
         var handler_automatic_trash_cleanness = function(data){
@@ -68 +73 @@
         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);