From 2b26796719f7dd14e055791a08e7026e95231bd1 Mon Sep 17 00:00:00 2001
From: Lars Jung <lrsjng@gmail.com>
Date: Thu, 29 May 2014 18:51:54 +0200
Subject: [PATCH] Refactor core/settings module.

---
 src/_h5ai/client/js/inc/core/resource.js   |  6 +++---
 src/_h5ai/client/js/inc/core/settings.js   | 19 +++++--------------
 src/_h5ai/client/js/inc/ext/preview-txt.js |  4 ++--
 src/_h5ai/client/js/inc/ext/qrcode.js      |  2 +-
 src/_h5ai/client/js/inc/model/item.js      |  8 ++++----
 5 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/src/_h5ai/client/js/inc/core/resource.js b/src/_h5ai/client/js/inc/core/resource.js
index 9d6cf746..ed84bde7 100644
--- a/src/_h5ai/client/js/inc/core/resource.js
+++ b/src/_h5ai/client/js/inc/core/resource.js
@@ -3,13 +3,13 @@ modulejs.define('core/resource', ['core/settings'], function (settings) {
 
 	var image = function (id) {
 
-			return settings.h5aiAbsHref + 'client/images/' + id + '.svg';
+			return settings.appUrl + 'client/images/' + id + '.svg';
 		},
 
 		icon = function (id) {
 
-			// return settings.h5aiAbsHref + 'client/themes/faenza/icons/' + id + '.png';
-			return settings.h5aiAbsHref + 'client/themes/evolvere/icons/' + id + '.svg';
+			// return settings.appUrl + 'client/themes/faenza/icons/' + id + '.png';
+			return settings.appUrl + 'client/themes/evolvere/icons/' + id + '.svg';
 		};
 
 	return {
diff --git a/src/_h5ai/client/js/inc/core/settings.js b/src/_h5ai/client/js/inc/core/settings.js
index 03112e74..7ba35a55 100644
--- a/src/_h5ai/client/js/inc/core/settings.js
+++ b/src/_h5ai/client/js/inc/core/settings.js
@@ -1,17 +1,8 @@
 
-modulejs.define('core/settings', ['config', '_', '$'], function (config, _, $) {
+modulejs.define('core/settings', ['config', '_'], function (config, _) {
 
-	var filename = 'client/js/scripts.js',
-		src = $('script[src$="' + filename + '"]').attr('src'),
-		appHref = src.substr(0, src.length - filename.length),
-
-		h5aiAbsHref = src.substr(0, src.length - filename.length).replace(/\/*$/, '/'),
-		rootAbsHref = /^(.*\/)[^\/]+\/?$/.exec(h5aiAbsHref)[1],
-
-		settings = _.extend({}, config.options, {
-			h5aiAbsHref: h5aiAbsHref,
-			rootAbsHref: rootAbsHref
-		});
-
-	return settings;
+	return _.extend({}, config.options, {
+		appUrl: config.setup.APP_URL,
+		rootUrl: config.setup.ROOT_URL
+	});
 });
diff --git a/src/_h5ai/client/js/inc/ext/preview-txt.js b/src/_h5ai/client/js/inc/ext/preview-txt.js
index a6a85a2c..abf8c746 100644
--- a/src/_h5ai/client/js/inc/ext/preview-txt.js
+++ b/src/_h5ai/client/js/inc/ext/preview-txt.js
@@ -63,11 +63,11 @@ modulejs.define('ext/preview-txt', ['_', '$', 'core/settings', 'core/event', 'ex
 		},
 		loadSyntaxhighlighter = function (callback) {
 
-			loadScript(allsettings.h5aiAbsHref + 'client/js/syntaxhighlighter.js', 'SyntaxHighlighter', callback);
+			loadScript(allsettings.appUrl + 'client/js/syntaxhighlighter.js', 'SyntaxHighlighter', callback);
 		},
 		loadMarkdown = function (callback) {
 
-			loadScript(allsettings.h5aiAbsHref + 'client/js/markdown.js', 'markdown', callback);
+			loadScript(allsettings.appUrl + 'client/js/markdown.js', 'markdown', callback);
 		},
 
 		preloadText = function (absHref, callback) {
diff --git a/src/_h5ai/client/js/inc/ext/qrcode.js b/src/_h5ai/client/js/inc/ext/qrcode.js
index ca460eda..25a56fc6 100644
--- a/src/_h5ai/client/js/inc/ext/qrcode.js
+++ b/src/_h5ai/client/js/inc/ext/qrcode.js
@@ -16,7 +16,7 @@ modulejs.define('ext/qrcode', ['_', '$', 'modernizr', 'core/settings', 'core/eve
 				callback();
 			} else {
 				$.ajax({
-					url: allsettings.h5aiAbsHref + 'client/js/qrcode.js',
+					url: allsettings.appUrl + 'client/js/qrcode.js',
 					dataType: 'script',
 					complete: function () {
 
diff --git a/src/_h5ai/client/js/inc/model/item.js b/src/_h5ai/client/js/inc/model/item.js
index 1d82cb1c..227bfb54 100644
--- a/src/_h5ai/client/js/inc/model/item.js
+++ b/src/_h5ai/client/js/inc/model/item.js
@@ -30,7 +30,7 @@ modulejs.define('model/item', ['_', 'core/types', 'core/event', 'core/settings',
 			if (match) {
 				var split = { parent: match[1], name: match[2] };
 
-				if (split.parent && !startsWith(split.parent, settings.rootAbsHref)) {
+				if (split.parent && !startsWith(split.parent, settings.rootUrl)) {
 					split.parent = null;
 				}
 				return split;
@@ -45,7 +45,7 @@ modulejs.define('model/item', ['_', 'core/types', 'core/event', 'core/settings',
 
 			absHref = location.forceEncoding(absHref);
 
-			if (!startsWith(absHref, settings.rootAbsHref)) {
+			if (!startsWith(absHref, settings.rootUrl)) {
 				return null;
 			}
 
@@ -164,12 +164,12 @@ modulejs.define('model/item', ['_', 'core/types', 'core/event', 'core/settings',
 
 		isRoot: function () {
 
-			return this.absHref === settings.rootAbsHref;
+			return this.absHref === settings.rootUrl;
 		},
 
 		isH5ai: function () {
 
-			return this.absHref === settings.h5aiAbsHref;
+			return this.absHref === settings.appUrl;
 		},
 
 		isEmpty: function () {