biss/hexo-theme-butterfly
1
0
Fork 0
mirror of https://github.com/jerryc127/hexo-theme-butterfly.git synced 2026-04-12 22:17:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

💥 支持雙評論系統配置/評論配置整理

Browse Source 
✨ 增加mac light 代碼框
✨ 增加文章過期提醒配置
✨ 文章copyright 可單獨配置
✨ card-category 中category名稱和數字限制一行顯示
✨ 簡繁轉換優化，placeholder文字也會被轉換
🐛 修復配置PWA參數時，如果網站是子目錄時，會出現加載不到文件的bugs
調整當card-category有收縮按鈕時的顯示佈局
This commit is contained in:
Jerry
2020-06-25 23:13:55 +08:00
parent 67b49c01ba
commit 4d34208391
47 changed files with 1098 additions and 817 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
_config.yml
View File

@@ -20,7 +20,7 @@ menu:
# Code Blocks (代碼相關) # Code Blocks (代碼相關)
# -------------------------------------- # --------------------------------------
highlight_theme: light # default / darker / pale night / light / ocean / mac / false highlight_theme: light # default / darker / pale night / light / ocean / mac / mac light / false
highlight_copy: true # copy button highlight_copy: true # copy button
highlight_lang: true # show the code language highlight_lang: true # show the code language
highlight_shrink: false # true: shrink the code blocks / false: expand the code blocks | none: expand code blocks and hide the button highlight_shrink: false # true: shrink the code blocks / false: expand the code blocks | none: expand code blocks and hide the button
@@ -200,6 +200,15 @@ photofigcaption: false
# when you scroll in post, the URL will update according to header id. # when you scroll in post, the URL will update according to header id.
anchor: false anchor: false
# Displays outdated notice for a post (文章過期提醒)
noticeOutdate:
enable: false
style: flat # style: simple/flat
limit_day: 500 # When will it be shown
position: top # position: top/bottom
message_prev: It has been
message_next: days since the last update, the content of the article may be outdated.
# Share System (分享功能) # Share System (分享功能)
# -------------------------------------- # --------------------------------------
@@ -231,18 +240,23 @@ addtoany:
# Comments System # Comments System
# -------------------------------------- # --------------------------------------
comments:
# Up to two comments system, the first will be shown as default
# Disqus/Disqusjs/Livere/Gitalk/Valine/Utterances/Facebook Comments
use:
text: true # Display the comment name next to the button
load_begin: false # The second comment system will auto load when visiting the website
count: false # Dispaly comment count in top_img
# disqus # disqus
# https://disqus.com/ # https://disqus.com/
disqus: disqus:
enable: false
shortname: shortname:
count: false # dispaly comment count in top_img
# Alternative Disqus - Render comments with Disqus API # Alternative Disqus - Render comments with Disqus API
# DisqusJS評論系統，可以實現在網路審查地區載入 Disqus 評論列表，兼容原版 # DisqusJS評論系統，可以實現在網路審查地區載入 Disqus 評論列表，兼容原版
# https://github.com/SukkaW/DisqusJS # https://github.com/SukkaW/DisqusJS
disqusjs: disqusjs:
enable: false
shortname: shortname:
siteName: siteName:
apikey: apikey:
@@ -250,18 +264,15 @@ disqusjs:
nocomment: # display when a blog post or an article has no comment attached nocomment: # display when a blog post or an article has no comment attached
admin: admin:
adminLabel: adminLabel:
count: false # dispaly comment count in top_img
# livere(來必力) # livere(來必力)
# https://www.livere.com/ # https://www.livere.com/
livere: livere:
enable: false
uid: uid:
# gitalk # gitalk
# https://github.com/gitalk/gitalk # https://github.com/gitalk/gitalk
gitalk: gitalk:
enable: false
client_id: client_id:
client_secret: client_secret:
repo: repo:
@@ -272,12 +283,10 @@ gitalk:
distractionFreeMode: false # Facebook-like distraction free mode. distractionFreeMode: false # Facebook-like distraction free mode.
pagerDirection: last # Comment sorting direction, available values are last and first. pagerDirection: last # Comment sorting direction, available values are last and first.
createIssueManually: false # Gitalk will create a corresponding github issue for your every single page automatically createIssueManually: false # Gitalk will create a corresponding github issue for your every single page automatically
count: false # dispaly comment count in top_img
# valine # valine
# https://valine.js.org # https://valine.js.org
valine: valine:
enable: false # if you want use valine,please set this value is true
appId: # leancloud application app id appId: # leancloud application app id
appKey: # leancloud application app key appKey: # leancloud application app key
pageSize: 10 # comment list page size pageSize: 10 # comment list page size
@@ -291,12 +300,10 @@ valine:
emojiCDN: # emoji CDN emojiCDN: # emoji CDN
enableQQ: false # enable the Nickname box to automatically get QQ Nickname and QQ Avatar enableQQ: false # enable the Nickname box to automatically get QQ Nickname and QQ Avatar
requiredFields: nick,mail # required fields (nick/mail) requiredFields: nick,mail # required fields (nick/mail)
count: false # dispaly comment count in top_img
# utterances # utterances
# https://utteranc.es/ # https://utteranc.es/
utterances: utterances:
enable: false
repo: repo:
# Issue Mapping: pathname/url/title/og:title # Issue Mapping: pathname/url/title/og:title
issue_term: pathname issue_term: pathname
@@ -307,13 +314,11 @@ utterances:
# Facebook Comments Plugin # Facebook Comments Plugin
# https://developers.facebook.com/docs/plugins/comments/ # https://developers.facebook.com/docs/plugins/comments/
facebook_comments: facebook_comments:
enable: false
app_id: app_id:
user_id: # optional user_id: # optional
pageSize: 10 # The number of comments to show pageSize: 10 # The number of comments to show
order_by: social # social/time/reverse_time order_by: social # social/time/reverse_time
lang: en_US # Language en_US/zh_CN/zh_TW and so on lang: en_US # Language en_US/zh_CN/zh_TW and so on
count: false
# Chat Services # Chat Services
# -------------------------------------- # --------------------------------------

16
layout/includes/comments/disqus.pug
View File

