Changeset 6361


Ignore:
Timestamp:
05/31/12 14:46:42 (8 years ago)
Author:
gustavo
Message:

Ticket #2768 - Melhorias na criação de mensagens

Location:
sandbox/2.4.1-3
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • sandbox/2.4.1-3/expressoMail1_2/js/draw_api.js

    r6358 r6361  
    35973597                } 
    35983598 
    3599                  
     3599                //AO DIGITAR ENTER, ";", "," "  " 
    36003600                if(e.keyCode == 13 || e.keyCode == 9 || (e.keyCode == 188 && !e.shiftKey) || (e.keyCode == 191 && !e.shiftKey) ){ 
    36013601                        if(e.keyCode == 13){ 
     
    36203620                        return; 
    36213621                } 
    3622                  
     3622                //AO DIGITAR " " 
    36233623                if(e.keyCode == 32){ 
    36243624                        if(!input.val().length){ 
     
    36433643                        } 
    36443644                } 
    3645                  
     3645                //AO DIGITAR ">" 
    36463646                if(e.keyCode == 190 && e.shiftKey && input.val().length == getPosition(input[0])){ 
    36473647                        input.val(input.val()+">"); 
     
    36643664        //AO SAIR DO FOCO MONTAGEM DA CAIXA DE EMAIL 
    36653665        .focusout(function(){ 
    3666                 if(!($(this).parents("tr:first").find("button").hasClass("ui-state-active") || f9 || $(".expressomail-qs-container").dialog("isOpen"))){ 
     3666                if(!(f9 || $(this).parents("tr:first").find("button").hasClass("ui-state-active"))){ 
    36673667                        if($(input).val() != "") 
    36683668                                draw_email_box(input.val(), input); 
     
    36723672                input_search = $(input).val(); 
    36733673                $(input).val(""); 
    3674         }).bind("paste", function(e){ 
     3674        }) 
     3675        //AO COLAR UM TEXTO NO CAMPO 
     3676        .bind("paste", function(e){ 
    36753677                $(this).trigger("keydown"); 
    36763678                var pthis = $(this); 
  • sandbox/2.4.1-3/prototype/api/datalayer.js

    r6351 r6361  
    259259        //return this.send( this.dispatchPath + 'rest' + uri, [ 'get', accept || 'json' ], false, callback ); 
    260260        //http://expressodev.prognus.com.br/cristiano/expresso-api/rest/maillast 
    261         return this.send( ('rest' + uri), [ 'get', accept || 'json' ], data, callback, !!!callback,  
     261        //return this.send( ('rest' + uri), [ 'get', accept || 'json' ], data, callback, !!!callback,  
     262        return this.send( (this.dispatchPath + '../rest' + uri), [ 'get', accept || 'json' ], data, callback, !!!callback,  
    262263        {'beforeSend' : function (xhr){  
    263             xhr.setRequestHeader('Authorization', "OAUTH Bearer " + DataLayer.me.token)}  
     264            xhr.setRequestHeader('Authorization', "OAUTH Bearer " + (DataLayer.me ? DataLayer.me.token : DataLayer.dispatch("../prototype/me").token))}  
    264265        }); 
    265266       
     
    276277     
    277278    create: function( uri, data, callback, accept ){ 
    278        
    279         return this.send( 'rest' + uri, [ 'post', accept || 'json' ], data, callback, !!!callback,  
    280         {'beforeSend' : function (xhr){  
    281             xhr.setRequestHeader('Authorization', "OAUTH Bearer " + DataLayer.me.token)}  
    282         }); 
    283        
     279                //return this.send( 'rest' + uri, [ 'post', accept || 'json' ], data, callback, !!!callback,  
     280                return this.send( (this.dispatchPath + '../rest' + uri), [ 'post', accept || 'json' ], data, callback, !!!callback,  
     281                {'beforeSend' : function (xhr){  
     282                        xhr.setRequestHeader('Authorization', "OAUTH Bearer " + DataLayer.me.token)}  
     283                });       
    284284    }, 
    285285 
     
    295295    update: function( uri, data, callback, accept ){ 
    296296       
    297         return this.send( 'rest' + uri, [ 'put', accept || 'json' ], data, callback, !!!callback,  
     297        //return this.send( 'rest' + uri, [ 'put', accept || 'json' ], data, callback, !!!callback,  
     298        return this.send( (this.dispatchPath + '../rest' + uri), [ 'put', accept || 'json' ], data, callback, !!!callback,  
    298299        {'beforeSend' : function (xhr){  
    299300            xhr.setRequestHeader('Authorization', "OAUTH Bearer " + DataLayer.me.token)}  
     
    313314    "delete": function( uri, callback, accept ){ 
    314315       
    315         return this.send( 'rest' + uri, [ 'delete', accept || 'json' ], false, callback, !!!callback,  
     316        //return this.send( 'rest' + uri, [ 'delete', accept || 'json' ], false, callback, !!!callback,  
     317        return this.send( (this.dispatchPath + '../rest' + uri), [ 'delete', accept || 'json' ], false, callback, !!!callback,  
    316318        {'beforeSend' : function (xhr){  
    317319            xhr.setRequestHeader('Authorization', "OAUTH Bearer " + DataLayer.me.token)}  
  • sandbox/2.4.1-3/prototype/rest/dispatch.php

    r6357 r6361  
    3838// handle request, passing the current env baseUri and autoload mapping; 
    3939$request = new Request(array( 
    40         'baseUri'=> '/tezza/expressoDFD/rest', 
     40        'baseUri'=> '/gustavo/expressoDFD/rest', 
    4141        'autoload' => $autoload, 
    4242)); 
Note: See TracChangeset for help on using the changeset viewer.