From 5150ecb973e2264e38f724a86594bd9f5cadc219 Mon Sep 17 00:00:00 2001 From: Meeeeow Date: Fri, 21 Apr 2017 11:36:28 +0800 Subject: [PATCH] fix loading not show after first search --- lib/GUI/js/search.js | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/lib/GUI/js/search.js b/lib/GUI/js/search.js index a089bad2e..e36738dd0 100644 --- a/lib/GUI/js/search.js +++ b/lib/GUI/js/search.js @@ -9,7 +9,7 @@ $(function() { var $pkgListing = $('#all-packages') var $searchBtn = $('.js-search-btn') var request - var currentResults + var lastQuery = '' var toggle = function(validQuery) { $searchResults.toggleClass('show', validQuery) @@ -20,21 +20,20 @@ $(function() { } $form.bind('submit keyup', function(e) { - var q, qBool + var query, isValidQuery e.preventDefault() - q = $input.val() - qBool = (q !== '') + query = $input.val() + isValidQuery = (query !== '') - toggle(qBool) + toggle(isValidQuery) - if (!qBool) { + if (!isValidQuery) { if (request && typeof request.abort === 'function') { request.abort() } - currentResults = null $searchResults.html('') return } @@ -43,14 +42,13 @@ $(function() { request.abort() } - if (!currentResults) { + if (query !== lastQuery) { + lastQuery = query $searchResults.html( "Spinner") } - request = $.getJSON('-/search/' + q, function( results ) { - currentResults = results - + request = $.getJSON('-/search/' + query, function( results ) { if (results.length > 0) { var html = ''