diff --git a/static/js/index.advanced-search-form.js b/static/js/index.advanced-search-form.js index c74b6fc..a6ceee5 100644 --- a/static/js/index.advanced-search-form.js +++ b/static/js/index.advanced-search-form.js @@ -92,6 +92,13 @@ loadInputFieldWidgets(); searchGroups[0].scrollTop = searchGroups[0].scrollHeight; }); + $("div#advanced-search button#submit").click(function(){ + $("div#advanced-search").hide(); + advancedSearchButton.removeClass("clicked"); + assembleQuery(); + queryServer(); + }) + var previousAdvancedQuery = ""; var searchBar = $("form#search-bar input[name=query]"); @@ -158,6 +165,8 @@ function assembleQuery(){ * * @param field (DOM element) An `input[type=text]` element. * @param hasRegex (boolean) Whether or not the field's value has regex. + * + * @return The processed query. */ function genFieldQueryString(field, hasRegex){ var terms = field.value.replace(/\\/g, "\\\\").replace(/\"/g, "\\\""); diff --git a/static/js/index.js b/static/js/index.js index 8fd9651..0b9b550 100644 --- a/static/js/index.js +++ b/static/js/index.js @@ -47,6 +47,7 @@ var searchResultsPage = 1; advancedSearchButton.removeClass("clicked"); if($("div#results .result").length == 0) searchField.removeClass("partly-visible"); + clearResults(); } }); @@ -197,6 +198,7 @@ function finishedTyping(){ searchField.removeClass("partly-visible"); $("div#advanced-search").fadeOut(50); advancedSearchButton.removeClass("clicked"); + clearResults(); } } diff --git a/static/sass/index.sass b/static/sass/index.sass index 815ecba..2c31167 100644 --- a/static/sass/index.sass +++ b/static/sass/index.sass @@ -205,6 +205,7 @@ div#advanced-search float: right font-size: 80% font-weight: bold + margin-right: 1% padding-left: 4% padding-right: 4% @@ -213,7 +214,6 @@ div#advanced-search &#add-group background-color: #7FAFFC - margin-right: 1% &:hover background-color: #609AF8 @@ -224,6 +224,12 @@ div#advanced-search &:hover background-color: #D63636 + &#submit + background-color: #4ee76c + + &:hover + background-color: #0FDD38 + >div @include vendor(box-sizing, border-box) @@ -316,6 +322,7 @@ div#advanced-search &:hover cursor: pointer + background-color: #d6d6d6 &#selected background-color: #CACACA diff --git a/templates/index.html b/templates/index.html index 87390a2..bdac619 100644 --- a/templates/index.html +++ b/templates/index.html @@ -39,6 +39,9 @@
Fields
Search groups +