diff options
| -rw-r--r-- | ishtar_common/static/js/ishtar.js | 44 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/forms/search_query.html | 8 |
2 files changed, 37 insertions, 15 deletions
diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js index 6e48bf5cf..a446e6964 100644 --- a/ishtar_common/static/js/ishtar.js +++ b/ishtar_common/static/js/ishtar.js @@ -190,19 +190,22 @@ function display_info(msg){ }, 5000); } -function add_message(message, message_type, target, clear){ +function add_message(message, message_type, target, clear, dismiss){ if (!message_type) message_type = 'info'; if (!target) target = "#message_list"; + if (typeof dismiss == "undefined") dismiss = true; var html = ""; if (!clear) html = $(target).html(); html += '<div class="alert alert-' + message_type + ' alert-dismissible fade show"'; html += ' role="alert">'; html += message; - html += ' <button type="button" class="close" data-dismiss="alert"'; - html += ' aria-label="Close">'; - html += ' <span aria-hidden="true">×</span>'; - html += ' </button>'; + if (dismiss){ + html += ' <button type="button" class="close" data-dismiss="alert"'; + html += ' aria-label="Close">'; + html += ' <span aria-hidden="true">×</span>'; + html += ' </button>'; + } html += ' </div>'; $(target).html(html); } @@ -296,10 +299,10 @@ var load_bookmark_list = function(){ '" href="#">' + bookmark['label'] + '</span>'; } $('#bookmark-list').html(bookmark_list); - if (bookmark_list === ""){ - $('#bookmark-list').addClass('disabled'); + if (!bookmark_list){ + $('#load-bookmark').addClass('disabled'); } else { - $('#bookmark-list').removeClass('disabled'); + $('#load-bookmark').removeClass('disabled'); } $("#bookmark-list span").click(function(){ $("#id_search_vector").val( @@ -579,7 +582,7 @@ var enable_save = function(){ function clear_search_field(){ $("#id_search_vector").val(""); - add_message("-", 'info', "#advanced-search-info", true); + add_message("-", 'info', "#advanced-search-info", true, false); enable_save(); } @@ -635,9 +638,9 @@ function update_search_field(){ base_query += query $("#id_search_vector").val(base_query); if (base_query){ - add_message(base_query, 'info', "#advanced-search-info", true); + add_message(base_query, 'info', "#advanced-search-info", true, false); } else { - add_message("-", 'info', "#advanced-search-info", true); + add_message("-", 'info', "#advanced-search-info", true, false); } enable_save(); } @@ -673,8 +676,27 @@ function register_advanced_search(){ document.getElementById('wizard-form').reset(); } ); + $('#modal-advanced-search input').keypress(function(e) { + var key = e.key; + if (key === "Enter") { + $(".advanced-search-valid").click(); + } + }); $(".advanced-search-valid").click(update_search_field); $(".advanced-search-clear").click(clear_search_field); + $('#modal-advanced-search').on('hidden.bs.modal', function (e) { + var base_query = $("#id_search_vector").val(); + // reset all criteria + document.getElementById('wizard-form').reset(); + // restore main input + $("#id_search_vector").val(base_query); + setTimeout(function(){ + $("#id_search_vector").focus(); + }, 200); // the hidden should be fire after anything is hide but... + }); + $('#modal-advanced-search').on('shown.bs.modal', function (e) { + update_search_field(); + }); } diff --git a/ishtar_common/templates/ishtar/forms/search_query.html b/ishtar_common/templates/ishtar/forms/search_query.html index d44c61ade..eb8ba6d53 100644 --- a/ishtar_common/templates/ishtar/forms/search_query.html +++ b/ishtar_common/templates/ishtar/forms/search_query.html @@ -85,12 +85,12 @@ <script type='text/javascript'> var update_form_display = function(){ - if ($("#create-choice:checked").length){ - $("#update-search-query").hide(); - $("#new-search-query").show(); - } else { + if ($("#update-choice:checked").length){ $("#new-search-query").hide(); $("#update-search-query").show(); + } else { + $("#update-search-query").hide(); + $("#new-search-query").show(); } } |