From e5475f0b28e80a6eea05cf21f0eb38e64d460d81 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 9 Aug 2009 11:37:32 +0000
Subject: [PATCH] Add hidden option MAIN_US_MINI_JS to use minified version of
 large javascript

---
 htdocs/main.inc.php | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index ddb74fca567..de47fe96ccf 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -748,22 +748,22 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
 		if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="copyright" title="GNU General Public License" href="http://www.gnu.org/copyleft/gpl.html#SEC1">'."\n";
 		if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="author" title="Dolibarr Development Team" href="http://www.dolibarr.org">'."\n";
 
-		// Output javascript links
+		// Output standard javascript links
 		if (! $disablejs && $conf->use_javascript_ajax)
 		{
 			print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/lib/lib_head.js"></script>'."\n";
-		}
-		if (! $disablejs && $conf->use_javascript_ajax)
-		{
+
+			// Other external js
 			require_once DOL_DOCUMENT_ROOT.'/lib/ajax.lib.php';
-			$mini='';
-			if (! empty($conf->global->MAIN_US_MINI_JS)) $mini='_mini';
+
+			$mini='';$ext='';
+			if (! empty($conf->global->MAIN_OPTIMIZE_SPEED)) { $mini='_mini'; $ext=''; }	// mini='_mini', ext='.gz'
 
 			// This one is required for all Ajax features
 			if (! defined('DISABLE_PROTOTYPE'))
 			{
 				print '<!-- Includes for Prototype (Used by Scriptaculous and PWC) -->'."\n";
-				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/scriptaculous/lib/prototype'.$mini.'.js"></script>'."\n";
+				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/scriptaculous/lib/prototype'.$mini.'.js'.$ext.'"></script>'."\n";
 			}
 			// This one is required for boxes
 			if (! defined('DISABLE_SCRIPTACULOUS'))
@@ -779,9 +779,11 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
 			{
 				print '<!-- Includes for PWC (Used for confirm popup) -->'."\n";
 				// PWC js
-				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/pwc/window'.$mini.'.js"></script>'."\n";
+				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/pwc/window'.$mini.'.js'.$ext.'"></script>'."\n";
 			}
 		}
+
+		// Output module javascript
 		if (is_array($arrayofjs))
 		{
 			foreach($arrayofjs as $jsfile)