diff --git a/lib/assets/javascripts/dmproadmap/forms.js b/lib/assets/javascripts/dmproadmap/forms.js index d8f23a5..0b07e36 100644 --- a/lib/assets/javascripts/dmproadmap/forms.js +++ b/lib/assets/javascripts/dmproadmap/forms.js @@ -72,3 +72,29 @@ return __('Invalid email address'); } } + +// --------------------------------------------------------------------------- +function toggleFormElementError(input, errorMessage, blankAsError){ + //Check if element is a auto complete combobox + if ($(input).attr('data-combobox-prefix-class') === 'combobox'){ + idbox = '#' + $(input).attr('id').replace('_name', '_id'); + }else{ + idbox = input; + } + var err = $(idbox).siblings("span.error-tooltip"); + if(err.length <= 0){ + err = $(idbox).siblings("span.error-tooltip-right"); + } + console.log(err.length + ' - ' + errorMessage + ' - ' + $(input).val().trim().length); + + // If an error element is available and the error message is not empty and the field + // is not empty (unless its a required field!) + if(err.length > 0 && (errorMessage === '' || (!blankAsError && $(input).val().trim().length <= 0))){ + err.html('').attr('role', '').css('display', 'none'); + $(input).removeClass('red-border'); + }else{ + err.html(errorMessage).attr('role', 'alert').css('display', 'inline'); + $(input).addClass('red-border'); + } +} + diff --git a/lib/assets/javascripts/dmproadmap/utils.js b/lib/assets/javascripts/dmproadmap/utils.js index ba67bc5..88a87d1 100644 --- a/lib/assets/javascripts/dmproadmap/utils.js +++ b/lib/assets/javascripts/dmproadmap/utils.js @@ -47,26 +47,3 @@ }); }); -function toggleFormElementError(input, errorMessage, blankAsError){ - //Check if element is a auto complete combobox - if ($(input).attr('data-combobox-prefix-class') === 'combobox'){ - idbox = '#' + $(input).attr('id').replace('_name', '_id'); - }else{ - idbox = input; - } - var err = $(idbox).siblings("span.error-tooltip"); - if(err.length <= 0){ - err = $(idbox).siblings("span.error-tooltip-right"); - } - console.log(err.length + ' - ' + errorMessage + ' - ' + $(input).val().trim().length); - - // If an error element is available and the error message is not empty and the field - // is not empty (unless its a required field!) - if(err.length > 0 && (errorMessage === '' || (!blankAsError && $(input).val().trim().length <= 0))){ - err.html('').attr('role', '').css('display', 'none'); - $(input).removeClass('red-border'); - }else{ - err.html(errorMessage).attr('role', 'alert').css('display', 'inline'); - $(input).addClass('red-border'); - } -}