Merged V3.2 to HEAD

18484: Merged DEV-TEMPORARY to V3.2 
                  18478: XForms errors - ACT 15969

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18485 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2010-02-05 21:02:51 +00:00
parent 6989a3fcb3
commit 7cbb3a0daf
2 changed files with 92 additions and 61 deletions

View File

@@ -1578,9 +1578,9 @@ alfresco.xforms.ComboboxSelect1 = alfresco.xforms.AbstractSelectWidget.extend({
this.widget = this.domNode;
for (var i = 0; i < values.length; i++)
{
if (initial_value && !values[i].valid)
if (!values[i].valid)
{
// skip the invalid value if we have a default value
// always skip the invalid values for combos
continue;
}
var option = new Element("option");