jekyll-text-theme 2.0.1 → 2.0.2

data/_includes/markdown-enhancements/mermaid.html

@@ -2,7 +2,9 @@
 {%- assign _sources = __return -%}
 <script>
   window.Lazyload.js('{{ _sources.mermaid }}', function() {
+    mermaid.initialize({
+      startOnLoad: true
+    });
     mermaid.init(undefined, '.language-mermaid');
-    mermaid.initialize({ startOnLoad: true });
   });
 </script>

data/_includes/pageview.html

@@ -1,6 +1,4 @@
-{%- assign __source = page.pageview -%}
-{%- assign __target = site.data.variables.default.pageview -%}
-{%- include snippets/assign.html -%}
+{%- include snippets/assign.html target=site.data.variables.default.pageview source0=page.pageview -%}
 {%- assign _pageview = __return -%}
 
 

data/_includes/paginator.html

@@ -0,0 +1,97 @@
+{%- if paginator.total_pages > 1 -%}
+  <nav class="pagination">
+
+    {%- include snippets/locale-to-string.html locale=site.data.locale.STATISTICS -%}
+    {%- assign _locale_statistics = __return -%}
+
+    {%- assign _post_count = site.posts | size -%}
+    {%- assign _page_count = paginator.total_pages -%}
+    <p>{{ _locale_statistics | replace: '[POST_COUNT]', _post_count | replace: '[PAGE_COUNT]', _page_count }}</p>
+
+    <ul class="menu menu--nowrap">
+      {%- assign _max_show = 5 -%}
+      {%- assign _max_show_modulo_two = _max_show | modulo: 2 -%}
+      {%- assign _length = paginator.total_pages -%}
+      {%- assign _length_mimus_one = _length | minus: 1 -%}
+      {%- assign _cur = paginator.page -%}
+      {%- assign _extra = _max_show | minus: 3 -%}
+      {%- assign _extra_half = _extra | divided_by: 2 -%}
+
+      {%- if  _max_show > 4 and _max_show_modulo_two == 1 and paginator.total_pages > _max_show -%}
+        {%- assign _condition0 = _extra | divided_by: 2 | plus: 1 -%}
+        {%- assign _condition1 = _length | minus: _extra_half  -%}
+        {%- if _cur <= _condition0 -%}
+          {%- assign _n0 = 2 -%}
+          {%- assign _n1 = _extra | plus: 2 -%}
+        {%- elsif _cur >= _condition1 -%}
+          {%- assign _n0 = _length | minus: _extra | minus: 1 -%}
+          {%- assign _n1 = _length | minus: 1 -%}
+        {%- else -%}
+          {%- assign _n0 = _cur | minus: _extra_half -%}
+          {%- assign _n1 = _cur | plus: _extra_half -%}
+        {%- endif -%}
+      {%- endif -%}
+
+      {%- if paginator.previous_page -%}
+        {%- include snippets/prepend-baseurl.html path=paginator.previous_page_path -%}
+        {%- assign _href = __return -%}
+        <li><a class="button button--secondary button--circle" href="{{ _href }}">
+          <i class="fas fa-angle-left"></i>
+        </a></li>
+      {%- else -%}
+        <li><div class="button button--secondary button--circle disabled">
+          <i class="fas fa-angle-left"></i>
+        </div></li>
+      {%- endif -%}
+
+      {%- for page in (1.._length) -%}
+        {%- if page == _cur -%}
+          <li>
+            <div class="button button--primary button--circle focus"><span>{{ page }}</span></div>
+          </li>
+
+        {%- elsif page == 1 -%}
+          {%- assign _home_path = site.paths.home | default: site.data.variables.default.paths.home -%}
+          {%- include snippets/prepend-baseurl.html path=_home_path -%}
+          {%- assign _href = __return -%}
+          <li>
+            <a class="button button--secondary button--circle" href="{{ _href }}"><span>{{ page }}</span></a>
+          </li>
+
+        {%- else -%}
+          {%- if _n0 and _n1 -%}
+            {%- if page > 1 and page < _n0 -%}
+              {%- if page == 2 -%}<li><span class="pagination__omit"><i class="fas fa-ellipsis-h"></i></span></li>{%- endif -%}
+            {%- elsif page > _n1 and page < _length -%}
+              {%- if page == _length_mimus_one -%}<li><span class="omit"><i class="fas fa-ellipsis-h"></i></span></li>{%- endif -%}
+            {%- else -%}
+              {%- include snippets/prepend-baseurl.html path=site.paginate_path -%}
+              {%- assign _href = __return -%}
+              <li>
+                <a class="button button--secondary button--circle" href="{{ _href | replace: ':num', page }}"><span>{{ page }}</span></a>
+              </li>
+            {%- endif -%}
+          {%- else -%}
+            {%- include snippets/prepend-baseurl.html path=site.paginate_path -%}
+            {%- assign _href = __return -%}
+            <li>
+              <a class="button button--secondary button--circle" href="{{ _href | replace: ':num', page }}"><span>{{ page }}</span></a>
+            </li>
+          {%- endif -%}
+        {%- endif -%}
+      {%- endfor -%}
+
+      {%- if paginator.next_page -%}
+        {%- include snippets/prepend-baseurl.html path=paginator.next_page_path -%}
+        {%- assign _href = __return -%}
+        <li><a class="button button--secondary button--circle" href="{{ _href }}">
+          <i class="fas fa-angle-right"></i>
+        </a></li>
+      {%- else -%}
+        <li><div class="button button--secondary button--circle disabled">
+          <i class="fas fa-angle-right"></i>
+        </div></li>
+      {%- endif -%}
+    </ul>
+  </nav>
+{%- endif -%}

