diff --git a/app/assets/javascripts/my_modules/results.js.erb b/app/assets/javascripts/my_modules/results.js.erb index 079815e61..b56218e41 100644 --- a/app/assets/javascripts/my_modules/results.js.erb +++ b/app/assets/javascripts/my_modules/results.js.erb @@ -166,8 +166,9 @@ var $nameInput = $form.find('#result_name'); var nameValid = textValidator(ev, $nameInput, 0, <%= Constants::NAME_MAX_LENGTH %>); - var $textInput = TinyMCE.getContent(); - textValidator(ev, $textInput, 1, <%= Constants::TEXT_MAX_LENGTH %>, false, true); + var $descrTextarea = $form.find("#result_result_text_attributes_text"); + var $tinyMCEInput = TinyMCE.getContent(); + textValidator(ev, $descrTextarea, 1, <%= Constants::TEXT_MAX_LENGTH %>, false, $tinyMCEInput); break; case ResultTypeEnum.COMMENT: var $commentInput = $form.find('#comment_message'); diff --git a/app/assets/javascripts/protocols/steps.js.erb b/app/assets/javascripts/protocols/steps.js.erb index 3458fecb2..93ca6d6b2 100644 --- a/app/assets/javascripts/protocols/steps.js.erb +++ b/app/assets/javascripts/protocols/steps.js.erb @@ -540,8 +540,9 @@ var nameValid = textValidator(ev, $nameInput, 1, <%= Constants::NAME_MAX_LENGTH %>); var $descrTextarea = $form.find("#step_description"); + var $tinyMCEInput = TinyMCE.getContent(); var descriptionValid = textValidator(ev, $descrTextarea, 0, - <%= Constants::TEXT_MAX_LENGTH %>); + <%= Constants::TEXT_MAX_LENGTH %>, false, $tinyMCEInput); if (DragNDropSteps.filesStatus() && checklistsValid && diff --git a/app/assets/javascripts/sitewide/form_validators.js.erb b/app/assets/javascripts/sitewide/form_validators.js.erb index 323457e5d..aca5ef0f3 100644 --- a/app/assets/javascripts/sitewide/form_validators.js.erb +++ b/app/assets/javascripts/sitewide/form_validators.js.erb @@ -22,11 +22,11 @@ $.fn.onSubmitValidator = function(validatorCb) { * @param {boolean} clearErr Set clearErr to true if this is the only * error that can happen/show. */ -function textValidator(ev, textInput, textLimitMin, textLimitMax, clearErr, tinyMCE) { +function textValidator(ev, textInput, textLimitMin, textLimitMax, clearErr, tinyMCEInput) { clearErr = _.isUndefined(clearErr) ? false : clearErr; - if(tinyMCE){ - var text = textInput.length; + if(tinyMCEInput){ + var text = tinyMCEInput; } else { var text = $(textInput).val().trim(); $(textInput).val(text);