From aea9d7db5de2a13e7b5b3de44c8c5cc1918166f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Sat, 6 Apr 2019 22:19:03 +0200
Subject: [PATCH] search: simplify generated javascript (#18921)

---
 .../search/templates/combo/search-cell.html   | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/combo/apps/search/templates/combo/search-cell.html b/combo/apps/search/templates/combo/search-cell.html
index a26744d5..80374605 100644
--- a/combo/apps/search/templates/combo/search-cell.html
+++ b/combo/apps/search/templates/combo/search-cell.html
@@ -12,45 +12,45 @@
 
 <script>
 $(function() {
-  var combo_search_timeout_{{ cell.pk }};
-  var combo_search_form_{{ cell.pk }} = $('#combo-search-form-{{ cell.pk }}');
-  var combo_search_input_{{ cell.pk }} = $('#combo-search-input-{{ cell.pk }}');
+  var timeout;
+  var $form = $('#combo-search-form-{{ cell.pk }}');
+  var $input = $('#combo-search-input-{{ cell.pk }}');
   {% for search_service in cell.search_services %}
-  var combo_search_results_{{ cell.pk }}_{{ forloop.counter }} = $('#combo-search-results-{{ cell.pk }}-{{ forloop.counter }}');
+  var $results_{{ forloop.counter }} = $('#combo-search-results-{{ cell.pk }}-{{ forloop.counter }}');
   var xhr_{{ forloop.counter }} = null;
   var url_{{ forloop.counter }} = '{% url 'combo-search-ajax-results' cell_pk=cell.pk service_slug=search_service.slug %}{% if initial_query_string %}?{{ initial_query_string }}{% endif %}';
   {% endfor %}
 
-  function combo_search_update_{{ cell.pk }}() {
+  function update() {
     {% for search_service in cell.search_services %}
     if (xhr_{{ forloop.counter }}) xhr_{{ forloop.counter }}.abort();
     xhr_{{ forloop.counter }} = $.get(url_{{ forloop.counter }},
-      {'q': combo_search_input_{{ cell.pk }}.val()},
+      {'q': $input.val()},
       function (response) {
         xhr_{{ forloop.counter }} = null;
-        combo_search_results_{{ cell.pk }}_{{ forloop.counter }}.html(response);
+        $results_{{ forloop.counter }}.html(response);
       }
     );
     {% endfor %}
   };
 
-  combo_search_input_{{ cell.pk }}.on('paste keyup', function() {
-    clearTimeout(combo_search_timeout_{{ cell.pk }});
-    combo_search_timeout_{{ cell.pk }} = setTimeout(combo_search_update_{{ cell.pk }}, 300);
+  $input.on('paste keyup', function() {
+    clearTimeout(timeout);
+    timeout = setTimeout(update, 300);
   });
-  combo_search_input_{{ cell.pk }}.on('change', function() {
-    clearTimeout(combo_search_timeout_{{ cell.pk }});
-    combo_search_update_{{ cell.pk }}(this);
+  $input.on('change', function() {
+    clearTimeout(timeout);
+    update(this);
   });
-  combo_search_form_{{ cell.pk }}.on('submit', function() {
-    clearTimeout(combo_search_timeout_{{ cell.pk }});
-    combo_search_update_{{ cell.pk }}();
+  $form.on('submit', function() {
+    clearTimeout(timeout);
+    update();
     return false;
   });
 
   {% if initial_q %}
-  combo_search_input_{{ cell.pk }}.val('{{ initial_q }}');
-  combo_search_update_{{ cell.pk }}();
+  $input.val('{{ initial_q }}');
+  update();
   {% endif %}
 });
 </script>