From cc82387efb319c84b6c1493aff053f121ade114c Mon Sep 17 00:00:00 2001
From: spen <spen@rulingcom.com>
Date: Thu, 21 Aug 2014 14:08:29 +0800
Subject: [PATCH] update ckeditor  paste From Word clean up

---
 Gemfile                                       | 2 +-
 app/assets/javascripts/ckeditor/config.js.erb | 6 ++++++
 config/application.rb                         | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 7dda595..d3548b2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -109,7 +109,7 @@ group :test, :development do
   gem "spork"
   gem "capybara"
   #gem 'rack-mini-profiler'
-  gem "better_errors"
+  gem "better_errors", "1.1.0"
   # gem 'yard'
   # gem "bluecloth"
 end
diff --git a/app/assets/javascripts/ckeditor/config.js.erb b/app/assets/javascripts/ckeditor/config.js.erb
index 3fba3b2..269a56c 100644
--- a/app/assets/javascripts/ckeditor/config.js.erb
+++ b/app/assets/javascripts/ckeditor/config.js.erb
@@ -28,6 +28,8 @@ CKEDITOR.editorConfig = function( config ) {
 		{ name: 'about' }
 	];
 
+	config.allowedContent = true;
+
 	config.skin = 'moono';
 
 	config.filebrowserBrowseUrl = "<%= Rails.application.routes.url_helpers.admin_assets_path(:module_app_id=>ModuleApp.where(:key=>'asset').first.id) %>";
@@ -35,6 +37,10 @@ CKEDITOR.editorConfig = function( config ) {
 
 	//Font Config
 	config.font_names = 'Arial;Comic Sans MS;Courier New;Georgia;Helvetica;Lucida Sans Unicode;Tahoma;Times New Roman;Trebuchet MS;Verdana;微軟正黑體';
+
+	config.enterMode = CKEDITOR.ENTER_BR;
+	config.shiftEnterMode = CKEDITOR.ENTER_BR;
+	config.pasteFromWordPromptCleanup = true;
 };
 
 CKEDITOR.on('instanceReady',function(){
diff --git a/config/application.rb b/config/application.rb
index 4af3206..b56da2c 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -56,6 +56,7 @@ module Orbit
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
     config.i18n.load_path += Dir[Rails.root.join('config', 'locales', 'modules', '*.{rb,yml}').to_s]
+    config.i18n.enforce_available_locales = false
     config.i18n.default_locale = :zh_tw
 
     # JavaScript files you want as :defaults (application.js is always included).