Merge pull request comfy#200 from derek-watson/master

Fixed AJAX uploads in Chrome and newer Firefox
gaynetdinov · Jul 10, 2012 · 55b1d7a · 55b1d7a
2 parents 256a701 + 000b933
commit 55b1d7a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/assets/javascripts/comfortable_mexican_sofa/application.js b/app/assets/javascripts/comfortable_mexican_sofa/application.js
@@ -195,7 +195,7 @@ $.CMS = function(){
           xhr.open('POST', action, true);
           xhr.setRequestHeader('Accept', 'application/javascript');
           xhr.setRequestHeader('X-CSRF-Token', $('meta[name=csrf-token]').attr('content'));
-          xhr.setRequestHeader('Content-Type', file.content_type);
+          xhr.setRequestHeader('Content-Type', file.content_type || file.type);
           xhr.setRequestHeader('X-File-Name', file.name);
           xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
           xhr.send(file);
@@ -220,4 +220,4 @@ $.CMS = function(){
       });
     }
   }
-}();
+}();