From b38fb205f63f020d17ffa62600a6b0c18d4b2406 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 8 May 2009 19:27:39 +0000
Subject: [PATCH] Fix: Ajax popup now works on IE.

---
 htdocs/html.form.class.php |  4 +++-
 htdocs/main.inc.php        | 19 ++++++++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php
index 21b30256033..102c81840f0 100644
--- a/htdocs/html.form.class.php
+++ b/htdocs/html.form.class.php
@@ -1607,7 +1607,9 @@ class Form
 			$pageyes=$page.'&action='.$action.'&confirm=yes';
 			$pageno=($useajax == 2?$page.'&confirm=no':'');
 			// Note: Title is not used by dialogConfirm function
-			print '<script type="text/javascript">dialogConfirm(\''.$title.'\',\''.$pageyes.'\',\''.$pageno.'\',\''.dol_escape_js('<b>'.$title.'</b><br>'.$more.$question).'\',\''.$langs->trans("Yes").'\',\''.$langs->trans("No").'\',\'validate\')</script>';
+			print '<script type="text/javascript">window.onload = function(){ dialogConfirm(\''.$title.'\',\''.$pageyes.'\',\''.$pageno.'\',\''.dol_escape_js('<b>'.$title.'</b><br>'.$more.$question).'\',\''.$langs->trans("Yes").'\',\''.$langs->trans("No").'\',\'validate\'); }</script>';
+//			print '<script id="eee" type="text/javascript">dialogConfirm(\'aaa\',\'bbb\',\'ccc\',\'eee\',\'yyy\',\'zzz\',\'validate\')</script>';
+
 			print "\n";
 			$ret='ajax';
 		}
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 8d344dbff10..77cdf6af198 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -737,18 +737,27 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
 			require_once DOL_DOCUMENT_ROOT.'/lib/ajax.lib.php';
 
 			// This one is required for all Ajax features
-			if (! defined('DISABLE_PROTOTYPE')) print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/scriptaculous/lib/prototype.js"></script>'."\n";
+			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.js"></script>'."\n";
+			}
 			// This one is required fox boxes
-			if (! defined('DISABLE_SCRIPTACULOUS')) print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/scriptaculous/src/scriptaculous.js"></script>'."\n";
+			if (! defined('DISABLE_SCRIPTACULOUS'))
+			{
+				print '<!-- Includes for Scriptaculous (Used by Drag and drop and PWC) -->'."\n";
+				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/scriptaculous/src/scriptaculous.js"></script>'."\n";
+			}
 
 			// Those ones are required only with option "confirm by ajax popup"
-			if ($conf->global->MAIN_CONFIRM_AJAX)
+			if (! defined('DISABLE_PWC') && $conf->global->MAIN_CONFIRM_AJAX)
 			{
+				print '<!-- Includes for PWC (Used for confirm popup) -->'."\n";
 				// PWC css
 				print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/alert.css">'."\n";
 				// Scriptaculous used by PWC
-				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/scriptaculous/src/effects.js"></script>'."\n";
-				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/scriptaculous/src/controls.js"></script>'."\n";
+//				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/scriptaculous/src/effects.js"></script>'."\n";
+//				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/scriptaculous/src/controls.js"></script>'."\n";
 				// PWC js
 				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/pwc/window.js"></script>'."\n";
 			}