From acc0b4f18b3780879ab006ac0ccf9047d6a1b2f8 Mon Sep 17 00:00:00 2001
From: flashlab <zhengjuefei25@163.com>
Date: Fri, 5 Feb 2016 14:06:18 +0800
Subject: [PATCH 1/3] new feature: local search

---
 layout/_layout.swig                           |   1 +
 layout/_partials/header.swig                  |   2 +-
 layout/_partials/search.swig                  |   2 +
 layout/_partials/search/localsearch.swig      |  10 ++
 layout/_scripts/third-party/localsearch.swig  | 159 ++++++++++++++++++
 .../components/third-party/localsearch.styl   |  76 +++++++++
 .../components/third-party/third-party.styl   |   1 +
 7 files changed, 250 insertions(+), 1 deletion(-)
 create mode 100644 layout/_partials/search/localsearch.swig
 create mode 100644 layout/_scripts/third-party/localsearch.swig
 create mode 100644 source/css/_common/components/third-party/localsearch.styl

diff --git a/layout/_layout.swig b/layout/_layout.swig
index a386d4da6..e1294ee19 100644
--- a/layout/_layout.swig
+++ b/layout/_layout.swig
@@ -63,6 +63,7 @@
 
   {% include '_scripts/third-party/comments.swig' %}
   {% include '_scripts/third-party/tinysou.swig' %}
+  {% include '_scripts/third-party/localsearch.swig' %}
   {% include '_scripts/third-party/mathjax.swig' %}
   {% include '_scripts/third-party/baidushare.swig' %}
   {% include '_scripts/third-party/lean-analytics.swig' %}
diff --git a/layout/_partials/header.swig b/layout/_partials/header.swig
index c64ea86bb..7fa8cf137 100644
--- a/layout/_partials/header.swig
+++ b/layout/_partials/header.swig
@@ -27,7 +27,7 @@
 </div>
 
 <nav class="site-nav">
-  {% set hasSearch = theme.swiftype_key || theme.tinysou_Key %}
+  {% set hasSearch = theme.swiftype_key || theme.tinysou_Key || config.search %}
 
   {% if theme.menu %}
     <ul id="menu" class="menu {{ hasSearch and 'menu-left' }}">
diff --git a/layout/_partials/search.swig b/layout/_partials/search.swig
index 9796994ab..7b050d986 100644
--- a/layout/_partials/search.swig
+++ b/layout/_partials/search.swig
@@ -2,4 +2,6 @@
   {% include 'search/swiftype.swig' %}
 {% elseif theme.tinysou_Key %}
   {% include 'search/tinysou.swig' %}
+{% elseif config.search.path %}
+  {% include 'search/localsearch.swig' %}
 {% endif %}
