#88 restoring init() js, if available

makesites · Jun 27, 2013 · 33d12af · 33d12af
1 parent 1ba32e8
commit 33d12af
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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>