Merge pull request #102 from jiewenhuang/dev

update:v1.1.2

package.json

@@ -1,6 +1,6 @@
 {
   "name": "halo-theme-joe3.0",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Theme of Halo2",
   "devDependencies": {
     "uglify-js": "^3.17.4"

settings.yaml

@@ -38,6 +38,23 @@ spec:
           label: Waline 服务端地址
           value: ""
           help: "Waline 服务端地址，如 https://waline-server.herokuapp.com 不要加结尾反斜杠"
+        - $formkit: radio
+          name: enable_source_link
+          id: enable_source_link
+          label: "是否使用外部资源地址"
+          help: "使用外部请将整个assets目录上传"
+          value: false
+          options:
+            - value: false
+              label: 默认
+            - value: true
+              label: 外部
+        - $formkit: text
+          name: source_link
+          label: 外部资源地址
+          value: ""
+          help: "如果你的资源地址是https://example.com/assets/js/min/index.min.js，那么这里填写https://example.com"
+
 
         - $formkit: text
           name: mode_color_light

templates/assets/js/common.js

@@ -310,7 +310,7 @@ const commonContext = {
 			} else {
 				htmlStr = `
       <div class="joe_pdf">
-        <iframe src="${ThemeConfig.blog_url}/themes/theme-Joe3/assets/lib/pdfjs/web/viewer.html?file=${options.src}" style="width:${options.width};height:${options.height}"></iframe>
+        <iframe src="${ThemeConfig.BASE_RES_URL}/assets/lib/pdfjs/web/viewer.html?file=${options.src}" style="width:${options.width};height:${options.height}"></iframe>
       </div>`;
 			}
 			$(item).replaceWith(htmlStr);
@@ -537,7 +537,7 @@ const commonContext = {
 		)
 			return;
 		$.getScript(
-			`/themes/theme-Joe3/assets/lib/3dtag/3dtag.min.js`,
+			`${ThemeConfig.BASE_RES_URL}/assets/lib/3dtag/3dtag.min.js`,
 			(_res) => {
 				const entries = [];
 				const colors = [
@@ -839,7 +839,7 @@ const commonContext = {
 		)
 			return;
 		$.getScript(
-			`/themes/theme-Joe3/assets/effect/cursor/${ThemeConfig.cursor_effect}.js`
+			`${ThemeConfig.BASE_RES_URL}/assets/effect/cursor/${ThemeConfig.cursor_effect}.js`
 		);
 	},
 	/* 加载背景特效 */
@@ -851,7 +851,7 @@ const commonContext = {
 		)
 			return;
 		$.getScript(
-			`/themes/theme-Joe3/assets/effect/backdrop/${ThemeConfig.backdrop}.js`
+			`${ThemeConfig.BASE_RES_URL}/assets/effect/backdrop/${ThemeConfig.backdrop}.js`
 		);
 	},
 	/* 自定义favicon */

templates/assets/js/custom.js

@@ -235,6 +235,7 @@ document.addEventListener("DOMContentLoaded", () => {
 					github: "Github仓库",
 					gitee: "Gitee仓库",
 					lz: "蓝奏云网盘",
+					ad: "阿里云盘",
 				};
 				this.innerHTML = `
 					<span class="joe_cloud">
@@ -277,7 +278,7 @@ document.addEventListener("DOMContentLoaded", () => {
 				if (!$comment || !$header) return;
 				this.$button.addEventListener("click", (e) => {
 					e.stopPropagation();
-					if (!Boolean(document.querySelector('[id*="comment-"]'))) {
+					if (!Boolean(document.querySelector('[id*="comment-"]')) &&!Boolean(document.querySelector("#waline"))) {
 
 						Qmsg.warning("评论功能不可用！");
 						return;
@@ -612,6 +613,7 @@ document.addEventListener("DOMContentLoaded", () => {
 		}
 	);
 
+
 	customElements.define(
 		"joe-dplayer",
 		class JoeDplayer extends HTMLElement {
@@ -621,7 +623,7 @@ document.addEventListener("DOMContentLoaded", () => {
 					src: this.getAttribute("src") || "",
 					player:
             this.getAttribute("player") ||
-            `/themes/theme-Joe3/assets/lib/dplayer/web/dplayer.html?url=`,
+            `${ThemeConfig.BASE_RES_URL}/assets/lib/dplayer/web/${ThemeConfig.BASE_RES_URL==='/themes/theme-Joe3'?'dplayer':'dplayer-source'}.html?url=`,
 					width: this.getAttribute("width") || "100%",
 					height: this.getAttribute("height") || "500px",
 				};