diff --git a/layout/_partials/search/localsearch.swig b/layout/_partials/search/localsearch.swig
new file mode 100644
index 000000000..8e7c2faf9
--- /dev/null
+++ b/layout/_partials/search/localsearch.swig
@@ -0,0 +1,10 @@
+<form class="site-search-form" >
+  <input type="text" id="search-input">
+  <div id="search-result"><ul class="search-result-list"><li><a href="//www.baidu.com/s?wd=XXX%20site%3A{{config.url}}" class="search-result">百度搜索 <i class="search-keyword">XXX</i></a></li><li><a href="//www.google.com/search?q=XXX%20site%3A{{config.url}}" class="search-result">谷歌搜索 <i class="search-keyword">XXX</i></a></li><li><a href="#" class="popup-trigger search-result">本地搜索</a></li></ul>
+  </div>
+</form>
+  <div class="popup">
+  <input type="text" id="local-search-input">
+  <div id="local-search-result"></div>
+  <span class="popup-btn-close">close</span>
+  </div>
\ No newline at end of file
diff --git a/layout/_scripts/third-party/localsearch.swig b/layout/_scripts/third-party/localsearch.swig
new file mode 100644
index 000000000..1e1340d15
--- /dev/null
+++ b/layout/_scripts/third-party/localsearch.swig
@@ -0,0 +1,159 @@
+{% if config.search.path %}
+  <script type="text/javascript">
+    // Popup Window;
+    var scrollTop = '';
+    var newHeight = '100';
+
+    // Search DB path;
+    var search_path = "{{ config.search.path }}";
+    if (search_path.length == 0) {
+       search_path = "search.xml";
+    }
+    var path = "{{ config.root }}" + search_path;
+
+    // monitor main search box;
+    $('#search-input').on('input', function() {
+    if ($(this).val().length <= 0) {
+      $('#search-result').hide();
+      return;
+    }
+    $('i.search-keyword').text($(this).val());
+    $('a.search-result[href!="#"]').each(function(){
+      this.href = this.href.replace(/\=(.*?)(?=%20site)/,'='+$('#search-input').val())
+    });
+    $('#search-result').show();
+    });
+
+    // search function;
+    var searchFunc = function(path, search_id, content_id) {
+    'use strict';
+    searchFunc = function(){};
+    $.ajax({
+        url: path,
+        dataType: "xml",
+        async: false,
+        success: function( xmlResponse ) {
+            // get the contents from search data
+            var datas = $( "entry", xmlResponse ).map(function() {
+                return {
+                    title: $( "title", this ).text(),
+                    content: $("content",this).text(),
+                    url: $( "url" , this).text()
+                };
+            }).get();
+            var $input = document.getElementById(search_id);
+            var $resultContent = document.getElementById(content_id);
+            $input.addEventListener('input', function(){
+                var str='<ul class=\"search-result-list\">';                
+                var keywords = this.value.trim().toLowerCase().split(/[\s\-]+/);
+                $resultContent.innerHTML = "";
+                if (this.value.trim().length <= 0) {
+                    return;
+                }
+                // perform local searching
+                datas.forEach(function(data) {
+                    var isMatch = true;
+                    var content_index = [];
+                    var data_title = data.title.trim().toLowerCase();
+                    var data_content = data.content.trim().replace(/<[^>]+>/g,"").toLowerCase();
+                    var data_url = data.url;
+                    var index_title = -1;
+                    var index_content = -1;
+                    var first_occur = -1;
+                    // only match artiles with not empty titles and contents
+                    if(data_title != '' && data_content != '') {
+                        keywords.forEach(function(keyword, i) {
+                            index_title = data_title.indexOf(keyword);
+                            index_content = data_content.indexOf(keyword);
+                            if( index_title < 0 && index_content < 0 ){
+                                isMatch = false;
+                            } else {
+                                if (index_content < 0) {
+                                    index_content = 0;
+                                }
+                                if (i == 0) {
+                                    first_occur = index_content;
+                                }
+                            }
+                        });
+                    }
+                    // show search results
+                    if (isMatch) {
+                        str += "<li><a href='"+ data_url +"' class='search-result-title'>"+ data_title +"</a>";
+                        var content = data.content.trim().replace(/<[^>]+>/g,"");
+                        if (first_occur >= 0) {
+                            // cut out 100 characters
+                            var start = first_occur - 20;
+                            var end = first_occur + 80;
+                            if(start < 0){
+                                start = 0;
+                            }
+                            if(start == 0){
+                                end = 100;
+                            }
+                            if(end > content.length){
+                                end = content.length;
+                            }
+                            var match_content = content.substr(start, end); 
+                            // highlight all keywords
+                            keywords.forEach(function(keyword){
+                                var regS = new RegExp(keyword, "gi");
+                                match_content = match_content.replace(regS, "<b class=\"search-keyword\">"+keyword+"</b>");
+                            });
+                            
+                            str += "<p class=\"search-result\">" + match_content +"...</p>"
+                        }
+                        str += "</li>";
+                    }
+                });
+                str += "</ul>";
+                $resultContent.innerHTML = str;
+            });
+        }
+    });}
+
+    // handle and trigger popup window;
+    $(window).bind('scroll', function() {
+      scrollTop = $( window ).scrollTop();
+      newHeight = scrollTop + 100;
+    });
+    $('#search-result a').mousedown(function(e) {
+      if (this.className.indexOf('popup') < 0) {
+        window.location.href = this.href;
+        return;
+      }
+      searchFunc(path, 'local-search-input', 'local-search-result');
+      $('#local-search-input').val($('#search-input').val());
+      document.getElementById('local-search-input').dispatchEvent(new Event('input'));
+      e.stopPropagation();
+      if(jQuery(window).width() < 767) {
+        $('.site-search-form').after( $( ".popup" ) );
+        $('.popup').show().addClass('popup-mobile').css('top', 0);
+        $('html, body').animate({
+          scrollTop: $('.popup').offset().top
+        }, 500);
+      } else {
+        $('.popup').removeClass('popup-mobile').css('top', newHeight).    toggle();
+      };
+    });
+
+    $('#search-input').focus(function() {
+    if ($(this).val().length > 0) {
+      $('#search-result').show();
+      }
+    });
+    $('#search-input').blur(function() {
+      $('#search-result').hide();
+    });
+
+    $('.html').click(function() {
+      $('.popup').hide();
+    });
+    $('.popup-btn-close').click(function(e){
+      $('.popup').hide();
+    });
+    $('.popup').click(function(e){
+      e.stopPropagation();
+    });
+  </script>
+{% endif %}
\ No newline at end of file
diff --git a/source/css/_common/components/third-party/localsearch.styl b/source/css/_common/components/third-party/localsearch.styl
new file mode 100644
index 000000000..f63d63590
--- /dev/null
+++ b/source/css/_common/components/third-party/localsearch.styl
@@ -0,0 +1,76 @@
+.search-result-list li{
+  list-style-type: none;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+ul.search-result-list {
+  padding-left: 0px;
+  margin: 0px 0px 0px 12px;
+}
+a.search-result-title {
+  font-weight: bold;
+}
+a.search-result {
+  border-bottom: transparent;
+}
+p.search-result {
+  color=#555;
+}
+.search-keyword {
+  border-bottom: 1px dashed #4088b8;
+  font-weight: bold;
+}
+#search-result {
+  display: none;
+  position: absolute;
+  width: 158px;
+  border: 1px solid #ccc;
+  background: #fff;
+  cursor: default;
+  overflow: auto;
+  margin: 0px;
+  z-index: 999;
+}
+#local-search-result {
+  scroll:auto;
+  overflow:auto;
+  max-height:3in;
+}
+
+.popup {
+  display: none;
+  position: absolute;
+  top: 100px;
+  left: 50%;
+  width: 700px;
+  min-height: 300px;
+  margin-left: -350px;
+  padding: 0px 10px;
+  background: #fff;
+  color: #333;
+  border: 1px solid #150E2D;
+  z-index: 9999;
+  -webkit-border-radius: 5px;
+  border-radius: 5px;
+}
+#local-search-input {
+  width: 50%;
+}
+.popup-mobile {
+  position: relative;
+  top: 0;
+  left: 0;
+  margin: 30px 0 0;
+  width: inherit;
+}
+.popup-btn-close {
+  position: absolute;
+  top: 8px;
+  right: 14px;
+  color: #4EBD79;
+  font-size: 14px;
+  font-weight: bold;
+  text-transform: uppercase;
+  cursor: pointer;
+}
\ No newline at end of file
diff --git a/source/css/_common/components/third-party/third-party.styl b/source/css/_common/components/third-party/third-party.styl
index af469f8d6..9c0c2df59 100644
--- a/source/css/_common/components/third-party/third-party.styl
+++ b/source/css/_common/components/third-party/third-party.styl
@@ -1,2 +1,3 @@
 @import "duoshuo";
 @import "jiathis";
