Prevent searching if country value is empty

Simple defensive coding for now
experiandataquality · Sep 15, 2015 · d910073 · d910073
1 parent 1dd0589
commit d910073
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/demo.html b/demo.html
@@ -7,7 +7,8 @@
 		<form>
 			<label for="country">Country</label>
 			<select name="country">
-				<option value="gbr">UK</option>
+				<option value="">Please select</option>
+				<option value="gbr" selected>UK</option>
 				<option value="usa">USA</option>
 			</select>
 

diff --git a/src/js/contact-data-services.js b/src/js/contact-data-services.js
@@ -90,8 +90,12 @@ var contactDataServices = {
 			}
 		},
 		canSearch: function(){
-			// If search term is not empty and not the same as previous search term
-			return (contactDataServices.address.currentSearchTerm !== "" && contactDataServices.address.lastSearchTerm !== contactDataServices.address.currentSearchTerm);
+					// If search term is not empty and
+			return (contactDataServices.address.currentSearchTerm !== "" && 
+					// If search term is not the same as previous search term and
+					contactDataServices.address.lastSearchTerm !== contactDataServices.address.currentSearchTerm &&
+					// If the country is not empty
+					contactDataServices.address.countryList.value !== "");
 		},
 		// Bind a list of countries. Using either a user-defined list or creating a new one.
 		setCountryList: function(){