Changeset 6514 for sandbox/2.4.1-3/prototype/api/datalayer.js

Timestamp:

06/15/12 09:32:00 (12 years ago)

Author:

gustavo

Message:

Ticket #2766 - implementacao da dfd0065 e correcao de bugs da dfd0099

File:

• sandbox/2.4.1-3/prototype/api/datalayer.js (modified) (6 diffs)

sandbox/2.4.1-3/prototype/api/datalayer.js

@@ -195 +195 @@
     
     send: function( url, type, data, callback, sync, extraOptions ){
-      
+
           var result = false, fired = false;
       
@@ -243 +243 @@
 
           $.ajax( envelope );
-      
           return( result );
     },
@@ -260 +259 @@
         //http://expressodev.prognus.com.br/cristiano/expresso-api/rest/maillast
         //return this.send( ('rest' + uri), [ 'get', accept || 'json' ], data, callback, !!!callback, 
+console.log(this.dispatchPath+'../rest'+uri);
         return this.send( (this.dispatchPath + '../rest' + uri), [ 'get', accept || 'json' ], data, callback, !!!callback, 
         {'beforeSend' : function (xhr){ 
@@ -277 +277 @@
     
     create: function( uri, data, callback, accept ){
-                //return this.send( 'rest' + uri, [ 'post', accept || 'json' ], data, callback, !!!callback, 
-                return this.send( (this.dispatchPath + '../rest' + uri), [ 'post', accept || 'json' ], data, callback, !!!callback, 
-                {'beforeSend' : function (xhr){ 
-                        xhr.setRequestHeader('Authorization', "OAUTH Bearer " + DataLayer.me.token)} 
-                });      
+        //return this.send( 'rest' + uri, [ 'post', accept || 'json' ], data, callback, !!!callback, 
+        return this.send( (this.dispatchPath + '../rest' + uri), [ 'post', accept || 'json' ], data, callback, !!!callback, 
+        {'beforeSend' : function (xhr){ 
+                //xhr.setRequestHeader('Authorization', "OAUTH Bearer " + DataLayer.me.token)} 
+                xhr.setRequestHeader('Authorization', "OAUTH Bearer " + (DataLayer.me ? DataLayer.me.token : DataLayer.dispatch("../prototype/me").token))} 
+        });      
     },
 
@@ -298 +299 @@
         return this.send( (this.dispatchPath + '../rest' + uri), [ 'put', accept || 'json' ], data, callback, !!!callback, 
         {'beforeSend' : function (xhr){ 
-            xhr.setRequestHeader('Authorization', "OAUTH Bearer " + DataLayer.me.token)} 
+            //xhr.setRequestHeader('Authorization', "OAUTH Bearer " + DataLayer.me.token)} 
+                xhr.setRequestHeader('Authorization', "OAUTH Bearer " + (DataLayer.me ? DataLayer.me.token : DataLayer.dispatch("../prototype/me").token))} 
         });
       
@@ -312 +314 @@
     */
 
-    "delete": function( uri, callback, accept ){
-      
+    delete: function( uri, callback, accept ){
         //return this.send( 'rest' + uri, [ 'delete', accept || 'json' ], false, callback, !!!callback, 
         return this.send( (this.dispatchPath + '../rest' + uri), [ 'delete', accept || 'json' ], false, callback, !!!callback, 
         {'beforeSend' : function (xhr){ 
-            xhr.setRequestHeader('Authorization', "OAUTH Bearer " + DataLayer.me.token)} 
+            //xhr.setRequestHeader('Authorization', "OAUTH Bearer " + DataLayer.me.token)} 
+                xhr.setRequestHeader('Authorization', "OAUTH Bearer " + (DataLayer.me ? DataLayer.me.token : DataLayer.dispatch("../prototype/me").token))} 
         });