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

updates for autocomplete

Browse source
This commit is contained in:
hjkhjk54 2011-12-07 15:32:16 +00:00
parent eb73a306cb
commit 1982bda0ee
2 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -107,7 +107,7 @@ var customForm = {
} }
else if (this.findValidationErrors()) { else if (this.findValidationErrors()) {
this.initFormWithValidationErrors(); this.initFormWithValidationErrors();
} else if(this.supportEdit && this.editMode == 'edit') { } else if(this.supportEdit) {
this.initFormWithSupportEdit(); this.initFormWithSupportEdit();
} }
// If type is already selected when the page loads (Firefox retains value // If type is already selected when the page loads (Firefox retains value
@ -176,11 +176,15 @@ var customForm = {
}, },
initFormWithSupportEdit: function() { initFormWithSupportEdit: function() {
this.initFormWithValidationErrors(); if(this.editMode == 'edit') {
//Hide verify match when edit mode this.initFormWithValidationErrors();
this.verifyMatch.hide(); //Hide verify match when edit mode
this.verifyMatch.hide();
} else {
this.initFormFullView();
}
//Disable submit button until selection made //Disable submit button until selection made
this.button.attr('disabled', true); this.button.attr('disabled', 'disabled');
}, },
// Bind event listeners that persist over the life of the page. Event listeners // Bind event listeners that persist over the life of the page. Event listeners
@ -407,7 +411,7 @@ var customForm = {
//Resetting so disable submit button again for object property autocomplete //Resetting so disable submit button again for object property autocomplete
if(this.supportEdit) { if(this.supportEdit) {
this.button.attr('disabled', true); //this.button.attr('disabled', 'disabled');
} }
} }

3
productMods/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl
View file

@ -58,7 +58,8 @@
<p> <p>
<input type="submit" id="submit" value="${editConfiguration.submitLabel}" role="button "/> <input type="submit" id="submit" value="${editConfiguration.submitLabel}" role="button" disabled="disabled"/>
<span class="or"> or </span> <span class="or"> or </span>
<a title="Cancel" class="cancel" href="${cancelUrl}">Cancel</a> <a title="Cancel" class="cancel" href="${cancelUrl}">Cancel</a>
</p> </p>