Merge pull request #12 from AlexanderWillner/master

Support for hash url #9
LodLive · Nov 11, 2014 · f5ab74a · f5ab74a
2 parents ff5fc3f + 2423ab3
commit f5ab74a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/js/lodlive.app.js b/js/lodlive.app.js
@@ -24,13 +24,15 @@ $(function() {
 	var nextSpeed = 500;
 	var fadeSpeed = 100;
 	var loca = $(location).attr('search');
+    var hash = $(location).attr('hash');
 	if (loca) {
 		$("#startPanel").remove();
 		$(".paginator").remove();
 		$("#footer").remove();
 		$("#lang").remove();
 		$('body').append('<div id="aSpace"></div>');
 		var res = $.trim(loca.substring(loca.indexOf("?") + 1));
+		if (hash) res += hash;
 		res = res.replace(/%2F/g, '/');
 		res = res.replace(/%3A/g, ':');
 		res = res.replace(/%23/g, '#');

diff --git a/js/lodlive.core.js b/js/lodlive.core.js
@@ -3070,7 +3070,7 @@ var debugOn = false;
 				strokeStyle : "#606060",
 				x : (x2bis + x1 + ((x1 + 60) > x2 ? -60 : +60)) / 2,
 				y : (y1 + y1 - ((x1 + 60) > x2 ? 18 : -18)) / 2,
-				text : ((x1 + 60) > x2 ? " Â« " : "") + label + ((x1 + 60) > x2 ? "" : " Â» "),
+				text : ((x1 + 60) > x2 ? " « " : "") + label + ((x1 + 60) > x2 ? "" : " » "),
 				align : "center",
 				strokeWidth : 0.01,
 				fontSize : 11,

diff --git a/js/lodlive.custom-lines.js b/js/lodlive.custom-lines.js
@@ -34,7 +34,7 @@
 				strokeStyle : "#000",
 				x : (x2bis + x1 + ((x1 + 60) > x2 ? -60 : +60)) / 2,
 				y : (y1 + y1 - ((x1 + 60) > x2 ? 18 : -18)) / 2,
-				text : ((x1 + 60) > x2 ? " Â« " : "") + label + ((x1 + 60) > x2 ? "" : " Â» "),
+				text : ((x1 + 60) > x2 ? " « " : "") + label + ((x1 + 60) > x2 ? "" : " » "),
 				align : "center",
 				strokeWidth : 0.01,
 				fontSize : 11,