jekyll-text-theme 2.2.4 → 2.2.5

data/_includes/scripts/lib/lazyload.js

@@ -140,4 +140,4 @@
       }
     };
   })(this.document);
-})();
+})();

data/_includes/scripts/lib/modal.js

@@ -5,12 +5,13 @@
     var $pageRoot = $('.js-page-root'), $pageMain = $('.js-page-main');
     var activeCount = 0;
     function modal(options) {
-      var $root = this, visible, onChange;
+      var $root = this, visible, onChange, hideWhenWindowScroll = false;
       var scrollTop;
       function setOptions(options) {
         var _options = options || {};
         visible = _options.initialVisible === undefined ? false : show;
         onChange = _options.onChange;
+        hideWhenWindowScroll = _options.hideWhenWindowScroll;
       }
       function init() {
         setState(visible);
@@ -21,19 +22,19 @@
         }
         visible = isShow;
         if (visible) {
-          activeCount ++;
+          activeCount++;
           scrollTop = $(window).scrollTop() || $pageMain.scrollTop();
           $root.addClass('modal--show');
           $pageMain.scrollTop(scrollTop);
           activeCount === 1 && ($pageRoot.addClass('show-modal'), $body.addClass('of-hidden'));
-          $window.on('scroll', hide);
+          hideWhenWindowScroll && window.hasEvent('touchstart') && $window.on('scroll', hide);
           $window.on('keyup', handleKeyup);
         } else {
-          activeCount > 0 && activeCount --;
+          activeCount > 0 && activeCount--;
           $root.removeClass('modal--show');
           $window.scrollTop(scrollTop);
           activeCount === 0 && ($pageRoot.removeClass('show-modal'), $body.removeClass('of-hidden'));
-          $window.off('scroll', hide);
+          hideWhenWindowScroll && window.hasEvent('touchstart') && $window.off('scroll', hide);
           $window.off('keyup', handleKeyup);
         }
         onChange && onChange(visible);
@@ -54,9 +55,10 @@
       init();
       return {
         show: show,
-        hide: hide
+        hide: hide,
+        $el: $root
       };
     }
     $.fn.modal = modal;
   });
-})();
+})();

data/_includes/scripts/lib/scroll-to.js

@@ -10,4 +10,4 @@
     }
     $.fn.scrollToAnchor = scrollToAnchor;
   });
-})();
+})();

data/_includes/scripts/lib/swiper.js

@@ -2,18 +2,21 @@
   var SOURCES = window.TEXT_VARIABLES.sources;
   window.Lazyload.js(SOURCES.jquery, function() {
     function swiper(options) {
-      var $window = $(window), $root = this, $swiperWrapper, $swiperButtonPrev, $swiperButtonNext,
-        initialSlide, animation,
-        rootWidth, count, curIndex, translateX, CRITICAL_ANGLE = Math.PI / 3;
+      var $window = $(window), $root = this, $swiperWrapper, $swiperSlides, $swiperButtonPrev, $swiperButtonNext,
+        initialSlide, animation, onChange, onChangeEnd,
+        rootWidth, count, preIndex, curIndex, translateX, CRITICAL_ANGLE = Math.PI / 3;
 
       function setOptions(options) {
         var _options = options || {};
         initialSlide = _options.initialSlide || 0;
         animation = _options.animation === undefined && true;
+        onChange = onChange || _options.onChange;
+        onChangeEnd = onChangeEnd || _options.onChangeEnd;
       }
 
       function init() {
         $swiperWrapper = $root.find('.swiper__wrapper');
+        $swiperSlides = $root.find('.swiper__slide');
         $swiperButtonPrev = $root.find('.swiper__button--prev');
         $swiperButtonNext = $root.find('.swiper__button--next');
         animation && $swiperWrapper.addClass('swiper__wrapper--animation');
@@ -32,7 +35,7 @@
       }
 
       var calc = (function() {
-        var preAnimation;
+        var preAnimation, $swiperSlide, $preSwiperSlide;
         return function (needPreCalc, params) {
           needPreCalc && preCalc();
           var _animation = (params && params.animation !== undefined) ? params.animation : animation;
@@ -40,6 +43,21 @@
             preAnimation = _animation ? $swiperWrapper.addClass('swiper__wrapper--animation') :
               $swiperWrapper.removeClass('swiper__wrapper--animation');
           }
+          if (preIndex !== curIndex) {
+            ($preSwiperSlide = $swiperSlides.eq(preIndex)).removeClass('active');
+            ($swiperSlide = $swiperSlides.eq(curIndex)).addClass('active');
+            onChange && onChange(curIndex, $swiperSlides.eq(curIndex), $swiperSlide, $preSwiperSlide);
+            if (onChangeEnd) {
+              if (_animation) {
+                setTimeout(function() {
+                  onChangeEnd(curIndex, $swiperSlides.eq(curIndex), $swiperSlide, $preSwiperSlide);
+                }, 400);
+              } else {
+                onChangeEnd(curIndex, $swiperSlides.eq(curIndex), $swiperSlide, $preSwiperSlide);
+              }
+            }
+            preIndex = curIndex;
+          }
           $swiperWrapper.css('transform', 'translate(' + translateX + 'px, 0)');
           if (count > 1) {
             if (curIndex <= 0) {
@@ -61,6 +79,7 @@
       }
 
       function moveToIndex(index ,params) {
+        preIndex = curIndex;
         curIndex = index;
         translateX = getTranslateXFromCurIndex();
         calc(false, params);
@@ -85,6 +104,7 @@
 
       setOptions(options);
       init();
+      preIndex = curIndex;
 
       $swiperButtonPrev.on('click', function(e) {
         e.stopPropagation();
@@ -95,7 +115,6 @@
         move('next');
       });
       $window.on('resize', function() {
-        translateX = getTranslateXFromCurIndex();
         calc(true, { animation: false });
       });
 
@@ -109,6 +128,9 @@
           preTranslateX = translateX;
         }
         function handleTouchmove(e) {
+          if (e.touches && e.touches.length > 1) {
+            return;
+          }
           var point = e.touches ? e.touches[0] : e;
           var deltaX = point.pageX - pageX;
           var deltaY = point.pageY - pageY;
@@ -178,4 +200,4 @@
     }
     $.fn.swiper = swiper;
   });
-})();
+})();

