From 8d1a0d2773ecf424c448659bf864b35ca97f2f46 Mon Sep 17 00:00:00 2001
From: Vit Brunner <vit.brunner@gmail.com>
Date: Sun, 12 Oct 2014 14:30:19 +0200
Subject: [PATCH] Better config loading

---
 source/documents/scripts/controllers.js.coffee    | 10 +++++++++-
 source/documents/scripts/services/poems.js.coffee |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/source/documents/scripts/controllers.js.coffee b/source/documents/scripts/controllers.js.coffee
index c498498..90407e8 100644
--- a/source/documents/scripts/controllers.js.coffee
+++ b/source/documents/scripts/controllers.js.coffee
@@ -7,7 +7,15 @@ angular.module("sideBySide.controllers", [])
 				then '/' + $previousRoute.params.base
 				else ''
 
-		base = $location.url().replace(/\/(.*)\/.*/, '$1')
+		appUrl = $location.absUrl()
+			.substring(0, $location.absUrl().length - $location.url().length)
+			.replace(/#$/, '')
+
+		base = appUrl + $location.url()
+			.slice(1)
+			.replace(/(.*)\/.*/, '$1')
+			.replace(/\./g, '/')
+
 		poems.load base
 ]
 
diff --git a/source/documents/scripts/services/poems.js.coffee b/source/documents/scripts/services/poems.js.coffee
index 78e0a9d..a0a55cc 100644
--- a/source/documents/scripts/services/poems.js.coffee
+++ b/source/documents/scripts/services/poems.js.coffee
@@ -14,7 +14,7 @@ angular.module("sideBySide").service "poems", ['$q', 'fetch', ($q, fetch) ->
 		(poem for poem in @all when poem.meta.Active is true)
 
 	@load = (base = '') =>
-		config = base.replace(/\./g, '/') + "/config.json"
+		config = base + "/config.json"
 
 		fetch(config).then (result) =>
 			$q.all(result.promises).then (results) =>