diff --git a/hyperglass/static/hyperglass.es6 b/hyperglass/static/hyperglass.es6 index e173251..1973f22 100644 --- a/hyperglass/static/hyperglass.es6 +++ b/hyperglass/static/hyperglass.es6 @@ -7,7 +7,36 @@ const selectpicker = require('bootstrap-select'); const animsition = require('animsition'); const ClipboardJS = require('clipboard'); -$('#location').selectpicker({ +const queryLocation = $('#location'); +const queryType = $('#query_type'); +const queryTarget = $('#query_target'); +const resultsContainer = $('#hg-results'); +const formContainer = $('#hg-form'); +const resultsAccordion = $('#hg-accordion'); +const backButton = $('#hg-back-btn'); + +const resetResults = () => { + queryLocation.selectpicker('deselectAll'); + queryLocation.selectpicker('val', ''); + queryType.selectpicker('val', ''); + queryTarget.val(''); + resultsContainer.animsition('out', formContainer, '#'); + resultsContainer.hide(); + formContainer.show(); + formContainer.animsition('in'); + backButton.hide(); + resultsAccordion.empty(); +}; + +const reloadPage = () => { + queryLocation.selectpicker('deselectAll'); + queryLocation.selectpicker('val', ''); + queryType.selectpicker('val', ''); + queryTarget.val(''); + resultsAccordion.empty(); +}; + +queryLocation.selectpicker({ liveSearchNormalize: true, style: '', styleBase: 'form-control', @@ -15,7 +44,7 @@ $('#location').selectpicker({ tickIcon: 'remixicon-check-line', }); -$('#query_type').selectpicker({ +queryType.selectpicker({ liveSearchNormalize: true, style: '', styleBase: 'form-control', @@ -24,8 +53,10 @@ $('#query_type').selectpicker({ }); $(document).ready(() => { - $('#hg-results').hide(); + reloadPage(); + resultsContainer.hide(); $('#hg-ratelimit-query').modal('hide'); + backButton.hide(); $('.animsition').animsition({ inClass: 'fade-in', outClass: 'fade-out', @@ -34,25 +65,8 @@ $(document).ready(() => { transition: (url) => { window.location.href = url; }, }); - $('#hg-form').animsition('in'); -}); - -const resetResults = () => { - const queryLocation = $('#location'); - const queryType = $('#query_type'); - const queryTarget = $('#query_target'); - const resultsContainer = $('#hg-results'); - const formContainer = $('#hg-form'); - const resultsAccordion = $('#hg-accordion'); - queryLocation.selectpicker('deselectAll'); - queryType.selectpicker('val', ''); - queryTarget.val(''); - resultsContainer.animsition('out', formContainer, '#'); - resultsContainer.hide(); - formContainer.show(); formContainer.animsition('in'); - resultsAccordion.empty(); -}; +}); const queryApp = (queryType, queryTypeName, locationList, queryTarget) => { const resultsTitle = `${queryTypeName} Query for ${queryTarget}`; @@ -75,7 +89,7 @@ const queryApp = (queryType, queryTypeName, locationList, queryTarget) => {