From 9a103bbb7e832908657e265df1163d4da50b8f67 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Mon, 6 Aug 2012 15:13:21 +0800
Subject: [PATCH 1/3] Fix remote upload file for tinymce

---
 Gemfile                                     | 1 +
 app/assets/javascripts/new_admin.js         | 2 +-
 app/views/admin/assets/file_upload.html.erb | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9fb4c3cd..6e07eafa 100644
--- a/Gemfile
+++ b/Gemfile
@@ -26,6 +26,7 @@ gem 'mysql2'
 gem 'nokogiri'
 gem 'radius'
 gem 'rake'
+gem 'remotipart'
 gem 'resque' # background jobs
 gem 'resque-scheduler' # job scheduling
 gem 'resque-restriction'
diff --git a/app/assets/javascripts/new_admin.js b/app/assets/javascripts/new_admin.js
index 949753a9..0c9f30df 100644
--- a/app/assets/javascripts/new_admin.js
+++ b/app/assets/javascripts/new_admin.js
@@ -17,4 +17,4 @@
 //= require side_bar_history
 //= require rss
 //= require ajax_form
-//= require inc/ajax_setting
+//= require jquery.remotipart
diff --git a/app/views/admin/assets/file_upload.html.erb b/app/views/admin/assets/file_upload.html.erb
index abdcfbc6..d267b674 100644
--- a/app/views/admin/assets/file_upload.html.erb
+++ b/app/views/admin/assets/file_upload.html.erb
@@ -3,7 +3,7 @@
 
 <%= flash_messages %>
 
-<%= form_for :asset, :url => admin_assets_path(:uploader => true), :html => {:id => 'ajaxForm', :multipart => true } do |f| %>
+<%= form_for :asset, :url => admin_assets_path(:uploader => true), :remote => true do |f| %>
     <div class="modal-header">
         <h3><%= t 'admin.file_upload' %></h3>
     </div>
@@ -51,7 +51,7 @@
     </div>
     <div style="position: absolute; width: 100%; bottom: 0;">
         <div class="modal-footer">
-            <a id='ajax_form_submit' class="btn btn-primary"><%= t(:create) %></a>
+            <%= f.submit t(:create), :class => "btn btn-primary" %>
         </div>
     </div>
 

From 80887ace3c83b24fe7518abdd054b8d2a3c4112a Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Mon, 6 Aug 2012 15:15:44 +0800
Subject: [PATCH 2/3] Remove console.log

---
 app/assets/javascripts/tinymce_orbit.js.erb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/javascripts/tinymce_orbit.js.erb b/app/assets/javascripts/tinymce_orbit.js.erb
index f12bfa3d..aa954973 100644
--- a/app/assets/javascripts/tinymce_orbit.js.erb
+++ b/app/assets/javascripts/tinymce_orbit.js.erb
@@ -47,7 +47,6 @@ function myFileBrowser(field_name, url, type, win) {
     var cmsURL = window.location.toString();
       cmsURL = cmsURL.split("/");
       cmsURL = "<%= Rails.application.routes.url_helpers.file_upload_admin_assets_path %>"; 
-      console.log(cmsURL);
       // script URL - use an absolute path!
     if (cmsURL.indexOf("?") < 0) {
         //add the type as the only query parameter

From 3f543193f0e0db4e08c778277a3ec3073470db52 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Mon, 6 Aug 2012 17:34:00 +0800
Subject: [PATCH 3/3] Remove remotipart (not working with ie9) the upload is
 working except that the pop-up does not disappear in ie

---
 Gemfile                                     | 2 +-
 app/assets/javascripts/ajax_form.js         | 6 ++++++
 app/assets/javascripts/new_admin.js         | 2 +-
 app/views/admin/assets/file_upload.html.erb | 4 ++--
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 6e07eafa..7b12d5c0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -26,7 +26,7 @@ gem 'mysql2'
 gem 'nokogiri'
 gem 'radius'
 gem 'rake'
-gem 'remotipart'
+# gem 'remotipart'
 gem 'resque' # background jobs
 gem 'resque-scheduler' # job scheduling
 gem 'resque-restriction'
diff --git a/app/assets/javascripts/ajax_form.js b/app/assets/javascripts/ajax_form.js
index d9b5abfe..26218a08 100644
--- a/app/assets/javascripts/ajax_form.js
+++ b/app/assets/javascripts/ajax_form.js
@@ -2,6 +2,12 @@ $(document).on('click', '#ajax_form_submit', function(){
 	$('#ajaxForm').ajaxSubmit({
 		beforeSubmit: function(a,f,o) {
 			o.dataType = 'script';
+			if (o.dataType == 'script') {
+        o.url = o.url.split('?'); // split on GET params
+        if (o.url[0].substr(-3) != '.js') o.url[0] += '.js'; // force rails to respond to respond to the request with :format = js
+        o.url = o.url.join('?'); // join on GET params
+        alert(o.url)
+      }
 		}
 	});
 });
\ No newline at end of file
diff --git a/app/assets/javascripts/new_admin.js b/app/assets/javascripts/new_admin.js
index 0c9f30df..949753a9 100644
--- a/app/assets/javascripts/new_admin.js
+++ b/app/assets/javascripts/new_admin.js
@@ -17,4 +17,4 @@
 //= require side_bar_history
 //= require rss
 //= require ajax_form
-//= require jquery.remotipart
+//= require inc/ajax_setting
diff --git a/app/views/admin/assets/file_upload.html.erb b/app/views/admin/assets/file_upload.html.erb
index d267b674..abdcfbc6 100644
--- a/app/views/admin/assets/file_upload.html.erb
+++ b/app/views/admin/assets/file_upload.html.erb
@@ -3,7 +3,7 @@
 
 <%= flash_messages %>
 
-<%= form_for :asset, :url => admin_assets_path(:uploader => true), :remote => true do |f| %>
+<%= form_for :asset, :url => admin_assets_path(:uploader => true), :html => {:id => 'ajaxForm', :multipart => true } do |f| %>
     <div class="modal-header">
         <h3><%= t 'admin.file_upload' %></h3>
     </div>
@@ -51,7 +51,7 @@
     </div>
     <div style="position: absolute; width: 100%; bottom: 0;">
         <div class="modal-footer">
-            <%= f.submit t(:create), :class => "btn btn-primary" %>
+            <a id='ajax_form_submit' class="btn btn-primary"><%= t(:create) %></a>
         </div>
     </div>