From ac7017f6b9382e93da080e4eb6e17b6cf5f0ec2d Mon Sep 17 00:00:00 2001
From: haoouba <2323333339@qq.com>
Date: Thu, 18 Feb 2021 20:38:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/js/joe.global.js    | 19 ++++++++++++++++++-
 assets/js/joe.post&page.js | 17 ++++++++++-------
 core/function.php          |  2 +-
 friends.php                |  2 +-
 page.php                   |  2 +-
 post.php                   |  2 +-
 public/include.php         | 22 ++++------------------
 7 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/assets/js/joe.global.js b/assets/js/joe.global.js
index 75d2d1a..f8fba12 100644
--- a/assets/js/joe.global.js
+++ b/assets/js/joe.global.js
@@ -1,4 +1,21 @@
 document.addEventListener('DOMContentLoaded', () => {
+	/* 公共修改地址栏URL函数 */
+	const changeURLArg = (url, arg, arg_val) => {
+		let pattern = arg + '=([^&]*)'
+		let replaceText = arg + '=' + arg_val
+		if (url.match(pattern)) {
+			let tmp = '/(' + arg + '=)([^&]*)/gi'
+			return url.replace(eval(tmp), replaceText)
+		} else {
+			if (url.match('[?]')) {
+				return url + '&' + replaceText
+			} else {
+				return url + '?' + replaceText
+			}
+		}
+		return url + '\n' + arg + '\n' + arg_val
+	}
+
 	/* 初始化昼夜模式 */
 	{
 		if (localStorage.getItem('data-night')) {
@@ -327,7 +344,7 @@ document.addEventListener('DOMContentLoaded', () => {
 						Qmsg.warning(str.textContent.trim() || '')
 						isSubmit = false
 					} else {
-						window.location.href = Joe.changeURLArg(location.href, 'scroll', 'joe_comment')
+						window.location.href = changeURLArg(location.href, 'scroll', 'joe_comment')
 					}
 				}
 			})
diff --git a/assets/js/joe.post&page.js b/assets/js/joe.post&page.js
index 02bba19..1aabd25 100644
--- a/assets/js/joe.post&page.js
+++ b/assets/js/joe.post&page.js
@@ -1,4 +1,7 @@
 document.addEventListener('DOMContentLoaded', () => {
+	const encryption = str => window.btoa(unescape(encodeURIComponent(str)))
+	const decrypt = str => decodeURIComponent(escape(window.atob(str)))
+
 	/* 当前页的CID */
 	const cid = $('.joe_detail').attr('data-cid')
 
@@ -76,7 +79,7 @@ document.addEventListener('DOMContentLoaded', () => {
 
 	/* 激活浏览功能 */
 	{
-		let viewsArr = localStorage.getItem(Joe.encryption('views')) ? JSON.parse(Joe.decrypt(localStorage.getItem(Joe.encryption('views')))) : []
+		let viewsArr = localStorage.getItem(encryption('views')) ? JSON.parse(decrypt(localStorage.getItem(encryption('views')))) : []
 		const flag = viewsArr.includes(cid)
 		if (!flag) {
 			$.ajax({
@@ -87,8 +90,8 @@ document.addEventListener('DOMContentLoaded', () => {
 					if (res.code !== 1) return
 					$('#Joe_Article_Views').html(`${res.data.views} 阅读`)
 					viewsArr.push(cid)
-					const name = Joe.encryption('views')
-					const val = Joe.encryption(JSON.stringify(viewsArr))
+					const name = encryption('views')
+					const val = encryption(JSON.stringify(viewsArr))
 					localStorage.setItem(name, val)
 				}
 			})
@@ -97,14 +100,14 @@ document.addEventListener('DOMContentLoaded', () => {
 
 	/* 激活文章点赞功能 */
 	{
-		let agreeArr = localStorage.getItem(Joe.encryption('agree')) ? JSON.parse(Joe.decrypt(localStorage.getItem(Joe.encryption('agree')))) : []
+		let agreeArr = localStorage.getItem(encryption('agree')) ? JSON.parse(decrypt(localStorage.getItem(encryption('agree')))) : []
 		if (agreeArr.includes(cid)) $('.joe_detail__agree .icon-1').addClass('active')
 		else $('.joe_detail__agree .icon-2').addClass('active')
 		let _loading = false
 		$('.joe_detail__agree .icon').on('click', function () {
 			if (_loading) return
 			_loading = true
-			agreeArr = localStorage.getItem(Joe.encryption('agree')) ? JSON.parse(Joe.decrypt(localStorage.getItem(Joe.encryption('agree')))) : []
+			agreeArr = localStorage.getItem(encryption('agree')) ? JSON.parse(decrypt(localStorage.getItem(encryption('agree')))) : []
 			let flag = agreeArr.includes(cid)
 			$.ajax({
 				url: Joe.BASE_API,
@@ -125,8 +128,8 @@ document.addEventListener('DOMContentLoaded', () => {
 						$('.joe_detail__agree .icon-1').addClass('active')
 						$('.joe_detail__agree .icon').addClass('active')
 					}
-					const name = Joe.encryption('agree')
-					const val = Joe.encryption(JSON.stringify(agreeArr))
+					const name = encryption('agree')
+					const val = encryption(JSON.stringify(agreeArr))
 					localStorage.setItem(name, val)
 				},
 				complete() {
diff --git a/core/function.php b/core/function.php
index b7bfc1e..f113201 100644
--- a/core/function.php
+++ b/core/function.php
@@ -3,7 +3,7 @@
 /* 获取主题当前版本号 */
 function _getVersion()
 {
-    return "5.1.3";
+    return "5.1.4";
 };
 
 /* 判断是否是手机 */
diff --git a/friends.php b/friends.php
index ab7c93a..ac7b7dd 100644
--- a/friends.php
+++ b/friends.php
@@ -18,7 +18,7 @@
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-tomorrow.css">
     <script src="https://cdn.jsdelivr.net/npm/clipboard@2.0.6/dist/clipboard.min.js"></script>
     <script src="https://cdn.jsdelivr.net/gh/HaoOuBa/Joe@master/plugin/prism/prism.js"></script>
-    <script src="<?php $this->options->themeUrl('assets/js/joe.post&page.js'); ?>"></script>
+    <script src="<?php $this->options->themeUrl('assets/js/joe.post&page.js?v=111'); ?>"></script>
 </head>
 
 <body>
diff --git a/page.php b/page.php
index a5a78c7..859f017 100644
--- a/page.php
+++ b/page.php
@@ -8,7 +8,7 @@
     <link rel="stylesheet" href="<?php $this->options->themeUrl('assets/css/joe.post.css'); ?>">
     <script src="https://cdn.jsdelivr.net/npm/clipboard@2.0.6/dist/clipboard.min.js"></script>
     <script src="https://cdn.jsdelivr.net/gh/HaoOuBa/Joe@master/plugin/prism/prism.js"></script>
-    <script src="<?php $this->options->themeUrl('assets/js/joe.post&page.js?v=545'); ?>"></script>
+    <script src="<?php $this->options->themeUrl('assets/js/joe.post&page.js?v=111'); ?>"></script>
 </head>
 
 <body>
diff --git a/post.php b/post.php
index e4b5c80..6dfe5bd 100644
--- a/post.php
+++ b/post.php
@@ -8,7 +8,7 @@
     <link rel="stylesheet" href="<?php $this->options->themeUrl('assets/css/joe.post.css'); ?>">
     <script src="https://cdn.jsdelivr.net/npm/clipboard@2.0.6/dist/clipboard.min.js"></script>
     <script src="https://cdn.jsdelivr.net/gh/HaoOuBa/Joe@master/plugin/prism/prism.js"></script>
-    <script src="<?php $this->options->themeUrl('assets/js/joe.post&page.js?v=545'); ?>"></script>
+    <script src="<?php $this->options->themeUrl('assets/js/joe.post&page.js?v=111'); ?>"></script>
 </head>
 
 <body>
diff --git a/public/include.php b/public/include.php
index c18284b..966ec31 100644
--- a/public/include.php
+++ b/public/include.php
@@ -1,6 +1,6 @@
 <script>
     /* 用于页面一进入，直接判断是否是黑夜模式，请勿将它移走或删除，必须放这里，解决闪烁问题，下面的style也是，请勿修改 */
-    if (localStorage.getItem('data-night')) document.querySelector("html").setAttribute("data-night", "night")
+    localStorage.getItem("data-night") && document.querySelector("html").setAttribute("data-night", "night");
     window.Joe = {
         LIVE2D: '<?php $this->options->JLive2d() ?>',
         BASE_API: '<?php echo $this->options->rewrite == 0 ? '/index.php/joe/api' : '/joe/api' ?>',
@@ -11,24 +11,10 @@
         DOCUMENT_TITLE: '<?php $this->options->JDocumentTitle() ?>',
         LAZY_LOAD: '<?php _getLazyload() ?>',
         BIRTHDAY: '<?php $this->options->JBirthDay() ?>',
-        encryption: str => window.btoa(unescape(encodeURIComponent(str))),
-        decrypt: str => decodeURIComponent(escape(window.atob(str))),
-        changeURLArg: (url, arg, arg_val) => {
-            let pattern = arg + '=([^&]*)';
-            let replaceText = arg + '=' + arg_val;
-            if (url.match(pattern)) {
-                let tmp = '/(' + arg + '=)([^&]*)/gi';
-                return url.replace(eval(tmp), replaceText);
-            } else {
-                if (url.match('[?]')) {
-                    return url + '&' + replaceText;
-                } else {
-                    return url + '?' + replaceText;
-                }
-            }
-            return url + '\n' + arg + '\n' + arg_val;
-        }
     }
+    /* 判断是否是ie浏览器 */
+    function detectIE(){var n=window.navigator.userAgent,e=n.indexOf("MSIE ");if(e>0)return parseInt(n.substring(e+5,n.indexOf(".",e)),10);if(n.indexOf("Trident/")>0){var r=n.indexOf("rv:");return parseInt(n.substring(r+3,n.indexOf(".",r)),10)}var i=n.indexOf("Edge/");return i>0&&parseInt(n.substring(i+5,n.indexOf(".",i)),10)}
+    detectIE() && (alert('当前站点不支持IE浏览器或您开启了兼容模式，请使用其他浏览器访问或关闭兼容模式。'), (location.href = 'https://www.baidu.com'))
 </script>
 <style>
     body::before {