rich

Author: Richard Young

Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-ruby '2.0.0'
+ruby '2.1.0'
 
 # Load this project as a gem.
 gemspec
@@ -19,7 +19,7 @@ end
 
 group :development do
  gem 'rake'
- gem 'debugger'
+ #gem 'debugger'
  gem 'quiet_assets'
 end
 group :test, :development do

Gemfile.lock

@@ -11,7 +11,7 @@ PATH
  jquery-rails (~> 3.1)
  jquery-ui-rails (~> 4.1)
  panoramic
- paperclip (~> 3.5.1)
+ paperclip (~> 4.1.0)
  rails (~> 4.0.0)
  sass-rails
  simple_form (>= 3.0.0.rc, < 3.1)
@@ -58,9 +58,11 @@ GEM
  cucumber (>= 1.1.1)
  rspec-expectations (>= 2.7.0)
  atomic (1.1.14)
- bcrypt-ruby (3.1.2)
+ bcrypt (3.1.7)
+ bcrypt-ruby (3.1.5)
+ bcrypt (>= 3.1.3)
  bluecloth (2.2.0)
- bootstrap-sass (3.1.0.2)
+ bootstrap-sass (3.1.1.0)
  sass (~> 3.2)
  builder (3.1.4)
  capybara (2.1.0)
@@ -78,7 +80,6 @@ GEM
  activesupport (>= 3.0)
  cocaine (0.5.3)
  climate_control (>= 0.0.3, < 1.0)
- columnize (0.3.6)
  compass (0.12.2)
  chunky_png (~> 1.2)
  fssm (>= 0.2.7)
@@ -97,13 +98,7 @@ GEM
  nokogiri (>= 1.5.0)
  daemons (1.1.9)
  database_cleaner (1.2.0)
- debugger (1.6.2)
- columnize (>= 0.3.1)
- debugger-linecache (~> 1.2.0)
- debugger-ruby_core_source (~> 1.2.3)
- debugger-linecache (1.2.0)
- debugger-ruby_core_source (1.2.3)
- devise (3.2.2)
+ devise (3.2.3)
  bcrypt-ruby (~> 3.0)
  orm_adapter (~> 0.1)
  railties (>= 3.2.6, < 5)
@@ -132,8 +127,8 @@ GEM
  jquery-rails (3.1.0)
  railties (>= 3.0, < 5.0)
  thor (>= 0.14, < 2.0)
- jquery-ui-rails (4.1.1)
- railties (>= 3.1.0)
+ jquery-ui-rails (4.2.0)
+ railties (>= 3.2.16)
  launchy (2.3.0)
  addressable (~> 2.3)
  m (1.3.2)
@@ -165,7 +160,7 @@ GEM
  orm_adapter (0.5.0)
  panoramic (0.0.4)
  rails (>= 3.0.7)
- paperclip (3.5.4)
+ paperclip (4.1.1)
  activemodel (>= 3.0.0)
  activesupport (>= 3.0.0)
  cocaine (~> 0.5.3)
@@ -257,7 +252,6 @@ DEPENDENCIES
  cucumber
  cucumber-rails
  database_cleaner
- debugger
  factory_girl_rails (= 3.3.0)
  launchy
  m (~> 1.2)

app/assets/javascripts/bcms/ckeditor.js

@@ -2,7 +2,5 @@
 // Manifest file for loading the CKeditor JS. Loads it from ckeditor-rails gem.
 // See /assets/ckeditor/config.js for default configuration.
 //
-//= require ckeditor-jquery
-//= require bcms/ckeditor_load
-//= require bcms/ckeditor_standard_config
+//= require rich
 

app/views/cms/html_blocks/_form.html.erb

@@ -1,3 +1,3 @@
 <%= f.input :name %>
-<%= f.input :content, as: :text_editor %>
+<%= f.input :content, as: :rich %>
 <%= f.cms_tag_list %>

browsercms.gemspec

@@ -36,11 +36,10 @@ Gem::Specification.new do |s|
  s.add_dependency("bootstrap-sass")
  s.add_dependency("compass-rails", "~> 1.1.3")
  s.add_dependency("ancestry", "~> 2.0.0")
- s.add_dependency("ckeditor_rails", "~> 4.3.0")
  s.add_dependency("underscore-rails", "~> 1.4")
  s.add_dependency("jquery-rails", "~> 3.1")
  s.add_dependency("jquery-ui-rails", "~> 4.1")
- s.add_dependency("paperclip", "~> 3.5.1")
+ s.add_dependency("paperclip", "~> 4.1.0")
  s.add_dependency("panoramic")
  s.add_dependency("will_paginate", "~>3.0.0")
  s.add_dependency("actionpack-page_caching", "~>1.0")

lib/browsercms.rb

@@ -10,7 +10,7 @@
 # Gem name is different than file name
 # Must be required FIRST, so that our assets paths appear before its do.
 # This allows app/assets/ckeditor/config.js to set CMS specific defaults.
-require 'ckeditor-rails'
+#require 'ckeditor-rails'
 
 # Explicitly require this, so that CMS projects do not need to add it to their Gemfile
 # especially while upgrading