Merge branch 'release/2.3.2'

Gemfile.lock

@@ -2,29 +2,32 @@ GEM
  remote: https://rubygems.org/
  specs:
  addressable (2.4.0)
- colorator (0.1)
+ colorator (1.1.0)
  faraday (0.9.2)
  multipart-post (>= 1.2, < 3)
- ffi (1.9.10)
- ffi (1.9.10-x64-mingw32)
- jekyll (3.1.6)
- colorator (~> 0.1)
+ ffi (1.9.14)
+ ffi (1.9.14-x64-mingw32)
+ forwardable-extended (2.6.0)
+ jekyll (3.2.1)
+ colorator (~> 1.0)
  jekyll-sass-converter (~> 1.0)
  jekyll-watch (~> 1.1)
  kramdown (~> 1.3)
  liquid (~> 3.0)
  mercenary (~> 0.3.3)
+ pathutil (~> 0.9)
  rouge (~> 1.7)
  safe_yaml (~> 1.0)
- jekyll-feed (0.5.1)
+ jekyll-feed (0.7.0)
  jekyll-gist (1.4.0)
  octokit (~> 4.2)
  jekyll-sass-converter (1.4.0)
  sass (~> 3.4)
- jekyll-sitemap (0.10.0)
- jekyll-watch (1.4.0)
+ jekyll-sitemap (0.11.0)
+ addressable (~> 2.4.0)
+ jekyll-watch (1.5.0)
  listen (~> 3.0, < 3.1)
- kramdown (1.11.1)
+ kramdown (1.12.0)
  liquid (3.0.6)
  listen (3.0.8)
  rb-fsevent (~> 0.9, >= 0.9.4)
@@ -33,10 +36,12 @@ GEM
  multipart-post (2.0.0)
  octokit (4.3.0)
  sawyer (~> 0.7.0, >= 0.5.3)
+ pathutil (0.14.0)
+ forwardable-extended (~> 2.6)
  rb-fsevent (0.9.7)
  rb-inotify (0.9.7)
  ffi (>= 0.5.0)
- rouge (1.10.1)
+ rouge (1.11.1)
  safe_yaml (1.0.4)
  sass (3.4.22)
  sawyer (0.7.0)

_layouts/post.html

@@ -37,13 +37,13 @@ <h1 class="entry-title">{% if page.headline %}{{ page.headline }}{% else %}{{ pa
  <span class="author vcard">By <span class="fn">{{ author.name }}</span></span>
  <span class="entry-date date published"><time datetime="{{ page.date | date_to_xmlschema }}"><i class="fa fa-calendar-o"></i> {{ page.date | date: "%B %d, %Y" }}</time></span>
  {% if page.modified %}<span class="entry-date date modified"><time datetime="{{ page.modified }}"><i class="fa fa-pencil"></i> {{ page.modified | date: "%B %d, %Y" }}</time></span>{% endif %}
- {% if (site.owner.disqus-shortname and page.comments) or site.comments %}<span class="entry-comments"><i class="fa fa-comment-o"></i> <a href="#disqus_thread">Comment</a></span>{% endif %}
+ {% if site.owner.disqus-shortname and page.comments or site.comments %}<span class="entry-comments"><i class="fa fa-comment-o"></i> <a href="#disqus_thread">Comment</a></span>{% endif %}
  {% if page.share %}{% include social-share.html %}{% endif %}
  {% if page.ads == true %}{% include ad-sidebar.html %}<!-- /.google-ads -->{% endif %}
  </footer>
  <div class="entry-content">
  {{ content }}
- {% if (site.owner.disqus-shortname and page.comments) or site.comments %}
+ {% if site.owner.disqus-shortname and page.comments or site.comments %}
  <div id="disqus_thread"></div><!-- /#disqus_thread -->
  {% include disqus-comments.html %}
  {% endif %}

assets/js/plugins/search.js

@@ -12,7 +12,7 @@
  ========================================================================== */
 
 var q, jsonFeedUrl = "/search.json",
- $searchForm = $(".simple-search"),
+ $searchForm = "[data-search-form]",
  $searchInput = $("[data-search-input]"),
  $resultTemplate = $("#search-result"),
  $resultsPlaceholder = $("[data-search-results]"),
@@ -25,7 +25,7 @@ var q, jsonFeedUrl = "/search.json",
 
 
 $(document).ready( function() {
- 
+
  // hide items found string
  $foundContainer.hide();
 
@@ -39,7 +39,7 @@ $(document).ready( function() {
  /* ==========================================================================
  Search functions
  ========================================================================== */
- 
+
 
 /**
  * Initiate search functionality.
@@ -66,7 +66,7 @@ function initSearch() {
 
 /**
  * Executes search
- * @param {String} q 
+ * @param {String} q
  * @return null
  */
 function execSearch(q) {
@@ -92,7 +92,7 @@ function toggleLoadingClass() {
 
 /**
  * Get Search results from JSON
- * @param {Function} callbackFunction 
+ * @param {Function} callbackFunction
  * @return null
  */
 function getSearchResults(callbackFunction) {
@@ -106,14 +106,14 @@ function getSearchResults(callbackFunction) {
  */
 function processData() {
  $results = [];
- 
+
  return function(data) {
- 
+
  var resultsCount = 0,
  results = "";
 
  $.each(data, function(index, item) {
- // check if search term is in content or title 
+ // check if search term is in content or title
  if (item.excerpt.toLowerCase().indexOf(q.toLowerCase()) > -1 || item.title.toLowerCase().indexOf(q.toLowerCase()) > -1) {
  var result = populateResultContent($resultTemplate.html(), item);
  resultsCount++;
@@ -144,7 +144,7 @@ function showSearchResults(results) {
 
 /**
  * Add results content to item template
- * @param {String} html 
+ * @param {String} html
  * @param {object} item
  * @return {String} Populated HTML
  */
@@ -159,7 +159,7 @@ function populateResultContent(html, item) {
 
 /**
  * Populates results string
- * @param {String} count 
+ * @param {String} count
  * @return null
  */
 function populateResultsString(count) {
@@ -178,7 +178,7 @@ function populateResultsString(count) {
 
 /**
  * Gets query string parameter - taken from http://stackoverflow.com/questions/901115/how-can-i-get-query-string-values-in-javascript
- * @param {String} name 
+ * @param {String} name
  * @return {String} parameter value
  */
 function getParameterByName(name) {
@@ -191,10 +191,10 @@ function getParameterByName(name) {
  * Injects content into template using placeholder
  * @param {String} originalContent
  * @param {String} injection
- * @param {String} placeholder 
+ * @param {String} placeholder
  * @return {String} injected content
  */
 function injectContent(originalContent, injection, placeholder) {
  var regex = new RegExp(placeholder, 'g');
  return originalContent.replace(regex, injection);
-}
+}