Van 2018-09-25 10:48:28 +08:00
parent 751599e758
commit 73c125c9f0
No known key found for this signature in database
GPG Key ID: 7059B8783A78F16C
2 changed files with 160 additions and 146 deletions

View File

@ -51,8 +51,8 @@
</head> </head>
<body> <body>
<#include "header.ftl"> <#include "header.ftl">
<div id="pjaxArticle"> <div id="pjax">
<#if pjax><!---- pjax {#pjaxArticle} start ----></#if> <#if pjax><!---- pjax {#pjax} start ----></#if>
<div class="main post__main"> <div class="main post__main">
<#if noticeBoard??> <#if noticeBoard??>
<div class="board"> <div class="board">
@ -131,7 +131,6 @@
</div> </div>
</article> </article>
</div> </div>
</div>
<div class="article__bottom"> <div class="article__bottom">
<div class="wrapper"> <div class="wrapper">
<div class="fn-flex footer__tag"> <div class="fn-flex footer__tag">
@ -216,8 +215,8 @@
data-avatar="${article.authorThumbnailURL}"></span> data-avatar="${article.authorThumbnailURL}"></span>
</div> </div>
</div> </div>
</div>
<#if pjax><!---- pjax {#pjaxArticle} end ----></#if> <#if pjax><!---- pjax {#pjax} end ----></#if>
</div> </div>
<script type="text/javascript" src="${staticServePath}/js/lib/compress/pjax.min.js" charset="utf-8"></script> <script type="text/javascript" src="${staticServePath}/js/lib/compress/pjax.min.js" charset="utf-8"></script>
<script type="text/javascript" src="${staticServePath}/js/common${miniPostfix}.js?${staticResourceVersion}" <script type="text/javascript" src="${staticServePath}/js/common${miniPostfix}.js?${staticResourceVersion}"
@ -229,35 +228,36 @@
charset="utf-8"></script> charset="utf-8"></script>
<script type="text/javascript"> <script type="text/javascript">
var latkeConfig = { var latkeConfig = {
"servePath": "${servePath}", 'servePath': "${servePath}",
"staticServePath": "${staticServePath}", 'staticServePath': "${staticServePath}",
"isLoggedIn": "${isLoggedIn?string}", 'isLoggedIn': "${isLoggedIn?string}",
"userName": "${userName}" 'userName': "${userName}",
}; }
var Label = { var Label = {
"skinDirName": "${skinDirName}", 'skinDirName': "${skinDirName}",
"em00Label": "${em00Label}", 'em00Label': "${em00Label}",
"em01Label": "${em01Label}", 'em01Label': "${em01Label}",
"em02Label": "${em02Label}", 'em02Label': "${em02Label}",
"em03Label": "${em03Label}", 'em03Label': "${em03Label}",
"em04Label": "${em04Label}", 'em04Label': "${em04Label}",
"em05Label": "${em05Label}", 'em05Label': "${em05Label}",
"em06Label": "${em06Label}", 'em06Label': "${em06Label}",
"em07Label": "${em07Label}", 'em07Label': "${em07Label}",
"em08Label": "${em08Label}", 'em08Label': "${em08Label}",
"em09Label": "${em09Label}", 'em09Label': "${em09Label}",
"em10Label": "${em10Label}", 'em10Label': "${em10Label}",
"em11Label": "${em11Label}", 'em11Label': "${em11Label}",
"em12Label": "${em12Label}", 'em12Label': "${em12Label}",
"em13Label": "${em13Label}", 'em13Label': "${em13Label}",
"em14Label": "${em14Label}" 'em14Label': "${em14Label}",
}; }
Util.killIE() Util.killIE()
Util.parseMarkdown('content-reset'); Util.parseMarkdown('content-reset')
Skin.initArticle(); Skin.initArticle()
</script> </script>
<!---- pjax {#pjax} start ----></#if>
<@comment_script oId=article.oId> <@comment_script oId=article.oId>
Skin.initComment = function (articleOId, articleTags) { Skin.initComment = function (articleOId, articleTags) {
page.tips.externalRelevantArticlesDisplayCount = "${externalRelevantArticlesDisplayCount}"; page.tips.externalRelevantArticlesDisplayCount = "${externalRelevantArticlesDisplayCount}";
@ -273,6 +273,7 @@
} }
Skin.initComment('${article.oId}', "<#list article.articleTags?split(",") as articleTag>${articleTag}<#if articleTag_has_next>,</#if></#list>") Skin.initComment('${article.oId}', "<#list article.articleTags?split(",") as articleTag>${articleTag}<#if articleTag_has_next>,</#if></#list>")
</@comment_script> </@comment_script>
<!---- pjax {#pjax} end ----></#if>
${plugins} ${plugins}
</body> </body>
</html> </html>

View File

@ -51,10 +51,17 @@ var Skin = {
if (location.href === latkeConfig.servePath + '/tags.html') { if (location.href === latkeConfig.servePath + '/tags.html') {
Skin.initTags() Skin.initTags()
} }
}, function () { if (Util.isArticlePage(location.href)) {
Util.parseMarkdown('content-reset'); if (!$('#articleSideShare .article__code').qrcode) {
$.ajax({
method: "GET",
url: latkeConfig.staticServePath + '/js/jquery.qrcode.min.js',
dataType: "script",
cache: true
});
}
Skin.initArticle(); Skin.initArticle();
Skin.initComment($('.post__tags').data('oid'), $('.post__tags').data('tag')) }
}) })
}, },
initTags: function () { initTags: function () {
@ -83,6 +90,9 @@ var Skin = {
})); }));
}, },
initArticle: function () { initArticle: function () {
if ($('#articleShare').length === 0) {
return
}
Skin._share('#articleShare') Skin._share('#articleShare')
Skin._share('#articleSideShare') Skin._share('#articleSideShare')
Skin._share('#articleBottomShare') Skin._share('#articleBottomShare')
@ -96,6 +106,9 @@ var Skin = {
var sideAbsoluteTop = ($(window).height() - 249) / 2 + 125 var sideAbsoluteTop = ($(window).height() - 249) / 2 + 125
var beforScrollTop = $(window).scrollTop() var beforScrollTop = $(window).scrollTop()
$(window).scroll(function () { $(window).scroll(function () {
if ($('#articleShare').length === 0) {
return
}
var scrollTop = $(window).scrollTop() var scrollTop = $(window).scrollTop()
var bottomTop = $('.article__bottom').offset().top var bottomTop = $('.article__bottom').offset().top
if (scrollTop > 65) { if (scrollTop > 65) {