From 2a760de2896a02af98caa013537166b5d3fcc717 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Wed, 14 Mar 2012 21:44:41 +1100 Subject: Multiple changes. Added $config['minify_js'] to compress Javascript with minify Added $config['additional_javascript_compile'] to put all Javascript files/addons into one file. Moved delete/report post controls to a shared template. Ability to have different Javascript files between boards. --- inc/functions.php | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'inc/functions.php') diff --git a/inc/functions.php b/inc/functions.php index 12b51d25..a2861edc 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -100,7 +100,9 @@ if(!isset($config['url_stylesheet'])) $config['url_stylesheet'] = $config['uri_stylesheets'] . 'style.css'; if(!isset($config['url_javascript'])) - $config['url_javascript'] = $config['root'] . 'main.js'; + $config['url_javascript'] = $config['root'] . $config['file_script']; + if(!isset($config['additional_javascript_url'])) + $config['additional_javascript_url'] = $config['root']; if($config['root_file']) { chdir($config['root_file']); @@ -1266,10 +1268,22 @@ 'uri' => addslashes((!empty($uri) ? $config['uri_stylesheets'] : '') . $uri)); } - file_write($config['file_script'], Element('main.js', Array( + $script = Element('main.js', Array( 'config' => $config, 'stylesheets' => $stylesheets - ))); + )); + if($config['additional_javascript_compile']) { + foreach($config['additional_javascript'] as $file) { + $script .= file_get_contents($file); + } + } + + if($config['minify_js']) { + require_once 'inc/contrib/minify/JSMin.php'; + $script = JSMin::minify($script); + } + + file_write($config['file_script'], $script); } function checkDNSBL() { -- cgit v1.3