Merge pull request gucki#4 from sutherland/master

Rewrite default settings script as javascript
joerichsen · Nov 18, 2011 · cb97b68 · cb97b68
2 parents 2a9f136 + 3237749
commit cb97b68
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/app/assets/javascripts/plupload.settings.js.coffee.erb b/app/assets/javascripts/plupload.settings.js.coffee.erb
diff --git a/app/assets/javascripts/plupload.settings.js.erb b/app/assets/javascripts/plupload.settings.js.erb
@@ -0,0 +1,14 @@
+// Assigns default Plupload settings that work with the asset pipeline.
+(function () {
+  var proxied = plupload.Uploader;
+
+  plupload.Uploader = function (settings) {
+    settings = $.extend({}, settings, {
+      multipart: true,
+      flash_swf_url: '<%=asset_path("plupload.flash.swf")%>',
+      silverlight_xap_url: '<%=asset_path("plupload.silverlight.xap")%>'
+    });
+
+    return proxied.apply(this, [settings]);
+  };
+}());