diff options
Diffstat (limited to 'www/js/views/search.js')
| -rw-r--r-- | www/js/views/search.js | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/www/js/views/search.js b/www/js/views/search.js index 0cf1de2..9e0a4ca 100644 --- a/www/js/views/search.js +++ b/www/js/views/search.js @@ -5,9 +5,9 @@ id: 'search-page', events: { - 'click a.address': 'goAddress', - 'click #submit': 'search', - 'click #locate': 'goLocate', + 'vclick a.address': 'goAddress', + 'vclick #submit': 'search', + 'vclick #locate': 'goLocate', 'pagehide': 'destroy', 'pagebeforeshow': 'beforeDisplay', 'pageshow': 'afterDisplay', @@ -23,6 +23,7 @@ search: function(e) { // this is to stop form submission e.preventDefault(); + this.clearValidationErrors(); var pc = this.$('#pc').val(); this.listenTo(FMS.locator, 'search_located', this.searchSuccess ); this.listenTo(FMS.locator, 'search_failed', this.searchFail); @@ -51,7 +52,7 @@ $('#submit').focus(); this.stopListening(FMS.locator); if ( details.msg ) { - this.displayError( details.msg ); + this.validationError( 'pc', details.msg ); } else if ( details.locations ) { var multiple = ''; for ( var i = 0; i < details.locations.length; i++ ) { @@ -59,9 +60,9 @@ var li = '<li><a class="address" id="location_' + i + '" data-lat="' + loc.lat + '" data-long="' + loc.long + '">' + loc.address + '</a></li>'; multiple = multiple + li; } - $('#front-howto').html('<ul>' + multiple + '</ul>'); + $('#front-howto').html('<p>Multiple matches found</p><ul>' + multiple + '</ul>'); } else { - this.displayError( FMS.strings.location_problem ); + this.validationError( 'pc', FMS.strings.location_problem ); } }, |