From e39e6c86a175ff229802ce7aaaaaff10434c8850 Mon Sep 17 00:00:00 2001
From: Henry Oswald <henry.oswald@sharelatex.com>
Date: Wed, 23 Jul 2014 11:29:04 +0100
Subject: [PATCH] moved where we write the window.sharelatex.x to the header as
 some times it is possible for the scripts to evaulate before those props have
 been read in

---
 services/web/app/views/layout.jade            | 44 ++++++++++---------
 .../web/public/coffee/main/templates.coffee   |  2 -
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/services/web/app/views/layout.jade b/services/web/app/views/layout.jade
index 473e488dad..95c7519885 100644
--- a/services/web/app/views/layout.jade
+++ b/services/web/app/views/layout.jade
@@ -34,6 +34,28 @@ html(itemscope, itemtype='http://schema.org/Product')
 		script(src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js")
 		script(src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.0-beta.14/angular.min.js")
 		
+		script.
+			window.sharelatex = {
+				siteUrl: '#{settings.siteUrl}',
+				jsPath:  '#{jsPath}'
+			};
+
+		- if (typeof(settings.algolia) != "undefined")
+			script.
+				window.sharelatex.algolia = {
+					app_id:'#{settings.algolia.app_id}',
+					api_key:'#{settings.algolia.read_only_api_key}',
+					indexes:!{JSON.stringify(settings.algolia.indexes)}
+				}
+
+		- if (typeof(settings.apis) != "undefined" && typeof(settings.apis.templates_api) != "undefined")
+			script.
+				window.sharelatex.templates = {
+					user_id : '!{settings.apis.templates_api.user_id}',
+					cdnDomain : '!{settings.apis.templates_api.cdnDomain}',
+					indexName : '!{settings.apis.templates_api.indexName}'
+				}
+				
 	body
 		- if(typeof(suppressNavbar) == "undefined")
 			include layout/navbar
@@ -73,25 +95,5 @@ html(itemscope, itemtype='http://schema.org/Product')
 					category: "questions"
 				};
 
-		script.
-			window.sharelatex = {
-				siteUrl: '#{settings.siteUrl}',
-				jsPath:  '#{jsPath}'
-			};
-
-		- if (typeof(settings.algolia) != "undefined")
-			script.
-				window.sharelatex.algolia = {
-					app_id:'#{settings.algolia.app_id}',
-					api_key:'#{settings.algolia.read_only_api_key}',
-					indexes:!{JSON.stringify(settings.algolia.indexes)}
-				}
-
-		- if (typeof(settings.apis) != "undefined" && typeof(settings.apis.templates_api) != "undefined")
-			script.
-				window.sharelatex.templates = {
-					user_id : '!{settings.apis.templates_api.user_id}',
-					cdnDomain : '!{settings.apis.templates_api.cdnDomain}',
-					indexName : '!{settings.apis.templates_api.indexName}'
-				}
+	
 
diff --git a/services/web/public/coffee/main/templates.coffee b/services/web/public/coffee/main/templates.coffee
index a51a8f8c44..6a14a88342 100644
--- a/services/web/public/coffee/main/templates.coffee
+++ b/services/web/public/coffee/main/templates.coffee
@@ -17,8 +17,6 @@ define [
 
 
 	App.factory "algolia", ->
-		console.log window.sharelatex.algolia?.app_id, window.sharelatex.algolia?.api_key
-
 		if window?.sharelatex?.algolia?.app_id?
 			client = new AlgoliaSearch(window.sharelatex.algolia?.app_id, window.sharelatex.algolia?.api_key)
 			index = client.initIndex(window.sharelatex.algolia?.indexes?.templates)