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

NIHVIVO-1110 Fix cancel button after validation errors on all custom form types

Browse source
This commit is contained in:
rjy7 2010-09-03 21:50:27 +00:00
parent 6f2dcba70d
commit 2a2d87006b
1 changed files with 19 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -158,15 +158,6 @@ var customForm = {
if (uri) { if (uri) {
this.showAutocompleteSelection(label, uri); this.showAutocompleteSelection(label, uri);
} }
this.cancel.unbind('click');
this.cancel.click(function() {
// Cancel back to full view with only type selection showing
customForm.undoAutocompleteSelection();
customForm.clearFields(customForm.fullViewOnly);
customForm.initFormFullView();
return false;
});
}, },
@ -178,14 +169,8 @@ var customForm = {
var typeVal = $(this).val(); var typeVal = $(this).val();
// If an autocomplete selection has been made, undo it. // If an autocomplete selection has been made, undo it.
// The test is not just for efficiency: undoAutocompleteSelection empties the acSelector value, customForm.undoAutocompleteSelection();
// 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; // Reinitialize view. If no type selection in a two-step form, go back to type view;
// otherwise, reinitialize full view. // otherwise, reinitialize full view.
(!typeVal.length && customForm.formSteps > 1) ? customForm.initFormTypeView() : customForm.initFormFullView(); (!typeVal.length && customForm.formSteps > 1) ? customForm.initFormTypeView() : customForm.initFormFullView();
@ -356,18 +341,23 @@ var customForm = {
// Cancel action after making an autocomplete selection: undo autocomplete // Cancel action after making an autocomplete selection: undo autocomplete
// selection (from showAutocomplete) before returning to full view. // selection (from showAutocomplete) before returning to full view.
undoAutocompleteSelection: function() { undoAutocompleteSelection: function() {
this.acSelectorWrapper.show(); // The test is not just for efficiency: undoAutocompleteSelection empties the acSelector value,
this.hideFields(this.acSelection); // which we don't want to do if user has manually entered a value, since he may intend to
this.acSelector.val(''); // change the type but keep the value. If no new value has been selected, form initialization
this.acUriReceiver.val(''); // below will correctly empty the value anyway.
this.acSelectionInfo.html(''); if (!this.acSelection.is(':hidden')) {
this.verifyMatch.attr('href', this.verifyMatch.data('baseHref')); this.acSelectorWrapper.show();
this.hideFields(this.acSelection);
if (this.formSteps > 1) { this.acSelector.val('');
this.acSelection.find('label').html('Selected '); this.acUriReceiver.val('');
} this.acSelectionInfo.html('');
this.verifyMatch.attr('href', this.verifyMatch.data('baseHref'));
if (this.formSteps > 1) {
this.acSelection.find('label').html('Selected ');
}
}
}, },
// Set type uri for autocomplete, and type name for labels and button text. // Set type uri for autocomplete, and type name for labels and button text.