caojiezi2003/Jony
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
haoouba 2021-02-01 21:24:49 +08:00
parent 30056b762c
commit 1de54fa2bb
8 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/css/joe.global.css
View File

File diff suppressed because one or more lines are too long

4
assets/css/joe.global.scss
View File

@ -1463,6 +1463,10 @@ html[data-night='night'] {
color: var(--theme); color: var(--theme);
} }
} }
&-player {
width: 100%;
height: 500px;
}
&-protected { &-protected {
display: flex; display: flex;
justify-content: center; justify-content: center;

2
assets/css/joe.wallpaper.css
View File

File diff suppressed because one or more lines are too long

14
assets/css/joe.wallpaper.scss
View File

@ -21,13 +21,13 @@
user-select: none; user-select: none;
&::before { &::before {
content: ''; content: '';
position: absolute; position: absolute;
border-style: solid; bottom: -10px;
border-width: 10px; left: -10px;
bottom: -20px; border-style: solid;
left: 0; border-width: 10px;
z-index: -1; border-color: var(--theme) transparent transparent;
border-color: var(--theme) transparent transparent; transform: rotate(90deg);
} }
} }
&-list { &-list {

2
assets/js/joe.video.js
View File

@ -117,7 +117,7 @@ document.addEventListener('DOMContentLoaded', () => {
/* 搜索功能 */ /* 搜索功能 */
const searchFn = () => { const searchFn = () => {
const val = $('.joe_video__list-search input').val(); const val = $('.joe_video__list-search input').val();
if (!val || isLoading) return; if (isLoading) return;
queryData.pg = 1; queryData.pg = 1;
queryData.t = ''; queryData.t = '';
queryData.wd = val; queryData.wd = val;

18
core/short.php
View File

@ -18,6 +18,22 @@ function _parseShortCode($content)
$content $content
); );
} }
/* 过滤bilibili播放器 */
if (preg_match('/\[bilibili\s{0,}bvid="\w{0,}"\s{0,}\/\]/', $content)) {
$content = preg_replace(
'/\[bilibili\s{0,}bvid="(\w{0,})"\s{0,}\/\]/',
'<iframe class="joe_detail__article-player block" allowfullscreen="true" src="//player.bilibili.com/player.html?bvid=$1"></iframe>',
$content
);
}
/* 过滤dplayer播放器 */
if (preg_match('/\[dplayer\s{0,}src=".{0,}"\s{0,}\/\]/', $content)) {
$player = Helper::options()->JCustomPlayer ? Helper::options()->JCustomPlayer : '/usr/themes/Joe/library/player.php?url=';
$content = preg_replace(
'/\[dplayer\s{0,}src="(.{0,})"\s{0,}\/\]/',
'<iframe class="joe_detail__article-player block" allowfullscreen="true" src="' . $player . '$1"></iframe>',
$content
);
}
return $content; return $content;
} }

1
functions.php
View File

@ -647,6 +647,7 @@ function themeConfig($form)
NULL, NULL,
'自定义视频播放器（非必填）', '自定义视频播放器（非必填）',
'介绍：用于修改主题自带的默认播放器 <br /> '介绍：用于修改主题自带的默认播放器 <br />
例如：https://v.ini0.com/player/?url= <br />
注意：主题自带的播放器只能解析M3U8的视频格式' 注意：主题自带的播放器只能解析M3U8的视频格式'
); );
$JCustomPlayer->setAttribute('class', 'joe_content joe_other'); $JCustomPlayer->setAttribute('class', 'joe_content joe_other');

2
video.php
View File

@ -34,7 +34,7 @@
</div> </div>
<div class="joe_video__player joe_video__contain"> <div class="joe_video__player joe_video__contain">
<div class="joe_video__contain-title">正在播放：</div> <div class="joe_video__contain-title">正在播放：</div>
<iframe class="joe_video__player-play" data-player="<?php echo $this->options->JCustomPlayer ? $this->options->JCustomPlayer : '/usr/themes/Joe/library/player.php?url=' ?>"></iframe> <iframe allowfullscreen="true" class="joe_video__player-play" data-player="<?php echo $this->options->JCustomPlayer ? $this->options->JCustomPlayer : '/usr/themes/Joe/library/player.php?url=' ?>"></iframe>
</div> </div>
<?php else : ?> <?php else : ?>
<div class="joe_video__type joe_video__contain"> <div class="joe_video__type joe_video__contain">