Rev2055, Don't add ? to url if start with # using replaceState and pu…

…shState
HelloZeroNet · May 6, 2017 · 34a6337 · 34a6337
1 parent e426319
commit 34a6337
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/Config.py b/src/Config.py
@@ -10,7 +10,7 @@ class Config(object):
 
     def __init__(self, argv):
         self.version = "0.5.4"
-        self.rev = 2054
+        self.rev = 2055
         self.argv = argv
         self.action = None
         self.config_file = "zeronet.conf"

diff --git a/src/Ui/media/Wrapper.coffee b/src/Ui/media/Wrapper.coffee
@@ -149,7 +149,9 @@ class Wrapper
 		back = window.location.pathname
 		if back.match /^\/[^\/]+$/ # Add / after site address if called without it
 			back += "/"
-		if query.replace("?", "")
+		if query.startsWith("#")
+			back = query
+		else if query.replace("?", "")
 			back += "?"+query.replace("?", "")
 		return back
 

diff --git a/src/Ui/media/all.js b/src/Ui/media/all.js
@@ -1005,7 +1005,9 @@ jQuery.extend( jQuery.easing,
       if (back.match(/^\/[^\/]+$/)) {
         back += "/";
       }
-      if (query.replace("?", "")) {
+      if (query.startsWith("#")) {
+        back = query;
+      } else if (query.replace("?", "")) {
         back += "?" + query.replace("?", "");
       }
       return back;