summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2023-11-21 01:03:43 +0000
committerGo MAEDA <maeda@farend.jp>2023-11-21 01:03:43 +0000
commitf5d68651a06abf004552654dfdcd9c41f57ffb05 (patch)
treeb75c64bacd42b9e126e7796b563410a48619c219
parent9e07e16bf1a31cff7aba0883bde2af7a6482a329 (diff)
downloadredmine-f5d68651a06abf004552654dfdcd9c41f57ffb05.tar.gz
redmine-f5d68651a06abf004552654dfdcd9c41f57ffb05.zip
Add data-text-formatting attribute for selected markup language to body tag (#20620).
Patch by Go MAEDA. git-svn-id: https://svn.redmine.org/redmine/trunk@22472 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/views/layouts/base.html.erb2
-rw-r--r--test/functional/welcome_controller_test.rb10
2 files changed, 11 insertions, 1 deletions
diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb
index bcd6622a7..16a640267 100644
--- a/app/views/layouts/base.html.erb
+++ b/app/views/layouts/base.html.erb
@@ -17,7 +17,7 @@
<!-- page specific tags -->
<%= yield :header_tags -%>
</head>
-<body class="<%= body_css_classes %>">
+<body class="<%= body_css_classes %>" data-text-formatting="<%= Setting.text_formatting %>">
<%= call_hook :view_layouts_base_body_top %>
<div id="wrapper">
diff --git a/test/functional/welcome_controller_test.rb b/test/functional/welcome_controller_test.rb
index 45cbc08ae..d7c6741c9 100644
--- a/test/functional/welcome_controller_test.rb
+++ b/test/functional/welcome_controller_test.rb
@@ -117,6 +117,16 @@ class WelcomeControllerTest < Redmine::ControllerTest
assert_select 'body.textarea-proportional'
end
+ def test_data_text_setting_attribute
+ formats = %w(textile common_mark)
+ formats.each do |format|
+ with_settings text_formatting: format do
+ get :index
+ assert_select 'body[data-text-formatting=?]', format
+ end
+ end
+ end
+
def test_logout_link_should_post
@request.session[:user_id] = 2