baseurl

DOI-ONRR · Jan 26, 2017 · cdc2209 · cdc2209
1 parent 343fa5b
commit cdc2209
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 12 deletions.
diff --git a/_plugins/search.rb b/_plugins/search.rb
@@ -2,7 +2,6 @@ module Jekyll
   class SearchStoreTag < Liquid::Tag
     def initialize(tag, text, tokens)
       super
-      @baseurl = Jekyll.sites[0].config['baseurl']
     end
 
     def slugify(str)
@@ -18,7 +17,7 @@ def create_store(collections)
               title: doc.data['title'],
               description: doc.data['description'],
               tag: doc.data['tag'],
-              url: "#{@baseurl}#{doc.data['permalink']}",
+              url: doc.data['permalink'],
               internal: true
             }
             obj[slugify(doc.data['permalink'])] = new_obj

diff --git a/js/components/search.js b/js/components/search.js
@@ -22,8 +22,11 @@
         var external = item.internal
           ? ''
           : ' target="_blank" ';
+        var baseurl = item.internal
+          ? window.location.origin
+          : ''
         appendString += '<article class="search-result-list">' +
-                          '<h1><a href="' + item.url + '"' + external + ">" +
+                          '<h1><a href="' + baseurl + item.url + '"' + external + ">" +
                             item.title +
                           '</a></h1>' +
                           '<p>' + item.description + '</p>' +

diff --git a/js/lib/company-revenue.min.js.map b/js/lib/company-revenue.min.js.map
diff --git a/js/lib/explore.min.js.map b/js/lib/explore.min.js.map
diff --git a/js/lib/homepage.min.js.map b/js/lib/homepage.min.js.map
diff --git a/js/lib/main.min.js.map b/js/lib/main.min.js.map
diff --git a/js/lib/narrative.min.js.map b/js/lib/narrative.min.js.map
diff --git a/js/lib/reconciliation.min.js.map b/js/lib/reconciliation.min.js.map
diff --git a/js/lib/search.min.js b/js/lib/search.min.js
diff --git a/js/lib/search.min.js.map b/js/lib/search.min.js.map
diff --git a/js/lib/state-pages.min.js.map b/js/lib/state-pages.min.js.map