From 33d12affa3bd6503266426d0ef5690bddd70d131 Mon Sep 17 00:00:00 2001
From: Makis Tracend <makis.tracend@gmail.com>
Date: Wed, 26 Jun 2013 17:13:50 -0700
Subject: [PATCH] #88 restoring init() js, if available

---
 app/helpers/template.php | 2 ++
 app/views/main/foot.php  | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/helpers/template.php b/app/helpers/template.php
index 17fa31f..ed34a54 100644
--- a/app/helpers/template.php
+++ b/app/helpers/template.php
@@ -241,6 +241,8 @@ function createClient( $dom ){
 
 		}
 		// render the global client vars
+		$client .= 'Object.extend(KISSCMS, '. json_encode_escaped( $GLOBALS['client'] ) .');';
+		$client .= 'require.config( KISSCMS["require"] );';
 
 		$client = $this->trimWhitespace($client);
 		// #87 not caching client vars as a file
diff --git a/app/views/main/foot.php b/app/views/main/foot.php
index 960601b..ad5a246 100644
--- a/app/views/main/foot.php
+++ b/app/views/main/foot.php
@@ -5,8 +5,7 @@
 <![endif]-->
 
 <script type="text/javascript" data-type="client">
-	Object.extend(KISSCMS, <?=json_encode_escaped( $GLOBALS['client'] )?>);
-	require.config( KISSCMS.require );
+	Object.extend(KISSCMS, {"require":{"callback": function(){ if(typeof init != "undefined") init(); } }});
 </script>
 
 <script id="require-main" type="text/javascript" data-main="<?=url("/client")?>" src="<?=url("/js/libs/require.js")?>"  defer="defer"></script>