data/_includes/scripts/lib/throttle.js

@@ -25,4 +25,4 @@
       return result;
     };
   };
-})();
+})();

data/_includes/scripts/lib/toc.js

@@ -104,4 +104,4 @@
     }
     $.fn.toc = toc;
   });
-})();
+})();

data/_includes/scripts/page.js

@@ -1,3 +1,3 @@
 /*(function () {
 
-})();*/
+})();*/

data/_includes/scripts/utils/imagesLoad.js

@@ -25,4 +25,4 @@
       }
     };
   };
-})();
+})();

data/_includes/scripts/utils/utils.js

@@ -6,10 +6,6 @@
     return typeof val === 'string';
   };
 
-  window.decodeUrl = function(str) {
-    return str ? decodeURIComponent(str.replace(/\+/g, '%20')) : '';
-  };
-
   window.hasEvent = function(event) {
     return 'on'.concat(event) in window.document;
   };
@@ -40,4 +36,4 @@
       }
     };
   })();
-})();
+})();

data/_includes/scripts/variables.html

@@ -7,7 +7,7 @@
 <script>
   (function() {
     var TEXT_VARIABLES = {
-      version: '2.2.4',
+      version: '2.2.5',
       sources: {
         font_awesome: '{{ _sources.font_awesome }}',
         jquery: '{{ _sources.jquery }}',

data/_includes/search-providers/custom/search.html

@@ -0,0 +1,3 @@
+<!-- start custom search snippet -->
+
+<!-- end custom search snippet -->

data/_includes/{scripts/components/search → search-providers/default}/search-data.js

@@ -4,10 +4,10 @@ window.TEXT_SEARCH_DATA={
     '{{ _collection.label }}':[
       {%- for _article in _collection.docs -%}
       {%- unless forloop.first -%},{%- endunless -%}
-      {'title':'{{ _article.title | url_encode }}',
+      {'title':{{ _article.title | jsonify }},
       {%- include snippets/prepend-baseurl.html path=_article.url -%}
       {%- assign _url = __return -%}
-      'url':'{{ _url | url_encode }}'}
+      'url':{{ _url | jsonify }}}
       {%- endfor -%}
     ]
   {%- endfor -%}

data/_includes/search-providers/default/search.html

@@ -0,0 +1,18 @@
+<div class="search search--dark">
+  <div class="main">
+    <div class="search__header">{{ _locale_search }}</div>
+    <div class="search-bar">
+      <div class="search-box js-search-box">
+        <div class="search-box__icon-search"><i class="fas fa-search"></i></div>
+        <input type="text" />
+        <div class="search-box__icon-clear js-icon-clear">
+          <a><i class="fas fa-times"></i></a>
+        </div>
+      </div>
+      <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 search-providers/default/search.js -%}</script>

data/_includes/{scripts/components/search → search-providers/default}/search.js

@@ -1,7 +1,8 @@
 var SOURCES = window.TEXT_VARIABLES.sources;
 var PAHTS = window.TEXT_VARIABLES.paths;
 window.Lazyload.js([SOURCES.jquery, PAHTS.search_js], function() {
-  var searchData = window.TEXT_SEARCH_DATA ? initData(window.TEXT_SEARCH_DATA) : {};
+  var search = (window.search || (window.search = {}));
+  var searchData = window.TEXT_SEARCH_DATA || {};
 
   function memorize(f) {
     var cache = {};
@@ -12,21 +13,6 @@ window.Lazyload.js([SOURCES.jquery, PAHTS.search_js], function() {
     };
   }
 
-  function initData(data) {
-    var _data = [], i, j, key, keys, cur;
-    keys = Object.keys(data);
-    for (i = 0; i < keys.length; i++) {
-      key = keys[i], _data[key] = [];
-      for (j = 0; j < data[key].length; j++) {
-        cur = data[key][j];
-        cur.title = window.decodeUrl(cur.title);
-        cur.url = window.decodeUrl(cur.url);
-        _data[key].push(cur);
-      }
-    }
-    return _data;
-  }
-
   /// search
   function searchByQuery(query) {
     var i, j, key, keys, cur, _title, result = {};
@@ -71,60 +57,21 @@ window.Lazyload.js([SOURCES.jquery, PAHTS.search_js], function() {
   }
 
   // search box
-  var $searchBox = $('.js-search-box');
-  var $searchInput = $searchBox.children('input');
-  var $searchClear = $searchBox.children('.js-icon-clear');
   var $result = $('.js-search-result'), $resultItems;
   var lastActiveIndex, activeIndex;
 
-  function searchBoxEmpty() {
-    $searchBox.removeClass('not-empty'); $result.html(null);
+  function clear() {
+    $result.html(null);
     $resultItems = $('.search-result__item'); activeIndex = 0;
   }
-
-  $searchInput.on('input', window.throttle(function() {
-    var val = $(this).val();
-    if (val === '' || typeof val !== 'string') {
-      searchBoxEmpty();
-    } else {
-      $searchBox.addClass('not-empty'); $result.html(render(searchByQuery(val)));
-      $resultItems = $('.search-result__item'); activeIndex = 0;
-      $resultItems.eq(0).addClass('active');
-    }
-  }, 400));
-  $searchInput.on('focus', function() {
-    $(this).addClass('focus');
-  });
-  $searchInput.on('blur', function() {
-    $(this).removeClass('focus');
-  });
-  $searchClear.on('click', function() {
-    $searchInput.val(''); searchBoxEmpty();
-  });
-
-  // search panel
-  var $searchModal = $('.js-page-search-modal');
-  var $searchToggle = $('.js-search-toggle');
-  var modalVisible = false;
-
-  var searchModal = $searchModal.modal({ onChange: handleModalChange });
-
-  function handleModalChange(visible) {
-    modalVisible = visible;
-    if (visible) {
-      $searchInput[0].focus();
-    } else {
-      $searchInput[0].blur();
-      setTimeout(function() {
-        $searchInput.val(''); searchBoxEmpty();
-        window.pageAsideAffix && window.pageAsideAffix.refresh();
-      }, 400);
-    }
+  function onInputNotEmpty(val) {
+    $result.html(render(searchByQuery(val)));
+    $resultItems = $('.search-result__item'); activeIndex = 0;
+    $resultItems.eq(0).addClass('active');
   }
 
-  $searchToggle.on('click', function() {
-    modalVisible ? searchModal.hide() : searchModal.show();
-  });
+  search.clear = clear;
+  search.onInputNotEmpty = onInputNotEmpty;
 
   function updateResultItems() {
     lastActiveIndex >= 0 && $resultItems.eq(lastActiveIndex).removeClass('active');
@@ -144,8 +91,9 @@ window.Lazyload.js([SOURCES.jquery, PAHTS.search_js], function() {
     }
   }
 
-  // Char Code: 13  Enter, 37  ⬅, 38  ⬆, 39  ➡, 40  ⬇, 83  S, 191 /
+  // Char Code: 13  Enter, 37  ⬅, 38  ⬆, 39  ➡, 40  ⬇
   $(window).on('keyup', function(e) {
+    var modalVisible = search.getModalVisible && search.getModalVisible();
     if (modalVisible) {
       if (e.which === 38) {
         modalVisible && moveActiveIndex('up');
@@ -154,10 +102,6 @@ window.Lazyload.js([SOURCES.jquery, PAHTS.search_js], function() {
       } else if (e.which === 13) {
         modalVisible && $resultItems && activeIndex >= 0 && $resultItems.eq(activeIndex).children('a')[0].click();
       }
-    } else {
-      if (!window.isFormElement(e.target || e.srcElement) && (e.which === 83 || e.which === 191)) {
-        modalVisible || searchModal.show();
-      }
     }
   });
 
@@ -165,4 +109,4 @@ window.Lazyload.js([SOURCES.jquery, PAHTS.search_js], function() {
     var itemIndex = $(this).parent().data('index');
     itemIndex >= 0 && (lastActiveIndex = activeIndex, activeIndex = itemIndex, updateResultItems());
   });
-});
+});

data/_includes/search-providers/google-custom-search-engine/search.html

@@ -0,0 +1,21 @@
+{%- if site.search.google.custom_search_engine_id -%}
+  <div class="search search--dark search--google-custom-search-engine">
+    <div class="main">
+      <div class="content js-gcse">
+        <!-- <gcse:search enableAutoComplete="true" gname="search-box"></gcse:search>
+        <gcse:searchresults-only gname="results"></gcse:searchresults-only> -->
+      </div>
+    </div>
+  </div>
+  <script>
+    var gcse = document.getElementsByClassName('js-gcse')[0];
+    var gcseSearch = document.createElement('gcse:search');
+    gcseSearch.setAttribute('enableAutoComplete', 'true');
+    gcseSearch.setAttribute('gname', 'search-box');
+    var gcseSearchresults = document.createElement('gcse:searchresults-only');
+    gcseSearchresults.setAttribute('gname', 'results');
+    gcse.appendChild(gcseSearch);
+    gcse.appendChild(gcseSearchresults);
+  </script>
+  <script>{%- include search-providers/google-custom-search-engine/search.js -%}</script>
+{%- endif -%}

data/_includes/search-providers/google-custom-search-engine/search.js

@@ -0,0 +1,33 @@
+var SOURCES = window.TEXT_VARIABLES.sources;
+window.Lazyload.js(SOURCES.jquery, function() {
+  /* global google */
+  var search = (window.search || (window.search = {}));
+  var searchBox, searchInput, clearIcon, searchModal;
+
+  search.clear = function() {
+    searchBox && searchBox.clearAllResults();
+  };
+  search.onShow = function() {
+    searchInput && searchInput.focus();
+  };
+  search.onHide = function() {
+    searchInput && searchInput.blur();
+  };
+
+  window.__gcse = {
+    callback: function() {
+      searchBox = google.search.cse.element.getElement('search-box');
+      searchInput = document.getElementById('gsc-i-id1');
+      clearIcon = document.getElementById('gs_cb50');
+      searchModal = search.searchModal;
+      searchModal && searchModal.$el && searchModal.$el.on('click', function(e) {
+        (e.target === this || e.target === clearIcon || e.target.className === 'gs-title') && searchModal.hide();
+      });
+    }
+  };
+  var cx = '{{ site.search.google.custom_search_engine_id }}'; // Insert your own Custom Search Engine ID here
+  var gcse = document.createElement('script'); gcse.type = 'text/javascript'; gcse.async = true;
+  gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') +
+    '//cse.google.com/cse.js?cx=' + cx;
+  var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(gcse, s);
+});

data/_includes/search.html

@@ -1,22 +1,20 @@
-{%- include snippets/locale-to-string.html locale=site.data.locale.CANCEL -%}
+{%- include snippets/get-locale-string.html key='CANCEL' -%}
 {%- assign _locale_cancel = __return -%}
-{%- include snippets/locale-to-string.html locale=site.data.locale.SEARCH -%}
+{%- include snippets/get-locale-string.html key='SEARCH' -%}
 {%- assign _locale_search = __return -%}
 
-<div class="search search--dark">
-  <div class="main">
-    <div class="search__header">{{ _locale_search }}</div>
-    <div class="search-bar">
-      <div class="search-box js-search-box">
-        <div class="search-box__icon-search"><i class="fas fa-search"></i></div>
-        <input type="text" />
-        <div class="search-box__icon-clear js-icon-clear">
-          <a><i class="fas fa-times"></i></a>
-        </div>
-      </div>
-      <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>
+{%- if site.search.provider == 'google' -%}
+  <script>window.useDefaultSearchBox = false;</script>
+{%- endif -%}
+
+{%- if site.search.provider -%}
+  <script>{%- include scripts/components/search.js -%}</script>
+{%- endif -%}
+
+{%- if site.search.provider == 'default' -%}
+  {%- include search-providers/default/search.html -%}
+{%- elsif site.search.provider == 'google' -%}
+  {%- include search-providers/google-custom-search-engine/search.html -%}
+{%- elsif site.search.provider == 'custom' -%}
+  {%- include search-providers/custom/search.html -%}
+{%- endif -%}