litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-1024 Fixed error in clearFields() method of customFormUtils from last commit: field val was not being cleared. When type selection changes, prevent emptying of acSelector field if a new type value has been entered manually.

Browse source
This commit is contained in:
rjy7 2010-09-03 20:18:37 +00:00
parent 243073d7a2
commit ddaa72d639
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
productMods/edit/forms/js/customFormWithAutocomplete.js
View file

@ -179,14 +179,18 @@ var customForm = {
this.typeSelector.change(function() {
var typeVal = $(this).val();
// If an autocomplete selection has been made, undo it
customForm.undoAutocompleteSelection();
// If no selection, go back to type view. This prevents problems like trying to run autocomplete
// or submitting form without a type selection. Exceptions: (1) a one-step form; (2) a two-step
// form in repair mode, so we don't lose the other data in the form.
(typeVal.length || customForm.formSteps === 1) ? customForm.initFormFullView() : customForm.initFormTypeView();
// If an autocomplete selection has been made, undo it.
// The test is not just for efficiency: undoAutocompleteSelection empties the acSelector value,
// which we don't want to do if user has manually entered a value, since he may intend to
// change the type but keep the value. If no new value has been selected, form initialization
// below will correctly empty the value anyway.
if (!customForm.acSelection.is(':hidden')) {
customForm.undoAutocompleteSelection();
}
// Reinitialize view. If no type selection in a two-step form, go back to type view;
// otherwise, reinitialize full view.
(!typeVal.length && customForm.formSteps > 1) ? customForm.initFormTypeView() : customForm.initFormFullView();
});
this.verifyMatch.click(function() {
@ -329,7 +333,7 @@ var customForm = {
this.acSelection.show();
this.acUriReceiver.val(uri);
this.acSelector.val(label);
this.acSelector.val(label);
this.acSelectionInfo.html(label);
this.verifyMatch.attr('href', this.verifyMatchBaseHref + uri);