Skip to content

Commit

Permalink
Merge pull request #307 from everfu/dev
Browse files Browse the repository at this point in the history 
bug: 修复分享未开启报错
  • Loading branch information
@everfu
everfu committed Jun 16, 2024
2 parents fa9a28b + f15057b commit 04212a1
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 45 deletions.
2 changes: 1 addition & 1 deletion layout/includes/inject/body.pug
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ div

if theme.mermaid
script(src=url_for(theme.cdn.mermaid_js))
if theme.post.share.list.includes('qrcode')
if theme.post.share.enable && theme.post.share.list && theme.post.share.list.includes('qrcode')
script(src=url_for(theme.cdn.qrcode))

if theme.display_mode.universe
Expand Down
89 changes: 45 additions & 44 deletions layout/includes/widgets/post/copyright.pug
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,50 +15,51 @@
a.reward-link-button(href=url_for(theme.post.rss))
i.solitude.st-plant-fill
= _p('footer.rss')
.social-share
- const path = config.url + url_for(page.path);
- const encodedPath = encodeURIComponent(path);
- const encodedTitle = encodeURIComponent(page.title);
- const encodedDescription = encodeURIComponent(page.description);
- const encodedIcon = encodeURIComponent(page.cover || theme.site.icon);
each item in theme.post.share.list || []
case item
when 'qq'
a.social-share-ico.icon-qq(href=`https://connect.qq.com/widget/shareqq/index.html?url=${encodedPath}&title=${encodedTitle}&desc=${encodedDescription}&summary=${encodedDescription}&site=${encodedTitle}&pics=${encodedIcon}` title=_p('post.share.qq'))
i.solitude.st-qq-fill
when 'weibo'
a.social-share-ico.icon-weibo(href=`http://service.weibo.com/share/share.php?url=${encodedPath}&title=${encodedTitle}&pic=${encodedIcon}` title=_p('post.share.weibo'))
i.solitude.st-weibo-fill
when 'telegram'
a.social-share-ico.icon-telegram(href=`https://t.me/share/url?url=${encodedPath}&text=${encodedTitle}` title=_p('post.share.telegram'))
i.solitude.st-telegram-fill
when 'whatsapp'
a.social-share-ico.icon-whatsapp(href=`https://api.whatsapp.com/send?text=${encodedTitle} ${encodedPath}` title=_p('post.share.whatsapp'))
i.solitude.st-whatsapp-fill
when 'linkedin'
a.social-share-ico.icon-linkedin(href=`https://www.linkedin.com/shareArticle?mini=true&url=${encodedPath}&title=${encodedTitle}&summary=${encodedDescription}&source=${encodedTitle}` title=_p('post.share.linkedin'))
i.solitude.st-linkedin-box-fill
when 'facebook'
a.social-share-ico.icon-facebook(href=`https://www.facebook.com/sharer/sharer.php?u=${encodedPath}` title=_p('post.share.facebook'))
i.solitude.st-facebook-fill
when 'twitter'
a.social-share-ico.icon-twitter(href=`https://twitter.com/intent/tweet?url=${encodedPath}&text=${encodedTitle}` title=_p('post.share.twitter'))
i.solitude.st-twitter-x-fill
when 'link'
.social-share-ico.icon-link(onclick=`utils.copy("${path}")` title=_p('post.share.link'))
i.solitude.st-links-line
when 'qrcode'
.social-share-ico.icon-qrcode(title=_p('post.share.qrcode'))
i.solitude.st-qr-code-fill
.share-main
.share-main-all
#qrcode
.reward-dec=_p('post.share.qrcode')
script(pjax).
typeof QRCode === 'function' && new QRCode(document.getElementById("qrcode"), '!{path}');
window.addEventListener('DOMContentLoaded', () => {
new QRCode(document.getElementById("qrcode"), '!{path}');
});
if theme.post.share.enable
.social-share
- const path = config.url + url_for(page.path);
- const encodedPath = encodeURIComponent(path);
- const encodedTitle = encodeURIComponent(page.title);
- const encodedDescription = encodeURIComponent(page.description);
- const encodedIcon = encodeURIComponent(page.cover || theme.site.icon);
each item in theme.post.share.list || []
case item
when 'qq'
a.social-share-ico.icon-qq(href=`https://connect.qq.com/widget/shareqq/index.html?url=${encodedPath}&title=${encodedTitle}&desc=${encodedDescription}&summary=${encodedDescription}&site=${encodedTitle}&pics=${encodedIcon}` title=_p('post.share.qq'))
i.solitude.st-qq-fill
when 'weibo'
a.social-share-ico.icon-weibo(href=`http://service.weibo.com/share/share.php?url=${encodedPath}&title=${encodedTitle}&pic=${encodedIcon}` title=_p('post.share.weibo'))
i.solitude.st-weibo-fill
when 'telegram'
a.social-share-ico.icon-telegram(href=`https://t.me/share/url?url=${encodedPath}&text=${encodedTitle}` title=_p('post.share.telegram'))
i.solitude.st-telegram-fill
when 'whatsapp'
a.social-share-ico.icon-whatsapp(href=`https://api.whatsapp.com/send?text=${encodedTitle} ${encodedPath}` title=_p('post.share.whatsapp'))
i.solitude.st-whatsapp-fill
when 'linkedin'
a.social-share-ico.icon-linkedin(href=`https://www.linkedin.com/shareArticle?mini=true&url=${encodedPath}&title=${encodedTitle}&summary=${encodedDescription}&source=${encodedTitle}` title=_p('post.share.linkedin'))
i.solitude.st-linkedin-box-fill
when 'facebook'
a.social-share-ico.icon-facebook(href=`https://www.facebook.com/sharer/sharer.php?u=${encodedPath}` title=_p('post.share.facebook'))
i.solitude.st-facebook-fill
when 'twitter'
a.social-share-ico.icon-twitter(href=`https://twitter.com/intent/tweet?url=${encodedPath}&text=${encodedTitle}` title=_p('post.share.twitter'))
i.solitude.st-twitter-x-fill
when 'link'
.social-share-ico.icon-link(onclick=`utils.copy("${path}")` title=_p('post.share.link'))
i.solitude.st-links-line
when 'qrcode'
.social-share-ico.icon-qrcode(title=_p('post.share.qrcode'))
i.solitude.st-qr-code-fill
.share-main
.share-main-all
#qrcode
.reward-dec=_p('post.share.qrcode')
script(pjax).
typeof QRCode === 'function' && new QRCode(document.getElementById("qrcode"), '!{path}');
window.addEventListener('DOMContentLoaded', () => {
new QRCode(document.getElementById("qrcode"), '!{path}');
});

if copyright.enable || page.copyright
.post-copyright__notice
Expand Down

0 comments on commit 04212a1

Please sign in to comment.