Merge pull request #224 from jiewenhuang/dev

Update to v1.2.0
jiewenhuang · Mar 7, 2024 · cad2e8f · cad2e8f
2 parents 3018877 + f653817
commit cad2e8f
Show file tree

Hide file tree

Showing 14 changed files with 236 additions and 186 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
           node-version: 16
       - name: Compress zip
         run: |
-          PACKAGE_VERSION=$(sed -nE 's/^\s*"version": "(.*?)",$/\1/p' package.json)
+          PACKAGE_VERSION=$(sed -nE 's/^ *version: "([^"]+)"$/\1/p' theme.yaml)
           PRE_ZIP_FOLDER=halo-theme-Joe3-${PACKAGE_VERSION}
           ARTIFACT_NAME=${PRE_ZIP_FOLDER}.zip
           ARTIFACT_PATHNAME=dist/${ARTIFACT_NAME}
@@ -52,7 +52,7 @@ jobs:
           node-version: 16
       - name: Compress zip
         run: |
-          PACKAGE_VERSION=$(sed -nE 's/^\s*"version": "(.*?)",$/\1/p' package.json)
+          PACKAGE_VERSION=$(sed -nE 's/^ *version: "([^"]+)"$/\1/p' theme.yaml)
           PRE_ZIP_FOLDER=halo-theme-Joe3-${PACKAGE_VERSION}
           ARTIFACT_NAME=${PRE_ZIP_FOLDER}.zip
           ARTIFACT_PATHNAME=dist/${ARTIFACT_NAME}

diff --git a/templates/assets/img/photo_loading.gif b/templates/assets/img/photo_loading.gif
diff --git a/templates/assets/js/common.js b/templates/assets/js/common.js
@@ -172,7 +172,7 @@ const commonContext = {
 				}
 				// 代码复制
 				if (ThemeConfig.enable_code_copy) {
-					const text = $item.find("code[class='language-none'], code[class*='language-']").text();
+					const text = $item.find('code[class*="language-"]').text();
 					const span = $(
 						"<span class=\"copy-button\"><i class=\"joe-font joe-icon-copy\" title=\"复制代码\"></i></span>"
 					);

diff --git a/templates/assets/js/min/common.min.js b/templates/assets/js/min/common.min.js
diff --git a/templates/assets/js/min/photos.min.js b/templates/assets/js/min/photos.min.js