From f3d0fced1fcbd404b65f82228cd5e040968c495a Mon Sep 17 00:00:00 2001
From: mrdrogdrog <tilman.vatteroth@udo.edu>
Date: Tue, 24 Nov 2015 11:55:39 +0100
Subject: [PATCH] Anpassungen an den aktuellen layoutloader
---
js/starter.js | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/js/starter.js b/js/starter.js
index 8fa0f78..ef59127 100644
--- a/js/starter.js
+++ b/js/starter.js
@@ -1,8 +1,11 @@
+/**
+ * Created by tilman on 30.09.15.
+ */
$(document).ready(function(){
window.fontsReady = false;
WebFont.load( {
custom : {
- families : ['time-medium', 'time-fat', 'vrr'],
+ families : ['time-medium', 'time-fat', 'vrr', "NewCicle"]
},
active : function() {
window.fontsReady = true;
@@ -10,9 +13,7 @@ $(document).ready(function(){
});
var params = location.search.replace('?','').split('&').reduce(function(s,c){var t=c.split('=');s[t[0]]=t[1];return s;},{});
- var layoutname = (typeof(params.layout)=="undefined" ? "default" : params.layout);
+ var layoutname = ((typeof(params["layout"])=="undefined" || params["layout"]=="") ? "default" : params["layout"]);
layout.loadLayout(layoutname);
-});/**
- * Created by tilman on 30.09.15.
- */
+});
--
GitLab