diff --git a/app/assets/javascripts/ckeditor/config.js b/app/assets/javascripts/ckeditor/config.js index 22c4ab028..294c100f0 100644 --- a/app/assets/javascripts/ckeditor/config.js +++ b/app/assets/javascripts/ckeditor/config.js @@ -6,8 +6,6 @@ For licensing, see LICENSE.html or http://ckeditor.com/license CKEDITOR.editorConfig = function( config ) { - config.forcePasteAsPlainText = true; - config.filebrowserImageBrowseLinkUrl = "/ckeditor/pictures"; config.filebrowserImageBrowseUrl = "/ckeditor/pictures"; config.filebrowserImageUploadUrl = "/ckeditor/pictures"; diff --git a/config/initializers/ckeditor.rb b/config/initializers/ckeditor.rb index e9ab77aa3..f60914e45 100644 --- a/config/initializers/ckeditor.rb +++ b/config/initializers/ckeditor.rb @@ -9,6 +9,6 @@ Ckeditor.setup do |config| config.assets_languages = Rails.application.config.i18n.available_locales.map { |l| l.to_s.downcase } config.assets_plugins = %w[balloonpanel balloontoolbar copyformatting image - link magicline scayt table tableselection wsc] + link magicline pastefromword scayt table tableselection wsc] config.assets.reject! { |asset| asset =~ /\Ackeditor\/samples\// } end