rename editor to rich_editor

jgv · Jul 6, 2012 · 84c91c2 · 84c91c2
1 parent 53bfe29
commit 84c91c2
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 10 deletions.
diff --git a/README.rdoc b/README.rdoc
@@ -141,7 +141,7 @@ Rich also includes a few settings that manipulate CKEditor settings, but are a b
 
 === Editor styles
 
-When you run the generator a css file is created for you in <tt>app/assets/stylesheets/rich/editor.css</tt>. Use this stylesheet to define the contents of the Styles drop down in CKEditor.
+When you run the generator a css file is created for you in <tt>app/assets/stylesheets/rich/rich_editor.css</tt>. Use this stylesheet to define the contents of the Styles drop down in CKEditor.
 
 === Image configuration & (re)processing
 

diff --git a/app/assets/stylesheets/rich/editor.css → app/assets/stylesheets/rich/rich_editor.css b/app/assets/stylesheets/rich/editor.css → app/assets/stylesheets/rich/rich_editor.css
diff --git a/lib/generators/rich/install/install_generator.rb b/lib/generators/rich/install/install_generator.rb
@@ -18,7 +18,7 @@ def setup_route
       end
 
       def install_editor_styles
-        copy_file '../../../../../app/assets/stylesheets/rich/editor.css', 'app/assets/stylesheets/rich/editor.css'
+        copy_file '../../../../../app/assets/stylesheets/rich/rich_editor.css', 'app/assets/stylesheets/rich/rich_editor.css'
       end
 
       def install_javascript

diff --git a/lib/rich.rb b/lib/rich.rb
@@ -61,7 +61,7 @@ def self.image_styles=(image_styles)
     :stylesSet  =>  [],
     :extraPlugins => 'stylesheetparser,richfile,MediaEmbed',
     :removePlugins => 'scayt,menubutton,contextmenu,image,forms',
-    :contentsCss => '/assets/rich/editor.css',
+    :contentsCss => '/assets/rich/rich_editor.css',
     :removeDialogTabs => 'link:advanced;link:target',
     :startupOutlineBlocks => true,
     :forcePasteAsPlainText => true,
@@ -163,11 +163,7 @@ def self.setup
   end
 
   def self.insert
-
-
-
-
-
+
     # manually inject into Formtastic 1. V2 is extended autmatically.
     if Object.const_defined?("Formtastic")
       if(Gem.loaded_specs["formtastic"].version.version[0,1] == "1")

diff --git a/lib/rich/engine.rb b/lib/rich/engine.rb
@@ -6,7 +6,7 @@ class Engine < Rails::Engine
     isolate_namespace Rich
 
     initializer "rich.add_middleware" do |app|
-      app.config.assets.precompile += %w( rich/base.js rich/editor.css )
+      app.config.assets.precompile += %w( rich/base.js rich/rich_editor.css )
       app.middleware.use 'Rack::RawUpload', :paths => ['/rich/files']
     end
 

diff --git a/lib/rich/version.rb b/lib/rich/version.rb
@@ -1,3 +1,3 @@
 module Rich
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end