From fac94876f73e6413d7460e1dc3429d107227cc23 Mon Sep 17 00:00:00 2001 From: Vitaly Fomichov Date: Sat, 7 Sep 2013 15:21:45 +0400 Subject: [PATCH 1/2] In Rails 4 "loose" assets (images, fonts, etc.) in `lib` and `vendor` are no longer precompiled by default. Rails Engines should put their assets in their own app/assets. See: https://github.com/rails/rails/pull/7968 --- {vendor => app}/assets/images/loading.gif | Bin {vendor => app}/assets/images/progressbar.gif | Bin .../assets/javascripts/jquery-fileupload/basic.js | 0 .../cors/jquery.postmessage-transport.js | 0 .../jquery-fileupload/cors/jquery.xdr-transport.js | 0 .../assets/javascripts/jquery-fileupload/index.js | 0 .../jquery-fileupload/jquery.fileupload-angular.js | 0 .../jquery-fileupload/jquery.fileupload-fp.js | 0 .../jquery-fileupload/jquery.fileupload-process.js | 0 .../jquery-fileupload/jquery.fileupload-resize.js | 0 .../jquery-fileupload/jquery.fileupload-ui.js | 0 .../jquery-fileupload/jquery.fileupload-validate.js | 0 .../jquery-fileupload/jquery.fileupload.js | 0 .../jquery-fileupload/jquery.iframe-transport.js | 0 .../assets/javascripts/jquery-fileupload/locale.js | 0 .../jquery-fileupload/vendor/canvas-to-blob.js | 0 .../jquery-fileupload/vendor/jquery.ui.widget.js | 0 .../jquery-fileupload/vendor/load-image.js | 0 .../javascripts/jquery-fileupload/vendor/tmpl.js | 0 .../assets/stylesheets/jquery.fileupload-ui.scss | 0 20 files changed, 0 insertions(+), 0 deletions(-) rename {vendor => app}/assets/images/loading.gif (100%) rename {vendor => app}/assets/images/progressbar.gif (100%) rename {vendor => app}/assets/javascripts/jquery-fileupload/basic.js (100%) rename {vendor => app}/assets/javascripts/jquery-fileupload/cors/jquery.postmessage-transport.js (100%) rename {vendor => app}/assets/javascripts/jquery-fileupload/cors/jquery.xdr-transport.js (100%) rename {vendor => app}/assets/javascripts/jquery-fileupload/index.js (100%) rename {vendor => app}/assets/javascripts/jquery-fileupload/jquery.fileupload-angular.js (100%) rename {vendor => app}/assets/javascripts/jquery-fileupload/jquery.fileupload-fp.js (100%) rename {vendor => app}/assets/javascripts/jquery-fileupload/jquery.fileupload-process.js (100%) rename {vendor => app}/assets/javascripts/jquery-fileupload/jquery.fileupload-resize.js (100%) rename {vendor => app}/assets/javascripts/jquery-fileupload/jquery.fileupload-ui.js (100%) rename {vendor => app}/assets/javascripts/jquery-fileupload/jquery.fileupload-validate.js (100%) rename {vendor => app}/assets/javascripts/jquery-fileupload/jquery.fileupload.js (100%) rename {vendor => app}/assets/javascripts/jquery-fileupload/jquery.iframe-transport.js (100%) rename {vendor => app}/assets/javascripts/jquery-fileupload/locale.js (100%) rename {vendor => app}/assets/javascripts/jquery-fileupload/vendor/canvas-to-blob.js (100%) rename {vendor => app}/assets/javascripts/jquery-fileupload/vendor/jquery.ui.widget.js (100%) rename {vendor => app}/assets/javascripts/jquery-fileupload/vendor/load-image.js (100%) rename {vendor => app}/assets/javascripts/jquery-fileupload/vendor/tmpl.js (100%) rename {vendor => app}/assets/stylesheets/jquery.fileupload-ui.scss (100%) diff --git a/vendor/assets/images/loading.gif b/app/assets/images/loading.gif similarity index 100% rename from vendor/assets/images/loading.gif rename to app/assets/images/loading.gif diff --git a/vendor/assets/images/progressbar.gif b/app/assets/images/progressbar.gif similarity index 100% rename from vendor/assets/images/progressbar.gif rename to app/assets/images/progressbar.gif diff --git a/vendor/assets/javascripts/jquery-fileupload/basic.js b/app/assets/javascripts/jquery-fileupload/basic.js similarity index 100% rename from vendor/assets/javascripts/jquery-fileupload/basic.js rename to app/assets/javascripts/jquery-fileupload/basic.js diff --git a/vendor/assets/javascripts/jquery-fileupload/cors/jquery.postmessage-transport.js b/app/assets/javascripts/jquery-fileupload/cors/jquery.postmessage-transport.js similarity index 100% rename from vendor/assets/javascripts/jquery-fileupload/cors/jquery.postmessage-transport.js rename to app/assets/javascripts/jquery-fileupload/cors/jquery.postmessage-transport.js diff --git a/vendor/assets/javascripts/jquery-fileupload/cors/jquery.xdr-transport.js b/app/assets/javascripts/jquery-fileupload/cors/jquery.xdr-transport.js similarity index 100% rename from vendor/assets/javascripts/jquery-fileupload/cors/jquery.xdr-transport.js rename to app/assets/javascripts/jquery-fileupload/cors/jquery.xdr-transport.js diff --git a/vendor/assets/javascripts/jquery-fileupload/index.js b/app/assets/javascripts/jquery-fileupload/index.js similarity index 100% rename from vendor/assets/javascripts/jquery-fileupload/index.js rename to app/assets/javascripts/jquery-fileupload/index.js diff --git a/vendor/assets/javascripts/jquery-fileupload/jquery.fileupload-angular.js b/app/assets/javascripts/jquery-fileupload/jquery.fileupload-angular.js similarity index 100% rename from vendor/assets/javascripts/jquery-fileupload/jquery.fileupload-angular.js rename to app/assets/javascripts/jquery-fileupload/jquery.fileupload-angular.js diff --git a/vendor/assets/javascripts/jquery-fileupload/jquery.fileupload-fp.js b/app/assets/javascripts/jquery-fileupload/jquery.fileupload-fp.js similarity index 100% rename from vendor/assets/javascripts/jquery-fileupload/jquery.fileupload-fp.js rename to app/assets/javascripts/jquery-fileupload/jquery.fileupload-fp.js diff --git a/vendor/assets/javascripts/jquery-fileupload/jquery.fileupload-process.js b/app/assets/javascripts/jquery-fileupload/jquery.fileupload-process.js similarity index 100% rename from vendor/assets/javascripts/jquery-fileupload/jquery.fileupload-process.js rename to app/assets/javascripts/jquery-fileupload/jquery.fileupload-process.js diff --git a/vendor/assets/javascripts/jquery-fileupload/jquery.fileupload-resize.js b/app/assets/javascripts/jquery-fileupload/jquery.fileupload-resize.js similarity index 100% rename from vendor/assets/javascripts/jquery-fileupload/jquery.fileupload-resize.js rename to app/assets/javascripts/jquery-fileupload/jquery.fileupload-resize.js diff --git a/vendor/assets/javascripts/jquery-fileupload/jquery.fileupload-ui.js b/app/assets/javascripts/jquery-fileupload/jquery.fileupload-ui.js similarity index 100% rename from vendor/assets/javascripts/jquery-fileupload/jquery.fileupload-ui.js rename to app/assets/javascripts/jquery-fileupload/jquery.fileupload-ui.js diff --git a/vendor/assets/javascripts/jquery-fileupload/jquery.fileupload-validate.js b/app/assets/javascripts/jquery-fileupload/jquery.fileupload-validate.js similarity index 100% rename from vendor/assets/javascripts/jquery-fileupload/jquery.fileupload-validate.js rename to app/assets/javascripts/jquery-fileupload/jquery.fileupload-validate.js diff --git a/vendor/assets/javascripts/jquery-fileupload/jquery.fileupload.js b/app/assets/javascripts/jquery-fileupload/jquery.fileupload.js similarity index 100% rename from vendor/assets/javascripts/jquery-fileupload/jquery.fileupload.js rename to app/assets/javascripts/jquery-fileupload/jquery.fileupload.js diff --git a/vendor/assets/javascripts/jquery-fileupload/jquery.iframe-transport.js b/app/assets/javascripts/jquery-fileupload/jquery.iframe-transport.js similarity index 100% rename from vendor/assets/javascripts/jquery-fileupload/jquery.iframe-transport.js rename to app/assets/javascripts/jquery-fileupload/jquery.iframe-transport.js diff --git a/vendor/assets/javascripts/jquery-fileupload/locale.js b/app/assets/javascripts/jquery-fileupload/locale.js similarity index 100% rename from vendor/assets/javascripts/jquery-fileupload/locale.js rename to app/assets/javascripts/jquery-fileupload/locale.js diff --git a/vendor/assets/javascripts/jquery-fileupload/vendor/canvas-to-blob.js b/app/assets/javascripts/jquery-fileupload/vendor/canvas-to-blob.js similarity index 100% rename from vendor/assets/javascripts/jquery-fileupload/vendor/canvas-to-blob.js rename to app/assets/javascripts/jquery-fileupload/vendor/canvas-to-blob.js diff --git a/vendor/assets/javascripts/jquery-fileupload/vendor/jquery.ui.widget.js b/app/assets/javascripts/jquery-fileupload/vendor/jquery.ui.widget.js similarity index 100% rename from vendor/assets/javascripts/jquery-fileupload/vendor/jquery.ui.widget.js rename to app/assets/javascripts/jquery-fileupload/vendor/jquery.ui.widget.js diff --git a/vendor/assets/javascripts/jquery-fileupload/vendor/load-image.js b/app/assets/javascripts/jquery-fileupload/vendor/load-image.js similarity index 100% rename from vendor/assets/javascripts/jquery-fileupload/vendor/load-image.js rename to app/assets/javascripts/jquery-fileupload/vendor/load-image.js diff --git a/vendor/assets/javascripts/jquery-fileupload/vendor/tmpl.js b/app/assets/javascripts/jquery-fileupload/vendor/tmpl.js similarity index 100% rename from vendor/assets/javascripts/jquery-fileupload/vendor/tmpl.js rename to app/assets/javascripts/jquery-fileupload/vendor/tmpl.js diff --git a/vendor/assets/stylesheets/jquery.fileupload-ui.scss b/app/assets/stylesheets/jquery.fileupload-ui.scss similarity index 100% rename from vendor/assets/stylesheets/jquery.fileupload-ui.scss rename to app/assets/stylesheets/jquery.fileupload-ui.scss From 5cf9ed63bcc359b8fd621e550dd3868b59e026a4 Mon Sep 17 00:00:00 2001 From: Vitaly Fomichov Date: Sat, 7 Sep 2013 15:21:45 +0400 Subject: [PATCH 2/2] In Rails 4 "loose" assets (images, fonts, etc.) in `lib` and `vendor` are no longer precompiled by default. Rails Engines should put their assets in their own app/assets. See: https://github.com/rails/rails/pull/7968 --- jquery-fileupload-rails.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jquery-fileupload-rails.gemspec b/jquery-fileupload-rails.gemspec index 78b5549..139436c 100644 --- a/jquery-fileupload-rails.gemspec +++ b/jquery-fileupload-rails.gemspec @@ -13,7 +13,7 @@ Gem::Specification.new do |s| s.rubyforge_project = "jquery-fileupload-rails" - s.files = Dir["lib/**/*"] + Dir["vendor/**/*"] + ["Rakefile", "README.md"] + s.files = Dir["lib/**/*"] + Dir["app/**/*"] + ["Rakefile", "README.md"] s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n") s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) } s.require_paths = ["lib"]