diff --git a/assets/css/_common/components/index.scss b/assets/css/_common/components/index.scss
index ca8bf6a..191a6cb 100644
--- a/assets/css/_common/components/index.scss
+++ b/assets/css/_common/components/index.scss
@@ -12,6 +12,14 @@
z-index: $zindex-5;
}
+.hidden {
+ display: none !important;
+}
+
+.show {
+ display: block !important;
+}
+
@import 'tool-buttons';
@import 'reading-progress';
diff --git a/assets/css/_common/components/post/post-body.scss b/assets/css/_common/components/post/post-body.scss
index 1757143..d084853 100644
--- a/assets/css/_common/components/post/post-body.scss
+++ b/assets/css/_common/components/post/post-body.scss
@@ -93,6 +93,7 @@
border-left: 6px solid #4A90E2;
margin: 0 0 0.85em 0;
padding: 0.65em 0.15em 0.65em 0.95em;
+ display: none;
.post-expired-title {
color: #4A90E2;
diff --git a/assets/css/_common/components/tool-buttons.scss b/assets/css/_common/components/tool-buttons.scss
index 2f06f6d..2b8630a 100644
--- a/assets/css/_common/components/tool-buttons.scss
+++ b/assets/css/_common/components/tool-buttons.scss
@@ -43,10 +43,6 @@
.goto-comments {
display: none;
}
-
- .goto-comments-on {
- display: block;
- }
}
@if $back2top_enable {
diff --git a/assets/js/next-boot.js b/assets/js/next-boot.js
index 048a52b..9c2c761 100644
--- a/assets/js/next-boot.js
+++ b/assets/js/next-boot.js
@@ -73,9 +73,9 @@ NexT.boot.refresh = function() {
if(NexT.CONFIG.page.comments) {
NexT.utils.initCommontesDispaly();
NexT.utils.registerCommonSwitch();
- NexT.utils.domAddClass('#goto-comments', 'goto-comments-on');
+ NexT.utils.domAddClass('#goto-comments', 'show');
} else {
- NexT.utils.hideComments();
+ NexT.utils.domAddClass('#goto-comments', 'hidden');
}
//TODO
diff --git a/assets/js/utils.js b/assets/js/utils.js
index d94ef74..19e6a63 100644
--- a/assets/js/utils.js
+++ b/assets/js/utils.js
@@ -14,27 +14,23 @@ NexT.utils = {
if (postLastmodTime != null) postTime = postLastmodTime.getAttribute("datetime");
+ let expiredTip = '';
const expireCfg = NexT.CONFIG.page.expiredTips;
- let expiredTipPre = '';
- let expiredTipSuf = '';
- let expireTime = this.diffDate(postTime, 2);
+ let expiredTime = this.diffDate(postTime, 2);
- if (expireTime == '0'+NexT.CONFIG.i18n.ds_days) {
- document.getElementById('post-expired-tip').style.display = 'none';
- } else {
- if (expireTime.indexOf(NexT.CONFIG.i18n.ds_years) > -1){
- let expireTip = expireCfg.warn.split('#');
- expiredTipPre = expireTip[0];
- expiredTipSuf = expireTip[1];
- } else {
- let expireTip = expireCfg.info.split('#');
- expiredTipPre = expireTip[0];
- expiredTipSuf = expireTip[1];
- }
-
- let expiredTip = expiredTipPre + '' + expireTime + '' + expiredTipSuf;
- document.getElementById('post-expired-content').innerHTML = expiredTip;
+ if (expiredTime.indexOf(NexT.CONFIG.i18n.ds_years) > -1) {
+ expiredTip = expireCfg.warn.split('#');
+ } else {
+ let days = parseInt(expiredTime.replace(NexT.CONFIG.i18n.ds_days, '').trim(), 10);
+ if (days < 180) return;
+ expiredTip = expireCfg.info.split('#');
}
+
+ let expiredTipPre = expiredTip[0];
+ let expiredTipSuf = expiredTip[1];
+ expiredTip = expiredTipPre + '' + expiredTime + '' + expiredTipSuf;
+ document.getElementById('post-expired-content').innerHTML = expiredTip;
+ this.domAddClass('#post-expired-tip', 'show');
},
registerMenuClick: function () {
const pMenus = document.querySelectorAll('.main-menu > li > a.menus-parent');
@@ -538,13 +534,6 @@ NexT.utils = {
});
},
- hideComments: function () {
- let postComments = document.querySelector('.post-comments');
- if (postComments !== null) {
- postComments.style.display = 'none';
- }
- },
-
hiddeLodingCmp: function (selector) {
const loadding = document.querySelector(selector).previousElementSibling;
loadding.style.display = 'none';