Merge pull request #14 from ffloyd/upstream

Precompiling assets. Fixes #5
PerfectlyNormal · Aug 20, 2012 · 1da0ba7 · 1da0ba7
2 parents a366bf3 + cee537e
commit 1da0ba7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/...ugins/uploadimage/editor_plugin.js.coffee → ...ugins/uploadimage/editor_plugin.js.coffee b/...ugins/uploadimage/editor_plugin.js.coffee → ...ugins/uploadimage/editor_plugin.js.coffee
diff --git a/lib/tasks/tinymce-uploadimage-assets.rake b/lib/tasks/tinymce-uploadimage-assets.rake
@@ -0,0 +1,7 @@
+Rake::Task['assets:precompile:primary'].enhance do
+  assets = File.expand_path(File.dirname(__FILE__) + "/../../vendor/assets/javascripts/tinymce")
+  target = File.join(Rails.public_path, Rails.application.config.assets.prefix)
+
+  mkdir_p target
+  cp_r assets, target
+end
diff --git a/lib/tinymce-rails-imageupload/rails.rb b/lib/tinymce-rails-imageupload/rails.rb
@@ -2,6 +2,9 @@ module Tinymce
   module Rails
     module Imageupload
       class Engine < ::Rails::Engine
+        initializer 'TinymceRailsImageupload.assets_pipeline' do |app|
+          app.config.assets.precompile << "tinymce/plugins/uploadimage/editor_plugin.js"     
+        end
       end
     end
   end