Changeset 6460 for sandbox/2.4.1-3/expressoMail1_2/js/draw_api.js

Timestamp:

06/11/12 18:11:01 (12 years ago)

Author:

gustavo

Message:

Ticket #2768 - Arrumados alguns pequenos bugs corrigido o js conforme recursos

File:

• sandbox/2.4.1-3/expressoMail1_2/js/draw_api.js (modified) (10 diffs)

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

@@ -9 +9 @@
  */
 onceOpenedHeadersMessages = {};
+
+var dynamicPersonalContacts = new Array();
+var dynamicPersonalGroups = new Array();
 
 var openTab = {
@@ -3572 +3575 @@
         input.keydown(function(e){
                 f9 = false;
-                var reEmail = /^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[_a-z0-9-]+(\.[_a-z0-9-]+)+$/;
-                var reEmail2 = /<([^<]*)>[\s]*$/;
                 var focusing = input.parent().find(".email-text");
                 //SE OS CONTATOS DINAMICOS ESTAO ATIVOS
                 if(parseInt(preferences.use_dynamic_contacts) && !input.hasClass("box-input")){
                         //SELECIONA O CONTATO E EVITA OUTROS COMANDOS
-                        if ( e.keyCode === $.ui.keyCode.TAB && $( this ).data( "autocomplete" ).menu.active ) {
+                        if ( e.keyCode === $.ui.keyCode.TAB && $( this ).data( "catcomplete" ).menu.active ) {
                                 e.preventDefault();
                                 return false;
@@ -3584 +3585 @@
                         
                         //FECHA OS CONTATOS DINÂMICOS
-                        if( (e.keyCode == 27) && $( this ).data( "autocomplete" ).menu.active ){
+                        if( (e.keyCode == 27) && $( this ).data( "catcomplete" ).menu.active ){
                                    e.stopPropagation();
                                    e.preventDefault();
@@ -3590 +3591 @@
                         
                         //SELECIONA O CONTATO E EVITA OUTROS COMANDOS
-                        if(e.keyCode == $.ui.keyCode.ENTER && $( this ).data( "autocomplete" ).menu.active){
+                        if(e.keyCode == $.ui.keyCode.ENTER && $( this ).data( "catcomplete" ).menu.active){
                                 e.preventDefault();
                                 return false;
@@ -3679 +3680 @@
                 
                 input_search = $(input).val();
-                if($(input).val().length >= 4)
-                        $(input).val("");
+                $(input).val("");
         })
         //AO COLAR UM TEXTO NO CAMPO
@@ -3802 +3802 @@
                                         box.find(".box-loading").removeClass("box-loading").addClass("box-info");
                                         box.addClass("box-"+value).removeClass("invalid-email-box");
-                                        loadExtraLDAPBox(data.collection.itens[0].data, ".box-"+value);
+                                        loadExtraLDAPBox(data.collection.data, ".box-"+value);
                                         box.unbind("dblclick").bind("dblclick", function(e){
                                                 new $.Zebra_Dialog('<strong>Impossivel editar</strong> um contato do catálogo pessoal\n' +
@@ -3811 +3811 @@
                                                         'auto_close': 3000
                                                 });
-                                        }).find(".box-input").val("\""+data.collection.itens[0].data[0].value+"\" <"+data.collection.itens[0].data[1].value+">");
-                                        box.find(".email-box-value").html( (data.collection.itens[0].data[0].value.length > 18 ? data.collection.itens[0].data[0].value.substring(0, 15)+"...": data.collection.itens[0].data[0].value))
+                                        }).find(".box-input").val("\""+data.collection.data[0].value+"\" <"+data.collection.data[1].value+">");
+                                        box.find(".email-box-value").html( (data.collection.data[0].value.length > 18 ? data.collection.data[0].value.substring(0, 15)+"...": data.collection.data[0].value))
                                 }
                         }else{
@@ -3893 +3893 @@
                 //PREPARAÇÃO DA ARRAY DOS CONTATOS DINÂMICOS
                 var dynamicContactList = new Array();
-                var myArray = contacts.split(",");
-                //Variavel de teste...Remover depois...
-                var flag = true;
-                for(var i in myArray){
-                        var dynamicContact = myArray[i].split(";");
-                                                
-                        /* if(dynamicContact.length > 1)
-                                dynamicContactList.push({name : dynamicContact[0], email: dynamicContact[1], value : (dynamicContact[0] +" - "+dynamicContact[1])});
-                        else
-                                dynamicContactList.push({name : "", email: dynamicContact[0], value :dynamicContact[0]}); */
-                                
-                        //Verificar outro modo para criar a divisão dos contatos dinâmicos
-                        if( i <(myArray.length / 2)){
-                                var type = 'recente';
-
-                                if(dynamicContact.length > 1)
-                                        dynamicContactList.push({name : dynamicContact[0], email: dynamicContact[1], value : (dynamicContact[0] +" - "+dynamicContact[1]), type:type });
-                                else
-                                        dynamicContactList.push({name : "", email: dynamicContact[0], value :dynamicContact[0], type:type});
-                        
-                        }else{
-                                var type = 'pessoal';
-
-                                if(flag){
-                                        dynamicContactList.push({name : "", email: "", value :"", type:"linha"});
-                                        flag = false;
-                                }
-                                
-                                if(dynamicContact.length > 1)
-                                        dynamicContactList.push({name : dynamicContact[0], email: dynamicContact[1], value : (dynamicContact[0] +" - "+dynamicContact[1]), type:type });
-                                else
-                                        dynamicContactList.push({name : "", email: dynamicContact[0], value :dynamicContact[0], type:type});
-                        }       
-                }
-                
+                var groupsData = DataLayer.read("/groups").collection.itens;
+                var contactsData = DataLayer.read("/contacts").collection.itens;
+                dynamicPersonalGroups = new Array();
+                
+                $.each(groupsData, function(index, value){
+                        var group = {
+                                id : parseInt(value.data[0].value),
+                                name : value.data[2].value,
+                                email : value.data[2].value,
+                                value: value.data[2].value + " - " + value.data[2].value,
+                                type: "G"
+                        };
+                        dynamicContactList.push(group);
+                        dynamicPersonalGroups.push(group);
+                });
+                
+                dynamicPersonalContacts = new Array();
+                
+                $.each(contactsData, function(index, value){
+                        var contact = {
+                                id : parseInt(value.data[0].value),
+                                name : value.data[1].value,
+                                email : value.data[2].value,
+                                value: value.data[1].value + " - " + value.data[2].value,
+                                type: "P"
+                        };
+                        dynamicContactList.push(contact);
+                        dynamicPersonalGroups.push(contact);
+                });
+                $.widget( "custom.catcomplete", $.ui.autocomplete, {
+                        _renderMenu: function( ul, items ) {
+                                var self = this,
+                                currentType = "G";
+                                $.each( items, function( index, item ) {
+                                        if ( item.type != currentType) {
+                                                self._renderItem( ul, {name:"", value:"", type:"linha"} );
+                                                currentType = item.type;
+                                        }
+                                        self._renderItem( ul, item );
+                                });
+                        }
+                });
                 //INSERÇÃO DO AUTO COMPLETE AO INPUT
-                div.find("input").autocomplete({
-                        minLength: 0,                   
-                        source: function( request, response ) {
-                                response( $.ui.autocomplete.filter(
-                                        dynamicContactList, extractLast( request.term ) ) );
-                        },
+                div.find("input").catcomplete({
+                        minLength: 1,                   
+                        source: dynamicContactList,
                         focus: function() {
                                 return false;
@@ -3946 +3950 @@
                                 return false;
                         },
-                        autoFocus: true,
-                        open : function(){
-                                if($.trim($(this).val()) == "")
-                                        $(this).autocomplete( "close" );
-                        }
+                        autoFocus: true
                 })
                 
                 //MONTAGEM DA LISTA DE CONTATOS DINÂMICOS DO AUTO COMPLETE
-                .data( "autocomplete" )._renderItem = function( ul, item ) {
+                .data( "catcomplete" )._renderItem = function( ul, item ) {
                         ul.css({"min-width":"280px", "width":"50%", "max-height" : "180px", "overflow-y" : "auto"});
                         if( $(ul).find("li").length > 10 ){
@@ -3985 +3985 @@
         //FUNÇÃO DOS BOTÕES PARA - CC - CCO
         div.parents("tr:first").find("button").button().click(function(){
-                emQuickSearch(($(this).parents("tr:first").find("input").val() ? $(this).parents("tr:first").find("input").val() : input_search), "."+$(this).parents("tr:first").attr('class').split("-")[0], ID, undefined, true);
+                if(!$(":focus").hasClass("new-message-input"))
+                        emQuickSearch(($(this).parents("tr:first").find("input").val() ? $(this).parents("tr:first").find("input").val() : input_search), "."+$(this).parents("tr:first").attr('class').split("-")[0], ID, undefined, true);
         });
 }