new context.bSearchRan because handlebar makes it hard inspecting undefined vs empty

[nominatim-ui.git] / src / assets / js / searchpage.js

diff --git a/src/assets/js/searchpage.js b/src/assets/js/searchpage.js
index a315338d989db38139f7779127b7fb8bf2416422..0aeab64a90c3234140c7b76777e429c1be0e61ba 100755 (executable)
--- a/src/assets/js/searchpage.js
+++ b/src/assets/js/searchpage.js
@@ -292,12 +292,9 @@ function init_map_on_search_page(is_reverse_search, nominatim_results, request_l
 
 
 
 
 
 

+function search_page_load() {

 
 

-jQuery(document).ready(function () {
-  //
-  if (!$('#search-page,#reverse-page').length) { return; }
-
-  var is_reverse_search = !!($('#reverse-page').length);
+  var is_reverse_search = window.location.pathname.match(/reverse/);

 
   var search_params = new URLSearchParams(window.location.search);
 
 
   var search_params = new URLSearchParams(window.location.search);
 


@@ -342,6 +339,7 @@ jQuery(document).ready(function () {
           aPlace = null;
         }
 
           aPlace = null;
         }
 

+        context.bSearchRan = true;

         context.aPlace = aPlace;
 
         render_template($('main'), 'reversepage-template', context);
         context.aPlace = aPlace;
 
         render_template($('main'), 'reversepage-template', context);


@@ -409,12 +407,13 @@ jQuery(document).ready(function () {
 
       fetch_from_api('search', api_request_params, function (aResults) {
 
 
       fetch_from_api('search', api_request_params, function (aResults) {
 

+        context.bSearchRan = true;

         context.aSearchResults = aResults;
 
         if (aResults.length >= 10) {
           var aExcludePlaceIds = [];
           if (search_params.has('exclude_place_ids')) {
         context.aSearchResults = aResults;
 
         if (aResults.length >= 10) {
           var aExcludePlaceIds = [];
           if (search_params.has('exclude_place_ids')) {

-            aExcludePlaceIds.search_params.get('exclude_place_ids').split(',');
+            aExcludePlaceIds = search_params.get('exclude_place_ids').split(',');

           }
           for (var i = 0; i < aResults.length; i += 1) {
             aExcludePlaceIds.push(aResults[i].place_id);
           }
           for (var i = 0; i < aResults.length; i += 1) {
             aExcludePlaceIds.push(aResults[i].place_id);


@@ -452,4 +451,6 @@ jQuery(document).ready(function () {
       );
     }
   }
       );
     }
   }

-});
+}
+
+