@@ -1,18 +1,28 @@
#disqus_thread #disqus_thread
script. script.
function loadDisqus () {
var disqus_config = function () { var disqus_config = function () {
this.page.url = '!{ page.permalink }'; this.page.url = '!{ page.permalink }';
this.page.identifier = '!{ page.path }'; this.page.identifier = '!{ page.path }';
this.page.title = '!{ page.title }'; this.page.title = '!{ page.title }';
}; };
(function() {
var d = document, s = d.createElement('script'); var d = document, s = d.createElement('script');
s.src = 'https://!{theme.disqus.shortname}.disqus.com/embed.js'; s.src = 'https://!{theme.disqus.shortname}.disqus.com/embed.js';
s.setAttribute('data-timestamp', +new Date()); s.setAttribute('data-timestamp', +new Date());
(d.head || d.body).appendChild(s); (d.head || d.body).appendChild(s);
})(); }
if is_post() && theme.disqus.count if ('!{defaultComment}' === 'Disqus' || !{theme.comments.load_begin}) {
window.addEventListener('load', loadDisqus)
}
else {
function loadOtherComment () {
loadDisqus()
}
}
if is_post() && theme.comments.count && defaultComment === 'Disqus'
script. script.
function getDisqusCount() { function getDisqusCount() {
var d = document, s = d.createElement('script'); var d = document, s = d.createElement('script');

22
layout/includes/comments/disqusjs.pug
View File

@@ -1,6 +1,12 @@
#disqus_thread #disqus_thread
script(src=url_for(theme.CDN.disqusjs))
script. script.
function loadDisqusjs () {
const ele = document.createElement('link')
ele.rel = 'stylesheet'
ele.href= '!{url_for(theme.CDN.disqusjs_css)}'
document.getElementsByTagName('head')[0].appendChild(ele)
loadScript('!{url_for(theme.CDN.disqusjs)}', function() {
var dsqjs = new DisqusJS({ var dsqjs = new DisqusJS({
shortname: '!{theme.disqusjs.shortname}', shortname: '!{theme.disqusjs.shortname}',
siteName: '!{theme.disqusjs.siteName}', siteName: '!{theme.disqusjs.siteName}',
@@ -13,8 +19,20 @@ script.
admin: '!{theme.disqusjs.admin}', admin: '!{theme.disqusjs.admin}',
adminLabel: '!{theme.disqusjs.adminLabel}' adminLabel: '!{theme.disqusjs.adminLabel}'
}); });
})
}
if is_post() && theme.disqusjs.count if ('!{defaultComment}' === 'Disqusjs' || !{theme.comments.load_begin}) {
window.addEventListener('load', loadDisqusjs)
}
else {
function loadOtherComment () {
loadDisqusjs()
}
}
if is_post() && theme.comments.count && defaultComment === 'Disqusjs'
script. script.
function getDisqusCount() { function getDisqusCount() {
var d = document, s = d.createElement('script'); var d = document, s = d.createElement('script');

20
layout/includes/comments/facebook_comments.pug
View File

@@ -1,11 +1,29 @@
#fb-root #fb-root
script(async defer crossorigin="anonymous" src=`https://connect.facebook.net/${theme.facebook_comments.lang}/sdk.js#xfbml=1&version=v6.0`)
.fb-comments(data-colorscheme = theme.display_mode === 'dark' ? 'dark' : 'light' .fb-comments(data-colorscheme = theme.display_mode === 'dark' ? 'dark' : 'light'
data-href=urlNoIndex() data-href=urlNoIndex()
data-numposts= theme.facebook_comments.pageSize || 10 data-numposts= theme.facebook_comments.pageSize || 10
data-order-by= theme.facebook_comments.order_by || 'social' data-order-by= theme.facebook_comments.order_by || 'social'
data-width="100%") data-width="100%")
script.
function loadFBComent () {
let ele = document.createElement('script')
ele.setAttribute('src','https://connect.facebook.net/!{theme.facebook_comments.lang}/sdk.js#xfbml=1&version=v7.0')
ele.setAttribute('async', 'true')
ele.setAttribute('defer', 'true')
ele.setAttribute('crossorigin', 'anonymous')
document.getElementById('fb-root').insertAdjacentElement('afterbegin',ele)
}
if ('!{defaultComment}' === 'Facebook Comments' || !{theme.comments.load_begin}) {
window.addEventListener('load', loadFBComent)
}
else {
function loadOtherComment () {
loadFBComent()
}
}
if theme.darkmode.enable if theme.darkmode.enable
script. script.
var themeNow = document.documentElement.getAttribute('data-theme') === 'dark' ? 'dark' : 'light' var themeNow = document.documentElement.getAttribute('data-theme') === 'dark' ? 'dark' : 'light'

20
layout/includes/comments/gitalk.pug
View File

@@ -1,5 +1,14 @@
#gitalk-container #gitalk-container
script(src=url_for(theme.CDN.blueimp_md5))
script. script.
function loadGitalk () {
const ele = document.createElement('link')
ele.rel = 'stylesheet'
ele.href= '!{url_for(theme.CDN.gitalk_css)}'
document.getElementsByTagName('head')[0].appendChild(ele)
loadScript('!{url_for(theme.CDN.gitalk)}', function () {
var gitalk = new Gitalk({ var gitalk = new Gitalk({
clientID: '!{theme.gitalk.client_id}', clientID: '!{theme.gitalk.client_id}',
clientSecret: '!{theme.gitalk.client_secret}', clientSecret: '!{theme.gitalk.client_secret}',
@@ -15,6 +24,7 @@ script.
updateCountCallback: commentCount updateCountCallback: commentCount
}) })
gitalk.render('gitalk-container') gitalk.render('gitalk-container')
})
function commentCount(n){ function commentCount(n){
try { try {
@@ -23,5 +33,15 @@ script.
return false return false
} }
} }
}
if ('!{defaultComment}' === 'Gitalk' || !{theme.comments.load_begin}) {
window.addEventListener('load', loadGitalk)
}
else {
function loadOtherComment () {
loadGitalk()
}
}

49
layout/includes/comments/index.pug
View File

@@ -1,29 +1,36 @@
- var d = theme.disqus && theme.disqus.enable if theme.comments && theme.comments.use
- var dj = theme.disqusjs && theme.disqusjs.enable - const defaultComment = theme.comments.use[0]
- var l = theme.livere && theme.livere.enable
- var gt = theme.gitalk && theme.gitalk.enable
- var v = theme.valine && theme.valine.enable
- var u = theme.utterances && theme.utterances.enable
- var fb = theme.facebook_comments && theme.facebook_comments.enable
- var isComment = d || dj || l || gt || v || u || fb
if isComment
hr hr
#post-comment #post-comment
.comment_headling .comment-head
.comment-headling
i.fas.fa-comments.fa-fw i.fas.fa-comments.fa-fw
span= ' ' + _p('comment') span= ' ' + _p('comment')
if d
if theme.comments.use.length > 1
.comment-switch
span.first-comment=defaultComment
label
input#switch-comments-btn(type="checkbox")
span.slider
span.second-comment=theme.comments.use[1]
.comment-wrap
each name, index in theme.comments.use
div(class=`comments-items-${index+1}` data-name=`${name}`)
case name
when 'Disqus'
include ./disqus.pug include ./disqus.pug
else if dj when 'Valine'
include ./disqusjs.pug
else if l
include ./livere.pug
else if gt
include ./gitalk.pug
else if v
include ./valine.pug include ./valine.pug
else if u when 'Disqusjs'
include ./disqusjs.pug
when 'Livere'
include ./livere.pug
when 'Gitalk'
include ./gitalk.pug
when 'Utterances'
include ./utterances.pug include ./utterances.pug
else if fb when 'Facebook Comments'
include ./facebook_comments.pug include ./facebook_comments.pug

11
layout/includes/comments/livere.pug
View File

@@ -1,5 +1,6 @@
#lv-container(data-id="city" data-uid=theme.livere.uid) #lv-container(data-id="city" data-uid=theme.livere.uid)
script. script.
function loadlivere () {
(function(d, s) { (function(d, s) {
var j, e = d.getElementsByTagName(s)[0]; var j, e = d.getElementsByTagName(s)[0];
if (typeof LivereTower === 'function') { return; } if (typeof LivereTower === 'function') { return; }
@@ -8,3 +9,13 @@
j.async = true; j.async = true;
e.parentNode.insertBefore(j, e); e.parentNode.insertBefore(j, e);
})(document, 'script'); })(document, 'script');
}
if ('!{defaultComment}' === 'Livere' || !{theme.comments.load_begin}) {
window.addEventListener('load', loadlivere)
}
else {
function loadOtherComment () {
loadlivere()
}
}

33
layout/includes/comments/utterances.pug
View File

@@ -1,15 +1,30 @@
script#utterances_comment(src=theme.CDN.utterances #utterances-wrap
repo=theme.utterances.repo
issue-term=theme.utterances.issue_term script.
theme= theme.display_mode === 'dark' ? theme.utterances.dark_theme : theme.utterances.light_theme function loadUtterances () {
crossorigin="anonymous" let ele = document.createElement('script')
async) ele.setAttribute('id', 'utterances_comment')
ele.setAttribute('src', '!{url_for(theme.CDN.utterances)}')
ele.setAttribute('repo', '!{theme.utterances.repo}')
ele.setAttribute('issue-term', '!{theme.utterances.issue_term}')
let nowTheme = document.documentElement.getAttribute('data-theme') === 'dark' ? '#{theme.utterances.dark_theme}' : '#{theme.utterances.light_theme}'
ele.setAttribute('theme', nowTheme)
ele.setAttribute('crossorigin', 'anonymous')
ele.setAttribute('async', 'true')
document.getElementById('utterances-wrap').insertAdjacentElement('afterbegin',ele)
}
if ('!{defaultComment}' === 'Utterances' || !{theme.comments.load_begin}) {
window.addEventListener('load', loadUtterances)
}
else {
function loadOtherComment () {
loadUtterances()
}
}
if theme.darkmode.enable if theme.darkmode.enable
script. script.
var themeNow = document.documentElement.getAttribute('data-theme') === 'dark' ? '#{theme.utterances.dark_theme}' : '#{theme.utterances.light_theme}'
document.getElementById('utterances_comment').setAttribute('theme',themeNow)
function utterancesTheme () { function utterancesTheme () {
var theme = document.documentElement.getAttribute('data-theme') === 'dark' ? '#{theme.utterances.dark_theme}' : '#{theme.utterances.light_theme}' var theme = document.documentElement.getAttribute('data-theme') === 'dark' ? '#{theme.utterances.dark_theme}' : '#{theme.utterances.light_theme}'
const message = { const message = {

16
layout/includes/comments/valine.pug
View File

@@ -3,8 +3,8 @@ if site.data.valine
- emojiMaps = JSON.stringify(site.data.valine) - emojiMaps = JSON.stringify(site.data.valine)
#vcomment.vcomment #vcomment.vcomment
script(src=url_for(theme.CDN.valine))
script. script.
function loadvaline () {
var requestSetting = function (from,set) { var requestSetting = function (from,set) {
var from = from var from = from
var setting = set.split(',').filter(function(item){ var setting = set.split(',').filter(function(item){
@@ -17,6 +17,7 @@ script.
var guestInfo = requestSetting(['nick','mail','link'],'#{ theme.valine.guest_info }') var guestInfo = requestSetting(['nick','mail','link'],'#{ theme.valine.guest_info }')
var requiredFields = requestSetting(['nick','mail'],'#{ theme.valine.requiredFields }') var requiredFields = requestSetting(['nick','mail'],'#{ theme.valine.requiredFields }')
function initValine () {
window.valine = new Valine({ window.valine = new Valine({
el:'#vcomment', el:'#vcomment',
appId: '#{theme.valine.appId}', appId: '#{theme.valine.appId}',
@@ -33,3 +34,16 @@ script.
enableQQ: #{theme.valine.enableQQ}, enableQQ: #{theme.valine.enableQQ},
requiredFields: requiredFields requiredFields: requiredFields
}); });
}
loadScript('!{url_for(theme.CDN.valine)}', initValine)
}
if ('!{defaultComment}' === 'Valine' || !{theme.comments.load_begin}) {
window.addEventListener('load', loadvaline)
}
else {
function loadOtherComment () {
loadvaline()
}
}

11
layout/includes/head/comment.pug
View File

@@ -1,14 +1,5 @@
if (theme.facebook_comments.enable && page.comments !== false && !is_tag() && !is_category() && !is_archive() && !is_home()) if page.comments !== false && theme.comments.use && theme.comments.use.includes('Facebook Comments')
if theme.facebook_comments.app_id if theme.facebook_comments.app_id
meta(property="fb:app_id" content=theme.facebook_comments.app_id ) meta(property="fb:app_id" content=theme.facebook_comments.app_id )
if theme.facebook_comments.user_id if theme.facebook_comments.user_id
meta(property="fb:admins" content=theme.facebook_comments.user_id) meta(property="fb:admins" content=theme.facebook_comments.user_id)
if (theme.disqusjs && theme.disqusjs.enable && page.comments !== false && !is_tag() && !is_category() && !is_archive() && !is_home())
link(rel="stylesheet" type="text/css" href=url_for(theme.CDN.disqusjs_css))
if (theme.gitalk && theme.gitalk.enable && page.comments !== false && !is_tag() && !is_category() && !is_archive() && !is_home())
link(rel="stylesheet" type="text/css" href=url_for(theme.CDN.gitalk_css))
script(src=url_for(theme.CDN.gitalk))
script(src=url_for(theme.CDN.blueimp_md5))

11
layout/includes/head/config.pug
View File

@@ -74,12 +74,23 @@
}) })
} }
var noticeOutdate = 'undefined';
if (theme.noticeOutdate && theme.noticeOutdate.enable) {
noticeOutdate = JSON.stringify({
limitDay: theme.noticeOutdate.limit_day,
position: theme.noticeOutdate.position,
messagePrev: theme.noticeOutdate.message_prev,
messageNext: theme.noticeOutdate.message_next,
})
}
script. script.
var GLOBAL_CONFIG = { var GLOBAL_CONFIG = {
root: '!{config.root}', root: '!{config.root}',
algolia: !{algolia}, algolia: !{algolia},
localSearch: !{localSearch}, localSearch: !{localSearch},
translate: !{translate}, translate: !{translate},
noticeOutdate: !{noticeOutdate},
copy: { copy: {
success: '!{_p("copy.success")}', success: '!{_p("copy.success")}',
error: '!{_p("copy.error")}', error: '!{_p("copy.error")}',

7
layout/includes/head/config_site.pug
View File

@@ -1,10 +1,10 @@
- -
let isHighlightShrink let isHighlightShrink
if (theme.highlight_shrink == 'none') isHighlightShrink = 'undefined' if (theme.highlight_shrink == 'none') isHighlightShrink = 'undefined'
else if (page.highlight_shrink !== null && page.toc !== undefined ) isHighlightShrink = page.highlight_shrink else if (page.highlight_shrink === true || page.highlight_shrink === false) isHighlightShrink = page.highlight_shrink
else isHighlightShrink = theme.highlight_shrink else isHighlightShrink = theme.highlight_shrink
const pageToc = page.toc !== null && page.toc !== undefined ? page.toc : theme.toc.enable const pageToc = page.toc === true || page.toc === false ? page.toc : theme.toc.enable
const showToc = is_post() && pageToc && (toc(page.content) !== '' || page.encrypt == true ) const showToc = is_post() && pageToc && (toc(page.content) !== '' || page.encrypt == true )
- -
@@ -13,5 +13,6 @@ script.
isPost: !{is_post()}, isPost: !{is_post()},
isHome: !{is_home()}, isHome: !{is_home()},
isHighlightShrink: !{isHighlightShrink}, isHighlightShrink: !{isHighlightShrink},
isSidebar: !{showToc} isSidebar: !{showToc},
postUpdate: '!{full_date(page.updated)}'
} }

10
layout/includes/head/pwa.pug
View File

@@ -1,13 +1,13 @@
link(rel="manifest" href=theme.pwa.manifest) link(rel="manifest" href=url_for(theme.pwa.manifest))
if(theme.pwa.theme_color) if(theme.pwa.theme_color)
meta(name="theme-color" content=theme.pwa.theme_color) meta(name="theme-color" content=theme.pwa.theme_color)
if(theme.pwa.theme_color) if(theme.pwa.theme_color)
meta(name="msapplication-TileColor" content=theme.pwa.theme_color) meta(name="msapplication-TileColor" content=theme.pwa.theme_color)
if(theme.pwa.apple_touch_icon) if(theme.pwa.apple_touch_icon)
link(rel="apple-touch-icon" sizes="180x180" href=theme.pwa.apple_touch_icon) link(rel="apple-touch-icon" sizes="180x180" href=url_for(theme.pwa.apple_touch_icon))
if(theme.pwa.favicon_32_32) if(theme.pwa.favicon_32_32)
link(rel="icon" type="image/png" sizes="32x32" href=theme.pwa.favicon_32_32) link(rel="icon" type="image/png" sizes="32x32" href=url_for(theme.pwa.favicon_32_32))
if(theme.pwa.favicon_16_16) if(theme.pwa.favicon_16_16)
link(rel="icon" type="image/png" sizes="16x16" href=theme.pwa.favicon_16_16) link(rel="icon" type="image/png" sizes="16x16" href=url_for(theme.pwa.favicon_16_16))
if(theme.pwa.mask_icon) if(theme.pwa.mask_icon)
link(rel="mask-icon" href=theme.pwa.mask_icon color="#5bbad5") link(rel="mask-icon" href=url_for(theme.pwa.mask_icon) color="#5bbad5")

11
layout/includes/header/post-info.pug
View File

@@ -57,29 +57,32 @@
span=_p('post.page_pv') + ':' span=_p('post.page_pv') + ':'
span#busuanzi_value_page_pv span#busuanzi_value_page_pv
if page.comments !== false && theme.comments.use && theme.comments.count
span.post-meta-commentcount span.post-meta-commentcount
if ((theme.disqus && theme.disqus.enable && theme.disqus.count && page.comments !== false) || (theme.disqusjs && theme.disqusjs.enable && theme.disqusjs.count && page.comments !== false))
- let whichCount = theme.comments.use[0]
if whichCount === 'Disqus' || whichCount === 'Disqusjs'
if (postWordcount || theme.busuanzi.page_pv) if (postWordcount || theme.busuanzi.page_pv)
span.post-meta__separator | span.post-meta__separator |
i.far.fa-comments.fa-fw.post-meta__icon i.far.fa-comments.fa-fw.post-meta__icon
span= _p('post.comments') + ':' span= _p('post.comments') + ':'
span.disqus-comment-count.comment-count span.disqus-comment-count.comment-count
a(href=full_url_for(page.path) + '#disqus_thread') a(href=full_url_for(page.path) + '#disqus_thread')
else if (theme.valine && theme.valine.enable && theme.valine.count && page.comments !== false) else if whichCount === 'Valine'
if (postWordcount || theme.busuanzi.page_pv) if (postWordcount || theme.busuanzi.page_pv)
span.post-meta__separator | span.post-meta__separator |
i.far.fa-comments.fa-fw.post-meta__icon i.far.fa-comments.fa-fw.post-meta__icon
span= _p('post.comments') + ':' span= _p('post.comments') + ':'
a(href=url_for(page.path) + '#post-comment' itemprop="discussionUrl") a(href=url_for(page.path) + '#post-comment' itemprop="discussionUrl")
span.valine-comment-count.comment-count(data-xid=url_for(page.path) itemprop="commentCount") span.valine-comment-count.comment-count(data-xid=url_for(page.path) itemprop="commentCount")
else if (theme.gitalk && theme.gitalk.enable && theme.gitalk.count && page.comments !== false) else if whichCount === 'Gitalk'
if (postWordcount || theme.busuanzi.page_pv) if (postWordcount || theme.busuanzi.page_pv)
span.post-meta__separator | span.post-meta__separator |
i.far.fa-comments.fa-fw.post-meta__icon i.far.fa-comments.fa-fw.post-meta__icon
span= _p('post.comments') + ':' span= _p('post.comments') + ':'
a(href=url_for(page.path) + '#post-comment') a(href=url_for(page.path) + '#post-comment')
span.gitalk-comment-count.comment-count span.gitalk-comment-count.comment-count
else if theme.facebook_comments.enable && theme.facebook_comments.count && page.comments !== false else if whichCount === 'Facebook Comments'
if (postWordcount || theme.busuanzi.page_pv) if (postWordcount || theme.busuanzi.page_pv)
span.post-meta__separator | span.post-meta__separator |
i.far.fa-comments.fa-fw.post-meta__icon i.far.fa-comments.fa-fw.post-meta__icon

2
layout/includes/layout.pug
View File

@@ -1,5 +1,5 @@
- var hideAside = !theme.aside.enable || page.aside === false ? 'hide-aside' : '' - var hideAside = !theme.aside.enable || page.aside === false ? 'hide-aside' : ''
- var pageHighlightShrinkSet = page.highlight_shrink !== undefined ? page.highlight_shrink : theme.highlight_shrink - var pageHighlightShrinkSet = page.highlight_shrink === true || page.highlight_shrink === false ? page.highlight_shrink : theme.highlight_shrink
- var pageHighlightShrink = theme.highlight_shrink !== 'none' && pageHighlightShrinkSet ? 'code-close' : '' - var pageHighlightShrink = theme.highlight_shrink !== 'none' && pageHighlightShrinkSet ? 'code-close' : ''
doctype html doctype html

12
layout/includes/post/post-copyright.pug
View File

@@ -1,13 +1,17 @@
if (theme.post_copyright && theme.post_copyright.enable && page.copyright != false) if theme.post_copyright.enable && page.copyright !== false
- let author = page.copyright_author ? page.copyright_author : config.author
- let authorHref = page.copyright_author_href ? page.copyright_author_href : `mailto:${config.email}`
- let url = page.copyright_url ? page.copyright_url : page.permalink
- let info = page.copyright_info ? page.copyright_info : _p('post.copyright.copyright_content', theme.post_copyright.license_url, theme.post_copyright.license, config.url, config.title)
.post-copyright .post-copyright
.post-copyright__author .post-copyright__author
span.post-copyright-meta= _p('post.copyright.author') + ": " span.post-copyright-meta= _p('post.copyright.author') + ": "
span.post-copyright-info span.post-copyright-info
a(href=`mailto:${config.email}`) #[=config.author] a(href=authorHref)=author
.post-copyright__type .post-copyright__type
span.post-copyright-meta= _p('post.copyright.link') + ": " span.post-copyright-meta= _p('post.copyright.link') + ": "
span.post-copyright-info span.post-copyright-info
a(href=url_for(page.permalink))= theme.post_copyright.decode ? decodeURI(page.permalink) : page.permalink a(href=url_for(url))= theme.post_copyright.decode ? decodeURI(url) : url
.post-copyright__notice .post-copyright__notice
span.post-copyright-meta= _p('post.copyright.copyright_notice') + ": " span.post-copyright-meta= _p('post.copyright.copyright_notice') + ": "
span.post-copyright-info!= _p('post.copyright.copyright_content', theme.post_copyright.license_url, theme.post_copyright.license, config.url, config.title) span.post-copyright-info!= info

2
layout/includes/post/reward.pug
View File

@@ -1,5 +1,5 @@
.post-reward .post-reward
button.reward-button button.reward-button(type="button")
i.fas.fa-qrcode i.fas.fa-qrcode
= ' ' + _p('donate') = ' ' + _p('donate')
.reward-main .reward-main

24
layout/includes/rightside.pug
View File

@@ -1,32 +1,32 @@
section#rightside.rightside section#rightside
#rightside-config-hide #rightside-config-hide
if is_post() if is_post()
if theme.readmode if theme.readmode
button#readmode(title=_p('rightside.readmode_title')) button#readmode(type="button" title=_p('rightside.readmode_title'))
i.fas.fa-book-open i.fas.fa-book-open
button#font_plus(title=_p('rightside.font_plus_title')) button#font_plus(type="button" title=_p('rightside.font_plus_title'))
i.fas.fa-plus i.fas.fa-plus
button#font_minus(title=_p('rightside.font_minus_title')) button#font_minus(type="button" title=_p('rightside.font_minus_title'))
i.fas.fa-minus i.fas.fa-minus
if theme.translate && theme.translate.enable if theme.translate && theme.translate.enable
button#translateLink.translate_chn_to_cht(title=_p('rightside.translate_title'))= theme.translate.default button#translateLink(type="button" title=_p('rightside.translate_title'))= theme.translate.default
if theme.darkmode.enable && theme.darkmode.button if theme.darkmode.enable && theme.darkmode.button
button#darkmode(title=_p('rightside.night_mode_title')) button#darkmode(type="button" title=_p('rightside.night_mode_title'))
i.fas.fa-adjust i.fas.fa-adjust
#rightside-config-show #rightside-config-show
button#rightside_config(title=_p("rightside.setting")) button#rightside_config(type="button" title=_p("rightside.setting"))
i.fas.fa-cog i.fas.fa-cog
if is_post() && page.comments !== false && isComment if is_post() && page.comments !== false && theme.comments.use
a#to_comment(href="#post-comment" title=_p("rightside.scroll_to_comment")) a#to_comment(href="#post-comment" title=_p("rightside.scroll_to_comment"))
i.scroll_to_comment.fas.fa-comments i.fas.fa-comments
if showToc if showToc
button#mobile-toc-button.close(title=_p("rightside.toc")) button#mobile-toc-button.close(type="button" title=_p("rightside.toc"))
i.fas.fa-list-ul i.fas.fa-list-ul
if theme.chat_btn && (theme.chatra.enable || theme.tidio.enable || theme.daovoice.enable || theme.gitter.enable) if theme.chat_btn && (theme.chatra.enable || theme.tidio.enable || theme.daovoice.enable || theme.gitter.enable)
button#chat_btn(title=_p("rightside.chat_btn")) button#chat_btn(type="button" title=_p("rightside.chat_btn"))
i.fas.fa-sms i.fas.fa-sms
button#go-up(title=_p("rightside.back_to_top")) button#go-up(type="button" title=_p("rightside.back_to_top"))
i.fas.fa-arrow-up i.fas.fa-arrow-up

2
layout/includes/widget/card_author.pug
View File

@@ -25,7 +25,7 @@
.length_num= site.categories.length .length_num= site.categories.length
.card-info-bookmark.is-center .card-info-bookmark.is-center
button#bookmark-it.button--animated(title= _p('aside.card_bookmark')) button#bookmark-it.button--animated(type="button" title= _p('aside.card_bookmark'))
i.fas.fa-bookmark i.fas.fa-bookmark
span= _p('aside.card_bookmark') || 'Follow Me' span= _p('aside.card_bookmark') || 'Follow Me'

2
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "hexo-theme-butterfly", "name": "hexo-theme-butterfly",
"version": "3.0.0-rc-1", "version": "3.0.0",
"private": true, "private": true,
"engines": { "engines": {
"node": ">=8.10.0" "node": ">=8.10.0"

4
scripts/filters/post_lazyload.js
View File

@@ -10,11 +10,11 @@
const urlFor = require('hexo-util').url_for.bind(hexo) const urlFor = require('hexo-util').url_for.bind(hexo)
function lazyProcess (htmlContent) { function lazyProcess (htmlContent) {
var bg = hexo.theme.config.lazyload.post ? urlFor(hexo.theme.config.lazyload.post) : 'data:image/gif;base64,R0lGODdhAQABAPAAAMPDwwAAACwAAAAAAQABAAACAkQBADs=' const bg = hexo.theme.config.lazyload.post ? urlFor(hexo.theme.config.lazyload.post) : 'data:image/gif;base64,R0lGODdhAQABAPAAAMPDwwAAACwAAAAAAQABAAACAkQBADs='
return htmlContent.replace(/(<img .*?src=)/ig, `$1 "${bg}" data-src=`) return htmlContent.replace(/(<img .*?src=)/ig, `$1 "${bg}" data-src=`)
} }
var processPost = function (data) { const processPost = function (data) {
if (!hexo.theme.config.lazyload.enable) return if (!hexo.theme.config.lazyload.enable) return
data.content = lazyProcess.call(this, data.content) data.content = lazyProcess.call(this, data.content)
return data return data

8
scripts/filters/random_cover.js
View File

@@ -14,10 +14,10 @@ hexo.extend.filter.register('before_post_render', function (data) {
return data return data
}) })
var randomCover = function () { function randomCover () {
var theme = hexo.theme.config const theme = hexo.theme.config
var cover let cover
var num let num
if (theme.cover.default_cover) { if (theme.cover.default_cover) {
if (!Array.isArray(theme.cover.default_cover)) { if (!Array.isArray(theme.cover.default_cover)) {

2
scripts/helpers/aside_archives.js
View File

@@ -98,7 +98,7 @@ hexo.extend.helper.register('aside_archives', function (options = {}) {
return result return result
}) })
var toMomentLocale = function (lang) { const toMomentLocale = function (lang) {
if (lang === undefined) { if (lang === undefined) {
return undefined return undefined
} }

10
scripts/helpers/aside_categories.js
View File

@@ -35,19 +35,19 @@ hexo.extend.helper.register('aside_categories', function (categories, options) {
const hierarchicalList = (t, level, parent, topparent = true) => { const hierarchicalList = (t, level, parent, topparent = true) => {
let result = '' let result = ''
var isTopParent = topparent const isTopParent = topparent
if (t > 0) { if (t > 0) {
prepareQuery(parent).forEach((cat, i) => { prepareQuery(parent).forEach((cat, i) => {
if (t > 0) { if (t > 0) {
t = t - 1 t = t - 1
let child let child
if (!depth || level + 1 < depth) { if (!depth || level + 1 < depth) {
var childList = hierarchicalList(t, level + 1, cat._id, false) const childList = hierarchicalList(t, level + 1, cat._id, false)
child = childList[0] child = childList[0]
t = childList[1] t = childList[1]
} }
var parentClass = isExpand && isTopParent && child ? 'parent' : '' const parentClass = isExpand && isTopParent && child ? 'parent' : ''
result += `<li class="card-category-list-item ${parentClass}">` result += `<li class="card-category-list-item ${parentClass}">`
@@ -79,8 +79,8 @@ hexo.extend.helper.register('aside_categories', function (categories, options) {
const list = hierarchicalList(limit, 0) const list = hierarchicalList(limit, 0)
var moreButton = function () { const moreButton = function () {
var moreHtml = '' let moreHtml = ''
if (categories.length <= limit) return '' if (categories.length <= limit) return ''
moreHtml += '<li class="card-category-list-item more is-center">' moreHtml += '<li class="card-category-list-item more is-center">'
moreHtml += `<a class="card-category-list-link-more" href="${categoryDir}"> moreHtml += `<a class="card-category-list-link-more" href="${categoryDir}">

6
scripts/helpers/page.js
View File

@@ -25,7 +25,7 @@ hexo.extend.helper.register('page_description', function () {
hexo.extend.helper.register('injectHtml', function (data) { hexo.extend.helper.register('injectHtml', function (data) {
let result = '' let result = ''
if (!data) return '' if (!data) return ''
for (var i = 0; i < data.length; i++) { for (let i = 0; i < data.length; i++) {
result += data[i] result += data[i]
} }
return result return result
@@ -41,8 +41,8 @@ hexo.extend.helper.register('cloudTags', function (options = {}) {
let result = '' let result = ''
const tagLimit = limit === 0 ? source.length : limit const tagLimit = limit === 0 ? source.length : limit
source.sort('name').limit(tagLimit).forEach(function (tags) { source.sort('name').limit(tagLimit).forEach(function (tags) {
var fontSize = Math.floor(Math.random() * (maxfontsize - minfontsize) + minfontsize) + 'px' const fontSize = Math.floor(Math.random() * (maxfontsize - minfontsize) + minfontsize) + 'px'
var color = 'rgb(' + Math.floor(Math.random() * 201) + ', ' + Math.floor(Math.random() * 201) + ', ' + Math.floor(Math.random() * 201) + ')' // 0,0,0 -> 200,200,200 const color = 'rgb(' + Math.floor(Math.random() * 201) + ', ' + Math.floor(Math.random() * 201) + ', ' + Math.floor(Math.random() * 201) + ')' // 0,0,0 -> 200,200,200
result += `<a href='${env.url_for(tags.path)}' style='font-size:${fontSize}; color:${color}'>${tags.name}</a>` result += `<a href='${env.url_for(tags.path)}' style='font-size:${fontSize}; color:${color}'>${tags.name}</a>`
}) })
return result return result

28
scripts/helpers/related_post.js
View File

@@ -7,11 +7,11 @@
'use strict' 'use strict'
hexo.extend.helper.register('related_posts', function (currentPost, allPosts) { hexo.extend.helper.register('related_posts', function (currentPost, allPosts) {
var relatedPosts = [] let relatedPosts = []
currentPost.tags.forEach(function (tag) { currentPost.tags.forEach(function (tag) {
allPosts.forEach(function (post) { allPosts.forEach(function (post) {
if (isTagRelated(tag.name, post.tags)) { if (isTagRelated(tag.name, post.tags)) {
var relatedPost = { const relatedPost = {
title: post.title, title: post.title,
path: post.path, path: post.path,
cover: post.cover, cover: post.cover,
@@ -20,7 +20,7 @@ hexo.extend.helper.register('related_posts', function (currentPost, allPosts) {
updated: post.updated, updated: post.updated,
created: post.date created: post.date
} }
var index = findItem(relatedPosts, 'path', post.path) const index = findItem(relatedPosts, 'path', post.path)
if (index !== -1) { if (index !== -1) {
relatedPosts[index].weight += 1 relatedPosts[index].weight += 1
} else { } else {
@@ -34,14 +34,14 @@ hexo.extend.helper.register('related_posts', function (currentPost, allPosts) {
if (relatedPosts.length === 0) { if (relatedPosts.length === 0) {
return '' return ''
} }
var result = '' let result = ''
const hexoConfig = hexo.theme.config.rootConfig const hexoConfig = hexo.theme.config.rootConfig
const config = hexo.theme.config const config = hexo.theme.config
var limitNum = config.related_post.limit || 6 const limitNum = config.related_post.limit || 6
var dateType = config.related_post.date_type || 'created' const dateType = config.related_post.date_type || 'created'
var headlineLang = this._p('post.recommend') const headlineLang = this._p('post.recommend')
var lazySrc = config.lazyload.enable ? 'data-src' : 'src' const lazySrc = config.lazyload.enable ? 'data-src' : 'src'
relatedPosts = relatedPosts.sort(compare('weight')) relatedPosts = relatedPosts.sort(compare('weight'))
@@ -54,8 +54,8 @@ hexo.extend.helper.register('related_posts', function (currentPost, allPosts) {
'</span></div>' '</span></div>'
result += '<div class="relatedPosts_list">' result += '<div class="relatedPosts_list">'
for (var i = 0; i < Math.min(relatedPosts.length, limitNum); i++) { for (let i = 0; i < Math.min(relatedPosts.length, limitNum); i++) {
var cover = const cover =
relatedPosts[i].cover === false relatedPosts[i].cover === false
? relatedPosts[i].randomcover ? relatedPosts[i].randomcover
: relatedPosts[i].cover : relatedPosts[i].cover
@@ -96,7 +96,7 @@ hexo.extend.helper.register('related_posts', function (currentPost, allPosts) {
}) })
function isTagRelated (tagName, TBDtags) { function isTagRelated (tagName, TBDtags) {
var result = false let result = false
TBDtags.forEach(function (tag) { TBDtags.forEach(function (tag) {
if (tagName === tag.name) { if (tagName === tag.name) {
result = true result = true
@@ -106,7 +106,7 @@ function isTagRelated (tagName, TBDtags) {
} }
function findItem (arrayToSearch, attr, val) { function findItem (arrayToSearch, attr, val) {
for (var i = 0; i < arrayToSearch.length; i++) { for (let i = 0; i < arrayToSearch.length; i++) {
if (arrayToSearch[i][attr] === val) { if (arrayToSearch[i][attr] === val) {
return i return i
} }
@@ -116,8 +116,8 @@ function findItem (arrayToSearch, attr, val) {
function compare (attr) { function compare (attr) {
return function (a, b) { return function (a, b) {
var val1 = a[attr] const val1 = a[attr]
var val2 = b[attr] const val2 = b[attr]
return val2 - val1 return val2 - val1
} }
} }

11
scripts/tags/button.js
View File

@@ -11,17 +11,18 @@ const urlFor = require('hexo-util').url_for.bind(hexo)
function btn (args) { function btn (args) {
args = args.join(' ').split(',') args = args.join(' ').split(',')
var url = args[0] || '' let url = args[0] || ''
var text = args[1] || '' let text = args[1] || ''
var icon = args[2] || '' let icon = args[2] || ''
var option = args[3] || '' let option = args[3] || ''
url = url.trim() url = url.trim()
text = text.trim() text = text.trim()
icon = icon.trim() icon = icon.trim()
option = option.trim() option = option.trim()
return `<a class="btn-beautify button--animated ${option}" href="${urlFor(url)}" title="${text}">${icon.length > 0 ? `<i class="${icon} fa-fw"></i>` : ''} ${text} </a>` return `<a class="btn-beautify button--animated ${option}" href="${urlFor(url)}"
title="${text}">${icon.length > 0 ? `<i class="${icon} fa-fw"></i>` : ''}<span>${text}</span></a>`
} }
hexo.extend.tag.register('btn', btn, { ends: false }) hexo.extend.tag.register('btn', btn, { ends: false })

6
scripts/tags/gallery.js
View File

@@ -5,7 +5,7 @@
'use strict' 'use strict'
const url_for = require('hexo-util').url_for.bind(hexo) const urlFor = require('hexo-util').url_for.bind(hexo)
function gallery (args, content) { function gallery (args, content) {
return `<div class="justified-gallery">${hexo.render.renderSync({ text: content, engine: 'markdown' }).split('\n').join('')} return `<div class="justified-gallery">${hexo.render.renderSync({ text: content, engine: 'markdown' }).split('\n').join('')}
@@ -15,8 +15,8 @@ function gallery (args, content) {
function galleryGroup (args) { function galleryGroup (args) {
const name = args[0] const name = args[0]
const desrc = args[1] const desrc = args[1]
const url = url_for(args[2]) const url = urlFor(args[2])
const img = url_for(args[3]) const img = urlFor(args[3])
return ` return `
<figure class="gallery-group"> <figure class="gallery-group">

32
scripts/tags/hide.js
View File

@@ -18,42 +18,42 @@
function hideInline (args) { function hideInline (args) {
args = args.join(' ').split(',') args = args.join(' ').split(',')
var content = args[0] const content = args[0]
var display = args[1] || 'Click' const display = args[1] || 'Click'
var bg = args[2] || false const bg = args[2] || false
var color = args[3] || false const color = args[3] || false
var group = 'style="' let group = 'style="'
if (bg) group += `background-color: ${bg};` if (bg) group += `background-color: ${bg};`
if (color) group += `color: ${color}` if (color) group += `color: ${color}`
group += '"' group += '"'
return `<span class="hide-inline"><button class="hide-button button--animated" ${group}>${display} return `<span class="hide-inline"><button type="button" class="hide-button button--animated" ${group}>${display}
</button><span class="hide-content">${content}</span></span>` </button><span class="hide-content">${content}</span></span>`
} }
function hideBlock (args, content) { function hideBlock (args, content) {
args = args.join(' ').split(',') args = args.join(' ').split(',')
var display = args[0] || 'Click' const display = args[0] || 'Click'
var bg = args[1] || false const bg = args[1] || false
var color = args[2] || false const color = args[2] || false
var group = 'style="' let group = 'style="'
if (bg) group += `background-color: ${bg};` if (bg) group += `background-color: ${bg};`
if (color) group += `color: ${color}` if (color) group += `color: ${color}`
group += '"' group += '"'
return `<div class="hide-block"><button class="hide-button button--animated" ${group}>${display} return `<div class="hide-block"><button type="button" class="hide-button button--animated" ${group}>${display}
</button><span class="hide-content">${hexo.render.renderSync({ text: content, engine: 'markdown' }).split('\n').join('')}</span></div>` </button><span class="hide-content">${hexo.render.renderSync({ text: content, engine: 'markdown' }).split('\n').join('')}</span></div>`
} }
function hideToggle (args, content) { function hideToggle (args, content) {
args = args.join(' ').split(',') args = args.join(' ').split(',')
var display = args[0] const display = args[0]
var bg = args[1] || false const bg = args[1] || false
var color = args[2] || false const color = args[2] || false
var group = 'style="' let group = 'style="'
var border = '' let border = ''
if (bg) { if (bg) {
border = `style="border: 1px solid ${bg}"` border = `style="border: 1px solid ${bg}"`

4
scripts/tags/tabs.js
View File

@@ -44,10 +44,10 @@ function postTabs (args, content) {
const icon = tabIcon.trim() const icon = tabIcon.trim()
tabIcon.length > 0 && (tabIcon = `<i class="${icon}"${isOnlyicon}></i>`) tabIcon.length > 0 && (tabIcon = `<i class="${icon}"${isOnlyicon}></i>`)
const toTop = '<button class="tab-to-top" onclick="scrollToDest($(this).parents(\'.tabs\'),65)"><i class="fas fa-arrow-up"></i></button>' const toTop = '<button type="button" class="tab-to-top" onclick="scrollToDest($(this).parents(\'.tabs\'),65)"><i class="fas fa-arrow-up"></i></button>'
const isActive = (tabActive > 0 && tabActive === tabId) || (tabActive === 0 && tabId === 1) ? ' active' : '' const isActive = (tabActive > 0 && tabActive === tabId) || (tabActive === 0 && tabId === 1) ? ' active' : ''
tabNav += `<li class="tab${isActive}"><button data-href="#${tabHref}">${tabIcon + tabCaption.trim()}</button></li>` tabNav += `<li class="tab${isActive}"><button type="button" data-href="#${tabHref}">${tabIcon + tabCaption.trim()}</button></li>`
tabContent += `<div class="tab-item-content${isActive}" id="${tabHref}">${postContent + toTop}</div>` tabContent += `<div class="tab-item-content${isActive}" id="${tabHref}">${postContent + toTop}</div>`
} }

5
source/css/_global/index.styl
View File

@@ -191,11 +191,6 @@ img:not([src])
&:hover &:hover
text-decoration: none !important text-decoration: none !important
.comment_headling
margin-bottom: 10px
font-weight: 700
font-size: 20px
.post-ad .post-ad
margin: 2rem 0 margin: 2rem 0

4
source/css/_highlight/highlight.styl
View File

@@ -182,11 +182,11 @@ blockquote
td td
border: none border: none
if $highlight_theme == 'mac' if $highlight_theme == 'mac' || $highlight_theme == 'mac light'
figure.highlight figure.highlight
margin: 0 0 1.2rem margin: 0 0 1.2rem
border-radius: 7px border-radius: 7px
box-shadow: 0 5px 10px 0 rgba(0, 0, 0, .4) box-shadow: 0 5px 10px 0 $highlight-mac-border
-webkit-transform: translateZ(0) -webkit-transform: translateZ(0)
.highlight-tools .highlight-tools

6
source/css/_highlight/theme.styl
View File

@@ -24,7 +24,7 @@ if $highlight_theme == 'default'
bg-color: darken($highlight-background, 2) bg-color: darken($highlight-background, 2)
} }
if $highlight_theme == 'darker' || ($highlight_theme == 'mac') if $highlight_theme == 'darker' || $highlight_theme == 'mac'
$highlight-background = #212121 $highlight-background = #212121
$highlight-current-line = #282a2e $highlight-current-line = #282a2e
$highlight-selection = #61616150 $highlight-selection = #61616150
@@ -39,6 +39,7 @@ if $highlight_theme == 'darker' || ($highlight_theme == 'mac')
$highlight-purple = #C792EA $highlight-purple = #C792EA
$highlight-deletion = #BF42BF $highlight-deletion = #BF42BF
$highlight-addition = #105EDE $highlight-addition = #105EDE
$highlight-mac-border = rgba(0,0,0,.4)
$highlight-gutter = { $highlight-gutter = {
color: alpha($highlight-foreground, .5), color: alpha($highlight-foreground, .5),
bg-color: $highlight-background bg-color: $highlight-background
@@ -96,7 +97,7 @@ if $highlight_theme == 'ocean'
bg-color: darken($highlight-background, 2) bg-color: darken($highlight-background, 2)
} }
if $highlight_theme == 'light' if $highlight_theme == 'light' || $highlight_theme == 'mac light'
$highlight-background = #F6F8FA $highlight-background = #F6F8FA
$highlight-current-line = #00346e $highlight-current-line = #00346e
$highlight-selection = #80CBC440 $highlight-selection = #80CBC440
@@ -111,6 +112,7 @@ if $highlight_theme == 'light'
$highlight-purple = #7C4DFF $highlight-purple = #7C4DFF
$highlight-deletion = #BF42BF $highlight-deletion = #BF42BF
$highlight-addition = #105EDE $highlight-addition = #105EDE
$highlight-mac-border = rgba(144, 164, 174, .4)
$highlight-gutter = { $highlight-gutter = {
color: alpha($highlight-foreground, .5), color: alpha($highlight-foreground, .5),
bg-color: $highlight-background bg-color: $highlight-background

3
source/css/_layout/aside.styl
View File

@@ -164,6 +164,7 @@
background-color: $light-blue background-color: $light-blue
span span
@extend .limit-one-line
display: inline-block display: inline-block
vertical-align: bottom vertical-align: bottom
@@ -195,7 +196,7 @@
width: 70% !important width: 70% !important
&-count &-count
width: 18% width: calc(100% - 70% - 20px)
text-align: right text-align: right
&-icon &-icon

74
source/css/_layout/comments.styl Normal file
View File

@@ -0,0 +1,74 @@
#post-comment
.comment-head
margin-bottom: 1rem
.comment-headling
display: inline-block
vertical-align: middle
font-weight: 700
font-size: 20px
.comment-switch
display: inline-block
if hexo-config('comments.text')
float: right
margin: .1rem auto 0
padding: .2rem .8rem
width: max-content
border-radius: 8px
background: $comments-switch-bg
else
> span
display: none
.first-comment
color: $comments-switch-first-text
.second-comment
color: $comments-switch-second-text
label
position: relative
display: inline-block
margin: 0 .4rem
width: 42px
height: 22px
vertical-align: sub
input#switch-comments-btn
width: 0
height: 0
opacity: 0
&:checked + .slider
background-color: $comments-switch-second-text
&:checked + .slider:before
transform: translateX(20px)
.slider
position: absolute
top: 0
right: 0
bottom: 0
left: 0
border-radius: 34px
background-color: $comments-switch-first-text
cursor: pointer
transition: .4s
&:before
position: absolute
bottom: 4px
left: 4px
width: 14px
height: 14px
border-radius: 50%
background-color: $comments-switch-round
content: ''
transition: .4s
.comment-wrap
.comments-items-2
display: none

21
source/css/_layout/post.styl
View File

@@ -284,6 +284,27 @@ img
iframe iframe
margin: 0 0 1rem margin: 0 0 1rem
.post-outdate-notice
position: relative
margin: 0 0 1rem
padding: .5rem 1.2rem
border-radius: 3px
background-color: $noticeOutdate-bg
color: $noticeOutdate-color
if hexo-config('noticeOutdate.style') == 'flat'
padding: .5rem 1.2rem .5rem 1.8rem
border-left: 5px solid $noticeOutdate-border
&:before
@extend .fontawesomeIcon
position: absolute
top: 50%
left: 1em
color: $noticeOutdate-border
content: '\f071'
transform: translateY(-50%)
@media screen and (max-width: 1024px) @media screen and (max-width: 1024px)
.layout_post .layout_post
width: auto width: auto

1
source/css/_layout/third-party.styl
View File

@@ -86,7 +86,6 @@ if hexo-config('beautify.enable')
.has-jax .has-jax
overflow: auto overflow: auto
//aplayer
#article-container #article-container
.aplayer .aplayer
margin: 0 0 1rem margin: 0 0 1rem

13
source/css/_mode/darkmode.styl
View File

@@ -85,6 +85,8 @@ if hexo-config('darkmode.enable') || hexo-config('display_mode') == 'dark'
color: alpha(#FFFFFF, .6) !important color: alpha(#FFFFFF, .6) !important
figure.highlight figure.highlight
box-shadow: none
.line:before .line:before
color: alpha(#FFFFFF, .6) !important color: alpha(#FFFFFF, .6) !important
@@ -246,6 +248,17 @@ if hexo-config('darkmode.enable') || hexo-config('display_mode') == 'dark'
a a
color: alpha(#FFFFFF, .6) !important color: alpha(#FFFFFF, .6) !important
#post-comment
.comment-switch
if hexo-config('comments.text')
background: #2c2c2c
label
filter: brightness(.7)
.post-outdate-notice
filter: brightness(.7)
// error 404 // error 404
#error-wrap #error-wrap
.error-content .error-content

3
source/css/_mode/readmode.styl
View File

@@ -187,7 +187,8 @@ if hexo-config('readmode')
#sidebar, #sidebar,
#toggle-sidebar, #toggle-sidebar,
#mobile-toc-button, #mobile-toc-button,
#nav #nav,
.post-outdate-notice
display: none !important display: none !important
#web_bg #web_bg

2
source/css/_tags/tabs.styl
View File

@@ -23,10 +23,10 @@
button button
display: block display: block
padding: .5rem 1rem padding: .5rem 1rem
width: 100%
border-top: 2px solid $tab-border-color border-top: 2px solid $tab-border-color
background: $tab-botton-bg background: $tab-botton-bg
color: $font-color color: $font-color
width 100%
line-height: 2 line-height: 2
transition: all .4s transition: all .4s

9
source/css/var.styl
View File

@@ -75,6 +75,15 @@ $reward-pop-up-color = #858585
$search-bg = #f6f8fa $search-bg = #f6f8fa
$search-color = $theme-color $search-color = $theme-color
$search-keyword-highlight = #F47466 $search-keyword-highlight = #F47466
// comments
$comments-switch-first-text = $bright-blue
$comments-switch-second-text = $light-orange
$comments-switch-round = #fff
$comments-switch-bg = #f6f8fa
// noticeOutdate
$noticeOutdate-bg = #ffe6e6
$noticeOutdate-color = #ff6666
$noticeOutdate-border = #ff8080
// gallery // gallery
$gallery-color = #fff $gallery-color = #fff
// tag-hide // tag-hide

217
source/js/main.js
View File

@@ -9,12 +9,12 @@ $(function () {
* 傳入 1 sidebar打開時 * 傳入 1 sidebar打開時
* 傳入 2 正常狀態下 * 傳入 2 正常狀態下
*/ */
var blogNameWidth = $('#blog_name').width() const blogNameWidth = $('#blog_name').width()
var menusWidth = $('.menus').width() const menusWidth = $('.menus').width()
var sidebarWidth = $('#sidebar').width() const sidebarWidth = $('#sidebar').width()
function isAdjust (n) { function isAdjust (n) {
var t let t
if (n === 1) { if (n === 1) {
t = blogNameWidth + menusWidth > $nav.width() - sidebarWidth - 20 t = blogNameWidth + menusWidth > $nav.width() - sidebarWidth - 20
} else if (n === 2) { } else if (n === 2) {
@@ -106,7 +106,7 @@ $(function () {
color: '#99a9bf', color: '#99a9bf',
opacity: '1' opacity: '1'
}) })
var isAdjustTimeCount = window.setInterval(function () { const isAdjustTimeCount = window.setInterval(function () {
if ($nav.hasClass('fixed')) isAdjust(1) if ($nav.hasClass('fixed')) isAdjust(1)
else isAdjust(2) else isAdjust(2)
}, 100) }, 100)
@@ -116,7 +116,7 @@ $(function () {
} }
$('#toggle-sidebar').on('click', function () { $('#toggle-sidebar').on('click', function () {
var isOpen = $(this).hasClass('on') const isOpen = $(this).hasClass('on')
isOpen ? $(this).removeClass('on') : $(this).addClass('on') isOpen ? $(this).removeClass('on') : $(this).addClass('on')
if (isOpen) { if (isOpen) {
closeSidebar() closeSidebar()
@@ -130,10 +130,10 @@ $(function () {
* 顯示menu和toc的sidebar * 顯示menu和toc的sidebar
*/ */
var $toggleMenu = $('.toggle-menu') const $toggleMenu = $('.toggle-menu')
var $mobileSidevarMenus = $('#mobile-sidebar-menus') const $mobileSidebarMenus = $('#mobile-sidebar-menus')
var $mobileTocButton = $('#mobile-toc-button') const $mobileTocButton = $('#mobile-toc-button')
var $menuMask = $('#menu_mask') const $menuMask = $('#menu_mask')
function openMobileSidebar (name) { function openMobileSidebar (name) {
sidebarPaddingR() sidebarPaddingR()
@@ -142,11 +142,11 @@ $(function () {
if (name === 'menu') { if (name === 'menu') {
$toggleMenu.removeClass('close').addClass('open') $toggleMenu.removeClass('close').addClass('open')
$mobileSidevarMenus.css('transform', 'translate3d(-100%,0,0)') $mobileSidebarMenus.css('transform', 'translate3d(-100%,0,0)')
var $mobileSidevarMenusChild = $mobileSidevarMenus.children() const $mobileSidebarMenusChild = $mobileSidebarMenus.children()
for (let i = 0; i <= $mobileSidevarMenusChild.length; i++) { for (let i = 0; i <= $mobileSidebarMenusChild.length; i++) {
const duration = i / 5 + 0.2 const duration = i / 5 + 0.2
$mobileSidevarMenusChild.eq(i).css('animation', 'sidebarItem ' + duration + 's') $mobileSidebarMenusChild.eq(i).css('animation', 'sidebarItem ' + duration + 's')
} }
} }
@@ -163,7 +163,7 @@ $(function () {
if (name === 'menu') { if (name === 'menu') {
$toggleMenu.removeClass('open').addClass('close') $toggleMenu.removeClass('open').addClass('close')
$mobileSidevarMenus.css('transform', '') $mobileSidebarMenus.css('transform', '')
$('#mobile-sidebar-menus > div,#mobile-sidebar-menus > hr').css('animation', '') $('#mobile-sidebar-menus > div,#mobile-sidebar-menus > hr').css('animation', '')
} }
@@ -227,7 +227,7 @@ $(function () {
return true return true
} else { // webkit - safari/chrome } else { // webkit - safari/chrome
if (isSnackbar) { if (isSnackbar) {
var bookmarkText = GLOBAL_CONFIG.Snackbar.bookmark.message_prev + ' ' + (navigator.userAgent.toLowerCase().indexOf('mac') !== -1 ? 'Command/Cmd' : 'CTRL') + '+ D ' + GLOBAL_CONFIG.Snackbar.bookmark.message_next + '.' const bookmarkText = GLOBAL_CONFIG.Snackbar.bookmark.message_prev + ' ' + (navigator.userAgent.toLowerCase().indexOf('mac') !== -1 ? 'Command/Cmd' : 'CTRL') + '+ D ' + GLOBAL_CONFIG.Snackbar.bookmark.message_next + '.'
snackbarShow(bookmarkText) snackbarShow(bookmarkText)
} else { } else {
alert(GLOBAL_CONFIG.bookmark.message_prev + ' ' + (navigator.userAgent.toLowerCase().indexOf('mac') !== -1 ? 'Command/Cmd' : 'CTRL') + '+ D ' + GLOBAL_CONFIG.bookmark.message_next + '.') alert(GLOBAL_CONFIG.bookmark.message_prev + ' ' + (navigator.userAgent.toLowerCase().indexOf('mac') !== -1 ? 'Command/Cmd' : 'CTRL') + '+ D ' + GLOBAL_CONFIG.bookmark.message_next + '.')
@@ -261,7 +261,7 @@ $(function () {
} }
$(document).on('click', '.highlight-tools >.code-expand', function () { $(document).on('click', '.highlight-tools >.code-expand', function () {
var $hideItem = $(this).parent().nextAll() const $hideItem = $(this).parent().nextAll()
if ($(this).hasClass('code-closed')) { if ($(this).hasClass('code-closed')) {
$hideItem.css('display', 'block') $hideItem.css('display', 'block')
$(this).removeClass('code-closed') $(this).removeClass('code-closed')
@@ -275,7 +275,7 @@ $(function () {
* 代碼語言 * 代碼語言
*/ */
if (isHighlightLang) { if (isHighlightLang) {
var langNameIndex, langName let langNameIndex, langName
$figureHighlight.each(function () { $figureHighlight.each(function () {
langNameIndex = langName = $(this).attr('class').split(' ')[1] langNameIndex = langName = $(this).attr('class').split(' ')[1]
if (langNameIndex === 'plain' || langNameIndex === undefined) langName = 'Code' if (langNameIndex === 'plain' || langNameIndex === undefined) langName = 'Code'
@@ -289,7 +289,7 @@ $(function () {
*/ */
if (isHighlightCopy) { if (isHighlightCopy) {
$highlightTools.append('<div class="copy-notice"></div><i class="fas fa-paste copy-button"></i>') $highlightTools.append('<div class="copy-notice"></div><i class="fas fa-paste copy-button"></i>')
var copy = function (text, ctx) { const copy = function (text, ctx) {
if (document.queryCommandSupported && document.queryCommandSupported('copy')) { if (document.queryCommandSupported && document.queryCommandSupported('copy')) {
try { try {
document.execCommand('copy') // Security exception may be thrown by some browsers. document.execCommand('copy') // Security exception may be thrown by some browsers.
@@ -337,14 +337,14 @@ $(function () {
// click events // click events
$(document).on('click', '.highlight-tools>.copy-button', function () { $(document).on('click', '.highlight-tools>.copy-button', function () {
var $buttonParent = $(this).parents('figure.highlight') const $buttonParent = $(this).parents('figure.highlight')
$buttonParent.addClass('copy-true') $buttonParent.addClass('copy-true')
var selection = window.getSelection() const selection = window.getSelection()
var range = document.createRange() const range = document.createRange()
range.selectNodeContents($buttonParent.find('table .code pre')[0]) range.selectNodeContents($buttonParent.find('table .code pre')[0])
selection.removeAllRanges() selection.removeAllRanges()
selection.addRange(range) selection.addRange(range)
var text = selection.toString() const text = selection.toString()
copy(text, this) copy(text, this)
selection.removeAllRanges() selection.removeAllRanges()
$buttonParent.removeClass('copy-true') $buttonParent.removeClass('copy-true')
@@ -358,9 +358,9 @@ $(function () {
function addPhotoFigcaption () { function addPhotoFigcaption () {
const images = $('#article-container img').not('.justified-gallery img') const images = $('#article-container img').not('.justified-gallery img')
images.each(function (i, o) { images.each(function (i, o) {
var $this = $(o) const $this = $(o)
if ($this.attr('alt')) { if ($this.attr('alt')) {
var t = $('<div class="img-alt is-center">' + $this.attr('alt') + '</div>') const t = $('<div class="img-alt is-center">' + $this.attr('alt') + '</div>')
$this.after(t) $this.after(t)
} }
}) })
@@ -370,11 +370,11 @@ $(function () {
/** /**
* justified-gallery 圖庫排版 * justified-gallery 圖庫排版
*/ */
var $justifiedGallery = $('.justified-gallery') const $justifiedGallery = $('.justified-gallery')
var isJustifiedGallery = false let isJustifiedGallery = false
if ($justifiedGallery.length) { if ($justifiedGallery.length) {
isJustifiedGallery = true isJustifiedGallery = true
var $imgList = $justifiedGallery.find('img') const $imgList = $justifiedGallery.find('img')
$imgList.unwrap() $imgList.unwrap()
if ($imgList.length) { if ($imgList.length) {
$imgList.each(function (i, o) { $imgList.each(function (i, o) {
@@ -386,29 +386,18 @@ $(function () {
loadScript(`${GLOBAL_CONFIG.justifiedGallery.js}`, function () { loadScript(`${GLOBAL_CONFIG.justifiedGallery.js}`, function () {
initJustifiedGallery($justifiedGallery) initJustifiedGallery($justifiedGallery)
}) })
var initJustifiedGallery = function (selector) {
selector.each(function (i, o) {
if ($(this).is(':visible')) {
$(this).justifiedGallery({
rowHeight: 220,
margins: 4
})
}
})
}
} }
/** /**
* fancybox和 mediumZoom * fancybox和 mediumZoom
*/ */
var isMediumZoom = GLOBAL_CONFIG.medium_zoom const isMediumZoom = GLOBAL_CONFIG.medium_zoom
var isFancybox = GLOBAL_CONFIG.fancybox const isFancybox = GLOBAL_CONFIG.fancybox
if (isFancybox) { if (isFancybox) {
var images = $('#article-container img:not(.gallery-group-img)').not($('a>img')) const images = $('#article-container img:not(.gallery-group-img)').not($('a>img'))
images.each(function (i, o) { images.each(function (i, o) {
var lazyloadSrc = $(o).attr('data-src') ? $(o).attr('data-src') : $(o).attr('src') const lazyloadSrc = $(o).attr('data-src') ? $(o).attr('data-src') : $(o).attr('src')
$(o).wrap(`<a href="${lazyloadSrc}" data-fancybox="group" data-caption="${$(o).attr('alt')}" class="fancybox"></a>`) $(o).wrap(`<a href="${lazyloadSrc}" data-fancybox="group" data-caption="${$(o).attr('alt')}" class="fancybox"></a>`)
}) })
@@ -422,7 +411,7 @@ $(function () {
} else if (isMediumZoom) { } else if (isMediumZoom) {
const zoom = mediumZoom(document.querySelectorAll('#article-container :not(a)>img')) const zoom = mediumZoom(document.querySelectorAll('#article-container :not(a)>img'))
zoom.on('open', function (event) { zoom.on('open', function (event) {
var photoBg = $(document.documentElement).attr('data-theme') === 'dark' ? '#121212' : '#fff' const photoBg = $(document.documentElement).attr('data-theme') === 'dark' ? '#121212' : '#fff'
zoom.update({ zoom.update({
background: photoBg background: photoBg
}) })
@@ -432,13 +421,13 @@ $(function () {
/** /**
* 滾動處理 * 滾動處理
*/ */
var initTop = 0 let initTop = 0
var isChatShow = true let isChatShow = true
var isChatBtnHide = typeof chatBtnHide === 'function' const isChatBtnHide = typeof chatBtnHide === 'function'
var isChatBtnShow = typeof chatBtnShow === 'function' const isChatBtnShow = typeof chatBtnShow === 'function'
$(window).scroll(throttle(function (event) { $(window).scroll(throttle(function (event) {
var currentTop = $(this).scrollTop() const currentTop = $(this).scrollTop()
var isDown = scrollDirection(currentTop) const isDown = scrollDirection(currentTop)
if (currentTop > 56) { if (currentTop > 56) {
if (isDown) { if (isDown) {
if ($nav.hasClass('visible')) $nav.removeClass('visible') if ($nav.hasClass('visible')) $nav.removeClass('visible')
@@ -467,7 +456,7 @@ $(function () {
// find the scroll direction // find the scroll direction
function scrollDirection (currentTop) { function scrollDirection (currentTop) {
var result = currentTop > initTop // true is down & false is up const result = currentTop > initTop // true is down & false is up
initTop = currentTop initTop = currentTop
return result return result
} }
@@ -488,7 +477,7 @@ $(function () {
// main of scroll // main of scroll
$(window).scroll(throttle(function (event) { $(window).scroll(throttle(function (event) {
var currentTop = $(this).scrollTop() const currentTop = $(this).scrollTop()
scrollPercent(currentTop) scrollPercent(currentTop)
findHeadPosition(currentTop) findHeadPosition(currentTop)
autoScrollToc(currentTop) autoScrollToc(currentTop)
@@ -505,20 +494,20 @@ $(function () {
}) })
// expand toc-item // expand toc-item
var expandToc = function ($item) { const expandToc = function ($item) {
if ($item.is(':visible')) { if ($item.is(':visible')) {
return return
} }
$item.fadeIn(400) $item.fadeIn(400)
} }
var scrollPercent = function (currentTop) { const scrollPercent = function (currentTop) {
var docHeight = $('#article-container').height() const docHeight = $('#article-container').height()
var winHeight = $(window).height() const winHeight = $(window).height()
var contentMath = (docHeight > winHeight) ? (docHeight - winHeight) : ($(document).height() - winHeight) const contentMath = (docHeight > winHeight) ? (docHeight - winHeight) : ($(document).height() - winHeight)
var scrollPercent = (currentTop) / (contentMath) const scrollPercent = (currentTop) / (contentMath)
var scrollPercentRounded = Math.round(scrollPercent * 100) const scrollPercentRounded = Math.round(scrollPercent * 100)
var percentage = (scrollPercentRounded > 100) ? 100 const percentage = (scrollPercentRounded > 100) ? 100
: (scrollPercentRounded <= 0) ? 0 : (scrollPercentRounded <= 0) ? 0
: scrollPercentRounded : scrollPercentRounded
$('.progress-num').text(percentage) $('.progress-num').text(percentage)
@@ -528,8 +517,8 @@ $(function () {
} }
// anchor // anchor
var isanchor = GLOBAL_CONFIG.isanchor const isanchor = GLOBAL_CONFIG.isanchor
var updateAnchor = function (anchor) { const updateAnchor = function (anchor) {
if (window.history.replaceState && anchor !== window.location.hash) { if (window.history.replaceState && anchor !== window.location.hash) {
window.history.replaceState(undefined, undefined, anchor) window.history.replaceState(undefined, undefined, anchor)
} }
@@ -539,17 +528,17 @@ $(function () {
// DOM Hierarchy: // DOM Hierarchy:
// ol.toc > (li.toc-item, ...) // ol.toc > (li.toc-item, ...)
// li.toc-item > (a.toc-link, ol.toc-child > (li.toc-item, ...)) // li.toc-item > (a.toc-link, ol.toc-child > (li.toc-item, ...))
var findHeadPosition = function (top) { const findHeadPosition = function (top) {
// assume that we are not in the post page if no TOC link be found, // assume that we are not in the post page if no TOC link be found,
// thus no need to update the status // thus no need to update the status
if ($('.toc-link').length === 0) { if ($('.toc-link').length === 0) {
return false return false
} }
var list = $('#article-container').find('h1,h2,h3,h4,h5,h6') const list = $('#article-container').find('h1,h2,h3,h4,h5,h6')
var currentId = '' let currentId = ''
list.each(function () { list.each(function () {
var head = $(this) const head = $(this)
if (top > head.offset().top - 25) { if (top > head.offset().top - 25) {
currentId = '#' + $(this).attr('id') currentId = '#' + $(this).attr('id')
} }
@@ -560,20 +549,20 @@ $(function () {
$('.toc-child').hide() $('.toc-child').hide()
} }
var currentActive = $('.toc-link.active') const currentActive = $('.toc-link.active')
if (currentId && currentActive.attr('href') !== currentId) { if (currentId && currentActive.attr('href') !== currentId) {
if (isanchor) updateAnchor(currentId) if (isanchor) updateAnchor(currentId)
$('.toc-link').removeClass('active') $('.toc-link').removeClass('active')
var _this = $('.toc-link[href="' + currentId + '"]') const _this = $('.toc-link[href="' + currentId + '"]')
_this.addClass('active') _this.addClass('active')
var parents = _this.parents('.toc-child') const parents = _this.parents('.toc-child')
// Returned list is in reverse order of the DOM elements // Returned list is in reverse order of the DOM elements
// Thus `parents.last()` is the outermost .toc-child container // Thus `parents.last()` is the outermost .toc-child container
// i.e. list of subsections // i.e. list of subsections
var topLink = (parents.length > 0) ? parents.last() : _this const topLink = (parents.length > 0) ? parents.last() : _this
expandToc(topLink.closest('.toc-item').find('.toc-child')) expandToc(topLink.closest('.toc-item').find('.toc-child'))
topLink topLink
// Find all top-level .toc-item containers, i.e. sections // Find all top-level .toc-item containers, i.e. sections
@@ -584,10 +573,10 @@ $(function () {
} }
} }
var autoScrollToc = function (currentTop) { const autoScrollToc = function (currentTop) {
if ($('.toc-link').hasClass('active')) { if ($('.toc-link').hasClass('active')) {
var activePosition = $('.active').offset().top const activePosition = $('.active').offset().top
var sidebarScrolltop = $('#sidebar .sidebar-toc__content').scrollTop() const sidebarScrolltop = $('#sidebar .sidebar-toc__content').scrollTop()
if (activePosition > (currentTop + $(window).height() - 100)) { if (activePosition > (currentTop + $(window).height() - 100)) {
$('#sidebar .sidebar-toc__content').scrollTop(sidebarScrolltop + 100) $('#sidebar .sidebar-toc__content').scrollTop(sidebarScrolltop + 100)
} }
@@ -631,7 +620,7 @@ $(function () {
}) })
$(window).on('touchmove', function (e) { $(window).on('touchmove', function (e) {
var $menusChild = $('#nav .menus_item_child') const $menusChild = $('#nav .menus_item_child')
if ($menusChild.is(':visible')) { if ($menusChild.is(':visible')) {
$menusChild.css('display', 'none') $menusChild.css('display', 'none')
} }
@@ -651,7 +640,7 @@ $(function () {
/** /**
* 複製時加上版權信息 * 複製時加上版權信息
*/ */
var copyright = GLOBAL_CONFIG.copyright const copyright = GLOBAL_CONFIG.copyright
if (copyright !== undefined) { if (copyright !== undefined) {
document.body.oncopy = function (event) { document.body.oncopy = function (event) {
event.preventDefault() event.preventDefault()
@@ -677,9 +666,9 @@ $(function () {
/** /**
* Darkmode * Darkmode
*/ */
var $darkModeButtom = $('#darkmode') const $darkModeButtom = $('#darkmode')
function switchReadMode () { function switchReadMode () {
var nowMode = document.documentElement.getAttribute('data-theme') === 'dark' ? 'dark' : 'light' const nowMode = document.documentElement.getAttribute('data-theme') === 'dark' ? 'dark' : 'light'
if (nowMode === 'light') { if (nowMode === 'light') {
activateDarkMode() activateDarkMode()
Cookies.set('theme', 'dark', 2) Cookies.set('theme', 'dark', 2)
@@ -701,26 +690,24 @@ $(function () {
*/ */
if (GLOBAL_CONFIG.runtime) { if (GLOBAL_CONFIG.runtime) {
// get user config // get user config
var $runtimeCount = $('#webinfo-runtime-count') const $runtimeCount = $('#webinfo-runtime-count')
var startDate = $runtimeCount.attr('publish_date') const startDate = $runtimeCount.attr('publish_date')
var showDateTime = function () { const showDateTime = function () {
var BirthDay = new Date(startDate) const BirthDay = new Date(startDate)
var today = new Date() const today = new Date()
var timeold = (today.getTime() - BirthDay.getTime()) const timeold = (today.getTime() - BirthDay.getTime())
var daysold = Math.floor(timeold / (24 * 60 * 60 * 1000)) const daysold = Math.floor(timeold / (24 * 60 * 60 * 1000))
$runtimeCount.text(daysold + ' ' + GLOBAL_CONFIG.runtime_unit) $runtimeCount.text(daysold + ' ' + GLOBAL_CONFIG.runtime_unit)
} }
var interval
showDateTime() showDateTime()
clearInterval(interval) setInterval(showDateTime, 10000)
interval = setInterval(showDateTime, 10000)
} }
/** /**
* table overflow * table overflow
*/ */
var $table = $('#article-container table').not($('figure.highlight > table')) const $table = $('#article-container table').not($('figure.highlight > table'))
$table.each(function () { $table.each(function () {
$(this).wrap('<div class="table-wrap"></div>') $(this).wrap('<div class="table-wrap"></div>')
}) })
@@ -730,14 +717,14 @@ $(function () {
*/ */
if (GLOBAL_CONFIG.baiduPush) { if (GLOBAL_CONFIG.baiduPush) {
(function () { (function () {
var bp = document.createElement('script') const bp = document.createElement('script')
var curProtocol = window.location.protocol.split(':')[0] const curProtocol = window.location.protocol.split(':')[0]
if (curProtocol === 'https') { if (curProtocol === 'https') {
bp.src = 'https://zz.bdstatic.com/linksubmit/push.js' bp.src = 'https://zz.bdstatic.com/linksubmit/push.js'
} else { } else {
bp.src = 'http://push.zhanzhang.baidu.com/push.js' bp.src = 'http://push.zhanzhang.baidu.com/push.js'
} }
var s = document.getElementsByTagName('script')[0] const s = document.getElementsByTagName('script')[0]
s.parentNode.insertBefore(bp, s) s.parentNode.insertBefore(bp, s)
})() })()
} }
@@ -745,11 +732,11 @@ $(function () {
/** /**
* tag-hide * tag-hide
*/ */
var $hideInline = $('.hide-button') const $hideInline = $('.hide-button')
if ($hideInline.length) { if ($hideInline.length) {
$hideInline.on('click', function (e) { $hideInline.on('click', function (e) {
var $this = $(this) const $this = $(this)
var $hideContent = $(this).next('.hide-content') const $hideContent = $(this).next('.hide-content')
$this.toggleClass('open') $this.toggleClass('open')
$hideContent.toggle() $hideContent.toggle()
if ($this.hasClass('open')) { if ($this.hasClass('open')) {
@@ -779,13 +766,51 @@ $(function () {
} }
}) })
var $cardCategory = $('.card-category-list-item.parent a') const $cardCategory = $('.card-category-list-item.parent a')
$cardCategory.on('click', function (e) { $cardCategory.on('click', function (e) {
if ($(event.target).hasClass('card-category-list-icon')) { if ($(event.target).hasClass('card-category-list-icon')) {
var $this = $(this) const $this = $(this)
$this.find('.card-category-list-icon').toggleClass('expand') $this.find('.card-category-list-icon').toggleClass('expand')
$this.parent().next().toggle() $this.parent().next().toggle()
return false return false
} }
}) })
let switchDone = false
$('#switch-comments-btn').change(function () {
$('#post-comment > .comment-wrap > div').each(function () {
if ($(this).is(':visible')) {
$(this).hide()
} else {
$(this).css({
display: 'block',
animation: 'tabshow .5s'
})
}
})
if (!switchDone && typeof loadOtherComment === 'function') {
switchDone = true
loadOtherComment()
}
})
if (GLOBAL_CONFIG_SITE.isPost && GLOBAL_CONFIG.noticeOutdate !== undefined) {
const data = GLOBAL_CONFIG.noticeOutdate
const diffDate = function (d) {
const dateNow = new Date()
const datePost = new Date(d.replace(/-/g, '/'))
const dateDiff = dateNow.getTime() - datePost.getTime()
const dayDiff = Math.floor(dateDiff / (24 * 3600 * 1000))
return dayDiff
}
var diffDay = diffDate(GLOBAL_CONFIG_SITE.postUpdate)
if (diffDay >= data.limitDay) {
const code = `<div class="post-outdate-notice">${data.messagePrev + ' ' + diffDay + ' ' + data.messageNext}</div>`
if (data.position === 'top') {
$('#article-container').prepend(code)
} else {
$('#article-container').append(code)
}
}
}
}) })

14
source/js/search/algolia.js
View File

@@ -13,7 +13,7 @@ $(function () {
}) })
}) })
var closeSearch = function () { const closeSearch = function () {
$('body').css('width', '') $('body').css('width', '')
$('body').css('overflow', '') $('body').css('overflow', '')
$('.search-dialog').css({ $('.search-dialog').css({
@@ -33,13 +33,13 @@ $(function () {
} }
$('.search-mask, .search-close-button').on('click touchstart', closeSearch) $('.search-mask, .search-close-button').on('click touchstart', closeSearch)
var algolia = GLOBAL_CONFIG.algolia const algolia = GLOBAL_CONFIG.algolia
var isAlgoliaValid = algolia.appId && algolia.apiKey && algolia.indexName const isAlgoliaValid = algolia.appId && algolia.apiKey && algolia.indexName
if (!isAlgoliaValid) { if (!isAlgoliaValid) {
return console.error('Algolia setting is invalid!') return console.error('Algolia setting is invalid!')
} }
var search = instantsearch({ const search = instantsearch({
appId: algolia.appId, appId: algolia.appId,
apiKey: algolia.apiKey, apiKey: algolia.apiKey,
indexName: algolia.indexName, indexName: algolia.indexName,
@@ -47,7 +47,7 @@ $(function () {
hitsPerPage: algolia.hits.per_page || 10 hitsPerPage: algolia.hits.per_page || 10
}, },
searchFunction: function (helper) { searchFunction: function (helper) {
var searchInput = $('#algolia-search-input').find('input') const searchInput = $('#algolia-search-input').find('input')
if (searchInput.val()) { if (searchInput.val()) {
helper.search() helper.search()
@@ -68,7 +68,7 @@ $(function () {
container: '#algolia-hits', container: '#algolia-hits',
templates: { templates: {
item: function (data) { item: function (data) {
var link = data.permalink ? data.permalink : (GLOBAL_CONFIG.root + data.path) const link = data.permalink ? data.permalink : (GLOBAL_CONFIG.root + data.path)
return ( return (
'<a href="' + link + '" class="algolia-hit-item-link">' + '<a href="' + link + '" class="algolia-hit-item-link">' +
data._highlightResult.title.value + data._highlightResult.title.value +
@@ -94,7 +94,7 @@ $(function () {
container: '#algolia-stats', container: '#algolia-stats',
templates: { templates: {
body: function (data) { body: function (data) {
var stats = GLOBAL_CONFIG.algolia.languages.hits_stats const stats = GLOBAL_CONFIG.algolia.languages.hits_stats
.replace(/\$\{hits}/, data.nbHits) .replace(/\$\{hits}/, data.nbHits)
.replace(/\$\{time}/, data.processingTimeMS) .replace(/\$\{time}/, data.processingTimeMS)
return ( return (

40
source/js/search/local-search.js
View File

@@ -1,5 +1,5 @@
$(function () { $(function () {
var loadFlag = false let loadFlag = false
$('a.social-icon.search').on('click', function () { $('a.social-icon.search').on('click', function () {
$('body').css({ $('body').css({
width: '100%', width: '100%',
@@ -22,7 +22,7 @@ $(function () {
}) })
}) })
var closeSearch = function () { const closeSearch = function () {
$('body').css('width', '') $('body').css('width', '')
$('body').css('overflow', '') $('body').css('overflow', '')
$('.search-dialog').css({ $('.search-dialog').css({
@@ -48,7 +48,7 @@ $(function () {
dataType: 'xml', dataType: 'xml',
success: function (xmlResponse) { success: function (xmlResponse) {
// get the contents from search data // get the contents from search data
var datas = $('entry', xmlResponse).map(function () { const datas = $('entry', xmlResponse).map(function () {
return { return {
title: $('title', this).text(), title: $('title', this).text(),
content: $('content', this).text(), content: $('content', this).text(),
@@ -56,29 +56,29 @@ $(function () {
} }
}).get() }).get()
var $input = $('#local-search-input input')[0] const $input = $('#local-search-input input')[0]
var $resultContent = $('#local-hits')[0] const $resultContent = $('#local-hits')[0]
$input.addEventListener('input', function () { $input.addEventListener('input', function () {
var str = '<div class="search-result-list">' let str = '<div class="search-result-list">'
var keywords = this.value.trim().toLowerCase().split(/[\s]+/) const keywords = this.value.trim().toLowerCase().split(/[\s]+/)
$resultContent.innerHTML = '' $resultContent.innerHTML = ''
if (this.value.trim().length <= 0) { if (this.value.trim().length <= 0) {
$('.local-search-stats__hr').hide() $('.local-search-stats__hr').hide()
return return
} }
var count = 0 let count = 0
// perform local searching // perform local searching
datas.forEach(function (data) { datas.forEach(function (data) {
var isMatch = true let isMatch = true
if (!data.title || data.title.trim() === '') { if (!data.title || data.title.trim() === '') {
data.title = 'Untitled' data.title = 'Untitled'
} }
var dataTitle = data.title.trim().toLowerCase() let dataTitle = data.title.trim().toLowerCase()
var dataContent = data.content.trim().replace(/<[^>]+>/g, '').toLowerCase() const dataContent = data.content.trim().replace(/<[^>]+>/g, '').toLowerCase()
var dataUrl = data.url const dataUrl = data.url
var indexTitle = -1 let indexTitle = -1
var indexContent = -1 let indexContent = -1
var firstOccur = -1 let firstOccur = -1
// only match artiles with not empty titles and contents // only match artiles with not empty titles and contents
if (dataTitle !== '' || dataContent !== '') { if (dataTitle !== '' || dataContent !== '') {
keywords.forEach(function (keyword, i) { keywords.forEach(function (keyword, i) {
@@ -101,11 +101,11 @@ $(function () {
// show search results // show search results
if (isMatch) { if (isMatch) {
var content = data.content.trim().replace(/<[^>]+>/g, '') const content = data.content.trim().replace(/<[^>]+>/g, '')
if (firstOccur >= 0) { if (firstOccur >= 0) {
// cut out 130 characters // cut out 130 characters
var start = firstOccur - 30 let start = firstOccur - 30
var end = firstOccur + 100 let end = firstOccur + 100
if (start < 0) { if (start < 0) {
start = 0 start = 0
@@ -119,11 +119,11 @@ $(function () {
end = content.length end = content.length
} }
var matchContent = content.substring(start, end) let matchContent = content.substring(start, end)
// highlight all keywords // highlight all keywords
keywords.forEach(function (keyword) { keywords.forEach(function (keyword) {
var regS = new RegExp(keyword, 'gi') const regS = new RegExp(keyword, 'gi')
matchContent = matchContent.replace(regS, '<span class="search-keyword">' + keyword + '</span>') matchContent = matchContent.replace(regS, '<span class="search-keyword">' + keyword + '</span>')
dataTitle = dataTitle.replace(regS, '<span class="search-keyword">' + keyword + '</span>') dataTitle = dataTitle.replace(regS, '<span class="search-keyword">' + keyword + '</span>')
}) })

296
source/js/third-party/piao.js vendored
View File

@@ -1,16 +1,15 @@
(function (name, factory) {
(function (name, factory) { if (typeof window === 'object') {
if (typeof window === "object") {
window[name] = factory() window[name] = factory()
} }
})("Ribbons", function () { })('Ribbons', function () {
var _w = window, var _w = window
_b = document.body, var _b = document.body
_d = document.documentElement; var _d = document.documentElement
var random = function () { var random = function () {
if (arguments.length === 1) { if (arguments.length === 1) {
if (Array.isArray(arguments[0])) { if (Array.isArray(arguments[0])) {
var index = Math.round(random(0, arguments[0].length - 1)); var index = Math.round(random(0, arguments[0].length - 1))
return arguments[0][index] return arguments[0][index]
} }
return random(0, arguments[0]) return random(0, arguments[0])
@@ -18,12 +17,12 @@
return Math.random() * (arguments[1] - arguments[0]) + arguments[0] return Math.random() * (arguments[1] - arguments[0]) + arguments[0]
} }
return 0 return 0
}; }
var screenInfo = function (e) { var screenInfo = function (e) {
var width = Math.max(0, _w.innerWidth || _d.clientWidth || _b.clientWidth || 0), var width = Math.max(0, _w.innerWidth || _d.clientWidth || _b.clientWidth || 0)
height = Math.max(0, _w.innerHeight || _d.clientHeight || _b.clientHeight || 0), var height = Math.max(0, _w.innerHeight || _d.clientHeight || _b.clientHeight || 0)
scrollx = Math.max(0, _w.pageXOffset || _d.scrollLeft || _b.scrollLeft || 0) - (_d.clientLeft || 0), var scrollx = Math.max(0, _w.pageXOffset || _d.scrollLeft || _b.scrollLeft || 0) - (_d.clientLeft || 0)
scrolly = Math.max(0, _w.pageYOffset || _d.scrollTop || _b.scrollTop || 0) - (_d.clientTop || 0); var scrolly = Math.max(0, _w.pageYOffset || _d.scrollTop || _b.scrollTop || 0) - (_d.clientTop || 0)
return { return {
width: width, width: width,
height: height, height: height,
@@ -33,101 +32,101 @@
scrollx: scrollx, scrollx: scrollx,
scrolly: scrolly scrolly: scrolly
} }
}; }
var mouseInfo = function (e) { var mouseInfo = function (e) {
var screen = screenInfo(e), var screen = screenInfo(e)
mousex = e ? Math.max(0, e.pageX || e.clientX || 0) : 0, var mousex = e ? Math.max(0, e.pageX || e.clientX || 0) : 0
mousey = e ? Math.max(0, e.pageY || e.clientY || 0) : 0; var mousey = e ? Math.max(0, e.pageY || e.clientY || 0) : 0
return { return {
mousex: mousex, mousex: mousex,
mousey: mousey, mousey: mousey,
centerx: mousex - screen.width / 2, centerx: mousex - screen.width / 2,
centery: mousey - screen.height / 2 centery: mousey - screen.height / 2
} }
}; }
var Point = function (x, y) { var Point = function (x, y) {
this.x = 0; this.x = 0
this.y = 0; this.y = 0
this.set(x, y) this.set(x, y)
}; }
Point.prototype = { Point.prototype = {
constructor: Point, constructor: Point,
set: function (x, y) { set: function (x, y) {
this.x = x || 0; this.x = x || 0
this.y = y || 0 this.y = y || 0
}, },
copy: function (point) { copy: function (point) {
this.x = point.x || 0; this.x = point.x || 0
this.y = point.y || 0; this.y = point.y || 0
return this return this
}, },
multiply: function (x, y) { multiply: function (x, y) {
this.x *= x || 1; this.x *= x || 1
this.y *= y || 1; this.y *= y || 1
return this return this
}, },
divide: function (x, y) { divide: function (x, y) {
this.x /= x || 1; this.x /= x || 1
this.y /= y || 1; this.y /= y || 1
return this return this
}, },
add: function (x, y) { add: function (x, y) {
this.x += x || 0; this.x += x || 0
this.y += y || 0; this.y += y || 0
return this return this
}, },
subtract: function (x, y) { subtract: function (x, y) {
this.x -= x || 0; this.x -= x || 0
this.y -= y || 0; this.y -= y || 0
return this return this
}, },
clampX: function (min, max) { clampX: function (min, max) {
this.x = Math.max(min, Math.min(this.x, max)); this.x = Math.max(min, Math.min(this.x, max))
return this return this
}, },
clampY: function (min, max) { clampY: function (min, max) {
this.y = Math.max(min, Math.min(this.y, max)); this.y = Math.max(min, Math.min(this.y, max))
return this return this
}, },
flipX: function () { flipX: function () {
this.x *= -1; this.x *= -1
return this return this
}, },
flipY: function () { flipY: function () {
this.y *= -1; this.y *= -1
return this return this
} }
}; }
var Factory = function (options) { var Factory = function (options) {
this._canvas = null; this._canvas = null
this._context = null; this._context = null
this._sto = null; this._sto = null
this._width = 0; this._width = 0
this._height = 0; this._height = 0
this._scroll = 0; this._scroll = 0
this._ribbons = []; this._ribbons = []
this._options = { this._options = {
colorSaturation: "80%", colorSaturation: '80%',
colorBrightness: "60%", colorBrightness: '60%',
colorAlpha: 0.65, colorAlpha: 0.65,
colorCycleSpeed: 6, colorCycleSpeed: 6,
verticalPosition: "center", verticalPosition: 'center',
horizontalSpeed: 150, horizontalSpeed: 150,
ribbonCount: 5, ribbonCount: 5,
strokeSize: 5, strokeSize: 5,
parallaxAmount: -0.5, parallaxAmount: -0.5,
animateSections: true animateSections: true
}; }
this._onDraw = this._onDraw.bind(this); this._onDraw = this._onDraw.bind(this)
this._onResize = this._onResize.bind(this); this._onResize = this._onResize.bind(this)
this._onScroll = this._onScroll.bind(this); this._onScroll = this._onScroll.bind(this)
this.setOptions(options); this.setOptions(options)
this.init() this.init()
}; }
Factory.prototype = { Factory.prototype = {
constructor: Factory, constructor: Factory,
setOptions: function (options) { setOptions: function (options) {
if (typeof options === "object") { if (typeof options === 'object') {
for (var key in options) { for (var key in options) {
if (options.hasOwnProperty(key)) { if (options.hasOwnProperty(key)) {
this._options[key] = options[key] this._options[key] = options[key]
@@ -137,41 +136,41 @@
}, },
init: function () { init: function () {
try { try {
this._canvas = document.createElement("canvas"); this._canvas = document.createElement('canvas')
this._canvas.style["display"] = "block"; this._canvas.style.display = 'block'
this._canvas.style["position"] = "fixed"; this._canvas.style.position = 'fixed'
this._canvas.style["margin"] = "0"; this._canvas.style.margin = '0'
this._canvas.style["padding"] = "0"; this._canvas.style.padding = '0'
this._canvas.style["border"] = "0"; this._canvas.style.border = '0'
this._canvas.style["outline"] = "0"; this._canvas.style.outline = '0'
this._canvas.style["left"] = "0"; this._canvas.style.left = '0'
this._canvas.style["top"] = "0"; this._canvas.style.top = '0'
this._canvas.style["width"] = "100%"; this._canvas.style.width = '100%'
this._canvas.style["height"] = "100%"; this._canvas.style.height = '100%'
this._canvas.style["z-index"] = "-1"; this._canvas.style['z-index'] = '-1'
this._onResize(); this._onResize()
this._context = this._canvas.getContext("2d"); this._context = this._canvas.getContext('2d')
this._context.clearRect(0, 0, this._width, this._height); this._context.clearRect(0, 0, this._width, this._height)
this._context.globalAlpha = this._options.colorAlpha; this._context.globalAlpha = this._options.colorAlpha
window.addEventListener("resize", this._onResize); window.addEventListener('resize', this._onResize)
window.addEventListener("scroll", this._onScroll); window.addEventListener('scroll', this._onScroll)
document.body.appendChild(this._canvas) document.body.appendChild(this._canvas)
} catch (e) { } catch (e) {
console.warn("Canvas Context Error: " + e.toString()); console.warn('Canvas Context Error: ' + e.toString())
return return
} }
this._onDraw() this._onDraw()
}, },
addRibbon: function () { addRibbon: function () {
var dir = Math.round(random(1, 9)) > 5 ? "right" : "left", var dir = Math.round(random(1, 9)) > 5 ? 'right' : 'left'
stop = 1000, var stop = 1000
hide = 200, var hide = 200
min = 0 - hide, var min = 0 - hide
max = this._width + hide, var max = this._width + hide
movex = 0, var movex = 0
movey = 0, var movey = 0
startx = dir === "right" ? min : max, var startx = dir === 'right' ? min : max
starty = Math.round(random(0, this._height)); var starty = Math.round(random(0, this._height))
if (/^(top|min)$/i.test(this._options.verticalPosition)) { if (/^(top|min)$/i.test(this._options.verticalPosition)) {
starty = 0 + hide starty = 0 + hide
} else if (/^(middle|center)$/i.test(this._options.verticalPosition)) { } else if (/^(middle|center)$/i.test(this._options.verticalPosition)) {
@@ -179,24 +178,24 @@
} else if (/^(bottom|max)$/i.test(this._options.verticalPosition)) { } else if (/^(bottom|max)$/i.test(this._options.verticalPosition)) {
starty = this._height - hide starty = this._height - hide
} }
var ribbon = [], var ribbon = []
point1 = new Point(startx, starty), var point1 = new Point(startx, starty)
point2 = new Point(startx, starty), var point2 = new Point(startx, starty)
point3 = null, var point3 = null
color = Math.round(random(0, 360)), var color = Math.round(random(0, 360))
delay = 0; var delay = 0
while (true) { while (true) {
if (stop <= 0) break; if (stop <= 0) break
stop--; stop--
movex = Math.round((Math.random() * 1 - 0.2) * this._options.horizontalSpeed); movex = Math.round((Math.random() * 1 - 0.2) * this._options.horizontalSpeed)
movey = Math.round((Math.random() * 1 - 0.5) * (this._height * 0.25)); movey = Math.round((Math.random() * 1 - 0.5) * (this._height * 0.25))
point3 = new Point(); point3 = new Point()
point3.copy(point2); point3.copy(point2)
if (dir === "right") { if (dir === 'right') {
point3.add(movex, movey); point3.add(movex, movey)
if (point2.x >= max) break if (point2.x >= max) break
} else if (dir === "left") { } else if (dir === 'left') {
point3.subtract(movex, movey); point3.subtract(movex, movey)
if (point2.x <= min) break if (point2.x <= min) break
} }
ribbon.push({ ribbon.push({
@@ -208,10 +207,10 @@
dir: dir, dir: dir,
alpha: 0, alpha: 0,
phase: 0 phase: 0
}); })
point1.copy(point2); point1.copy(point2)
point2.copy(point3); point2.copy(point3)
delay += 4; delay += 4
color += this._options.colorCycleSpeed color += this._options.colorCycleSpeed
} }
this._ribbons.push(ribbon) this._ribbons.push(ribbon)
@@ -222,45 +221,45 @@
return true return true
} }
if (section.delay <= 0) { if (section.delay <= 0) {
section.phase += 0.02; section.phase += 0.02
section.alpha = Math.sin(section.phase) * 1; section.alpha = Math.sin(section.phase) * 1
section.alpha = section.alpha <= 0 ? 0 : section.alpha; section.alpha = section.alpha <= 0 ? 0 : section.alpha
section.alpha = section.alpha >= 1 ? 1 : section.alpha; section.alpha = section.alpha >= 1 ? 1 : section.alpha
if (this._options.animateSections) { if (this._options.animateSections) {
var mod = Math.sin(1 + section.phase * Math.PI / 2) * 0.1; var mod = Math.sin(1 + section.phase * Math.PI / 2) * 0.1
if (section.dir === "right") { if (section.dir === 'right') {
section.point1.add(mod, 0); section.point1.add(mod, 0)
section.point2.add(mod, 0); section.point2.add(mod, 0)
section.point3.add(mod, 0) section.point3.add(mod, 0)
} else { } else {
section.point1.subtract(mod, 0); section.point1.subtract(mod, 0)
section.point2.subtract(mod, 0); section.point2.subtract(mod, 0)
section.point3.subtract(mod, 0) section.point3.subtract(mod, 0)
} }
section.point1.add(0, mod); section.point1.add(0, mod)
section.point2.add(0, mod); section.point2.add(0, mod)
section.point3.add(0, mod) section.point3.add(0, mod)
} }
} else { } else {
section.delay -= 0.5 section.delay -= 0.5
} }
var s = this._options.colorSaturation, var s = this._options.colorSaturation
l = this._options.colorBrightness, var l = this._options.colorBrightness
c = "hsla(" + section.color + ", " + s + ", " + l + ", " + section.alpha + " )"; var c = 'hsla(' + section.color + ', ' + s + ', ' + l + ', ' + section.alpha + ' )'
this._context.save(); this._context.save()
if (this._options.parallaxAmount !== 0) { if (this._options.parallaxAmount !== 0) {
this._context.translate(0, this._scroll * this._options.parallaxAmount) this._context.translate(0, this._scroll * this._options.parallaxAmount)
} }
this._context.beginPath(); this._context.beginPath()
this._context.moveTo(section.point1.x, section.point1.y); this._context.moveTo(section.point1.x, section.point1.y)
this._context.lineTo(section.point2.x, section.point2.y); this._context.lineTo(section.point2.x, section.point2.y)
this._context.lineTo(section.point3.x, section.point3.y); this._context.lineTo(section.point3.x, section.point3.y)
this._context.fillStyle = c; this._context.fillStyle = c
this._context.fill(); this._context.fill()
if (this._options.strokeSize > 0) { if (this._options.strokeSize > 0) {
this._context.lineWidth = this._options.strokeSize; this._context.lineWidth = this._options.strokeSize
this._context.strokeStyle = c; this._context.strokeStyle = c
this._context.lineCap = "round"; this._context.lineCap = 'round'
this._context.stroke() this._context.stroke()
} }
this._context.restore() this._context.restore()
@@ -273,11 +272,11 @@
this._ribbons.splice(i, 1) this._ribbons.splice(i, 1)
} }
} }
this._context.clearRect(0, 0, this._width, this._height); this._context.clearRect(0, 0, this._width, this._height)
for (var a = 0; a < this._ribbons.length; ++a) { for (var a = 0; a < this._ribbons.length; ++a) {
var ribbon = this._ribbons[a], var ribbon = this._ribbons[a]
numSections = ribbon.length, var numSections = ribbon.length
numDone = 0; var numDone = 0
for (var b = 0; b < numSections; ++b) { for (var b = 0; b < numSections; ++b) {
if (this._drawRibbonSection(ribbon[b])) { if (this._drawRibbonSection(ribbon[b])) {
numDone++ numDone++
@@ -293,42 +292,41 @@
requestAnimationFrame(this._onDraw) requestAnimationFrame(this._onDraw)
}, },
_onResize: function (e) { _onResize: function (e) {
var screen = screenInfo(e); var screen = screenInfo(e)
this._width = screen.width; this._width = screen.width
this._height = screen.height; this._height = screen.height
if (this._canvas) { if (this._canvas) {
this._canvas.width = this._width; this._canvas.width = this._width
this._canvas.height = this._height; this._canvas.height = this._height
if (this._context) { if (this._context) {
this._context.globalAlpha = this._options.colorAlpha this._context.globalAlpha = this._options.colorAlpha
} }
} }
}, },
_onScroll: function (e) { _onScroll: function (e) {
var screen = screenInfo(e); var screen = screenInfo(e)
this._scroll = screen.scrolly this._scroll = screen.scrolly
} }
}; }
return Factory return Factory
}); })
var cn = document.getElementById('ribbon_piao'); var cn = document.getElementById('ribbon_piao')
var mb = cn.getAttribute("mobile"); var mb = cn.getAttribute('mobile')
if ( mb == 'false' && (/Android|webOS|iPhone|iPod|iPad|BlackBerry/i.test(navigator.userAgent))) { if (mb == 'false' && (/Android|webOS|iPhone|iPod|iPad|BlackBerry/i.test(navigator.userAgent))) {
} else { } else {
new Ribbons({ new Ribbons({
colorSaturation: "60%", colorSaturation: '60%',
colorBrightness: "50%", colorBrightness: '50%',
colorAlpha: 0.5, colorAlpha: 0.5,
colorCycleSpeed: 5, colorCycleSpeed: 5,
verticalPosition: "random", verticalPosition: 'random',
horizontalSpeed: 200, horizontalSpeed: 200,
ribbonCount: 3, ribbonCount: 3,
strokeSize: 0, strokeSize: 0,
parallaxAmount: -0.2, parallaxAmount: -0.2,
animateSections: true animateSections: true
}); })
} }

127
source/js/tw_cn.js
View File

File diff suppressed because one or more lines are too long

65
source/js/utils.js
View File

@@ -1,13 +1,15 @@
/* eslint-disable no-unused-vars */
function debounce (func, wait, immediate) { function debounce (func, wait, immediate) {
var timeout let timeout
return function () { return function () {
var context = this const context = this
var args = arguments const args = arguments
var later = function () { const later = function () {
timeout = null timeout = null
if (!immediate) func.apply(context, args) if (!immediate) func.apply(context, args)
} }
var callNow = immediate && !timeout const callNow = immediate && !timeout
clearTimeout(timeout) clearTimeout(timeout)
timeout = setTimeout(later, wait) timeout = setTimeout(later, wait)
if (callNow) func.apply(context, args) if (callNow) func.apply(context, args)
@@ -15,21 +17,21 @@ function debounce (func, wait, immediate) {
}; };
function throttle (func, wait, options) { function throttle (func, wait, options) {
var timeout, context, args let timeout, context, args
var previous = 0 let previous = 0
if (!options) options = {} if (!options) options = {}
var later = function () { const later = function () {
previous = options.leading === false ? 0 : new Date().getTime() previous = options.leading === false ? 0 : new Date().getTime()
timeout = null timeout = null
func.apply(context, args) func.apply(context, args)
if (!timeout) context = args = null if (!timeout) context = args = null
} }
var throttled = function () { const throttled = function () {
var now = new Date().getTime() const now = new Date().getTime()
if (!previous && options.leading === false) previous = now if (!previous && options.leading === false) previous = now
var remaining = wait - (now - previous) const remaining = wait - (now - previous)
context = this context = this
args = arguments args = arguments
if (remaining <= 0 || remaining > wait) { if (remaining <= 0 || remaining > wait) {
@@ -49,9 +51,9 @@ function throttle (func, wait, options) {
} }
function sidebarPaddingR () { function sidebarPaddingR () {
var innerWidth = window.innerWidth const innerWidth = window.innerWidth
var clientWidth = document.body.clientWidth const clientWidth = document.body.clientWidth
var paddingRight = innerWidth - clientWidth const paddingRight = innerWidth - clientWidth
if (innerWidth !== clientWidth) { if (innerWidth !== clientWidth) {
$('body').css('padding-right', paddingRight) $('body').css('padding-right', paddingRight)
} }
@@ -63,8 +65,8 @@ function isIpad () {
} }
function isTMobile () { function isTMobile () {
var ua = navigator.userAgent const ua = navigator.userAgent
var pa = /iPad|iPhone|iPod|Android|Opera Mini|BlackBerry|webOS|UCWEB|Blazer|PSP|IEMobile|Symbian/g const pa = /iPad|iPhone|iPod|Android|Opera Mini|BlackBerry|webOS|UCWEB|Blazer|PSP|IEMobile|Symbian/g
return window.screen.width < 992 && pa.test(ua) return window.screen.width < 992 && pa.test(ua)
} }
@@ -77,14 +79,14 @@ function isDesktop () {
} }
function scrollToDest (name, offset = 0) { function scrollToDest (name, offset = 0) {
var scrollOffset = $(name).offset() const scrollOffset = $(name).offset()
$('body,html').animate({ $('body,html').animate({
scrollTop: scrollOffset.top - offset scrollTop: scrollOffset.top - offset
}) })
}; };
function loadScript (url, callback) { function loadScript (url, callback) {
var script = document.createElement('script') const script = document.createElement('script')
script.type = 'text/javascript' script.type = 'text/javascript'
if (script.readyState) { // IE if (script.readyState) { // IE
script.onreadystatechange = function () { script.onreadystatechange = function () {
@@ -104,15 +106,15 @@ function loadScript (url, callback) {
}; };
function snackbarShow (text, showAction, duration) { function snackbarShow (text, showAction, duration) {
var a = (typeof showAction !== 'undefined') ? showAction : false const sa = (typeof showAction !== 'undefined') ? showAction : false
var d = (typeof duration !== 'undefined') ? duration : 2000 const dur = (typeof duration !== 'undefined') ? duration : 2000
var position = GLOBAL_CONFIG.Snackbar.position const position = GLOBAL_CONFIG.Snackbar.position
var bg = document.documentElement.getAttribute('data-theme') === 'light' ? GLOBAL_CONFIG.Snackbar.bgLight : GLOBAL_CONFIG.Snackbar.bgDark const bg = document.documentElement.getAttribute('data-theme') === 'light' ? GLOBAL_CONFIG.Snackbar.bgLight : GLOBAL_CONFIG.Snackbar.bgDark
Snackbar.show({ Snackbar.show({
text: text, text: text,
backgroundColor: bg, backgroundColor: bg,
showAction: a, showAction: sa,
duration: d, duration: dur,
pos: position pos: position
}) })
} }
@@ -124,9 +126,9 @@ const Cookies = {
if (parts.length === 2) return parts.pop().split(';').shift() if (parts.length === 2) return parts.pop().split(';').shift()
}, },
set: function (name, value, days) { set: function (name, value, days) {
var expires = '' let expires = ''
if (days) { if (days) {
var date = new Date() const date = new Date()
date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000)) date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000))
expires = '; expires=' + date.toUTCString() expires = '; expires=' + date.toUTCString()
} }
@@ -134,6 +136,17 @@ const Cookies = {
} }
} }
const initJustifiedGallery = function (selector) {
selector.each(function (i, o) {
if ($(this).is(':visible')) {
$(this).justifiedGallery({
rowHeight: 220,
margins: 4
})
}
})
}
/** /**
* lazyload * lazyload
*/ */