From fb0d916901ad177df207385332d3b12cf97da64c Mon Sep 17 00:00:00 2001 From: haoouba <2323333339@qq.com> Date: Wed, 10 Feb 2021 11:39:20 +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 --- archive.php | 2 +- assets/js/joe.global.js | 3 --- assets/js/joe.index.js | 3 +-- assets/js/joe.live.js | 7 +++---- assets/js/joe.video.js | 6 ++---- assets/js/joe.wallpaper.js | 6 ++++-- core/parse.php | 6 +++--- core/short.php | 10 +++++----- friends.php | 2 +- index.php | 8 ++++---- live.php | 2 +- plugin/lazyload/joe.lazyload.js | 1 - public/article.php | 2 +- public/aside.php | 8 ++++---- public/comment.php | 2 +- public/header.php | 2 +- public/include.php | 2 +- video.php | 2 +- 18 files changed, 34 insertions(+), 40 deletions(-) delete mode 100644 plugin/lazyload/joe.lazyload.js diff --git a/archive.php b/archive.php index 402c4ba..74cb6da 100644 --- a/archive.php +++ b/archive.php @@ -36,7 +36,7 @@
  • - <?php $this->title() ?> + <?php $this->title() ?> diff --git a/assets/js/joe.global.js b/assets/js/joe.global.js index 6c11eda..8d2bec0 100644 --- a/assets/js/joe.global.js +++ b/assets/js/joe.global.js @@ -344,7 +344,4 @@ document.addEventListener('DOMContentLoaded', () => { }); } } - - /* 懒加载 */ - new LazyLoad('.lazyload'); }); diff --git a/assets/js/joe.index.js b/assets/js/joe.index.js index 0c74d6b..f4c6b56 100644 --- a/assets/js/joe.index.js +++ b/assets/js/joe.index.js @@ -49,7 +49,7 @@ document.addEventListener('DOMContentLoaded', () => {
  • - ${_.title} + ${_.title} @@ -83,7 +83,6 @@ document.addEventListener('DOMContentLoaded', () => { $('.joe_load').removeAttr('loading'); $('.joe_load').html('查看更多'); $('.joe_index__list .joe_list__loading').hide(); - new LazyLoad('.list_lazyload'); reslove(res.data.length > 0 ? res.data.length - 1 : 0); } }); diff --git a/assets/js/joe.live.js b/assets/js/joe.live.js index 1393e0f..af73d60 100644 --- a/assets/js/joe.live.js +++ b/assets/js/joe.live.js @@ -25,7 +25,7 @@ document.addEventListener('DOMContentLoaded', () => { renderLiveType(); function renderLiveType() { $.ajax({ - url: '/usr/themes/joe/assets/json/joe.live.json', + url: '/usr/themes/Joe/assets/json/joe.live.json', success(res) { const item = res[queryData.index]; $('.joe_live__type-title .text').html(item.name); @@ -55,14 +55,14 @@ document.addEventListener('DOMContentLoaded', () => {
    ${_.recommendTagName} - ${_.introduction} + ${_.introduction}
    - ${_.nick} + ${_.nick}
    ${_.nick}

    ${_.introduction}

    @@ -78,7 +78,6 @@ document.addEventListener('DOMContentLoaded', () => { `; }); $('.joe_live__list').html(htmlStr); - new LazyLoad('.screenshot_lazyload'); queryData.totalPage = res.data.totalPage; initPagination(); }, diff --git a/assets/js/joe.video.js b/assets/js/joe.video.js index dfd65bf..205c3f6 100644 --- a/assets/js/joe.video.js +++ b/assets/js/joe.video.js @@ -52,13 +52,12 @@ document.addEventListener('DOMContentLoaded', () => {     ${_.vod_year}
    - ${_.vod_name} + ${_.vod_name}

    ${_.vod_name}

    `; }); $('.joe_video__list-item').html(htmlStr); - new LazyLoad('.video_lazyload'); } pagecount = res.data.pagecount; initPagination(); @@ -131,7 +130,7 @@ document.addEventListener('DOMContentLoaded', () => { /* 设置视频详情 */ $('.joe_video__detail-info').html(`
    - ${item.vod_name} + ${item.vod_name} ${item.vod_year}
    @@ -142,7 +141,6 @@ document.addEventListener('DOMContentLoaded', () => {
    简介：

    ${getContent(item)}

    `); - new LazyLoad('.video_lazyload'); /* 设置视频播放标题 */ $('.joe_video__player .joe_video__contain-title').html('正在播放：' + item.vod_name); /* 设置播放链接 */ diff --git a/assets/js/joe.wallpaper.js b/assets/js/joe.wallpaper.js index 114eb61..0dd84bd 100644 --- a/assets/js/joe.wallpaper.js +++ b/assets/js/joe.wallpaper.js @@ -40,10 +40,12 @@ document.addEventListener('DOMContentLoaded', () => { if (res.code !== 1) return; let htmlStr = ''; res.data.forEach(_ => { - htmlStr += `壁纸`; + htmlStr += ` + + 壁纸 + `; }); $('.joe_wallpaper__list').html(htmlStr); - new LazyLoad('.wallpaper_lazyload'); total = res.total; initPagination(); }, diff --git a/core/parse.php b/core/parse.php index 9f42117..de80cf3 100644 --- a/core/parse.php +++ b/core/parse.php @@ -7,7 +7,7 @@ require_once('short.php'); function _parseCommentReply($text) { $text = _parseReply($text); - $text = preg_replace('/\{!{(.*?)\}!}/', '画图', $text); + $text = preg_replace('/\{!{(.*?)\}!}/', '画图', $text); echo $text; } @@ -17,14 +17,14 @@ function _parseReply($text) $text = preg_replace_callback( '/\:\:\(\s*(呵呵|哈哈|吐舌|太开心|笑眼|花心|小乖|乖|捂嘴笑|滑稽|你懂的|不高兴|怒|汗|黑线|泪|真棒|喷|惊哭|阴险|鄙视|酷|啊|狂汗|what|疑问|酸爽|呀咩爹|委屈|惊讶|睡觉|笑尿|挖鼻|吐|犀利|小红脸|懒得理|勉强|爱心|心碎|玫瑰|礼物|彩虹|太阳|星星月亮|钱币|茶杯|蛋糕|大拇指|胜利|haha|OK|沙发|手纸|香蕉|便便|药丸|红领巾|蜡烛|音乐|灯泡|开心|钱|咦|呼|冷|生气|弱|吐血)\s*\)/is', function ($match) { - return '表情'; + return '表情'; }, $text ); $text = preg_replace_callback( '/\:\@\(\s*(高兴|小怒|脸红|内伤|装大款|赞一个|害羞|汗|吐血倒地|深思|不高兴|无语|亲亲|口水|尴尬|中指|想一想|哭泣|便便|献花|皱眉|傻笑|狂汗|吐|喷水|看不见|鼓掌|阴暗|长草|献黄瓜|邪恶|期待|得意|吐舌|喷血|无所谓|观察|暗地观察|肿包|中枪|大囧|呲牙|抠鼻|不说话|咽气|欢呼|锁眉|蜡烛|坐等|击掌|惊喜|喜极而泣|抽烟|不出所料|愤怒|无奈|黑线|投降|看热闹|扇耳光|小眼睛|中刀)\s*\)/is', function ($match) { - return '表情'; + return '表情'; }, $text ); diff --git a/core/short.php b/core/short.php index c5e8468..f116515 100644 --- a/core/short.php +++ b/core/short.php @@ -17,7 +17,7 @@ function _parseContent($post, $login) if (preg_match('/\{music-list\s{0,}id="\d{0,}"\s{0,}\/\}/SU', $content)) { $content = preg_replace( '/\{music-list\s{0,}id="(\d{0,})"\s{0,}\/\}/SU', - '', + '', $content ); } @@ -25,16 +25,16 @@ function _parseContent($post, $login) if (preg_match('/\{music\s{0,}id="\d{0,}"\s{0,}\/\}/SU', $content)) { $content = preg_replace( '/\{music\s{0,}id="(\d{0,})"\s{0,}\/\}/SU', - '', + '', $content ); } /* 过滤dplayer播放器 */ if (preg_match('/\{dplayer\s{0,}src=".{0,}"\s{0,}\/\}/sSU', $content)) { - $player = Helper::options()->JCustomPlayer ? Helper::options()->JCustomPlayer : '/usr/themes/joe/library/player.php?url='; + $player = Helper::options()->JCustomPlayer ? Helper::options()->JCustomPlayer : '/usr/themes/Joe/library/player.php?url='; $content = preg_replace( '/\{dplayer\s{0,}src="(.{0,})"\s{0,}\/\}/sSU', - '', + '', $content ); } @@ -42,7 +42,7 @@ function _parseContent($post, $login) if (preg_match('/\{bilibili\s{0,}bvid="\w{0,}"\s{0,}\/\}/sSU', $content)) { $content = preg_replace( '/\{bilibili\s{0,}bvid="(\w{0,})"\s{0,}\/\}/sSU', - '', + '', $content ); } diff --git a/friends.php b/friends.php index 5e27fee..ab7c93a 100644 --- a/friends.php +++ b/friends.php @@ -93,7 +93,7 @@
    - <?php echo $item['name']; ?> + <?php echo $item['name']; ?>
    • diff --git a/index.php b/index.php index 548f487..67833b6 100644 --- a/index.php +++ b/index.php @@ -57,7 +57,7 @@
    - <?php echo $item['title'] ?> + <?php echo $item['title'] ?>
    @@ -77,7 +77,7 @@ widget('Widget_Archive@' . $cid, 'pageSize=1&type=post', 'cid=' . $cid)->to($item); ?>
    -
    <?php $item->title() ?> + <?php $item->title() ?>
    推荐 @@ -98,7 +98,7 @@
    - <?php $item->title(); ?> + <?php $item->title(); ?>
    title(); ?>
     @@ -118,7 +118,7 @@
    - <?php echo $index_ad['url'] ?> + <?php echo $index_ad['url'] ?> 广告
    diff --git a/live.php b/live.php index 3c701ef..17b2778 100644 --- a/live.php +++ b/live.php @@ -29,7 +29,7 @@
    正在播放：
    - +
    diff --git a/plugin/lazyload/joe.lazyload.js b/plugin/lazyload/joe.lazyload.js deleted file mode 100644 index d7ab10a..0000000 --- a/plugin/lazyload/joe.lazyload.js +++ /dev/null @@ -1 +0,0 @@ -'use strict';var _createClass=function(){function a(b,c){for(var e,d=0;dtitle() ?>
    - <?php $this->author(); ?> + <?php $this->author(); ?>
    author(); ?> diff --git a/public/aside.php b/public/aside.php index f74f155..a8a5de0 100644 --- a/public/aside.php +++ b/public/aside.php @@ -2,9 +2,9 @@