Merge pull request #973 from JounQin/master

fix search problem on mobile phone and some optimizations

.gitignore

@@ -1,6 +1,7 @@
 .DS_Store
 .idea/
 *.log
+*.iml
 node_modules/
 
 # Ignore unused verdors' files

layout/_macro/wechat-subscriber.swig

@@ -1,6 +1,6 @@
 {% if theme.wechat_subscriber.enabled %}
-<div id="wechat_subscriber" style="display: block； padding: 10px 0; margin: 20px auto; width: 100%; text-align: center">
+<div id="wechat_subscriber" style="display: block; padding: 10px 0; margin: 20px auto; width: 100%; text-align: center">
     <img id="wechat_subscriber_qcode" src="{{ theme.wechat_subscriber.qcode }}" alt="{{ theme.author }} wechat" style="width: 200px; max-width: 100%;"/>
     <div>{{ theme.wechat_subscriber.description }}</div>
 </div>
-{% endif %}
+{% endif %}

layout/_partials/header.swig

@@ -46,9 +46,9 @@
       {% if hasSearch %}
         <li class="menu-item menu-item-search">
           {% if theme.swiftype_key %}
-            <a href="#" class="st-search-show-outputs">
+            <a href="javascript:;" class="st-search-show-outputs">
           {% elseif config.search %}
-            <a href="#" class="popup-trigger">
+            <a href="javascript:;" class="popup-trigger">
           {% endif %}
             {% if theme.menu_icons.enable %}
               <i class="menu-item-icon fa fa-search fa-fw"></i> <br />

layout/_scripts/third-party/localsearch.swig

@@ -37,7 +37,7 @@
             var $resultContent = document.getElementById(content_id);
             $input.addEventListener('input', function(){
                 var matchcounts = 0;
-                var str='<ul class=\"search-result-list\">';                
+                var str='<ul class=\"search-result-list\">';
                 var keywords = this.value.trim().toLowerCase().split(/[\s\-]+/);
                 $resultContent.innerHTML = "";
                 if (this.value.trim().length > 1) {
@@ -92,7 +92,7 @@
                                 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>";
@@ -108,7 +108,7 @@
     });}
 
     // handle and trigger popup window;
-    $('.popup-trigger').mousedown(function(e) {
+    $('.popup-trigger').click(function(e) {
       e.stopPropagation();
       if (isfetched == false) {
         searchFunc(path, 'local-search-input', 'local-search-result');
@@ -127,4 +127,4 @@
       e.stopPropagation();
     });
   </script>
-{% endif %}
+{% endif %}

test/.jshintrc

@@ -4,7 +4,6 @@
   "eqeqeq": true,
   "undef": true,
   "newcap": true,
-  "undef": true,
   "unused": true,
   "laxcomma": false,
   "asi": false,