From d21e39ee884ffb7ba5d42ae4658de29150387546 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Kervella?= Date: Sun, 8 Oct 2017 00:48:32 +0000 Subject: [PATCH] Proprification de code du bft tag + fix mineur MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Utilise la fonction .format plutôt que la concténation pour rendre le code plus lisible. Le fix concernait le cas où il n'y a pas de initial_value, le JS sortait une erreur --- .../templatetags/bootstrap_form_typeahead.py | 192 +++++++++++------- machines/views.py | 60 +++--- 2 files changed, 147 insertions(+), 105 deletions(-) diff --git a/machines/templatetags/bootstrap_form_typeahead.py b/machines/templatetags/bootstrap_form_typeahead.py index a5c58d00..5f10f5f6 100644 --- a/machines/templatetags/bootstrap_form_typeahead.py +++ b/machines/templatetags/bootstrap_form_typeahead.py @@ -219,112 +219,150 @@ def typeahead_js( f_name, f_value, f_bound, t_choices, t_engine, t_match_func, t_update_on ) : """ The whole script to use """ - choices = mark_safe(t_choices[f_name]) if f_name in t_choices.keys() \ - else default_choices( f_value ) + choices = mark_safe( t_choices[f_name] ) if f_name in t_choices.keys() \ + else default_choices( f_value ) - engine = mark_safe(t_engine[f_name]) if f_name in t_engine.keys() \ - else default_engine ( f_name ) + engine = mark_safe( t_engine[f_name] ) if f_name in t_engine.keys() \ + else default_engine ( f_name ) match_func = mark_safe(t_match_func[f_name]) \ - if f_name in t_match_func.keys() \ - else default_match_func( f_name ) + if f_name in t_match_func.keys() else default_match_func( f_name ) update_on = t_update_on[f_name] if f_name in t_update_on.keys() else [] - js_content = \ - 'var choices_'+f_name+' = ' + choices + ';\n' + \ - 'var setup_'+f_name+' = function() {\n' + \ - 'var engine_'+f_name+' = ' + engine + ';\n' + \ - '$("#'+input_id(f_name) + '").typeahead("destroy");\n' + \ - '$("#'+input_id(f_name) + '").typeahead(\n' + \ - default_datasets( f_name, match_func ) + '\n' + \ - ');\n' + \ - reset_input( f_name, f_bound ) + '\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' - for u_id in update_on : - js_content += '$("#'+u_id+'").change( setup_'+f_name+' );\n' - js_content += '$("#'+input_id(f_name)+'").ready( setup_'+f_name+' );\n' + js_content = ( + 'var choices_{f_name} = {choices};' + 'var setup_{f_name} = function() {{' + 'var engine_{f_name} = {engine};' + '$( "#{input_id}" ).typeahead( "destroy" );' + '$( "#{input_id}" ).typeahead( {datasets} );' + '{reset_input}' + '}};' + '$( "#{input_id}" ).bind( "typeahead:select", {updater} );' + '$( "#{input_id}" ).bind( "typeahead:change", {change} );' + '{updates}' + '$( "#{input_id}" ).ready( setup_{f_name} );' + ).format( + f_name = f_name, + choices = choices, + engine = engine, + input_id = input_id( f_name ), + datasets = default_datasets( f_name, match_func ), + reset_input = reset_input( f_name, f_bound ), + updater = typeahead_updater( f_name ), + change = typeahead_change( f_name ), + updates = ''.join( + ['$( "#{u_id}").change( setup_{f_name} );'.format( + u_id = u_id, + f_name = f_name + ) for u_id in update_on ] + ) + ) return render_tag( 'script', content=mark_safe( js_content ) ) def reset_input( f_name, f_bound ) : """ The JS script to reset the fields values """ - return '$("#'+input_id(f_name)+'").typeahead(' \ - '"val", ' \ - 'engine_'+f_name+'.get('+str(f_bound.value())+')[0].value' \ - ');\n' \ - '$("#'+hidden_id(f_name)+'").val('+str(f_bound.value())+');' + init_key = f_bound.value() or '""' + return ( + '$( "#{input_id}" ).typeahead("val", {init_val});' + '$( "#{hidden_id}").val( {init_key} );' + ).format( + input_id = input_id( f_name ), + init_val = '""' if init_key == '""' else + 'engine_{f_name}.get( {init_key} )[0].value'.format( + f_name = f_name, + init_key = init_key + ), + init_key = init_key, + hidden_id = hidden_id( f_name ) + ) def default_choices( f_value ) : """ The JS script creating the variable choices_ """ - return '[' + \ - ', '.join([ \ - '{key: ' + (str(choice[0]) if choice[0] != '' else '""') + \ - ', value: "' + str(choice[1]) + '"}' \ - for choice in f_value.choices \ - ]) + \ - ']' + return '[ {objects} ]'.format( + objects = ', '.join( + [ '{{ key: {k}, value: "{k}" }}'.format( + k = choice[0] if choice[0] != '' else '""', + v = choice[1] + ) for choice in f_value.choices ] + ) + ) def default_engine ( f_name ) : """ The JS script creating the variable engine_ """ - return 'new Bloodhound({ ' \ - 'datumTokenizer: Bloodhound.tokenizers.obj.whitespace("value"), ' \ - 'queryTokenizer: Bloodhound.tokenizers.whitespace, ' \ - 'local: choices_'+f_name+', ' \ - 'identify: function(obj) { return obj.key; } ' \ - '})' + return ( + 'new Bloodhound({{' + 'datumTokenizer: Bloodhound.tokenizers.obj.whitespace("value"),' + 'queryTokenizer: Bloodhound.tokenizers.whitespace,' + 'local: choices_{f_name},' + 'identify: function(obj) {{ return obj.key; }}' + '}})' + ).format( + f_name = f_name + ) def default_datasets( f_name, match_func ) : """ The JS script creating the datasets to use with typeahead """ - return '{ ' \ - 'hint: true, ' \ - 'highlight: true, ' \ - 'minLength: 0 ' \ - '}, ' \ - '{ ' \ - 'display: "value", ' \ - 'name: "'+f_name+'", ' \ - 'source: '+match_func + \ - '}' + return ( + '{{' + 'hint: true,' + 'highlight: true,' + 'minLength: 0' + '}},' + '{{' + 'display: "value",' + 'name: "{f_name}",' + 'source: {match_func}' + '}}' + ).format( + f_name = f_name, + match_func = match_func + ) def default_match_func ( f_name ) : """ The JS script creating the matching function to use with typeahed """ - return 'function(q, sync) {' \ - 'if (q === "") {' \ - 'var nb = 10;' \ - 'var first = [] ;' \ - 'for ( var i=0 ; i