CC-4481: Library -> Advanced Search -> Validation icon does not show up sometimes

-fixed
This commit is contained in:
denise 2012-09-19 12:41:54 -04:00
parent dc95ab1d00
commit 81620d4f94
1 changed files with 5 additions and 7 deletions

View File

@ -38,6 +38,7 @@ var AIRTIME = (function(AIRTIME) {
"track_num" : "n", "track_num" : "n",
"year" : "n", "year" : "n",
"owner_id" : "s", "owner_id" : "s",
"info_url" : "s",
"replay_gain" : "n" "replay_gain" : "n"
}; };
@ -1041,6 +1042,7 @@ function addQtipToSCIcons(){
*/ */
function validateAdvancedSearch(divs) { function validateAdvancedSearch(divs) {
var valid = true, var valid = true,
allValid = true,
fieldName, fieldName,
fields, fields,
searchTerm = Array(), searchTerm = Array(),
@ -1053,7 +1055,6 @@ function validateAdvancedSearch(divs) {
searchTerm[0] = ""; searchTerm[0] = "";
searchTerm[1] = ""; searchTerm[1] = "";
$.each(divs, function(i, div){ $.each(divs, function(i, div){
fieldName = $(div).children(':nth-child(2)').attr('id'); fieldName = $(div).children(':nth-child(2)').attr('id');
fields = $(div).children().find('input'); fields = $(div).children().find('input');
@ -1085,6 +1086,7 @@ function validateAdvancedSearch(divs) {
//string fields do not need validation //string fields do not need validation
if (searchTermType !== "s") { if (searchTermType !== "s") {
valid = regExpr.test(searchTerm[i]); valid = regExpr.test(searchTerm[i]);
if (!valid) allValid = false;
} }
addRemoveValidationIcons(valid, $(field)); addRemoveValidationIcons(valid, $(field));
@ -1107,13 +1109,9 @@ function validateAdvancedSearch(divs) {
return false; return false;
} }
}); });
if (!valid) {
return false;
}
}); });
return valid; return allValid;
} }
function addRemoveValidationIcons(valid, field) { function addRemoveValidationIcons(valid, field) {