Merge branch 'master' into frontend-next

This commit is contained in:
Yukai Huang
2017-01-21 12:08:52 +08:00
8 changed files with 95 additions and 59 deletions

View File

@@ -102,7 +102,12 @@ $(".masthead-nav li").click(function () {
$(this).addClass("active");
});
$(".ui-home").click(() => {
// prevent empty link change hash
$('a[href="#"]').click(function (e) {
e.preventDefault();
});
$(".ui-home").click(function (e) {
if (!$("#home").is(':visible')) {
$(".section:visible").hide();
$("#home").fadeIn();
@@ -366,7 +371,7 @@ $(".ui-refresh-history").click(() => {
$('.search').val('');
historyList.search();
$('#history-list').slideUp('fast');
$('.pagination').slideUp('fast');
$('.pagination').hide();
resetCheckAuth();
historyList.clear();
@@ -378,7 +383,6 @@ $(".ui-refresh-history").click(() => {
$('.search').val(lastKeyword);
checkHistoryList();
$('#history-list').slideDown('fast');
$('.pagination').slideDown('fast');
});
});