From c81d4edb7da0d736aa77dcebca1c4ed9f34c0307 Mon Sep 17 00:00:00 2001 From: Ozzieisaacs Date: Mon, 10 Jun 2019 16:38:29 +0200 Subject: [PATCH] Fix for #923 --- cps/static/js/get_meta.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/cps/static/js/get_meta.js b/cps/static/js/get_meta.js index 7c5dbe4f..95a28042 100644 --- a/cps/static/js/get_meta.js +++ b/cps/static/js/get_meta.js @@ -20,16 +20,16 @@ * Douban Books api document: https://developers.douban.com/wiki/?title=book_v2 (Chinese Only) */ /* global _, i18nMsg, tinymce */ -var dbResults = []; +// var dbResults = []; var ggResults = []; $(function () { var msg = i18nMsg; /*var douban = "https://api.douban.com"; var dbSearch = "/v2/book/search";*/ - var dbDone = true; + // var dbDone = true; - var google = "https://www.googleapis.com/"; + var google = "https://www.googleapis.com"; var ggSearch = "/books/v1/volumes"; var ggDone = false; @@ -56,11 +56,9 @@ $(function () { if (showFlag === 1) { $("#meta-info").html(""); } - if (ggDone && dbDone) { - if (!ggResults && !dbResults) { - $("#meta-info").html("

" + msg.no_result + "

"); - return; - } + if (!ggDone) { + $("#meta-info").html("

" + msg.no_result + "

"); + return; } if (ggDone && ggResults.length > 0) { ggResults.forEach(function(result) { @@ -137,10 +135,12 @@ $(function () { dataType: "jsonp", jsonp: "callback", success: function success(data) { - ggResults = data.items; + if ("items" in data) { + ggResults = data.items; + ggDone = true; + } }, complete: function complete() { - ggDone = true; showResult(); $("#show-google").trigger("change"); }