From 952cf0fdb43bbf20684a1d13fef50fc2f846b16c Mon Sep 17 00:00:00 2001
From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 3 Mar 2021 15:34:16 +0000
Subject: [PATCH] Remove the old richtext_area helper

This has been superseded by the `f.richtext_field` custom form builder.
---
 app/helpers/application_helper.rb       | 20 -------------------
 app/views/site/_html_help.erb           |  0
 app/views/site/_markdown_help.html.erb  | 26 -------------------------
 config/locales/en.yml                   | 17 ----------------
 test/helpers/application_helper_test.rb |  5 -----
 5 files changed, 68 deletions(-)
 delete mode 100644 app/views/site/_html_help.erb
 delete mode 100644 app/views/site/_markdown_help.html.erb

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index c8473adfc..ed01ad89b 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -17,26 +17,6 @@ module ApplicationHelper
     link_to(image_tag("RSS.png", :size => "16x16", :border => 0), args, :class => "rsssmall")
   end
 
-  def richtext_area(object_name, method, options = {})
-    id = "#{object_name}_#{method}"
-    type = options.delete(:format) || "markdown"
-
-    tag.div(:id => "#{id}_container", :class => "richtext_container") do
-      output_buffer << tag.div(:id => "#{id}_content", :class => "richtext_content") do
-        output_buffer << text_area(object_name, method, options.merge("data-preview-url" => preview_url(:type => type)))
-        output_buffer << tag.div("", :id => "#{id}_preview", :class => "richtext_preview richtext text-break")
-      end
-
-      output_buffer << tag.div(:id => "#{id}_help", :class => "richtext_help") do
-        output_buffer << render("site/#{type}_help")
-        output_buffer << tag.div(:class => "buttons") do
-          output_buffer << submit_tag(I18n.t("site.richtext_area.edit"), :id => "#{id}_doedit", :class => "richtext_doedit deemphasize", :disabled => true)
-          output_buffer << submit_tag(I18n.t("site.richtext_area.preview"), :id => "#{id}_dopreview", :class => "richtext_dopreview deemphasize")
-        end
-      end
-    end
-  end
-
   def dir
     if dir = params[:dir]
       dir == "rtl" ? "rtl" : "ltr"
diff --git a/app/views/site/_html_help.erb b/app/views/site/_html_help.erb
deleted file mode 100644
index e69de29bb..000000000
diff --git a/app/views/site/_markdown_help.html.erb b/app/views/site/_markdown_help.html.erb
deleted file mode 100644
index 7dbadefe9..000000000
--- a/app/views/site/_markdown_help.html.erb
+++ /dev/null
@@ -1,26 +0,0 @@
-<h4 class='heading'><%= t ".title_html" %></h4>
-<ul class='list-unstyled'>
-  <li>
-    <h4><%= t ".headings" %></h4>
-    <p># <%= t ".heading" %><br>
-       ## <%= t ".subheading" %></p>
-  </li>
-  <li>
-    <h4><%= t ".unordered" %></h4>
-    <p>* <%= t ".first" %><br>
-       * <%= t ".second" %></p>
-  </li>
-  <li>
-    <h4><%= t ".ordered" %></h4>
-    <p>1. <%= t ".first" %><br>
-       2. <%= t ".second" %></p>
-  </li>
-  <li>
-    <h4><%= t ".link" %></h4>
-    <span>[<%= t ".text" %>](<%= t ".url" %>)</span>
-  </li>
-  <li>
-    <h4><%= t ".image" %></h4>
-    <span>![<%= t ".alt" %>](<%= t ".url" %>)</span>
-  </li>
-</ul>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 298369c22..f7ee6d04a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1995,23 +1995,6 @@ en:
           bicycle_shop: "Bicycle shop"
           bicycle_parking: "Bicycle parking"
           toilets: "Toilets"
-    richtext_area:
-      edit: Edit
-      preview: Preview
-    markdown_help:
-      title_html: Parsed with <a href="https://kramdown.gettalong.org/quickref.html">kramdown</a>
-      headings: Headings
-      heading: Heading
-      subheading: Subheading
-      unordered: Unordered list
-      ordered: Ordered list
-      first: First item
-      second: Second item
-      link: Link
-      text: Text
-      image: Image
-      alt: Alt text
-      url: URL
     welcome:
       title: Welcome!
       introduction_html: |
diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb
index fe4587b87..90fbaebc2 100644
--- a/test/helpers/application_helper_test.rb
+++ b/test/helpers/application_helper_test.rb
@@ -47,11 +47,6 @@ class ApplicationHelperTest < ActionView::TestCase
     assert_dom_equal "<a class=\"rsssmall\" href=\"/history/feed\"><img border=\"0\" height=\"16\" src=\"/images/RSS.png\" width=\"16\" /></a>", link
   end
 
-  def test_richtext_area
-    html = richtext_area(:message, :body, :cols => 40, :rows => 20)
-    assert_not_nil html
-  end
-
   def test_dir
     assert_equal "ltr", dir
 
-- 
2.45.1