+@import "localsearch"
\ No newline at end of file

From 89348802ac27d9dc5b8041d72df79b4c2a2a4cc7 Mon Sep 17 00:00:00 2001
From: flashlab <zhengjuefei25@163.com>
Date: Thu, 11 Feb 2016 23:43:45 +0800
Subject: [PATCH 2/3] improve compatibility of search function

---
 layout/_partials/header.swig                  |  4 ++--
 layout/_partials/search/localsearch.swig      |  6 ++++--
 layout/_scripts/third-party/localsearch.swig  | 11 +++++-----
 .../components/third-party/localsearch.styl   | 21 +++++++++----------
 source/css/_common/scaffolding/helpers.styl   | 19 +++++++++++++++++
 source/css/_schemes/Mist/index.styl           | 15 +------------
 source/css/_schemes/Muse/_search.styl         | 20 +-----------------
 source/css/_schemes/Pisces/_brand.styl        |  2 +-
 8 files changed, 43 insertions(+), 55 deletions(-)

diff --git a/layout/_partials/header.swig b/layout/_partials/header.swig
index 7fa8cf137..92fe58250 100644
--- a/layout/_partials/header.swig
+++ b/layout/_partials/header.swig
@@ -45,9 +45,9 @@
 
       {# Search icon for default scheme #}
       {% set use_search_icon = theme.scheme === 'Muse' or theme.scheme === 'Pisces' %}
-      {% if use_search_icon and theme.swiftype_key %}
+      {% if use_search_icon and hasSearch %}
         <li class="menu-item menu-item-search">
-          <a href="#" class="st-search-show-outputs">
+          <a href="#" class="popup-trigger">
             {% if theme.menu_icons.enable %}
               <i class="menu-item-icon fa fa-search fa-fw"></i> <br />
             {% endif %}
diff --git a/layout/_partials/search/localsearch.swig b/layout/_partials/search/localsearch.swig
index 8e7c2faf9..08b3c3944 100644
--- a/layout/_partials/search/localsearch.swig
+++ b/layout/_partials/search/localsearch.swig
@@ -1,10 +1,12 @@
 <form class="site-search-form" >
+  <span class="fa fa-search"></span>
   <input type="text" id="search-input">
   <div id="search-result"><ul class="search-result-list"><li><a href="//www.baidu.com/s?wd=XXX%20site%3A{{config.url}}" class="search-result">百度搜索 <i class="search-keyword">XXX</i></a></li><li><a href="//www.google.com/search?q=XXX%20site%3A{{config.url}}" class="search-result">谷歌搜索 <i class="search-keyword">XXX</i></a></li><li><a href="#" class="popup-trigger search-result">本地搜索</a></li></ul>
   </div>
 </form>
-  <div class="popup">
+ <div class="popup">
+  <span class="fa fa-search"></span>
   <input type="text" id="local-search-input">
   <div id="local-search-result"></div>
   <span class="popup-btn-close">close</span>
-  </div>
\ No newline at end of file
+ </div>
\ No newline at end of file
diff --git a/layout/_scripts/third-party/localsearch.swig b/layout/_scripts/third-party/localsearch.swig
index 1e1340d15..05a60295f 100644
--- a/layout/_scripts/third-party/localsearch.swig
+++ b/layout/_scripts/third-party/localsearch.swig
@@ -118,22 +118,21 @@
       newHeight = scrollTop + 100;
     });
     $('#search-result a').mousedown(function(e) {
-      if (this.className.indexOf('popup') < 0) {
         window.location.href = this.href;
-        return;
-      }
+      });
+    $('.popup-trigger').mousedown(function(e) {
       searchFunc(path, 'local-search-input', 'local-search-result');
       $('#local-search-input').val($('#search-input').val());
       document.getElementById('local-search-input').dispatchEvent(new Event('input'));
       e.stopPropagation();
-      if(jQuery(window).width() < 767) {
+      if(jQuery(window).width() < 750) {
         $('.site-search-form').after( $( ".popup" ) );
         $('.popup').show().addClass('popup-mobile').css('top', 0);
         $('html, body').animate({
           scrollTop: $('.popup').offset().top
         }, 500);
       } else {
-        $('.popup').removeClass('popup-mobile').css('top', newHeight).    toggle();
+        $('.popup').removeClass('popup-mobile').css('top', newHeight).toggle();
       };
     });
 
@@ -146,7 +145,7 @@
       $('#search-result').hide();
     });
 
