2 files changed, 8 insertions, 14 deletions
diff --git a/chimere/static/chimere/js/search-autocomplete.js b/chimere/static/chimere/js/search-autocomplete.js
index cd1b0e1..ea7531d 100644
--- a/chimere/static/chimere/js/search-autocomplete.js
+++ b/chimere/static/chimere/js/search-autocomplete.js
@@ -1,6 +1,4 @@
 
-var no_result_message = "No exact match.";
-
 var Autocomplete = function(options) {
   this.form_selector = options.form_selector;
   this.url = options.url || '/search/autocomplete/';
@@ -47,7 +45,11 @@ Autocomplete.prototype.fetch = function(query) {
     url: this.url,
     data: { 'q': query },
     success: function(data) {
-      self.show_results(data);
+      if(data.results.length){
+        self.show_results(data);
+      } else {
+        $('.ac-results').remove();
+      }
     }
   })
 }
@@ -60,17 +62,10 @@ Autocomplete.prototype.show_results = function(data) {
   var results_wrapper = $('<div class="ac-results"></div>');
   var base_elem = $('<div class="result-wrapper"><a href="#" class="ac-result"></a></div>');
 
-  if(results.length > 0) {
-    for(var res_offset in results) {
-      var elem = base_elem.clone();
-      // don't use .html(...) here, as it opens to XSS.
-      elem.find('.ac-result').text(results[res_offset]);
-      results_wrapper.append(elem);
-    }
-  }
-  else {
+  for(var res_offset in results) {
     var elem = base_elem.clone();
-    elem.text(no_result_message);
+    // don't use .html(...) here, as it opens to XSS.
+    elem.find('.ac-result').text(results[res_offset]);
     results_wrapper.append(elem);
   }
 
diff --git a/chimere/templates/search/search.html b/chimere/templates/search/search.html
index b40359a..d5a0579 100644
--- a/chimere/templates/search/search.html
+++ b/chimere/templates/search/search.html
@@ -38,7 +38,6 @@ for (idx=0 ; idx < geo_objects.length ; idx++){
 </form>
 <div id='search-result'></div>
 <script type='text/javascript'>
-no_result_message = "{% trans 'No exact match.' %}";
 $(function(){
     $('#haystack-search').click(
         function(evt){