Merge pull request #24 from gucki/2.0.0

Update to plupload 2.0.0

README.md

@@ -19,24 +19,17 @@ Quick Start
 
 Add to your application.js:
 
-    //= require plupload
-
+    //= require moxie
+    //= require plupload.dev
+
     // optional, only needed if you'd like to use plupload localized
     //= require plupload/i18n/de
 
     // optional, but recommended. it sets generic settings like flash url, etc.
-    //= require plupload.settings     
+    //= require plupload.settings
 
     // optional, only if you want to use the jquery integration
-    //= require jquery.plupload.queue 
-
-    // optional, choose the ones you'd like to use
-    //= require plupload.flash        
-    //= require plupload.silverlight  
-    //= require plupload.html4        
-    //= require plupload.html5        
-    //= require plupload.gears        
-    //= require plupload.browserplus
+    //= require jquery.plupload.queue
 
 
 Add to your application.scss:

app/assets/javascripts/plupload.settings.js.erb

@@ -1,14 +1,14 @@
 // Assigns default Plupload settings that work with the asset pipeline.
-(function () {
+(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")%>'
+      flash_swf_url: '<%= asset_path("Moxie.swf") %>',
+      silverlight_xap_url: '<%= asset_path("Moxie.xap") %>'
     });
 
     return proxied.apply(this, [settings]);
   };
-}());
+}(jQuery));