-    $('.html').click(function() {
+    $('html').click(function() {
       $('.popup').hide();
     });
     $('.popup-btn-close').click(function(e){
diff --git a/source/css/_common/components/third-party/localsearch.styl b/source/css/_common/components/third-party/localsearch.styl
index f63d63590..42a68c0c9 100644
--- a/source/css/_common/components/third-party/localsearch.styl
+++ b/source/css/_common/components/third-party/localsearch.styl
@@ -14,9 +14,6 @@ a.search-result-title {
 a.search-result {
   border-bottom: transparent;
 }
-p.search-result {
-  color=#555;
-}
 .search-keyword {
   border-bottom: 1px dashed #4088b8;
   font-weight: bold;
@@ -33,14 +30,16 @@ p.search-result {
   z-index: 999;
 }
 #local-search-result {
-  scroll:auto;
-  overflow:auto;
-  max-height:3in;
+  overflow: auto;
+  max-height: 3in;
+}
+.site-search-form {
+  background: $whitesmoke;
 }
 
 .popup {
   display: none;
-  position: absolute;
+  position: fixed;
   top: 100px;
   left: 50%;
   width: 700px;
@@ -58,15 +57,15 @@ p.search-result {
   width: 50%;
 }
 .popup-mobile {
-  position: relative;
+  padding: 0px 0px;
   top: 0;
   left: 0;
-  margin: 30px 0 0;
-  width: inherit;
+  margin: 0px 0 0;
+  width: 100%;
 }
 .popup-btn-close {
   position: absolute;
-  top: 8px;
+  top: 5px;
   right: 14px;
   color: #4EBD79;
   font-size: 14px;
diff --git a/source/css/_common/scaffolding/helpers.styl b/source/css/_common/scaffolding/helpers.styl
index 2f55e1b3b..c4838c495 100644
--- a/source/css/_common/scaffolding/helpers.styl
+++ b/source/css/_common/scaffolding/helpers.styl
@@ -66,3 +66,22 @@
 }
 
 .use-motion .motion-element { opacity: 0; }
+
+.site-search {
+  input {
+    padding: 3px;
+    border: none;
+    text-indent: 14px;
+    border-radius: 0;
+    width: 140px;
+    outline: none;
+    border-bottom: 1px solid $grey-dark;
+    background: inherit;
+    opacity: 0.5;
+    &:focus { opacity: 1; }
+  };
+  .fa-search {
+    position: absolute;
+    top: 6px;
+  }
+}
\ No newline at end of file
diff --git a/source/css/_schemes/Mist/index.styl b/source/css/_schemes/Mist/index.styl
index 218550f0e..79a23c00e 100644
--- a/source/css/_schemes/Mist/index.styl
+++ b/source/css/_schemes/Mist/index.styl
@@ -23,6 +23,7 @@
 // Search
 // --------------------------------------------------
 .site-search {
+  position: relative;
   float: right;
   margin-top: 8px;
 
@@ -30,20 +31,6 @@
     float: none;
     padding: 0 10px;
   }
-
-  input {
-    padding: 3px;
-    border: none;
-    padding-left: 18px;
-    border-radius: 0;
-    width: 140px;
-    background: url($search-icon) no-repeat 0 50%;
-    background-size: 12px 12px;
-    outline: none;
-    border-bottom: 1px solid $grey-dark;
-    opacity: 0.5;
-    &:focus { opacity: 1; }
-  }
 }
 
 
diff --git a/source/css/_schemes/Muse/_search.styl b/source/css/_schemes/Muse/_search.styl
index e3ff2dfbc..6cd7b2c96 100644
--- a/source/css/_schemes/Muse/_search.styl
+++ b/source/css/_schemes/Muse/_search.styl
@@ -1,23 +1,5 @@
 // Search
 // --------------------------------------------------
-.site-search {
-  position: absolute;
-  top: 0;
-  right: 0;
-  font-size: 0;
-
-  +mobile() { position: static; }
-}
-
 .site-search form {
   display: none;
-
-  +mobile() {
-    background: none;
-  }
-}
-
-.use-motion .site-search form {
-  top: -50px;
-  +mobile() { top: 0 !important; }
-}
+}
\ No newline at end of file
diff --git a/source/css/_schemes/Pisces/_brand.styl b/source/css/_schemes/Pisces/_brand.styl
index 1cc9754f0..356954fb7 100644
--- a/source/css/_schemes/Pisces/_brand.styl
+++ b/source/css/_schemes/Pisces/_brand.styl
@@ -20,4 +20,4 @@
 
 .site-subtitle { margin: 0; }
 
-.site-search { display: none; }
+.site-search form { display: none; }

From cf4f58f5d6cf8684a5a55bf700ac70b138066bdb Mon Sep 17 00:00:00 2001
From: flashlab <zhengjuefei25@163.com>
Date: Wed, 2 Mar 2016 00:05:51 +0800
Subject: [PATCH 3/3] optimize popup layout && add swiftype in pisces

---
 layout/_partials/header.swig                               | 6 ++++++
 source/css/_common/components/third-party/localsearch.styl | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/layout/_partials/header.swig b/layout/_partials/header.swig
index 92fe58250..70ba0211e 100644
--- a/layout/_partials/header.swig
+++ b/layout/_partials/header.swig
@@ -44,10 +44,16 @@
       {% endfor %}
 
       {# Search icon for default scheme #}
+
+
       {% set use_search_icon = theme.scheme === 'Muse' or theme.scheme === 'Pisces' %}
       {% if use_search_icon and hasSearch %}
         <li class="menu-item menu-item-search">
+        {% if theme.swiftype_key %}
+          <a href="#" class="st-search-show-outputs">
+        {% elseif config.search %}
           <a href="#" class="popup-trigger">
+        {% endif %}
             {% if theme.menu_icons.enable %}
               <i class="menu-item-icon fa fa-search fa-fw"></i> <br />
             {% endif %}
diff --git a/source/css/_common/components/third-party/localsearch.styl b/source/css/_common/components/third-party/localsearch.styl
index 42a68c0c9..3ac0e1556 100644
--- a/source/css/_common/components/third-party/localsearch.styl
+++ b/source/css/_common/components/third-party/localsearch.styl
@@ -48,10 +48,10 @@ a.search-result {
   padding: 0px 10px;
   background: #fff;
   color: #333;
-  border: 1px solid #150E2D;
   z-index: 9999;
   -webkit-border-radius: 5px;
   border-radius: 5px;
+  box-shadow: 0 0 0 9999px rgba(0,0,0,0.5);
 }
 #local-search-input {
   width: 50%;