fixed https://github.com/b3log/solo/issues/12524

2018-09-25 13:36:23 +08:00 · 2018-09-25 13:36:23 +08:00 · c2c29ee936
commit c2c29ee936
parent 77adf1de74
19 changed files with 131 additions and 20 deletions
--- a/Medium/js/common.js
+++ b/Medium/js/common.js
@ -48,9 +48,6 @@ var Skin = {

    Util.initPjax(function () {
      Util.parseMarkdown('content-reset');
-      if (location.href === latkeConfig.servePath + '/tags.html') {
-        Skin.initTags()
-      }
      if (Util.isArticlePage(location.href)) {
        if (!$('#articleSideShare .article__code').qrcode) {
          $.ajax({
--- a/Medium/js/common.min.js
+++ b/Medium/js/common.min.js
@ -15,4 +15,4 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
-var Skin={init:function(){$("body").on("click",".content-reset img",function(){window.open(this.src)}),$(window).scroll(function(){0!==$("#headerNav").length&&($(window).scrollTop()>64?($("#headerNav").addClass("header__nav--fixed"),$(".main").css("margin-top","100px")):($("#headerNav").removeClass("header__nav--fixed"),$(".main").css("margin-top","50px")))}),$(window).scroll(),Util.initPjax(function(){Util.parseMarkdown("content-reset"),location.href===latkeConfig.servePath+"/tags.html"&&Skin.initTags(),Util.isArticlePage(location.href)&&($("#articleSideShare .article__code").qrcode||$.ajax({method:"GET",url:latkeConfig.staticServePath+"/skins/Medium/js/jquery.qrcode.min.js",dataType:"script",cache:!0}))})},initTags:function(){for(var t=$("#tags"),e=t.find(".tag"),i=parseInt(e.first().data("count")),a=Math.ceil(i/5),o=0;o<e.length;o++)for(var n=parseInt($(e[o]).data("count")),s=0;s<5;s++)if(n>s*a&&n<=(s+1)*a){e[o].className="tag tag__level"+s;break}t.html(e.get().sort(function(t,e){var i=$(t).text().toLowerCase(),a=$(e).text().toLowerCase();return i.localeCompare(a)}))},initArticle:function(){if(0!==$("#articleShare").length){Skin._share("#articleShare"),Skin._share("#articleSideShare"),Skin._share("#articleBottomShare");var t=$(".post__side");$(window).height()>=$(".post").height()&&t.css("opacity",1),t.css("left",($(".post").offset().left-20)/2-27+"px");var e=($(window).height()-249)/2+125,i=$(window).scrollTop();$(window).scroll(function(){if(0!==$("#articleShare").length){var a=$(window).scrollTop(),o=$(".article__bottom").offset().top;a>65?(t.css("opacity",1),i-a>0?($(".header").addClass("header--fixed").css({top:"0"}),$(".main").css("padding-top","64px"),$(window).height()<=$(".post").height()&&a<o-$(window).height()&&$(".article__toolbar").css({bottom:0,opacity:1})):i-a<0&&($(".header").css({top:"-64px"}).removeClass("header--fixed"),$(".main").css("padding-top","0"),$(".article__toolbar").css({bottom:"-44px",opacity:0}))):($(window).height()<=$(".post").height()&&t.css("opacity",0),$(".header").removeClass("header--fixed").css("top","-64px"),$(".main").css("padding-top","0")),a>o-$(window).height()?o<$(window).height()?t.css({position:"absolute",top:o-125+"px"}):t.css({position:"absolute",top:o-e+"px"}):t.css({position:"fixed",top:"50%"}),i=a}}),$(window).scroll()}},_share:function(t){var e=$(t),i=e.find(".article__code"),a=i.data("url"),o=i.data("avatar"),n=encodeURIComponent(i.data("title")+" - "+i.data("blogtitle")),s=encodeURIComponent(a),r={};r.tencent="http://share.v.t.qq.com/index.php?c=share&a=index&title="+n+"&url="+s+"&pic="+o,r.weibo="http://v.t.sina.com.cn/share/share.php?title="+n+"&url="+s+"&pic="+o,r.google="https://plus.google.com/share?url="+s,r.twitter="https://twitter.com/intent/tweet?status="+n+" "+s,e.find("span").click(function(){var t=$(this).data("type");if(t)return"wechat"===t?(0===i.find("canvas").length?i.qrcode({width:128,height:128,text:a}):i.slideToggle(),!1):void window.open(r[t],"_blank","top=100,left=200,width=648,height=618")})}};Skin.init();
+var Skin={init:function(){$("body").on("click",".content-reset img",function(){window.open(this.src)}),$(window).scroll(function(){0!==$("#headerNav").length&&($(window).scrollTop()>64?($("#headerNav").addClass("header__nav--fixed"),$(".main").css("margin-top","100px")):($("#headerNav").removeClass("header__nav--fixed"),$(".main").css("margin-top","50px")))}),$(window).scroll(),Util.initPjax(function(){Util.parseMarkdown("content-reset"),Util.isArticlePage(location.href)&&($("#articleSideShare .article__code").qrcode||$.ajax({method:"GET",url:latkeConfig.staticServePath+"/skins/Medium/js/jquery.qrcode.min.js",dataType:"script",cache:!0}))})},initTags:function(){for(var t=$("#tags"),e=t.find(".tag"),i=parseInt(e.first().data("count")),a=Math.ceil(i/5),o=0;o<e.length;o++)for(var n=parseInt($(e[o]).data("count")),s=0;s<5;s++)if(n>s*a&&n<=(s+1)*a){e[o].className="tag tag__level"+s;break}t.html(e.get().sort(function(t,e){var i=$(t).text().toLowerCase(),a=$(e).text().toLowerCase();return i.localeCompare(a)}))},initArticle:function(){if(0!==$("#articleShare").length){Skin._share("#articleShare"),Skin._share("#articleSideShare"),Skin._share("#articleBottomShare");var t=$(".post__side");$(window).height()>=$(".post").height()&&t.css("opacity",1),t.css("left",($(".post").offset().left-20)/2-27+"px");var e=($(window).height()-249)/2+125,i=$(window).scrollTop();$(window).scroll(function(){if(0!==$("#articleShare").length){var a=$(window).scrollTop(),o=$(".article__bottom").offset().top;a>65?(t.css("opacity",1),i-a>0?($(".header").addClass("header--fixed").css({top:"0"}),$(".main").css("padding-top","64px"),$(window).height()<=$(".post").height()&&a<o-$(window).height()&&$(".article__toolbar").css({bottom:0,opacity:1})):i-a<0&&($(".header").css({top:"-64px"}).removeClass("header--fixed"),$(".main").css("padding-top","0"),$(".article__toolbar").css({bottom:"-44px",opacity:0}))):($(window).height()<=$(".post").height()&&t.css("opacity",0),$(".header").removeClass("header--fixed").css("top","-64px"),$(".main").css("padding-top","0")),a>o-$(window).height()?o<$(window).height()?t.css({position:"absolute",top:o-125+"px"}):t.css({position:"absolute",top:o-e+"px"}):t.css({position:"fixed",top:"50%"}),i=a}}),$(window).scroll()}},_share:function(t){var e=$(t),i=e.find(".article__code"),a=i.data("url"),o=i.data("avatar"),n=encodeURIComponent(i.data("title")+" - "+i.data("blogtitle")),s=encodeURIComponent(a),r={};r.tencent="http://share.v.t.qq.com/index.php?c=share&a=index&title="+n+"&url="+s+"&pic="+o,r.weibo="http://v.t.sina.com.cn/share/share.php?title="+n+"&url="+s+"&pic="+o,r.google="https://plus.google.com/share?url="+s,r.twitter="https://twitter.com/intent/tweet?status="+n+" "+s,e.find("span").click(function(){var t=$(this).data("type");if(t)return"wechat"===t?(0===i.find("canvas").length?i.qrcode({width:128,height:128,text:a}):i.slideToggle(),!1):void window.open(r[t],"_blank","top=100,left=200,width=648,height=618")})}};Skin.init();
--- a/Medium/tags.ftl
+++ b/Medium/tags.ftl
@ -59,8 +59,10 @@
    <#if pjax><!---- pjax {#pjax} end ----></#if>
 </div>
 <#include "footer.ftl">
+ <#if pjax><!---- pjax {#pjax} start ----></#if>
 <script>
    Skin.initTags()
 </script>
+    <#if pjax><!---- pjax {#pjax} end ----></#if>
 </body>
 </html>
--- a/nijigen/archive-articles.ftl
+++ b/nijigen/archive-articles.ftl
@ -31,7 +31,9 @@
 <body>
 <#include "header.ftl">
 <div class="main">
-    <main class="content">
+    <div id="pjax" class="content">
+    <#if pjax><!---- pjax {#pjax} start ----></#if>
+    <main>
        <div class="module">
            <div class="module__content ft__center">
                <i class="icon__home"></i>
@ -50,6 +52,8 @@
        </div>
        <#include "article-list.ftl">
    </main>
+    <#if pjax><!---- pjax {#pjax} end ----></#if>
+    </div>
    <#include "side.ftl">
 </div>
 <#include "footer.ftl">
--- a/nijigen/archives.ftl
+++ b/nijigen/archives.ftl
@ -29,7 +29,9 @@
 <body>
 <#include "header.ftl">
 <div class="main">
-    <main class="content">
+    <div id="pjax" class="content">
+    <#if pjax><!---- pjax {#pjax} start ----></#if>
+    <main>
        <div class="module">
            <div class="module__content ft__center">
                <i class="icon__home"></i>
@ -63,6 +65,8 @@
            </div>
        </div>
    </main>
+    <#if pjax><!---- pjax {#pjax} end ----></#if>
+    </div>
    <#include "side.ftl">
 </div>
 <#include "footer.ftl">
--- a/nijigen/article.ftl
+++ b/nijigen/article.ftl
@ -52,7 +52,9 @@
 <body>
 <#include "header.ftl">
 <div class="main">
-    <main class="content article-list">
+    <div id="pjax" class="content">
+    <#if pjax><!---- pjax {#pjax} start ----></#if>
+    <main class="article-list">
        <div class="item item--active">
            <time class="tooltipped tooltipped__n item__date"
                  aria-label="${article.articleCreateDate?string("yyyy")}${yearLabel}">
@ -145,9 +147,12 @@
            </div>
        </div>
    </main>
+    <#if pjax><!---- pjax {#pjax} end ----></#if>
+    </div>
    <#include "side.ftl">
 </div>
 <#include "footer.ftl">
+<#if pjax><!---- pjax {#pjax} start ----></#if>
 <@comment_script oId=article.oId>
 page.tips.externalRelevantArticlesDisplayCount = "${externalRelevantArticlesDisplayCount}";
    <#if 0 != randomArticlesDisplayCount>
@ -162,5 +167,6 @@ page.loadExternalRelevantArticles("<#list article.articleTags?split(",") as arti
    '<header class="module__header">${relevantArticlesLabel}</header>');
    </#if>
 </@comment_script>
+<#if pjax><!---- pjax {#pjax} end ----></#if>
 </body>
 </html>
--- a/nijigen/category-articles.ftl
+++ b/nijigen/category-articles.ftl
@ -30,7 +30,9 @@
 <body>
 <#include "header.ftl">
 <div class="main">
-    <main class="content">
+    <div id="pjax" class="content">
+    <#if pjax><!---- pjax {#pjax} start ----></#if>
+    <main>
        <div class="module">
            <div class="module__content ft__center">
                <i class="icon__home"></i>
@ -45,6 +47,8 @@
        </div>
        <#include "article-list.ftl">
    </main>
+    <#if pjax><!---- pjax {#pjax} end ----></#if>
+    </div>
    <#include "side.ftl">
 </div>
 <#include "footer.ftl">
--- a/nijigen/css/base.css
+++ b/nijigen/css/base.css
@ -20,7 +20,7 @@
 * skin style
 *
 * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
- * @version 0.1.0.0, Aug 31, 2018
+ * @version 0.2.0.0, Sep 25, 2018
 */
 /*
 * Symphony - A modern community (forum/BBS/SNS/blog) platform written in Java.
@ -574,6 +574,71 @@ blockquote {
 .em14 {
  background-position: -96px -48px; }

+/* Make clicks pass-through */
+#nprogress {
+  pointer-events: none; }
+
+#nprogress .bar {
+  background: #d23f31;
+  position: fixed;
+  z-index: 1031;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 2px; }
+
+/* Fancy blur effect */
+#nprogress .peg {
+  display: block;
+  position: absolute;
+  right: 0px;
+  width: 100px;
+  height: 100%;
+  box-shadow: 0 0 10px #d23f31, 0 0 5px #d23f31;
+  opacity: 1.0;
+  -webkit-transform: rotate(3deg) translate(0px, -4px);
+  -ms-transform: rotate(3deg) translate(0px, -4px);
+  transform: rotate(3deg) translate(0px, -4px); }
+
+/* Remove these to get rid of the spinner */
+#nprogress .spinner {
+  display: block;
+  position: fixed;
+  z-index: 1031;
+  top: 15px;
+  right: 15px; }
+
+#nprogress .spinner-icon {
+  width: 18px;
+  height: 18px;
+  box-sizing: border-box;
+  border: solid 2px transparent;
+  border-top-color: #d23f31;
+  border-left-color: #d23f31;
+  border-radius: 50%;
+  -webkit-animation: nprogress-spinner 400ms linear infinite;
+  animation: nprogress-spinner 400ms linear infinite; }
+
+.nprogress-custom-parent {
+  overflow: hidden;
+  position: relative; }
+
+.nprogress-custom-parent #nprogress .spinner,
+.nprogress-custom-parent #nprogress .bar {
+  position: absolute; }
+
+@-webkit-keyframes nprogress-spinner {
+  0% {
+    -webkit-transform: rotate(0deg); }
+  100% {
+    -webkit-transform: rotate(360deg); } }
+
+@keyframes nprogress-spinner {
+  0% {
+    transform: rotate(0deg); }
+  100% {
+    transform: rotate(360deg); } }
+
 /**
 * Solo - A small and beautiful blogging system written in Java.
 * Copyright (c) 2010-2018, b3log.org & hacpai.com
--- a/nijigen/css/base.min.css
+++ b/nijigen/css/base.min.css
--- a/nijigen/css/base.scss
+++ b/nijigen/css/base.scss
@ -19,13 +19,14 @@
 * skin style
 *
 * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
- * @version 0.1.0.0, Aug 31, 2018
+ * @version 0.2.0.0, Sep 25, 2018
 */
@import "../../../scss/reset";
@import "../../../scss/reset-content";
@import "../../../scss/function";
@import "../../../scss/tooltipped";
@import "../../../scss/comment";
+@import "../../../scss/nprogress";
@import "icon";

 $purple: #7266BA !default;
--- a/nijigen/dynamic.ftl
+++ b/nijigen/dynamic.ftl
@ -29,7 +29,9 @@
 <body>
 <#include "header.ftl">
 <div class="main">
-    <main class="content">
+    <div id="pjax" class="content">
+    <#if pjax><!---- pjax {#pjax} start ----></#if>
+    <main>
        <div class="module">
            <div class="module__content ft__center">
                <i class="icon__home"></i>
@ -46,6 +48,8 @@
        </ul>
    </#if>
    </main>
+    <#if pjax><!---- pjax {#pjax} end ----></#if>
+    </div>
 <#include "side.ftl">
 </div>
 <#include "footer.ftl">
--- a/nijigen/footer.ftl
+++ b/nijigen/footer.ftl
@ -32,7 +32,7 @@
 </footer>
 <div class="icon-up" onclick="Util.goTop()"></div>

-<script type="text/javascript" src="${staticServePath}/js/lib/jquery/jquery.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}" charset="utf-8"></script>
 <script type="text/javascript" src="${staticServePath}/skins/${skinDirName}/js/common${miniPostfix}.js?${staticResourceVersion}" charset="utf-8"></script>
 <script type="text/javascript">
--- a/nijigen/index.ftl
+++ b/nijigen/index.ftl
@ -33,9 +33,13 @@
 <body>
 <#include "header.ftl">
 <div class="main">
-    <main class="content">
+    <div id="pjax" class="content">
+    <#if pjax><!---- pjax {#pjax} start ----></#if>
+    <main>
    <#include "article-list.ftl">
    </main>
+    <#if pjax><!---- pjax {#pjax} end ----></#if>
+    </div>
    <#include "side.ftl">
 </div>
 <#include "footer.ftl">
--- a/nijigen/js/common.js
+++ b/nijigen/js/common.js
@ -19,7 +19,7 @@
 * @fileoverview util and every page should be used.
 *
 * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
- * @version 0.1.0.0, Sep 2, 2018
+ * @version 0.2.0.0, Sep 25, 2018
 */

 /**
@ -37,6 +37,8 @@ var Skin = {
    })
  },
  init: function () {
+    Util.initPjax()
+
    $('body').on('click', '.content-reset img', function () {
      window.open(this.src)
    })
--- a/nijigen/js/common.min.js
+++ b/nijigen/js/common.min.js
@ -15,4 +15,4 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
-var Skin={_initCommon:function(e){$(window).scroll(function(){$(window).scrollTop()>125?e.show():e.hide()})},init:function(){if($("body").on("click",".content-reset img",function(){window.open(this.src)}),this._initCommon($(".icon__up")),$(".header__nav a, .header__m a").each(function(){this.href===location.href&&(this.className="current")}),!("IntersectionObserver"in window))return $(".item").addClass("item--active"),!1;window.imageIntersectionObserver?(window.imageIntersectionObserver.disconnect(),$(".item").each(function(){window.imageIntersectionObserver.observe(this)})):(window.imageIntersectionObserver=new IntersectionObserver(function(e){e.forEach(function(e){if(void 0===e.isIntersecting?0!==e.intersectionRatio:e.isIntersecting)$(e.target).addClass("item--active");else{if(1===$(e.target).closest(".side").length||$(e.target).closest(".article-list").hasClass("content"))return;$(e.target).removeClass("item--active")}})}),$(".item").each(function(){window.imageIntersectionObserver.observe(this)}))},_initArticleCommon:function(){$(".b3-solo-list li").length>0&&$(window).width()>1e3&&($(".side").prepend('<div class="module"><div class="module__list"></div></div>'),$(".side .module:eq(0) .module__list").html($(".b3-solo-list")))},initArticle:function(){this._initArticleCommon(),setTimeout(function(){0===$("#externalRelevantArticlesWrap li").length&&($("#externalRelevantArticlesWrap").next().remove(),$("#externalRelevantArticlesWrap").remove()),0===$("#relevantArticlesWrap li").length&&($("#relevantArticlesWrap").prev().remove(),$("#relevantArticlesWrap").remove()),0===$("#randomArticlesWrap li").length&&($("#randomArticlesWrap").prev().remove(),$("#randomArticlesWrap").remove())},1e3)}};Skin.init();
+var Skin={_initCommon:function(e){$(window).scroll(function(){$(window).scrollTop()>125?e.show():e.hide()})},init:function(){if(Util.initPjax(),$("body").on("click",".content-reset img",function(){window.open(this.src)}),this._initCommon($(".icon__up")),$(".header__nav a, .header__m a").each(function(){this.href===location.href&&(this.className="current")}),!("IntersectionObserver"in window))return $(".item").addClass("item--active"),!1;window.imageIntersectionObserver?(window.imageIntersectionObserver.disconnect(),$(".item").each(function(){window.imageIntersectionObserver.observe(this)})):(window.imageIntersectionObserver=new IntersectionObserver(function(e){e.forEach(function(e){if(void 0===e.isIntersecting?0!==e.intersectionRatio:e.isIntersecting)$(e.target).addClass("item--active");else{if(1===$(e.target).closest(".side").length||$(e.target).closest(".article-list").hasClass("content"))return;$(e.target).removeClass("item--active")}})}),$(".item").each(function(){window.imageIntersectionObserver.observe(this)}))},_initArticleCommon:function(){$(".b3-solo-list li").length>0&&$(window).width()>1e3&&($(".side").prepend('<div class="module"><div class="module__list"></div></div>'),$(".side .module:eq(0) .module__list").html($(".b3-solo-list")))},initArticle:function(){this._initArticleCommon(),setTimeout(function(){0===$("#externalRelevantArticlesWrap li").length&&($("#externalRelevantArticlesWrap").next().remove(),$("#externalRelevantArticlesWrap").remove()),0===$("#relevantArticlesWrap li").length&&($("#relevantArticlesWrap").prev().remove(),$("#relevantArticlesWrap").remove()),0===$("#randomArticlesWrap li").length&&($("#randomArticlesWrap").prev().remove(),$("#randomArticlesWrap").remove())},1e3)}};Skin.init();
--- a/nijigen/links.ftl
+++ b/nijigen/links.ftl
@ -29,7 +29,9 @@
 <body>
 <#include "header.ftl">
 <div class="main">
-    <main class="content">
+    <div id="pjax" class="content">
+    <#if pjax><!---- pjax {#pjax} start ----></#if>
+    <main>
        <div class="module">
            <div class="module__content ft__center">
                <i class="icon__home"></i>
@ -56,6 +58,8 @@
            </div>
        </div>
    </main>
+    <#if pjax><!---- pjax {#pjax} end ----></#if>
+    </div>
    <#include "side.ftl">
 </div>
 <#include "footer.ftl">
--- a/nijigen/page.ftl
+++ b/nijigen/page.ftl
@ -30,7 +30,9 @@
 <body>
 <#include "header.ftl">
 <div class="main">
-    <main class="content">
+    <div id="pjax" class="content">
+    <#if pjax><!---- pjax {#pjax} start ----></#if>
+    <main>
        <article class="module">
            <div class="module__content">
                <div class="content-reset">
@ -40,6 +42,8 @@
        </article>
        <@comments commentList=pageComments article=page></@comments>
    </main>
+    <#if pjax><!---- pjax {#pjax} end ----></#if>
+    </div>
    <#include "side.ftl">
 </div>
 <#include "footer.ftl">
--- a/nijigen/tag-articles.ftl
+++ b/nijigen/tag-articles.ftl
@ -30,7 +30,9 @@
 <body>
 <#include "header.ftl">
 <div class="main">
-    <main class="content">
+    <div id="pjax" class="content">
+    <#if pjax><!---- pjax {#pjax} start ----></#if>
+    <main>
        <div class="module">
            <div class="module__content ft__center">
                <i class="icon__home"></i>
@ -44,6 +46,8 @@
        </div>
        <#include "article-list.ftl">
    </main>
+    <#if pjax><!---- pjax {#pjax} end ----></#if>
+    </div>
    <#include "side.ftl">
 </div>
 <#include "footer.ftl">
--- a/nijigen/tags.ftl
+++ b/nijigen/tags.ftl
@ -29,7 +29,9 @@
 <body>
 <#include "header.ftl">
 <div class="main">
-    <main class="content">
+    <div id="pjax" class="content">
+    <#if pjax><!---- pjax {#pjax} start ----></#if>
+    <main>
        <div class="module">
            <div class="module__content ft__center">
                <i class="icon__home"></i>
@ -51,9 +53,12 @@
            </div>
        </div>
    </main>
+    <#if pjax><!---- pjax {#pjax} end ----></#if>
+    </div>
    <#include "side.ftl">
 </div>
 <#include "footer.ftl">
+<#if pjax><!---- pjax {#pjax} start ----></#if>
 <script type="text/javascript" src="${staticServePath}/skins/${skinDirName}/js/isotope.pkgd.min.js"
        charset="utf-8"></script>
 <script>
@ -66,5 +71,6 @@
        sortBy: 'random',
    })
 </script>
+<#if pjax><!---- pjax {#pjax} end ----></#if>
 </body>
 </html>