diff options
| author | Joakim Reinert <mail@jreinert.com> | 2015-05-01 22:28:54 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2015-05-05 12:21:27 +0200 |
| commit | da835670f796774d1f98c05dfdf7da1c7ba2655a (patch) | |
| tree | 22922112e521779d76c7f2b2c418cee64a729e17 /application | |
| parent | f7da6a0ee8c3b79deb8995e592a130a4a409dc70 (diff) | |
Use global appConfig js variable instead of passing it down
Initialize it in header
Diffstat (limited to 'application')
| -rw-r--r-- | application/views/file/html_header.php | 7 | ||||
| -rw-r--r-- | application/views/header.php | 5 |
2 files changed, 6 insertions, 6 deletions
diff --git a/application/views/file/html_header.php b/application/views/file/html_header.php index 520e2482a..a5a6da99f 100644 --- a/application/views/file/html_header.php +++ b/application/views/file/html_header.php @@ -3,14 +3,11 @@ $force_full_html = true; include(FCPATH."application/views/header.php"); ?> </div><!-- .container --> - <script type="text/javascript"> /* <![CDATA[ */ - window.appConfig = { - lexers: <?php echo json_encode($lexers); ?> - } + window.appConfig.lexers = <?php echo json_encode($lexers); ?>; /* ]]> */ -</script> +<script> <?php if (isset($error_message)) { include 'framgents/alert-wide.php'; diff --git a/application/views/header.php b/application/views/header.php index 27fdbb92f..89a3c8617 100644 --- a/application/views/header.php +++ b/application/views/header.php @@ -26,8 +26,11 @@ if (is_cli_client() && !isset($force_full_html)) { echo '<link href="'.link_with_mtime("/data/local/favicon.png").'" rel="shortcut icon">'; } ?> - <script> + <script type="text/javascript"> + /* <![CDATA[ */ var require = { baseUrl: '/data/js' }; + window.appConfig = {}; + /* ]]> */ </script> <script data-main="main" src="/data/js/vendor/require.js"></script> </head> |