From: marc tobias <mtmail@gmx.net>
Date: Tue, 7 Jul 2020 12:26:53 +0000 (+0200)
Subject: new context.bSearchRan because handlebar makes it hard inspecting undefined vs empty
X-Git-Url: https://git.openstreetmap.org./nominatim-ui.git/commitdiff_plain/3373f462f0d499d1c836c1f95d756191725bf108?ds=sidebyside

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

diff --git a/dist/assets/js/nominatim-ui.js b/dist/assets/js/nominatim-ui.js
index 87776c4..c3ffd1b 100644
--- a/dist/assets/js/nominatim-ui.js
+++ b/dist/assets/js/nominatim-ui.js
@@ -599,6 +599,7 @@ function search_page_load() {
           aPlace = null;
         }
 
+        context.bSearchRan = true;
         context.aPlace = aPlace;
 
         render_template($('main'), 'reversepage-template', context);
@@ -666,6 +667,7 @@ function search_page_load() {
 
       fetch_from_api('search', api_request_params, function (aResults) {
 
+        context.bSearchRan = true;
         context.aSearchResults = aResults;
 
         if (aResults.length >= 10) {
@@ -789,7 +791,7 @@ jQuery(document).ready(function () {
     url_params.forEach(function (value, key) {
       if (value === '') to_delete.push(key);
     });
-    for (var i=0; i<to_delete.length; i++) {
+    for (var i = 0; i < to_delete.length; i += 1) {
       url_params.delete(to_delete[i]);
     }
     return url_params.toString();
diff --git a/dist/deletable.html b/dist/deletable.html
index aba9dbb..1b80968 100644
--- a/dist/deletable.html
+++ b/dist/deletable.html
@@ -199,7 +199,7 @@
 
 <div id="content">
 
-  {{#if sQuery}}
+  {{#if bSearchRan}}
     <div id="searchresults" class="sidebar">
       {{#each aSearchResults as |aResult|}}
         {{>partial_one_result iResNum=@index aResult=aResult env=env}}
diff --git a/dist/details.html b/dist/details.html
index aba9dbb..1b80968 100644
--- a/dist/details.html
+++ b/dist/details.html
@@ -199,7 +199,7 @@
 
 <div id="content">
 
-  {{#if sQuery}}
+  {{#if bSearchRan}}
     <div id="searchresults" class="sidebar">
       {{#each aSearchResults as |aResult|}}
         {{>partial_one_result iResNum=@index aResult=aResult env=env}}
diff --git a/dist/polygons.html b/dist/polygons.html
index aba9dbb..1b80968 100644
--- a/dist/polygons.html
+++ b/dist/polygons.html
@@ -199,7 +199,7 @@
 
 <div id="content">
 
-  {{#if sQuery}}
+  {{#if bSearchRan}}
     <div id="searchresults" class="sidebar">
       {{#each aSearchResults as |aResult|}}
         {{>partial_one_result iResNum=@index aResult=aResult env=env}}
diff --git a/dist/reverse.html b/dist/reverse.html
index aba9dbb..1b80968 100644
--- a/dist/reverse.html
+++ b/dist/reverse.html
@@ -199,7 +199,7 @@
 
 <div id="content">
 
-  {{#if sQuery}}
+  {{#if bSearchRan}}
     <div id="searchresults" class="sidebar">
       {{#each aSearchResults as |aResult|}}
         {{>partial_one_result iResNum=@index aResult=aResult env=env}}
diff --git a/dist/search.html b/dist/search.html
index aba9dbb..1b80968 100644
--- a/dist/search.html
+++ b/dist/search.html
@@ -199,7 +199,7 @@
 
 <div id="content">
 
-  {{#if sQuery}}
+  {{#if bSearchRan}}
     <div id="searchresults" class="sidebar">
       {{#each aSearchResults as |aResult|}}
         {{>partial_one_result iResNum=@index aResult=aResult env=env}}
diff --git a/src/assets/js/controller.js b/src/assets/js/controller.js
index e7f010c..2babae4 100644
--- a/src/assets/js/controller.js
+++ b/src/assets/js/controller.js
@@ -37,7 +37,7 @@ jQuery(document).ready(function () {
     url_params.forEach(function (value, key) {
       if (value === '') to_delete.push(key);
     });
-    for (var i=0; i<to_delete.length; i++) {
+    for (var i = 0; i < to_delete.length; i += 1) {
       url_params.delete(to_delete[i]);
     }
     return url_params.toString();
diff --git a/src/assets/js/searchpage.js b/src/assets/js/searchpage.js
index f53dfd4..0aeab64 100755
--- a/src/assets/js/searchpage.js
+++ b/src/assets/js/searchpage.js
@@ -339,6 +339,7 @@ function search_page_load() {
           aPlace = null;
         }
 
+        context.bSearchRan = true;
         context.aPlace = aPlace;
 
         render_template($('main'), 'reversepage-template', context);
@@ -406,6 +407,7 @@ function search_page_load() {
 
       fetch_from_api('search', api_request_params, function (aResults) {
 
+        context.bSearchRan = true;
         context.aSearchResults = aResults;
 
         if (aResults.length >= 10) {
diff --git a/src/templates/searchpage.hbs b/src/templates/searchpage.hbs
index ce2fc47..65cfa28 100644
--- a/src/templates/searchpage.hbs
+++ b/src/templates/searchpage.hbs
@@ -81,7 +81,7 @@
 
 <div id="content">
 
-  {{#if sQuery}}
+  {{#if bSearchRan}}
     <div id="searchresults" class="sidebar">
       {{#each aSearchResults as |aResult|}}
         {{>partial_one_result iResNum=@index aResult=aResult env=env}}