From 1c9a2fe4ac7faf6a58aac513ffa8987143cea243 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Kervella?= <kervella.mael@gmail.com>
Date: Sat, 7 Oct 2017 16:38:02 +0000
Subject: [PATCH] Tout le script JS est dans une fonction
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

pour povoir être relaod plusieurs fois
---
 .../templatetags/bootstrap_form_typeahead.py  | 34 ++++++++++---------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/machines/templatetags/bootstrap_form_typeahead.py b/machines/templatetags/bootstrap_form_typeahead.py
index 239eed35..d1b3978e 100644
--- a/machines/templatetags/bootstrap_form_typeahead.py
+++ b/machines/templatetags/bootstrap_form_typeahead.py
@@ -155,20 +155,23 @@ def typeahead_js( f_name, f_value, t_choices, t_match_func ) :
         else default_match_func()
 
     js_content =                                                              \
-        '$("#'+input_id(f_name)+'").ready( function() {\n'                  + \
-            reset_input( f_name, f_value ) + '\n'                           + \
-            'var choices = ' + choices + '\n'                               + \
-            'var engine = ' + default_engine() + '\n'                       + \
+        'var choices = ' + choices + ';\n'                                  + \
+        'var setup = function() {\n'                                        + \
+            'var engine = ' + deafult_engine() + ';\n'                      + \
+            '$("#'+input_id(f_name) + '").typeahead("destroy");\n'          + \
             '$("#'+input_id(f_name) + '").typeahead(\n'                     + \
-                default_datasets( f_name, match_func )                      + \
-            ').bind(\n'                                                     + \
-                '"typeahead:select", '                                      + \
-                typeahead_updater( f_name ) + '\n'                          + \
-            ').bind(\n'                                                     + \
-                '"typeahead:change", '                                      + \
-                typeahead_change( f_name ) + '\n'                           + \
-            ')\n'                                                           + \
-        '});\n'
+                default_datasets( f_name, match_func ) + '\n'               + \
+            ');\n'                                                          + \
+            reset_input( f_name, f_value ) + '\n'                           + \
+        '};\n'                                                              + \
+        '$("#'+input_id(f_name) + '").bind(\n'                              + \
+            '"typeahead:select", '                                          + \
+            typeahead_updater( f_name ) + '\n'                              + \
+        ').bind(\n'                                                         + \
+            '"typeahead:change", '                                          + \
+            typeahead_change( f_name ) + '\n'                               + \
+        ');\n'
+    js_content += '$("#'+input_id(f_name)+'").ready( setup );\n'
 
     return render_tag( 'script', content=mark_safe( js_content ) )
 
@@ -182,7 +185,7 @@ def default_choices( f_value ) :
             ', value: "' + str(choice[1]) + '"}'                              \
             for choice in f_value.choices                                     \
             ]) +                                                              \
-        '];'
+        ']'
 
 def default_engine () :
     return 'new Bloodhound({ '                                   \
@@ -217,7 +220,6 @@ def default_match_func () :
             'engine.search(q, sync);'                                         \
         '}'                                                                   \
     '}'
-# matches.filter(function (elt) {return elt.type == $("#id_type").val();});sync(matches);})
 
 def typeahead_updater( f_name ):
     return 'function(evt, item) { '                                           \
@@ -230,6 +232,6 @@ def typeahead_change( f_name ):
     return 'function(evt) { '                                                 \
         'if (evt.currentTarget.value === "") {'                               \
             '$("#'+hidden_id(f_name)+'").val(""); '                           \
-            '$("#'+hidden_id(f_name)+'").change();'                               \
+            '$("#'+hidden_id(f_name)+'").change();'                           \
         '}'                                                                   \
     '}'