summaryrefslogtreecommitdiffstats
path: root/module/web/templates/default/base.html
diff options
context:
space:
mode:
authorGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2013-05-24 20:43:19 +0200
committerGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2013-05-24 20:43:19 +0200
commitb8b3af1156a517e60e8253a1d7f0124773f6a9b7 (patch)
tree362042e23f20fb814727d90c7dccf958f4a53571 /module/web/templates/default/base.html
parentimprovements to json api (diff)
downloadpyload-b8b3af1156a517e60e8253a1d7f0124773f6a9b7.tar.xz
fixed loading of js files
Diffstat (limited to 'module/web/templates/default/base.html')
-rw-r--r--module/web/templates/default/base.html13
1 files changed, 8 insertions, 5 deletions
diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html
index fee0694b8..7785da01b 100644
--- a/module/web/templates/default/base.html
+++ b/module/web/templates/default/base.html
@@ -20,7 +20,7 @@
<script src="/static/js/libs/less-1.3.0.min.js" type="text/javascript"></script>
<script type="text/javascript" data-main="static/js/config" src="/static/js/libs/require-2.1.5.js"></script>
- <script>
+ <script type="text/javascript">
window.dates = {
weeks: ['week', 'weeks'],
days: ['day', 'days'],
@@ -32,10 +32,13 @@
window.wsAddress = "{{ ws }}";
window.pathPrefix = ""; // TODO
- require(['default'], function(App) {
- App.init();
- {% block require %}
- {% endblock %}
+ // Config has to be loaded first
+ require(['config'], function(Config) {
+ require(['default'], function(App) {
+ App.init();
+ {% block require %}
+ {% endblock %}
+ })
});
</script>
<script type="text/template" id="template-header">