From 8845c070a2ba315227011b638948f150b32b133e Mon Sep 17 00:00:00 2001
From: DennisSchiefer <shiin@gmx.de>
Date: Wed, 18 Apr 2012 06:56:17 +0100
Subject: [PATCH] moved favicon handling to webserver

---
 WebContent/OSRM.GUI.js                              |   3 ---
 WebContent/{images/osrm-favicon.ico => favicon.ico} | Bin
 WebContent/main.html                                |   3 ---
 WebContent/main.js                                  |   3 +--
 4 files changed, 1 insertion(+), 8 deletions(-)
 rename WebContent/{images/osrm-favicon.ico => favicon.ico} (100%)

diff --git a/WebContent/OSRM.GUI.js b/WebContent/OSRM.GUI.js
index f3ff3c1d1..5debdd760 100644
--- a/WebContent/OSRM.GUI.js
+++ b/WebContent/OSRM.GUI.js
@@ -30,9 +30,6 @@ init: function() {
 	OSRM.GUI.visible = true;
 	OSRM.GUI.width = document.getElementById("main-wrapper").clientWidth;
 	
-	// init favicon
-	document.getElementById('favicon').href=OSRM.G.images["favicon"].getAttribute("src");
-	
 	// init starting source/target
 	document.getElementById('gui-input-source').value = OSRM.DEFAULTS.ONLOAD_SOURCE;
 	document.getElementById('gui-input-target').value = OSRM.DEFAULTS.ONLOAD_TARGET;
diff --git a/WebContent/images/osrm-favicon.ico b/WebContent/favicon.ico
similarity index 100%
rename from WebContent/images/osrm-favicon.ico
rename to WebContent/favicon.ico
diff --git a/WebContent/main.html b/WebContent/main.html
index f225580c8..52fd95ea6 100644
--- a/WebContent/main.html
+++ b/WebContent/main.html
@@ -29,9 +29,6 @@ or see http://www.gnu.org/licenses/agpl.txt.
 <meta name="description" content="OSRM Website"/>
 <meta name="author" content="Dennis Schieferdecker" />
 
-<!--  favicon -->
-<link rel="shortcut icon" href="" type="image/x-icon" id="favicon"/>
-
 <!-- stylesheets -->
 <link rel="stylesheet" href="leaflet/leaflet.css" type="text/css"/>
 <!--[if lte IE 8]><link rel="stylesheet" href="leaflet/leaflet.ie.css" type="text/css"/><![endif]-->
diff --git a/WebContent/main.js b/WebContent/main.js
index b8bf2baec..3159e604b 100644
--- a/WebContent/main.js
+++ b/WebContent/main.js
@@ -68,8 +68,7 @@ OSRM.prefetchImages = function() {
 		              	{id:'direction_7',						url:'images/turn-left.png'},
 		              	{id:'direction_8',						url:'images/sharp-left.png'},
 		        		{id:'direction_11',						url:'images/round-about.png'},
-		        		{id:'direction_15',						url:'images/target.png'},
-		        		{id:'favicon',							url:'images/osrm-favicon.ico'}
+		        		{id:'direction_15',						url:'images/target.png'}
 	               ];
 		
 	for(var i=0; i<image_list.length; i++) {