Changeset 6526 for sandbox/2.4.1-3/expressoMail1_2/js/main.js

Timestamp:

06/15/12 16:30:56 (12 years ago)

Author:

gustavo

Message:

Ticket #2766 - Preparativos para fazer o merge com o trunk da comunidade

File:

• sandbox/2.4.1-3/expressoMail1_2/js/main.js (modified) (5 diffs)

sandbox/2.4.1-3/expressoMail1_2/js/main.js

@@ -35 +35 @@
 function updateDynamicContact(){
         dynamicContacts = new Array();
-        var dynamicData = DataLayer.read("/dynamiccontacts").collection.itens;
+        var dynamicData = REST.get("/dynamiccontacts").collection.itens;
         if(dynamicData){
                 $.each(dynamicData, function(index, value){
@@ -56 +56 @@
 function updateDynamicPersonalGroups(){
         dynamicPersonalGroups = new Array();
-        var groupsData = DataLayer.read("/groups").collection.itens;
+        var groupsData = REST.get("/groups").collection.itens;
         if(groupsData){
                 $.each(groupsData, function(index, value){
@@ -73 +73 @@
 function updateDynamicPersonalContacts(){
         dynamicPersonalContacts = new Array();
-        var contactsData = DataLayer.read("/contacts").collection.itens;
+        var contactsData = REST.get("/contacts").collection.itens;
         if(contactsData){
                 $.each(contactsData, function(index, value){
@@ -99 +99 @@
 
         }*/
-        var load_dynamics = function(){
-                updateDynamicContact();
-                updateDynamicPersonalGroups();
-                updateDynamicPersonalContacts();
-                updateDynamicContactList();
-        };
-        load_dynamics();
-        
+        if(parseInt(preferences.use_dynamic_contacts)){
+                var load_dynamics = function(){
+                        updateDynamicContact();
+                        updateDynamicPersonalGroups();
+                        updateDynamicPersonalContacts();
+                        updateDynamicContactList();
+                };
+                load_dynamics();
+        }
         var save_preferences = function(data){
 
@@ -2289 +2290 @@
                 var array = content.find(".to-tr").find(".box").clone();
                 delete_border(ID,'true'); 
-                $.each(array, function(i, value){
-                        var stop = false;
-                        $.each(dynamicPersonalContacts, function(x, valuex){
-                                if(valuex.email == $(value).find("input").val().match(reComplexEmail)[1]){
-                                        stop = true;
-                                        return false;
-                                }
-                        });
-                        if(!stop){
-                                var exist = 0;
-                                $.each(dynamicContacts, function(x, valuex){
+                if(parseInt(preferences.use_dynamic_contacts)){
+                        $.each(array, function(i, value){
+                                var stop = false;
+                                $.each(dynamicPersonalContacts, function(x, valuex){
                                         if(valuex.email == $(value).find("input").val().match(reComplexEmail)[1]){
-                                                exist = valuex.id;
+                                                stop = true;
                                                 return false;
                                         }
                                 });
-                                if(exist){
-                                        DataLayer.update("/dynamiccontact/"+exist, {name: $(value).find("input").val().split('"')[1], mail:$(value).find("input").val().match(reComplexEmail)[1]});
-                                }else{
-                                        DataLayer.create("/dynamiccontacts", {name: $(value).find("input").val().split('"')[1], mail:$(value).find("input").val().match(reComplexEmail)[1]});
+                                if(!stop){
+                                        var exist = 0;
+                                        $.each(dynamicContacts, function(x, valuex){
+                                                if(valuex.email == $(value).find("input").val().match(reComplexEmail)[1]){
+                                                        exist = valuex.id;
+                                                        return false;
+                                                }
+                                        });
+                                        if(exist){
+                                                REST.put("/dynamiccontact/"+exist, {name: $(value).find("input").val().split('"')[1], mail:$(value).find("input").val().match(reComplexEmail)[1]});
+                                        }else{
+                                                REST.post("/dynamiccontacts", {name: $(value).find("input").val().split('"')[1], mail:$(value).find("input").val().match(reComplexEmail)[1]});
+                                        }
                                 }
-                        }
-                });
-                updateDynamicContact();
-                updateDynamicContactList();
+                        });
+                        updateDynamicContact();
+                        updateDynamicContactList();
+                }
         }
         else{