data/_includes/scripts/archieve.js

@@ -146,7 +146,7 @@
       }
       return _buttons;
     }
-    function buttonFoucs(target) {
+    function buttonFocus(target) {
       if (target) {
         addClass(target, 'focus');
         $lastFocusButton && !$lastFocusButton.is(target) && removeClass($lastFocusButton, 'focus');
@@ -174,7 +174,7 @@
     }
 
     function showAll() {
-      setNotSearch(); setIsEmpty(); buttonFoucs($tagShowAll); setUrlQuery();
+      setNotSearch(); setIsEmpty(); buttonFocus($tagShowAll); setUrlQuery();
       $result.html(render(data));
     }
     function tagSelect(tag/*decode tag*/, target) {
@@ -185,7 +185,7 @@
         $result.html(render(searchByTag(tag)));
       }
       if (target) {
-        buttonFoucs(target);
+        buttonFocus(target);
         _tag = target.attr('data-encode');
         if (_tag === '' || typeof _tag !== 'string') {
           setUrlQuery();
@@ -209,7 +209,7 @@
       if (_tag !== undefined) {
         query.tag === undefined || (_tag = query.tag);
         tagSelect(window.decodeUrl(_tag));
-        buttonFoucs(searchButtonsByTag(_tag));
+        buttonFocus(searchButtonsByTag(_tag));
       } else if (_q !== undefined) {
         _q = window.decodeUrl(_q);
         queryInput(_q); setSearchBoxVal(_q);

data/_includes/scripts/article-list.html

@@ -1,5 +1,4 @@
-{%- assign __locale = site.data.locale.ARTICLE_LIST_DATE_FORMAT -%}
-{%- include snippets/locale-to-string.html -%}
+{%- include snippets/locale-to-string.html locale=site.data.locale.ARTICLE_LIST_DATE_FORMAT -%}
 {%- assign _format = __return -%}
 {%- assign _post_count = site.posts | size -%}
 {%- if _post_count < 1 -%}
@@ -18,8 +17,7 @@
     {%- for _tag in _post.tags -%}
       "{{ _tag | url_encode }}" {%- unless forloop.last -%},{%- endunless -%}
     {%- endfor -%}
-    {%- assign __path = _post.url -%}
-    {%- include snippets/prepend-baseurl.html -%}
+    {%- include snippets/prepend-baseurl.html path=_post.url -%}
     {%- assign _url = __return -%}
       ],"url":"{{ _url | url_encode }}","date":"{{ _post.date | date: _format }}"}
   {%- endfor -%}

data/_includes/scripts/aside/affix.js

@@ -7,15 +7,13 @@
     var tocDisabled = false;
     var hasSidebar = $('.js-page-root').hasClass('layout--page--sidebar');
 
-    setTimeout(function() {
-      affix = $pageAside.affix({
-        offsetBottom: $pageFooter.outerHeight(),
-        scrollTarget: hasSidebar ? '.js-page-main' : null,
-        scroller: hasSidebar ? '.js-page-main' : null,
-        scroll: hasSidebar ? $('.js-page-main').children() : null,
-        disabled: tocDisabled
-      });
-    }, 1000);
+    affix = $pageAside.affix({
+      offsetBottom: $pageFooter.outerHeight(),
+      scrollTarget: hasSidebar ? '.js-page-main' : null,
+      scroller: hasSidebar ? '.js-page-main' : null,
+      scroll: hasSidebar ? $('.js-page-main').children() : null,
+      disabled: tocDisabled
+    });
 
     $window.on('resize', window.throttle(function() {
       affix && affix.setOptions({

data/_includes/scripts/aside/toc.js

@@ -16,15 +16,13 @@
 
     tocDisabled = disabled();
 
-    setTimeout(function() {
-      toc = $tocRoot.toc({
-        selectors: TOC_SELECTOR,
-        container: $articleContent,
-        scrollTarget: hasSidebar ? '.js-page-main' : null,
-        scroller: hasSidebar ? '.js-page-main' : null,
-        disabled: tocDisabled
-      });
-    }, 1000);
+    toc = $tocRoot.toc({
+      selectors: TOC_SELECTOR,
+      container: $articleContent,
+      scrollTarget: hasSidebar ? '.js-page-main' : null,
+      scroller: hasSidebar ? '.js-page-main' : null,
+      disabled: tocDisabled
+    });
 
     $window.on('resize', window.throttle(function() {
       tocDisabled = disabled();

data/_includes/scripts/lib/affix.js

@@ -2,9 +2,9 @@
   var SOURCES = window.TEXT_VARIABLES.sources;
   window.Lazyload.js(SOURCES.jquery, function() {
     var $window = $(window), $root, $scrollTarget, $scroller, $scroll;
-    var rootTop, rootLeft, rootHeight, scrollBottom, rootBottomTop, lastScrollTop;
+    var rootTop, rootLeft, rootHeight, scrollBottom, rootBottomTop;
     var offsetBottom = 0, disabled = false, scrollTarget = window, scroller = 'html, body', scroll = window.document;
-    var hasInit = false, isOverallScroller = true;
+    var hasInit = false, isOverallScroller = true, curState;
 
     function setOptions(options) {
       var _options = options || {};
@@ -31,55 +31,64 @@
       rootBottomTop = scrollBottom - rootTop;
     }
     function top() {
-      $root.removeClass('fixed').css({
-        left: 0,
-        top: 0
-      });
+      if (curState !== 'top') {
+        $root.removeClass('fixed').css({
+          left: 0,
+          top: 0
+        });
+        curState = 'top';
+      }
     }
     function fixed() {
-      $root.addClass('fixed').css({
-        left: rootLeft + 'px',
-        top: 0
-      });
+      if (curState !== 'fixed') {
+        $root.addClass('fixed').css({
+          left: rootLeft + 'px',
+          top: 0
+        });
+        curState = 'fixed';
+      }
     }
     function bottom() {
-      $root.removeClass('fixed').css({
-        left: 0,
-        top: rootBottomTop + 'px'
-      });
+      if (curState !== 'bottom') {
+        $root.removeClass('fixed').css({
+          left: 0,
+          top: rootBottomTop + 'px'
+        });
+        curState = 'bottom';
+      }
     }
-    function setState(force) {
-      force !== true && (force = false);
+    function setState() {
       var scrollTop = $scrollTarget.scrollTop();
       if (scrollTop >= rootTop && scrollTop <= scrollBottom) {
-        (!force && lastScrollTop >= rootTop && lastScrollTop <= scrollBottom) || fixed();
+        fixed();
       } else if (scrollTop < rootTop) {
-        (!force && lastScrollTop < rootTop) || top();
+        top();
       } else {
-        (!force && lastScrollTop > scrollBottom) || bottom();
+        bottom();
       }
-      lastScrollTop = scrollTop;
     }
     function init() {
       if(!hasInit) {
         var interval, timeout;
         calc(true); setState();
-        // run calc every 1.5 seconds
+        // run calc every 100 millisecond
         interval = setInterval(function() {
           calc();
-        }, 1500);
+        }, 100);
         timeout = setTimeout(function() {
           clearInterval(interval);
-        }, 50000);
+        }, 60000);
         window.pageLoad.then(function() {
-          clearInterval(interval);
-          clearTimeout(timeout);
+          setTimeout(function() {
+            clearInterval(interval);
+            clearTimeout(timeout);
+          }, 1500);
         });
         $scrollTarget.on('scroll', function() {
           disabled || setState();
         });
         $window.on('resize', window.throttle(function() {
-          disabled || (calc(true), setState(true));
+          disabled || (calc(true), setState());
         }, 100));
         hasInit = true;
       }

data/_includes/scripts/lib/toc.js

@@ -65,16 +65,18 @@
       var interval, timeout;
       if(!hasInit) {
         render(); calc(); setState(null, scrolling);
-        // run calc every 1.5 seconds
+        // run calc every 100 millisecond
         interval = setInterval(function() {
           calc();
-        }, 1500);
+        }, 100);
         timeout = setTimeout(function() {
           clearInterval(interval);
-        }, 50000);
+        }, 60000);
         window.pageLoad.then(function() {
-          clearInterval(interval);
-          clearTimeout(timeout);
+          setTimeout(function() {
+            clearInterval(interval);
+            clearTimeout(timeout);
+          }, 1500);
         });
         $scrollTarget.on('scroll', function() {
           disabled || setState(null, scrolling);

data/_includes/sidebar/toc.html

@@ -7,11 +7,9 @@
         <li class="toc-h1">{{ _item.title }}</li>
         {%- if _item.children -%}
           {%- for _child in _item.children -%}
-            {%- assign __path = _child.url -%}
-            {%- include snippets/get-nav-url.html -%}
+            {%- include snippets/get-nav-url.html path=_child.url -%}
             {%- assign _nav_url = __return -%}
-            {%- assign __path = page.url -%}
-            {%- include snippets/get-nav-url.html -%}
+            {%- include snippets/get-nav-url.html path=page.url -%}
             {%- assign _page_url = __return -%}
             {%- if _nav_url == _page_url -%}
               <li class="toc-h2 active"><a href="{{ _nav_url }}">{{ _child.title }}</a></li>

data/_includes/snippets/assign.html

@@ -1,5 +1,9 @@
-{%- if __source == nil -%}
-  {%- assign __return = __target -%}
+{%- if include.source1 == nil -%}
+  {%- if include.source0 == nil -%}
+    {%- assign __return = include.target -%}
+  {%- else -%}
+    {%- assign __return = include.source0 -%}
+  {%- endif -%}
 {%- else -%}
-  {%- assign __return = __source -%}
+  {%- assign __return = include.source1 -%}
 {%- endif -%}

data/_includes/snippets/get-nav-url.html

@@ -1,8 +1,8 @@
-{%- assign _pre7 = __path | slice: 0, 7 -%}
-{%- assign _pre8 = __path | slice: 0, 8 -%}
+{%- assign _pre7 = include.path | slice: 0, 7 -%}
+{%- assign _pre8 = include.path | slice: 0, 8 -%}
 {%- if _pre7 == 'http://' or _pre8 == 'https://' -%}
-  {%- assign __return = __path -%}
+  {%- assign __return = include.path -%}
 {%- else -%}
-  {%- include snippets/prepend-baseurl.html -%}
+  {%- include snippets/prepend-baseurl.html path=include.path -%}
   {%- assign __return = __return -%}
 {%- endif -%}

data/_includes/snippets/get-sources.html

@@ -1,5 +1,2 @@
-{%- assign _sources = site.data.variables.default.sources -%}
-{%- if site.sources -%}
-  {%- assign _sources = site.sources -%}
-{%- endif -%}
+{%- assign _sources = site.sources | default: site.data.variables.default.sources -%}
 {%- assign __return = site.data.variables.sources[_sources] -%}

data/_includes/snippets/locale-to-string.html

@@ -1,7 +1,7 @@
 {%- include snippets/get-lang.html -%}
-{%- assign __lang = __return -%}
-{%- if __locale[__lang] -%}
-  {%- assign __return = __locale[__lang] -%}
+{%- assign _lang = __return -%}
+{%- if include.locale[_lang] -%}
+  {%- assign __return = include.locale[_lang] -%}
 {%- else -%}
-  {%- assign __return = __locale.en -%}
+  {%- assign __return = include.locale.en -%}
 {%- endif -%}

data/_includes/snippets/page-title.html

@@ -4,10 +4,8 @@
 {%- if _title -%}
   {%- assign __return = _title -%}
 {%- elsif _titles -%}
-  {%- assign __locale = _titles -%}
-  {%- include snippets/locale-to-string.html -%}
-  {%- assign __localeTitle = __return -%}
-  {%- assign __return = __localeTitle -%}
+  {%- include snippets/locale-to-string.html locale=_titles -%}
+  {%- assign __return = __return -%}
 {%- else -%}
   {%- assign __return = nil -%}
 {%- endif -%}

data/_includes/snippets/page-url.html

@@ -1,3 +1,2 @@
-{%- assign __path = page.url -%}
-{%- include snippets/prepend-baseurl.html -%}
+{%- include snippets/prepend-baseurl.html path=page.url -%}
 {{ __return | prepend: site.url }}

data/_includes/snippets/prepend-baseurl.html

@@ -1 +1 @@
-{%- assign __return = __path | replace:'index.html','' | prepend: site.baseurl | replace:'//','/' -%}
+{%- assign __return = include.path | replace:'index.html','' | prepend: site.baseurl | replace:'//','/' -%}

data/_includes/tags.html

@@ -18,7 +18,7 @@
 <div class="site-tags js-tags">
   <ul class="menu">
     <li>
-      <button type="button" class="button button--secondary button--pill tag-button js-article-tag " data-encode="">
+      <button type="button" class="button button--secondary button--pill tag-button js-article-tag js-tag-show-all" data-encode="">
         Show All<div class="tag-button__count">{{ site.posts | size }}</div>
       </button>
     </li>