fix download button when direct. fix js when no baseurl

nicnocquee · Jan 21, 2016 · 747650b · 747650b
1 parent 459eee8
commit 747650b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/_plugins/download.rb b/_plugins/download.rb
@@ -19,7 +19,7 @@ def initialize(tag_name, text, tokens)
 
     def render(context)
         site = context.registers[:site]
-        @img = site.baseurl + @img
+        @img = site.baseurl + (@img ? @img : "")
         if @url.length > 0
             if @text
                 rendered = "<p style=\"text-align: center\"><a href=\""+@url+"\" class=\"centerbutton\">"+@text+"</a></p>"

diff --git a/js/main.js b/js/main.js
@@ -371,7 +371,11 @@
 			if (qs["fr"] > 0) {
 				window.history.back();
 			} else {
-				window.location = {{ site.baseurl }};
+				{% if site.baseurl == '' %}
+					window.location = '/';
+				{% else %}
+					window.location = {{ site. baseurl }};
+				{% endif %}
 			}
 		});
 	}