Merge branch 'master' into frontend-next

2017-01-13 22:53:33 +08:00
parent 3566d71aea 3cf40a8dec
commit 3d6b319216
18 changed files with 306 additions and 69 deletions
--- a/public/js/cover.js
+++ b/public/js/cover.js
@@ -118,9 +118,11 @@ $(".ui-history").click(() => {

 function checkHistoryList() {
    if ($("#history-list").children().length > 0) {
+        $('.pagination').show();
        $(".ui-nohistory").hide();
        $(".ui-import-from-browser").hide();
    } else if ($("#history-list").children().length == 0) {
+        $('.pagination').hide();
        $(".ui-nohistory").slideDown();
        getStorageHistory(data => {
            if (data && data.length > 0 && getLoginState() && historyList.items.length == 0) {