From 231964080b26b3b3cab91b2c6144a784d3bef99d Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Sun, 14 Jun 2020 00:06:35 +0800
Subject: In-post APlayer now support multiple files
---
README.md | 14 ++++++++++----
README_CN.md | 14 ++++++++++----
assets/scss/_fuji-theme/_dark-diff.scss | 21 +++++++++++++++++++++
gulpfile.js | 4 ++++
layouts/_default/single.html | 2 +-
layouts/partials/head.html | 2 +-
layouts/partials/scripts-end.html | 21 +++++++++++++--------
package.json | 7 +++++--
static/assets/css/fuji.min.css | 2 +-
static/assets/css/fuji.min.css.map | 1 -
static/assets/js/fuji.min.js.map | 1 -
11 files changed, 66 insertions(+), 23 deletions(-)
delete mode 100644 static/assets/css/fuji.min.css.map
delete mode 100644 static/assets/js/fuji.min.js.map
diff --git a/README.md b/README.md
index d8f4428..e28ed3c 100644
--- a/README.md
+++ b/README.md
@@ -98,10 +98,16 @@ showToc = false
In-post APlayer supported, you can set these variables in post's front matter:
```toml
-playerName = "..." # Audio title or name
-playerArtist = "..." # Audio artist
-playerURL = "..." # Audio URL, support aac, mp3, wav and ogg
-playerCover = "..." # Audio cover
+[[player]]
+ playerName = "..." # Audio title or name
+ playerArtist = "..." # Audio artist
+ playerURL = "..." # Audio URL, support aac, mp3, wav and ogg
+ playerCover = "..." # Audio cover
+[[player]]
+ playerName = "..."
+ playerArtist = "..."
+ playerURL = "..."
+ playerCover = "..."
```
### 📷 Image zoom and lazyload settings
diff --git a/README_CN.md b/README_CN.md
index 6f2ed65..17fe0c0 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -88,10 +88,16 @@ showToc = false
支持给文章单独添加 APlayer，在 front matter 里加上这些:
```toml
-playerName = "..." # 标题
-playerArtist = "..." # 作者
-playerURL = "..." # URL
-playerCover = "..." # 封面
+[[player]]
+ playerName = "..." # 标题
+ playerArtist = "..." # 作者
+ playerURL = "..." # URL
+ playerCover = "..." # 封面
+[[player]]
+ playerName = "..."
+ playerArtist = "..."
+ playerURL = "..."
+ playerCover = "..."
```
### 📷 图片放大的设置和 lazyload
diff --git a/assets/scss/_fuji-theme/_dark-diff.scss b/assets/scss/_fuji-theme/_dark-diff.scss
index 55f596f..d5821a8 100644
--- a/assets/scss/_fuji-theme/_dark-diff.scss
+++ b/assets/scss/_fuji-theme/_dark-diff.scss
@@ -33,3 +33,24 @@ table {
.aplayer .aplayer-info .aplayer-controller .aplayer-time .aplayer-icon:hover path {
fill: var(--color-focus) !important;
}
+
+.aplayer .aplayer-list ol li {
+ border-top: 1px solid var(--color-bg) !important;
+}
+
+.aplayer.aplayer-withlist .aplayer-info {
+ border-bottom: 1px solid var(--color-bg) !important;
+}
+
+.aplayer .aplayer-list ol li.aplayer-list-light {
+ background-color: var(--color-codebg) !important;
+}
+
+.aplayer .aplayer-list ol li:hover {
+ background-color: var(--color-codebg) !important;
+}
+
+.aplayer .aplayer-list ol li .aplayer-list-author,
+.aplayer .aplayer-list ol li .aplayer-list-index {
+ color: var(--color-font) !important;
+}
diff --git a/gulpfile.js b/gulpfile.js
index 7caec20..a0df114 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,4 +1,5 @@
var pipeline = require('readable-stream').pipeline;
+var del = require('del');
var gulp = require('gulp');
var sourcemaps = require('gulp-sourcemaps');
var babel = require('gulp-babel');
@@ -58,6 +59,9 @@ function css() {
}
exports.build = gulp.parallel(js, css);
+exports.clean = function () {
+ return del(['static/assets/css/fuji.min.css.map', 'static/assets/js/fuji.min.js.map']);
+};
exports.devJs = function () {
return gulp.watch('assets/js/fuji.js', { delay: 500 }, devJs);
};
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index db5e2f5..413cacc 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -7,7 +7,7 @@
{{ partial "post-meta.html" . }}
- {{ with .Params.playerURL }}
+ {{ with .Params.player }}
{{ end }}
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 0603c4d..6470262 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -41,7 +41,7 @@
{{ end }}
-{{ if .Params.playerURL }}
+{{ if .Params.player }}
{{ end }}
{{ if .Site.Params.useDisqusJS }}
diff --git a/layouts/partials/scripts-end.html b/layouts/partials/scripts-end.html
index 862e0e2..2e1de5f 100644
--- a/layouts/partials/scripts-end.html
+++ b/layouts/partials/scripts-end.html
@@ -7,20 +7,25 @@
-{{ with .Params.playerURL }}
+{{ with .Params.player }}