From 351a560a912ac840f640a29e874a4d1e0ac08313 Mon Sep 17 00:00:00 2001 From: solstice23 Date: Sun, 20 Sep 2020 02:20:23 +0800 Subject: [PATCH] fix issue #92 --- README.md | 4 ++++ argontheme.js | 11 ++++++++++- info.json | 4 ++-- style.css | 2 +- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index c4ec8f55..6263f593 100644 --- a/README.md +++ b/README.md @@ -69,6 +69,10 @@ Argon 使用 [GPL V3.0](https://github.com/solstice23/argon-theme/blob/master/LI # 更新日志 +## 20200920 v1.0.3 ++ 修复评论回复和 Pjax 冲突 ++ 博主登录后自动填充加密文章密码 + ## 20200830 v1.0.2 + 增加 双栏(反转) 页面布局 + 修复和优化文章字数统计 diff --git a/argontheme.js b/argontheme.js index 2625aa7d..92061a98 100644 --- a/argontheme.js +++ b/argontheme.js @@ -565,9 +565,15 @@ if (argonConfig.headroom){ $(document).on("click" , ".comment-reply" , function(){ reply(this.getAttribute("data-id")); }); - $(document).on("click" , "#post_comment_reply_cancel" , function(){ + $(document).on("click pjax:click" , "#post_comment_reply_cancel" , function(){ cancelReply(); }); + $(document).on("pjax:click" , function(){ + replying = false; + replyID = 0; + $('#post_comment_reply_info').css("display", "none"); + $("#post_comment").removeClass("post-comment-force-privatemode-on post-comment-force-privatemode-off"); + }); //编辑评论 editing = false , editID = 0; function edit(commentID){ @@ -609,6 +615,9 @@ if (argonConfig.headroom){ }, 300); cancelEdit(true); }); + $(document).on("pjax:click" , function(){ + cancelEdit(true); + }); //显示/隐藏额外输入框 (评论者网站) $(document).on("click" , "#post_comment_toggle_extra_input" , function(){ diff --git a/info.json b/info.json index 9c1d66ee..056f9064 100644 --- a/info.json +++ b/info.json @@ -1,5 +1,5 @@ { - "version" : "1.0.2", + "version" : "1.0.3", "details_url" : "https://github.com/solstice23/argon-theme/releases", - "download_url" : "https://github.com/solstice23/argon-theme/releases/download/v1.0.2/argon.zip" + "download_url" : "https://github.com/solstice23/argon-theme/releases/download/v1.0.3/argon.zip" } diff --git a/style.css b/style.css index 7579c35e..ab6c1630 100644 --- a/style.css +++ b/style.css @@ -3,7 +3,7 @@ Theme Name: argon Author: solstice23 Author URI: https://solstice23.top/ Description: 轻盈、简洁、美观的 Wordpress 主题 -Version: 1.0.2 +Version: 1.0.3 License: GNU General Public License v3.0 License URI: https://www.gnu.org/licenses/gpl-3.0.html Tags: 简约, 两栏, 侧栏在左边, 浮动侧栏, 文章目录, 自适应, 夜间模式, 可自定义