From c4d77d38b30538ee506375d120693bc840b0eb85 Mon Sep 17 00:00:00 2001
From: Franzz <francois@lutran.fr>
Date: Sun, 8 Dec 2019 10:30:45 +0100
Subject: [PATCH] Fix hash parsing 3

---
 jquery/databap.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/jquery/databap.js b/jquery/databap.js
index e4e44e5..55f2353 100755
--- a/jquery/databap.js
+++ b/jquery/databap.js
@@ -99,11 +99,12 @@ function Databap()
 		if(!hash) return decodeURIComponent(window.location.hash.slice(1));
 		else
 		{
+			console.log('encoding: '+hash);
 			window.location.hash = '#'+encodeURIComponent(hash.slice(hash.substr(0, 1)=='#'?1:0));
 			
 			//favicon, bug firefox
-			var link = $('link[rel="shortcut icon"]').remove().attr("href");
-			$('<link href="'+ link +'" rel="shortcut icon" type="image/x-icon" />').appendTo('head');
+			//var link = $('link[rel="shortcut icon"]').remove().attr("href");
+			//$('<link href="'+ link +'" rel="shortcut icon" type="image/x-icon" />').appendTo('head');
 		}
 	};
 	
@@ -518,13 +519,15 @@ function Databap()
 	{
 		bAbsolute = bAbsolute || false;
 		if(sPage.length==1) sPage = self.vars.hash_to_page[sPage]; //if hash is provided instead of page
-		return (bAbsolute?self.vars.serv_name:'')+'#'+sPage+((iItemId>0 || iItemId!='')?'-'+escape($.trim(iItemId)):'');
+		return (bAbsolute?self.vars.serv_name:'')+'#'+sPage+((iItemId>0 || iItemId!='')?'-'+$.trim(iItemId):'');
 	};
 	
 	this.goToInternalLink = function(sPage, iItemId, bFade)
 	{
 		self.vars2('fade', bFade || false);
 		
+		console.log('goToInternalLink: '+iItemId);
+		
 		iItemId = iItemId || 0;
 		var sHash = self.getInternalLink(sPage, iItemId).substr(1);
 		if(sHash==self.hash()) self.onHashChange({force:true});