From 9f071282b3e2c3f5de86964e86d30eb97f22c7ab Mon Sep 17 00:00:00 2001
From: joost <joost@cnoc.nl>
Date: Mon, 5 Jul 2010 13:59:20 +0000
Subject: [PATCH]  * Added ALoaded parameter to MessageBox

git-svn-id: trunk@15528 -
---
 packages/fcl-web/src/base/fphtml.pp  | 20 +++++++++++---------
 packages/fcl-web/src/base/webpage.pp |  4 ++--
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/packages/fcl-web/src/base/fphtml.pp b/packages/fcl-web/src/base/fphtml.pp
index 855bc889a9..008a7a58b9 100644
--- a/packages/fcl-web/src/base/fphtml.pp
+++ b/packages/fcl-web/src/base/fphtml.pp
@@ -38,7 +38,7 @@ type
   end;
   TWebButtons = array of TWebButton;
 
-  TMessageBoxHandler = function(Sender: TObject; AText: String; Buttons: TWebButtons): string of object;
+  TMessageBoxHandler = function(Sender: TObject; AText: String; Buttons: TWebButtons; Loaded: string = ''): string of object;
   TWebController = class;
   THTMLContentProducer = class;
 
@@ -53,7 +53,7 @@ type
     constructor Create(const AWebController: TWebController); virtual;
     destructor Destroy; override;
     procedure AddScriptLine(ALine: String); virtual;
-    procedure MessageBox(AText: String; Buttons: TWebButtons); virtual;
+    procedure MessageBox(AText: String; Buttons: TWebButtons; Loaded: string = ''); virtual;
     procedure RedrawContentProducer(AContentProducer: THTMLContentProducer); virtual;
     procedure CallServerEvent(AHTMLContentProducer: THTMLContentProducer; AEvent: Integer; APostVariable: string = ''); virtual;
     procedure Clear; virtual;
@@ -92,8 +92,8 @@ type
     procedure CleanupAfterRequest; virtual;
     procedure BeforeGenerateHead; virtual;
     procedure BindJavascriptCallstackToElement(AComponent: TComponent; AnElement: THtmlCustomElement; AnEvent: string); virtual; abstract;
-    function MessageBox(AText: String; Buttons: TWebButtons): string; virtual;
-    function DefaultMessageBoxHandler(Sender: TObject; AText: String; Buttons: TWebButtons): string; virtual; abstract;
+    function MessageBox(AText: String; Buttons: TWebButtons; ALoaded: string = ''): string; virtual;
+    function DefaultMessageBoxHandler(Sender: TObject; AText: String; Buttons: TWebButtons;  ALoaded: string = ''): string; virtual; abstract;
     function CreateNewScript: TStringList; virtual; abstract;
     procedure FreeScript(var AScript: TStringList); virtual; abstract;
     property ScriptFileReferences: TStringList read GetScriptFileReferences;
@@ -433,6 +433,8 @@ const SimpleOkButton: array[0..0] of TWebButton = ((buttontype: btok;caption: 'O
 
 const jseButtonClick = 1000;
       jseInputChange = 1001;
+      jseFormReset   = 1002;
+      jseFormSubmit  = 1003;
 
 implementation
 Uses
@@ -469,9 +471,9 @@ begin
   FScript.Add(ALine);
 end;
 
-procedure TJavaScriptStack.MessageBox(AText: String; Buttons: TWebButtons);
+procedure TJavaScriptStack.MessageBox(AText: String; Buttons: TWebButtons; Loaded: string = '');
 begin
-  AddScriptLine(WebController.MessageBox(AText,Buttons));
+  AddScriptLine(WebController.MessageBox(AText,Buttons,Loaded));
 end;
 
 procedure TJavaScriptStack.RedrawContentProducer(AContentProducer: THTMLContentProducer);
@@ -1231,12 +1233,12 @@ begin
   // do nothing
 end;
 
-function TWebController.MessageBox(AText: String; Buttons: TWebButtons): string;
+function TWebController.MessageBox(AText: String; Buttons: TWebButtons; ALoaded: string = ''): string;
 begin
   if assigned(MessageBoxHandler) then
-    result := MessageBoxHandler(self,AText,Buttons)
+    result := MessageBoxHandler(self,AText,Buttons,ALoaded)
   else
-    result := DefaultMessageBoxHandler(self,AText,Buttons);
+    result := DefaultMessageBoxHandler(self,AText,Buttons,ALoaded);
 end;
 
 function TWebController.GetRequest: TRequest;
diff --git a/packages/fcl-web/src/base/webpage.pp b/packages/fcl-web/src/base/webpage.pp
index fb3ac2239a..3323cd89a0 100644
--- a/packages/fcl-web/src/base/webpage.pp
+++ b/packages/fcl-web/src/base/webpage.pp
@@ -34,7 +34,7 @@ type
     function GetUrl(ParamNames, ParamValues, KeepParams: array of string; Action: string = ''): string; override;
     procedure BindJavascriptCallstackToElement(AComponent: TComponent; AnElement: THtmlCustomElement; AnEvent: string); override;
     procedure AddScriptFileReference(AScriptFile: String); override;
-    function DefaultMessageBoxHandler(Sender: TObject; AText: String; Buttons: TWebButtons): string; override;
+    function DefaultMessageBoxHandler(Sender: TObject; AText: String; Buttons: TWebButtons; ALoaded: string = ''): string; override;
     function CreateNewScript: TStringList; override;
     procedure FreeScript(var AScript: TStringList); override;
   end;
@@ -345,7 +345,7 @@ begin
 end;
 
 function TStandardWebController.DefaultMessageBoxHandler(Sender: TObject;
-  AText: String; Buttons: TWebButtons): string;
+  AText: String; Buttons: TWebButtons; ALoaded: string = ''): string;
 var i : integer;
     HasCancel: boolean;
     OnOk: string;