Update search script

_includes/scripts.html

@@ -5,10 +5,11 @@
 <!-- Jekyll Simple Search option -->
 <script>
   $(document).ready(function() {
-      $('.search-field').simpleJekyllSearch({
+      $('.search-field').jekyllSearch({
-          jsonFile : '{{ site.url }}/search.json',
+          jsonFile: '{{ site.url }}/search.json',
-          searchResults : '.search-results',
+          searchResults: '.search-results',
-          template : '<li><article><a href="{url}">{title} <span class="entry-date"><time datetime="{date}">{shortdate}</time></span></a></article></li>',
+          template: '<li><article><a href="{url}">{title} <span class="entry-date"><time datetime="{date}">{shortdate}</time></span></a></article></li>',
+          fuzzy: true,
           noResults: '<p>Nothing found.</p>'
         });
   });

assets/js/plugins/simpleJekyllSearch.js

@@ -6,23 +6,22 @@
 */
 
 (function($) {
-    $.fn.simpleJekyllSearch = function(options) {
+    $.fn.jekyllSearch = function(options) {
         var settings = $.extend({
             jsonFile            : '/search.json',
-            jsonFormat      : 'title,category,desc,url,date,shortdate',
+            template            : '<a href="{url}" title="{desc}">{title}</a>',
-            template        : '<a href="{url}" title="{title}">{title}</a>',
             searchResults       : '.results',
             searchResultsTitle  : '<h4>Search results</h4>',
             limit               : '10',
             noResults           : '<p>Oh shucks<br/><small>Nothing found :(</small></p>'
         }, options);
 
-        var properties = settings.jsonFormat.split(',');
-        
         var jsonData = [],
             origThis = this,
             searchResults = $(settings.searchResults);
 
+        var matches = [];
+
         if(settings.jsonFile.length && searchResults.length){
             $.ajax({
                 type: "GET",
@@ -33,7 +32,7 @@
                     registerEvent();
                 },
                 error: function(x,y,z) {
-                    console.log("***ERROR in simpleJekyllSearch.js***");
+                    console.log("***ERROR in jekyllSearch.js***");
                     console.log(x);
                     console.log(y);
                     console.log(z);
@@ -42,9 +41,15 @@
             });
         }
 
-
         function registerEvent(){
             origThis.keyup(function(e){
+                if(e.which === 13){
+                    if(matches)
+                        window.location = matches[0].url;
+                        
+                    //follow the first link
+                    // if(searchResults.children().length)
+                }
                 if($(this).val().length){
                     writeMatches( performSearch($(this).val()) );
                 }else{
@@ -54,41 +59,48 @@
         }
 
         function performSearch(str){
-            var matches = [];
+            matches = [];
 
-            $.each(jsonData,function(i,entry){
+            for (var i = 0; i < jsonData.length; i++) {
-                for(var i=0;i<properties.length;i++)
+                var obj = jsonData[i];
-                    if(entry[properties[i]] !== undefined && entry[properties[i]].toLowerCase().indexOf(str.toLowerCase()) > 1){
+                for (key in obj) {
-                        matches.push(entry);
+                    if(obj.hasOwnProperty(key)){
-                        i=properties.length;
+                        if (obj[key] instanceof Array){
+                            var seen = false;
+                            for (var j = 0; j < obj[key].length; j++){
+                                if(obj[key][j].toLowerCase().indexOf(str.toLowerCase()) >= 0){
+                                    matches.push(obj);
+                                    break;
+                                }
+                            }
+                        }else if (obj[key].toLowerCase().indexOf(str.toLowerCase()) >= 0){
+                            matches.push(obj);
+                            break;
+                        }
+                    }
+                }
             }
-            });
             return matches;
-
         }
 
         function writeMatches(m){
             clearSearchResults();
+
             searchResults.append( $(settings.searchResultsTitle) );
 
-            if(m.length){
+            if(m && m.length){
-                $.each(m,function(i,entry){
+                for (var i = 0; i < m.length && i < settings.limit; i++) {
-                    if(i<settings.limit){
+                    var obj = m[i];
-                        var output=settings.template;
+                    output = settings.template;
-                        for(var i=0;i<properties.length;i++){
+                    output = output.replace(/\{(.*?)\}/g, function(match, property) {
-                            var regex = new RegExp("\{" + properties[i] + "\}", 'g');
+                        return obj[property];
-                            output = output.replace(regex, entry[properties[i]]);
+                    });
-                        }
                     searchResults.append($(output));
                 }
-                });
             }else{
                 searchResults.append( settings.noResults );
             }
-
-
         }
-
         function clearSearchResults(){
             searchResults.children().remove();
         }

search.json

@@ -6,6 +6,7 @@ sitemap: false
 		{
 		  "title"      : "{{ post.title | escape }}",
 		  "category"   : "{{ post.category }}",
+      "tags"       : "{{ post.tags | array_to_sentence_string }}",
 		  "url"        : "{{ site.url }}{{ post.url }}",
 		  "date"       : "{{ post.date }}",
 		  "shortdate"  : "{{ post.date | date: '%B %d, %Y' }}"