diff --git a/app/assets/javascripts/application.js.erb b/app/assets/javascripts/application.js.erb index f9a18432f..9cb8c9a80 100644 --- a/app/assets/javascripts/application.js.erb +++ b/app/assets/javascripts/application.js.erb @@ -230,7 +230,7 @@ var HelperModule = (function(){ return helpers; })(); -// initialize code markup in step descriptions and text results +// initialize code markup in rich text fields (function() { $(document).ready(function() { $('pre code [class^=language]').each(function(i, block) { diff --git a/app/assets/javascripts/my_modules/results.js.erb b/app/assets/javascripts/my_modules/results.js.erb index 63101f9fa..774466a91 100644 --- a/app/assets/javascripts/my_modules/results.js.erb +++ b/app/assets/javascripts/my_modules/results.js.erb @@ -183,7 +183,7 @@ function processResult(ev, resultTypeEnum, editMode, forS3) { var $nameInput = $form.find("#result_name"); var nameValid = textValidator(ev, $nameInput, 0, <%= Constants::NAME_MAX_LENGTH %>); - var $textInput = TinyMCE.getContent();// $form.find("#result_result_text_attributes_text"); + var $textInput = TinyMCE.getContent(); textValidator(ev, $textInput, 1, <%= Constants::TEXT_MAX_LENGTH %>, false, true); break; case ResultTypeEnum.COMMENT: diff --git a/app/views/result_texts/_edit.html.erb b/app/views/result_texts/_edit.html.erb index bbbf4f550..01585ec85 100644 --- a/app/views/result_texts/_edit.html.erb +++ b/app/views/result_texts/_edit.html.erb @@ -4,7 +4,6 @@ <%= f.fields_for :result_text do |ff| %>
<%= ff.tiny_mce_editor(:text, value: @result.result_text.text) %> - <%#= ff.text_area(:text, class: 'tinymce', cols: 120, rows: 40, value: @result.result_text.text ) %>
<% end %>
<%= f.submit t("result_texts.edit.update"), class: 'btn btn-primary save-result', onclick: "processResult(event, ResultTypeEnum.TEXT, true);" %> diff --git a/app/views/result_texts/_new.html.erb b/app/views/result_texts/_new.html.erb index ede7ac574..5ea696def 100644 --- a/app/views/result_texts/_new.html.erb +++ b/app/views/result_texts/_new.html.erb @@ -4,7 +4,6 @@ <%= f.fields_for :result_text do |ff| %>
<%= ff.tiny_mce_editor(:text) %> - <%#= ff.text_area(:text, class: 'tinymce', cols: 120, rows: 40) %>
<% end %>
<%= f.submit t("result_texts.new.create"), class: 'btn btn-primary save-result', onclick: "processResult(event, ResultTypeEnum.TEXT, false);" %>