rad_js 0.0.7 → 0.0.8

data/lib/js/js_helper.rb

@@ -1,6 +1,6 @@
 module Rad::JsHelper
   def initialize_js_commons
     javascript_tag %{\
-var AUTHENTICITY_TOKEN = "#{workspace.session_authenticity_token}";}
+window.AUTHENTICITY_TOKEN = "#{authenticity_token}";}
   end    
 end

data/static/lib/rad.js

@@ -24,11 +24,22 @@ Rad.Request = new Class({
 
   options: {
     method: 'post',
-    data: {authenticity_token: window.AUTHENTICITY_TOKEN},
     evalScripts: true,
-    evalResponse: true,   
+    evalResponse: true   
+    // data: {authenticity_token: window.AUTHENTICITY_TOKEN},
   },  
   
+  initialize: function(options){
+    // adding authenticity_token
+    if(options.method != 'get'){
+      if(typeOf(options.data) == 'object') options.data.authenticity_token = window.AUTHENTICITY_TOKEN;          
+      else if (typeOf(options.data) == 'string') {
+        options.data = options.data + "&authenticity_token=" + encodeURIComponent(window.AUTHENTICITY_TOKEN);
+      } else options.data = "authenticity_token=" + window.AUTHENTICITY_TOKEN;
+    }
+    this.parent(options);
+	},
+  
   success: function(text, xml){   
     try{
       this.fireEvent('load', arguments);
@@ -54,49 +65,28 @@ Rad.implement({
   call: function(url, data, options){
     options = options || {};
     options.url = url;
-    options.data = Object.merge({}, options.data, data);
+    if (data._method) options.method = data._method;
+    options.data = Object.merge({}, options.data, data);    
     var request = new Rad.Request(options);
     request.send();
   },
 
   submitFormViaXhr: function(form, data, callback){
-    // callback = callback || function(){};
-    // var url = form.get('action');    
-    // var formData = form.toQueryString().parseQueryString();
-    //         
-    // options = {
-    //   url: url, 
-    //   data: Object.merge({}, formData, data), // , {format: 'js'}),
-    //   onLoad: callback
-    // };
-    // var request = new Rad.Request(options);
-    // request.send();        
-    
     callback = callback || function(){};
-    var url = form.get('action');    
+    var url = form.get('action');
     
     var stringData = form.toQueryString();
-    if(data) stringData = stringData + '&' + Object.toQueryString(data);    
-    
+    if(data) stringData = stringData + '&' + Object.toQueryString(data);
+
     options = {
       url: url, 
       data: stringData,
       onLoad: callback
     };
+
     var request = new Rad.Request(options);
     request.send();
   },
-  
-  // submitForm: function(form, data, options){
-  //   var url = form.get('action');   
-  //   var formData = form.toQueryString().parseQueryString();
-  //           
-  //   options = options || {};
-  //   options.url = url;
-  //   options.data = Object.merge({}, options.data, formData, data, {format: 'js'});    
-  //   var request = new Rad.Request(options);
-  //   request.send();
-  // },
     
   process_js_link: function(event){
     var target = event.target;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rad_js
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors: 
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-05 00:00:00 +04:00
+date: 2011-07-30 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency