jekyll-text-theme 2.2.3 → 2.2.4

data/_includes/scripts/lib/swiper.js

@@ -3,39 +3,31 @@
   window.Lazyload.js(SOURCES.jquery, function() {
     function swiper(options) {
       var $window = $(window), $root = this, $swiperWrapper, $swiperButtonPrev, $swiperButtonNext,
-        initialSlide, width, height, animation,
-        rootWidth, rootHeight, count, curIndex, translateX, CRITICAL_ANGLE = Math.PI / 4;
+        initialSlide, animation,
+        rootWidth, count, curIndex, translateX, CRITICAL_ANGLE = Math.PI / 3;
 
       function setOptions(options) {
         var _options = options || {};
         initialSlide = _options.initialSlide || 0;
         animation = _options.animation === undefined && true;
-        width = _options.width === undefined ||
-          typeof _options.width === 'string' ? _options.width :
-          typeof _options.width === 'number' ? _options.width + 'px' : undefined;
-        height = _options.height  === undefined ||
-          typeof _options.height === 'string' ? _options.height :
-          typeof _options.height === 'number' ? _options.height + 'px' : undefined;
-        init();
       }
 
       function init() {
         $swiperWrapper = $root.find('.swiper__wrapper');
         $swiperButtonPrev = $root.find('.swiper__button--prev');
         $swiperButtonNext = $root.find('.swiper__button--next');
-        count = $swiperWrapper.children('.swiper__slide').length;
-        curIndex = initialSlide || 0;
-        translateX = getTranslateXFromCurIndex();
-        var _cssObj = {};
-        width === undefined || (_cssObj.width = width);
-        height === undefined || (_cssObj.height = height);
-        $root.css(_cssObj);
         animation && $swiperWrapper.addClass('swiper__wrapper--animation');
+        calc(true);
       }
 
       function preCalc() {
         rootWidth = $root.width();
-        rootHeight = $root.height();
+        count = $swiperWrapper.children('.swiper__slide').length;
+        if (count < 2) {
+          $swiperButtonPrev.addClass('d-none');
+          $swiperButtonNext.addClass('d-none');
+        }
+        curIndex = initialSlide || 0;
         translateX = getTranslateXFromCurIndex();
       }
 
@@ -49,13 +41,17 @@
               $swiperWrapper.removeClass('swiper__wrapper--animation');
           }
           $swiperWrapper.css('transform', 'translate(' + translateX + 'px, 0)');
-          if (curIndex <= 0) {
-            $swiperButtonPrev.addClass('disabled');
-          } else if (curIndex < count - 1) {
-            $swiperButtonPrev.removeClass('disabled');
-            $swiperButtonNext.removeClass('disabled');
-          } else {
-            $swiperButtonNext.addClass('disabled');
+          if (count > 1) {
+            if (curIndex <= 0) {
+              $swiperButtonPrev.addClass('disabled');
+            } else {
+              $swiperButtonPrev.removeClass('disabled');
+            }
+            if (curIndex >= count - 1) {
+              $swiperButtonNext.addClass('disabled');
+            } else {
+              $swiperButtonNext.removeClass('disabled');
+            }
           }
         };
       })();
@@ -88,12 +84,14 @@
       }
 
       setOptions(options);
-      calc(true);
+      init();
 
-      $swiperButtonPrev.on('click', function() {
+      $swiperButtonPrev.on('click', function(e) {
+        e.stopPropagation();
         move('prev');
       });
-      $swiperButtonNext.on('click', function() {
+      $swiperButtonNext.on('click', function(e) {
+        e.stopPropagation();
         move('next');
       });
       $window.on('resize', function() {
@@ -103,14 +101,14 @@
 
       (function() {
         var pageX, pageY, velocityX, preTranslateX = translateX, timeStamp, touching;
-        $swiperWrapper.on('touchstart', function(e) {
+        function handleTouchstart(e) {
           var point = e.touches ? e.touches[0] : e;
           pageX = point.pageX;
           pageY = point.pageY;
           velocityX = 0;
           preTranslateX = translateX;
-        });
-        $swiperWrapper.on('touchmove', function(e) {
+        }
+        function handleTouchmove(e) {
           var point = e.touches ? e.touches[0] : e;
           var deltaX = point.pageX - pageX;
           var deltaY = point.pageY - pageY;
@@ -123,8 +121,8 @@
           }
           pageX = point.pageX;
           pageY = point.pageY;
-        });
-        $swiperWrapper.on('touchend', function() {
+        }
+        function handleTouchend() {
           touching = false;
           var deltaX = translateX - preTranslateX;
           var distance = deltaX + velocityX * rootWidth;
@@ -133,7 +131,31 @@
           } else {
             move('cur');
           }
-        });
+        }
+        $swiperWrapper.on('touchstart', handleTouchstart);
+        $swiperWrapper.on('touchmove', handleTouchmove);
+        $swiperWrapper.on('touchend', handleTouchend);
+        $swiperWrapper.on('touchcancel', handleTouchend);
+
+        (function() {
+          var pressing = false, moved = false;
+          $swiperWrapper.on('mousedown', function(e) {
+            pressing = true; handleTouchstart(e);
+          });
+          $swiperWrapper.on('mousemove', function(e) {
+            pressing && (e.preventDefault(), moved = true, handleTouchmove(e));
+          });
+          $swiperWrapper.on('mouseup', function(e) {
+            pressing && (pressing = false, handleTouchend(e));
+          });
+          $swiperWrapper.on('mouseleave', function(e) {
+            pressing && (pressing = false, handleTouchend(e));
+          });
+          $swiperWrapper.on('click', function(e) {
+            moved && (e.stopPropagation(), moved = false);
+          });
+        })();
+
         $root.on('touchmove', function(e) {
           if (e.cancelable & touching) {
             e.preventDefault();
@@ -142,7 +164,16 @@
       })();
 
       return {
-        setOptions: setOptions
+        setOptions: setOptions,
+        previous: function(){
+          move('prev');
+        },
+        next: function(){
+          move('next');
+        },
+        refresh: function() {
+          calc(true, { animation: false });
+        }
       };
     }
     $.fn.swiper = swiper;

data/_includes/scripts/lib/toc.js

@@ -2,7 +2,7 @@
   var SOURCES = window.TEXT_VARIABLES.sources;
   window.Lazyload.js(SOURCES.jquery, function() {
     function toc(options) {
-      var $root = this, $window = $(window), $scrollTarget, $scroller, $tocUl = $('<ul class="toc"></ul>'), $tocLi, $headings, $activeLast, $activeCur,
+      var $root = this, $window = $(window), $scrollTarget, $scroller, $tocUl = $('<ul class="toc toc--ellipsis"></ul>'), $tocLi, $headings, $activeLast, $activeCur,
         selectors = 'h1,h2,h3', container = 'body', scrollTarget = window, scroller = 'html, body', disabled = false,
         headingsPos, scrolling = false, hasRendered = false, hasInit = false;
 

data/_includes/scripts/utils/imagesLoad.js

@@ -0,0 +1,28 @@
+(function() {
+  window.imagesLoad = function(images) {
+    images = images || document.getElementsByTagName('img');
+    var imagesCount = images.length, loadedCount = 0, image;
+    var i, j, loaded = false, cbs = [];
+    imagesCount < 1 && (loaded = true);
+    for (i = 0; i < imagesCount; i++) {
+      image = images[i];
+      image.complete ? handleImageLoad() : image.addEventListener('load', handleImageLoad);
+    }
+    function handleImageLoad() {
+      loadedCount++;
+      if (loadedCount === imagesCount) {
+        loaded = true;
+        if (cbs.length > 0) {
+          for (j = 0; j < cbs.length; j++) {
+            cbs[j]();
+          }
+        }
+      }
+    }
+    return {
+      then: function(cb) {
+        cb && (loaded ? cb() : (cbs.push(cb)));
+      }
+    };
+  };
+})();

data/_includes/scripts/{utils.js → utils/utils.js}

@@ -10,7 +10,6 @@
     return str ? decodeURIComponent(str.replace(/\+/g, '%20')) : '';
   };
 
-
   window.hasEvent = function(event) {
     return 'on'.concat(event) in window.document;
   };
@@ -19,13 +18,19 @@
     return node === document.documentElement || node === document.body || node === window;
   };
 
+  window.isFormElement = function(node) {
+    var tagName = node.tagName;
+    return tagName === 'INPUT' || tagName === 'SELECT' || tagName === 'TEXTAREA';
+  };
+
   window.pageLoad = (function () {
     var loaded = false, cbs = [];
     window.addEventListener('load', function () {
-      var i, cb; loaded = true;
+      var i;
+      loaded = true;
       if (cbs.length > 0) {
         for (i = 0; i < cbs.length; i++) {
-          cb = cbs[i]; cb();
+          cbs[i]();
         }
       }
     });

data/_includes/scripts/variables.html

@@ -7,7 +7,7 @@
 <script>
   (function() {
     var TEXT_VARIABLES = {
-      version: '2.2.3',
+      version: '2.2.4',
       sources: {
         font_awesome: '{{ _sources.font_awesome }}',
         jquery: '{{ _sources.jquery }}',
@@ -17,6 +17,7 @@
           js: '{{ _sources.gitalk.js }}',
           css: '{{ _sources.gitalk.css }}'
         },
+        valine: '{{ _sources.valine }}',
         mathjax: '{{ _sources.mathjax }}',
         mermaid: '{{ _sources.mermaid }}'
       },

data/_includes/search.html

@@ -14,11 +14,9 @@
           <a><i class="fas fa-times"></i></a>
         </div>
       </div>
-      <button class="button button--secondary button--pill search__cancel js-search-toggle">
+      <button class="button button--theme-dark button--pill search__cancel js-search-toggle">
         {{ _locale_cancel }}</button>
     </div>
     <div class="search-result js-search-result"></div>
   </div>
-</div>
-
-<script>{%- include scripts/components/search/search.js -%}</script>
+</div>

data/_layouts/base.html

@@ -8,7 +8,7 @@ layout: none
     {%- include analytics.html -%}
     {%- include head.html -%}
     <script>
-      {%- include scripts/utils.js -%}
+      {%- include scripts/utils/utils.js -%}
       {%- include scripts/lib/throttle.js -%}
       {%- include scripts/lib/lazyload.js -%}
     </script>
@@ -18,6 +18,8 @@ layout: none
     <div class="root" data-is-touch="false">
       {{ content }}
     </div>
-    <script>{%- include scripts/common.js -%}</script>
+    <script>
+      {%- include scripts/common.js -%}
+    </script>
   </body>
 </html>

data/_layouts/page.html

@@ -13,6 +13,10 @@ layout: base
   target=layout.footer source0=page.footer -%}
 {%- assign _footer = __return -%}
 
+{%- include snippets/assign.html
+  target=layout.lightbox source0=page.lightbox -%}
+{%- assign _lightbox = __return -%}
+
 {%- include snippets/assign.html
   target = site.data.variables.default.page.full_width
   source0=layout.full_width source1=page.full_width -%}
@@ -227,8 +231,12 @@ layout: base
     </div> {%- comment -%} end grid {%- endcomment -%}
   </div> {%- comment -%} end page__viewport {%- endcomment -%}
 {%- endif -%}
+
+{%- if _lightbox == true -%}
+  <div class="modal d-print-none js-page-gallery-modal"><div class="gallery"></div></div>
+{%- endif -%}
 {%- if _header != false -%}
-  <div class="page__search-panel d-print-none"">{%- include search.html -%}</div>
+  <div class="modal modal--overflow page__search-modal d-print-none js-page-search-modal">{%- include search.html -%}</div>
 {%- endif -%}
 </div>
 
@@ -237,25 +245,30 @@ layout: base
   {%- include scripts/lib/scroll-to.js -%}
   {%- include scripts/lib/affix.js -%}
   {%- include scripts/lib/toc.js -%}
+  {%- include scripts/lib/modal.js -%}
+  {%- if _lightbox == true -%}
+    {%- include scripts/lib/gallery.js -%}
+    {%- include scripts/components/lightbox.js -%}
+  {%- endif -%}
   {%- include scripts/page.js -%}
 </script>
 
 {%- if page.sidebar -%}
-<script>
-  {%- include scripts/components/sidebar.js -%}
-</script>
+<script>{%- include scripts/components/sidebar.js -%}</script>
 {%- endif -%}
 
 {%- if page.aside -%}
 <script>
   /* toc must before affix, since affix need to konw toc' height. */
-  {%- if page.aside.toc -%}
-    {%- include scripts/aside/toc.js -%}
-  {%- endif -%}
+  {%- if page.aside.toc -%}{%- include scripts/aside/toc.js -%}{%- endif -%}
   {%- include scripts/aside/affix.js -%}
 </script>
 {%- endif -%}
 
+{%- if _header != false -%}
+<script>{%- include scripts/components/search/search.js -%}</script>
+{%- endif -%}
+
 
 {%- include markdown-enhancements.html -%}
 {%- include pageview.html -%}

data/_sass/common/_reset.scss

@@ -23,7 +23,6 @@
  **/
 
 html {
-  height: 100%;
   font-size: map-get($base, font-size-root);
   -webkit-text-size-adjust: 100%; /* 1 */
   @media print {
@@ -34,15 +33,6 @@ html {
 body {
   padding: 0;
   margin: 0;
-}
-
-@include block-elements() {
-  padding: 0;
-  margin: map-get($spacers, 2) 0;
-}
-
-body {
-  height: 100%;
   font: map-get($base, font-weight) #{map-get($base, font-size)}/#{map-get($base, line-height)} map-get($base, font-family);
   ::-moz-selection {
     background: $select-color;
@@ -55,6 +45,11 @@ body {
   }
 }
 
+@include block-elements() {
+  padding: 0;
+  margin: map-get($spacers, 2) 0;
+}
+
 input, textarea, select, button {
   font: map-get($base, font-weight) #{map-get($base, font-size)}/#{map-get($base, line-height)} map-get($base, font-family);
   color: $text-color;

data/_sass/common/_variables.scss

@@ -8,8 +8,8 @@ $base: (
   font-size-xl:           1.5rem,
   font-size-lg:           1.25rem,
   font-size:              1rem,
-  font-size-sm:           .875rem,
-  font-size-xs:           .75rem,
+  font-size-sm:           .85rem,
+  font-size-xs:           .7rem,
 
   font-size-h1-xl:        3.5rem,
   font-size-h2-xl:        2.5rem,
@@ -39,12 +39,12 @@ $base: (
   font-size-h5-sm:        1rem,
   font-size-h6-sm:        1rem,
 
-  font-size-h1-xs:        1rem,
-  font-size-h2-xs:        .9rem,
-  font-size-h3-xs:        .85rem,
-  font-size-h4-xs:        .8rem,
-  font-size-h5-xs:        .75rem,
-  font-size-h6-xs:        .75rem,
+  font-size-h1-xs:        1.05rem,
+  font-size-h2-xs:        1rem,
+  font-size-h3-xs:        .95rem,
+  font-size-h4-xs:        .9rem,
+  font-size-h5-xs:        .85rem,
+  font-size-h6-xs:        .85rem,
 
   font-weight:            400,
   font-weight-bold:       700,
@@ -71,11 +71,11 @@ $spacers: (
   5:                      map-get($base, spacer) * 3
 );
 
-$z-index: (
+$z-indexes: (
   actions: 996,
   mask: 997,
   sidebar: 998,
-  search: 999
+  modal: 999
 );
 
 $layout: (

data/_sass/common/classes/_overflow.scss

@@ -1,8 +1,26 @@
-@mixin overflow($overflow: auto) {
+@mixin overflow($overflow: auto, $direction: default) {
+  @if $direction == default {
+    overflow: $overflow;
+  } @else if $direction == "x" {
+    @if $overflow == auto {
+      overflow: hidden;
+    }
+    overflow-x: $overflow;
+  } @else if $direction == "y" {
+    @if $overflow == auto {
+      overflow: hidden;
+    }
+    overflow-y: $overflow;
+  }
   @if $overflow == auto {
-    overflow: auto;
     -webkit-overflow-scrolling: touch;
-  } @else {
-    overflow: $overflow;
   }
+}
+
+.of-auto {
+  @include overflow(auto);
+}
+
+.of-hidden {
+  @include overflow(hidden);
 }