From e0b390d99eab64c99f1f3cccae2029649e90e11c Mon Sep 17 00:00:00 2001
From: "M.Shibuya" <mit.shibuya@gmail.com>
Date: Sun, 5 May 2019 12:18:15 +0900
Subject: [PATCH] Remove deprecated DSL syntax for richtext editors

---
 .../config/fields/types/ck_editor.rb           |  4 ----
 .../config/fields/types/code_mirror.rb         |  4 ----
 lib/rails_admin/config/fields/types/froala.rb  |  4 ----
 lib/rails_admin/config/fields/types/text.rb    | 18 ------------------
 .../config/fields/types/wysihtml5.rb           |  4 ----
 5 files changed, 34 deletions(-)

diff --git a/lib/rails_admin/config/fields/types/ck_editor.rb b/lib/rails_admin/config/fields/types/ck_editor.rb
index e51d78983c..e0d56351f8 100644
--- a/lib/rails_admin/config/fields/types/ck_editor.rb
+++ b/lib/rails_admin/config/fields/types/ck_editor.rb
@@ -27,10 +27,6 @@ class CKEditor < RailsAdmin::Config::Fields::Types::Text
           register_instance_option :partial do
             :form_ck_editor
           end
-
-          [:base_location, :config_js, :location].each do |key|
-            register_deprecated_instance_option :"ckeditor_#{key}", key
-          end
         end
       end
     end
diff --git a/lib/rails_admin/config/fields/types/code_mirror.rb b/lib/rails_admin/config/fields/types/code_mirror.rb
index 27bc6aa54f..36a9c8ff61 100644
--- a/lib/rails_admin/config/fields/types/code_mirror.rb
+++ b/lib/rails_admin/config/fields/types/code_mirror.rb
@@ -37,10 +37,6 @@ class CodeMirror < RailsAdmin::Config::Fields::Types::Text
           register_instance_option :partial do
             :form_code_mirror
           end
-
-          [:assets, :config, :css_location, :js_location].each do |key|
-            register_deprecated_instance_option :"codemirror_#{key}", key
-          end
         end
       end
     end
diff --git a/lib/rails_admin/config/fields/types/froala.rb b/lib/rails_admin/config/fields/types/froala.rb
index 5437515a5c..5136b9124f 100644
--- a/lib/rails_admin/config/fields/types/froala.rb
+++ b/lib/rails_admin/config/fields/types/froala.rb
@@ -26,10 +26,6 @@ class Froala < RailsAdmin::Config::Fields::Types::Text
           register_instance_option :partial do
             :form_froala
           end
-
-          [:config_options, :css_location, :js_location].each do |key|
-            register_deprecated_instance_option :"froala_#{key}", key
-          end
         end
       end
     end
diff --git a/lib/rails_admin/config/fields/types/text.rb b/lib/rails_admin/config/fields/types/text.rb
index e9c7948132..3a84ddb6d4 100644
--- a/lib/rails_admin/config/fields/types/text.rb
+++ b/lib/rails_admin/config/fields/types/text.rb
@@ -8,24 +8,6 @@ class Text < RailsAdmin::Config::Fields::Base
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types.register(self)
 
-          [:ckeditor, :ckeditor_base_location, :ckeditor_config_js, :ckeditor_location].each do |key|
-            register_deprecated_instance_option key do
-              raise("The 'field(:foo){ ckeditor true }' style DSL is deprecated. Please use 'field :foo, :ck_editor' instead.")
-            end
-          end
-
-          [:codemirror, :codemirror_assets, :codemirror_config, :codemirror_css_location, :codemirror_js_location].each do |key|
-            register_deprecated_instance_option key do
-              raise("The 'field(:foo){ codemirror true }' style DSL is deprecated. Please use 'field :foo, :code_mirror' instead.")
-            end
-          end
-
-          [:bootstrap_wysihtml5, :bootstrap_wysihtml5_config_options, :bootstrap_wysihtml5_css_location, :bootstrap_wysihtml5_js_location].each do |key|
-            register_deprecated_instance_option key do
-              raise("The 'field(:foo){ bootstrap_wysihtml5 true }' style DSL is deprecated. Please use 'field :foo, :wysihtml5' instead.")
-            end
-          end
-
           register_instance_option :html_attributes do
             {
               required: required?,
diff --git a/lib/rails_admin/config/fields/types/wysihtml5.rb b/lib/rails_admin/config/fields/types/wysihtml5.rb
index e987dbb7f6..a0148994d1 100644
--- a/lib/rails_admin/config/fields/types/wysihtml5.rb
+++ b/lib/rails_admin/config/fields/types/wysihtml5.rb
@@ -26,10 +26,6 @@ class Wysihtml5 < RailsAdmin::Config::Fields::Types::Text
           register_instance_option :partial do
             :form_wysihtml5
           end
-
-          [:config_options, :css_location, :js_location].each do |key|
-            register_deprecated_instance_option :"bootstrap_wysihtml5_#{key}", key
-          end
         end
       end
     end