scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-07 23:44:55 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #787 from mlorb/ml-sci-1561

Browse source 
Fix bug with tinyMCE text validaton [SCI-1561]
This commit is contained in:
mlorb 2017-10-05 08:39:22 +02:00 committed by GitHub
commit 91e2a6bab2
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/assets/javascripts/my_modules/results.js.erb
View file

@ -166,8 +166,9 @@
var $nameInput = $form.find('#result_name'); var $nameInput = $form.find('#result_name');
var nameValid = textValidator(ev, $nameInput, 0, var nameValid = textValidator(ev, $nameInput, 0,
<%= Constants::NAME_MAX_LENGTH %>); <%= Constants::NAME_MAX_LENGTH %>);
var $textInput = TinyMCE.getContent(); var $descrTextarea = $form.find("#result_result_text_attributes_text");
textValidator(ev, $textInput, 1, <%= Constants::TEXT_MAX_LENGTH %>, false, true); var $tinyMCEInput = TinyMCE.getContent();
textValidator(ev, $descrTextarea, 1, <%= Constants::TEXT_MAX_LENGTH %>, false, $tinyMCEInput);
break; break;
case ResultTypeEnum.COMMENT: case ResultTypeEnum.COMMENT:
var $commentInput = $form.find('#comment_message'); var $commentInput = $form.find('#comment_message');

3
app/assets/javascripts/protocols/steps.js.erb
View file

@ -540,8 +540,9 @@
var nameValid = textValidator(ev, $nameInput, 1, var nameValid = textValidator(ev, $nameInput, 1,
<%= Constants::NAME_MAX_LENGTH %>); <%= Constants::NAME_MAX_LENGTH %>);
var $descrTextarea = $form.find("#step_description"); var $descrTextarea = $form.find("#step_description");
var $tinyMCEInput = TinyMCE.getContent();
var descriptionValid = textValidator(ev, $descrTextarea, 0, var descriptionValid = textValidator(ev, $descrTextarea, 0,
<%= Constants::TEXT_MAX_LENGTH %>); <%= Constants::TEXT_MAX_LENGTH %>, false, $tinyMCEInput);
if (DragNDropSteps.filesStatus() && if (DragNDropSteps.filesStatus() &&
checklistsValid && checklistsValid &&

6
app/assets/javascripts/sitewide/form_validators.js.erb
View file

@ -22,11 +22,11 @@ $.fn.onSubmitValidator = function(validatorCb) {
* @param {boolean} clearErr Set clearErr to true if this is the only * @param {boolean} clearErr Set clearErr to true if this is the only
* error that can happen/show. * 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; clearErr = _.isUndefined(clearErr) ? false : clearErr;
if(tinyMCE){ if(tinyMCEInput){
var text = textInput.length; var text = tinyMCEInput;
} else { } else {
var text = $(textInput).val().trim(); var text = $(textInput).val().trim();
$(textInput).val(text); $(textInput).val(text);