changed config.js according to new settings

SammyLin · Jul 3, 2015 · 67dff70 · 67dff70
1 parent 7e1f466
commit 67dff70
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/lib/generators/redactor/templates/config.js b/lib/generators/redactor/templates/config.js
@@ -1,18 +1,20 @@
 window.init_redactor = function(){
   var csrf_token = $('meta[name=csrf-token]').attr('content');
   var csrf_param = $('meta[name=csrf-param]').attr('content');
-  var params;
+  var params = {};
   if (csrf_param !== undefined && csrf_token !== undefined) {
-      params = csrf_param + "=" + encodeURIComponent(csrf_token);
+      params[csrf_param] = csrf_token;
   }
   $('.redactor').redactor({
         // You can specify, which ones plugins you need.
         // If you want to use plugins, you have add plugins to your
         // application.js and application.css files and uncomment the line below:
         // "plugins": ['fontsize', 'fontcolor', 'fontfamily', 'fullscreen', 'textdirection', 'clips'],
-        "imageUpload":"/redactor_rails/pictures?" + params,
+        "imageUpload":"/redactor_rails/pictures",
+        "uploadImageFields": params,
         "imageGetJson":"/redactor_rails/pictures",
-        "fileUpload":"/redactor_rails/documents?" + params,
+        "fileUpload":"/redactor_rails/documents",
+        "uploadFileFields": params,
         "fileGetJson":"/redactor_rails/documents",
         "path":"/assets/redactor-rails",
         "css":"style.css"

diff --git a/vendor/assets/javascripts/redactor-rails/config.js b/vendor/assets/javascripts/redactor-rails/config.js
@@ -1,12 +1,13 @@
 window.init_redactor = function(){
   var csrf_token = $('meta[name=csrf-token]').attr('content');
   var csrf_param = $('meta[name=csrf-param]').attr('content');
-  var params;
+  var params = {};
   if (csrf_param !== undefined && csrf_token !== undefined) {
-    params = csrf_param + "=" + encodeURIComponent(csrf_token);
+      params[csrf_param] = csrf_token;
   }
   $('.redactor').redactor(
-    { "imageUpload":"/redactor_rails/pictures?" + params,
+    { "imageUpload":"/redactor_rails/pictures",
+      "uploadImageFields": params,
       "imageGetJson":"/redactor_rails/pictures",
       "path":"/assets/redactor-rails",
       "css":"style.css"}