Skip to content

Commit

Permalink
Fix search.json url for realZ this time
Browse files Browse the repository at this point in the history
  • Loading branch information
mmistakes committed Sep 12, 2013
1 parent f30520b commit 6eab0ea
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 37 deletions.
36 changes: 36 additions & 0 deletions _includes/scripts.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,42 @@
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
<script>window.jQuery || document.write('<script src="{{ site.url }}/assets/js/vendor/jquery-1.9.1.min.js"><\/script>')</script>
<script src="{{ site.url }}/assets/js/scripts.min.js"></script>
{% if site.search %}
<!-- Jekyll Simple Search option -->
<script>
$(document).ready(function() {
$('.search-field').simpleJekyllSearch({
jsonFile : '{{ site.url }}/search.json',
searchResults : '.search-results',
template : '<li><article><a href="{url}">{title} <span class="entry-date"><time datetime="{date}">{shortdate}</time></span></a></article></li>',
noResults: '<p>Nothing found.</p>'
});
});

(function( $, window, undefined ) {

var bs = {
close: $(".icon-remove-sign"),
searchform: $(".search-form"),
canvas: $("body"),
dothis: $('.dosearch')
};

bs.dothis.on('click', function() {
$('.search-wrapper').css({ display: "block" });
bs.searchform.toggleClass('active');
bs.searchform.find('input').focus();
bs.canvas.toggleClass('search-overlay');
});

bs.close.on('click', function() {
$('.search-wrapper').removeAttr( 'style' );
bs.searchform.toggleClass('active');
bs.canvas.removeClass('search-overlay');
});
})( jQuery, window );
</script>
{% endif %}
{% if site.google_analytics %}
<!-- Asynchronous Google Analytics snippet -->
<script>
Expand Down
36 changes: 1 addition & 35 deletions assets/js/_main.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,38 +26,4 @@ $('#site-nav').click(function(event){
// FitVids options
$(function() {
$("article").fitVids();
});

// Simple Jekyll Search options
$(document).ready(function() {
$('.search-field').simpleJekyllSearch({
jsonFile : '{siteurl}/search.json',
searchResults : '.search-results',
template : '<li><article><a href="{url}">{title} <span class="entry-date"><time datetime="{date}">{shortdate}</time></span></a></article></li>',
noResults: '<p>Nothing found.</p>'
});
});

(function( $, window, undefined ) {

var bs = {
close: $(".icon-remove-sign"),
searchform: $(".search-form"),
canvas: $("body"),
dothis: $('.dosearch')
};

bs.dothis.on('click', function() {
$('.search-wrapper').css({ display: "block" });
bs.searchform.toggleClass('active');
bs.searchform.find('input').focus();
bs.canvas.toggleClass('search-overlay');
});

bs.close.on('click', function() {
$('.search-wrapper').removeAttr( 'style' );
bs.searchform.toggleClass('active');
bs.canvas.removeClass('search-overlay');
});

})( jQuery, window );
});
2 changes: 1 addition & 1 deletion assets/js/scripts.min.js

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion search.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
[
{% for post in site.posts %}
{
"siteurl" : "{{ site.url }}",
"title" : "{{ post.title | escape }}",
"category" : "{{ post.category }}",
"url" : "{{ site.url }}{{ post.url }}",
Expand Down

0 comments on commit 6eab0ea

Please sign in to comment.