From 5a47e8d5c472bfbe07abb464cdcc5bbc721f8d59 Mon Sep 17 00:00:00 2001
From: wei <>
Date: Sat, 26 Aug 2006 12:27:37 +0000
Subject: MINOR BC BREAK (javascript related). Update javascript effect library
 to 1.6.2, unify javascript event handler function signatures.

---
 .../features/protected/pages/ValidatorEffects.page | 44 +++++++++++-----------
 .../tickets/protected/pages/Ticket278.page         | 18 ++++-----
 .../tickets/tests/Ticket274TestCase.php            | 10 ++---
 3 files changed, 36 insertions(+), 36 deletions(-)

(limited to 'tests/FunctionalTests')

diff --git a/tests/FunctionalTests/features/protected/pages/ValidatorEffects.page b/tests/FunctionalTests/features/protected/pages/ValidatorEffects.page
index 7fca0f56..e01b542e 100644
--- a/tests/FunctionalTests/features/protected/pages/ValidatorEffects.page
+++ b/tests/FunctionalTests/features/protected/pages/ValidatorEffects.page
@@ -4,43 +4,43 @@
 <fieldset id="quickRegistration">
 	<legend>Create New Account</legend>
 
-<com:TClientScript UsingPradoScripts="effects,logger" />
+<com:TClientScript PradoScripts="effects,logger" />
 
 <div class="username">
-	Username: 
+	Username:
 	<com:TTextBox ID="Username" />
 	<com:TRequiredFieldValidator
 		ID="UsernameVal"
 		ControlToValidate="Username"
-		ValidationGroup="registration" 
+		ValidationGroup="registration"
 		ControlCssClass="required"
 		Display="Dynamic"
 		ErrorMessage="a username is required.">
 	<prop:ClientSide.OnError>
-		Effect.Shake(validator.control);
-		Effect.Appear(validator.message);
+		Effect.Shake(sender.control);
+		Effect.Appear(sender.message);
 	</prop:ClientSide.OnError>
 	<prop:ClientSide.OnSuccess>
-		Effect.Fade(validator.message);
+		Effect.Fade(sender.message);
 	</prop:ClientSide.OnSuccess>
-	</com:TRequiredFieldValidator>		
+	</com:TRequiredFieldValidator>
 </div>
 <div class="password">
 	Password
 	<com:TTextBox ID="Password" TextMode="Password" />
-	<!-- alternate synatx : see 
+	<!-- alternate synatx : see
 	http://encytemedia.com/blog/articles/2006/03/07/prototype-gets-some-serious-syntactic-sugar
 	-->
 <com:TRequiredFieldValidator
 	ID="PasswordVal"
 	ControlToValidate="Password"
-	ValidationGroup="registration" 
+	ValidationGroup="registration"
 	ControlCssClass="required"
 	Display="Dynamic"
-	ClientSide.OnError="validator.message.visualEffect('appear')"
-	ClientSide.OnSuccess="validator.message.visualEffect('fade')"
-	ErrorMessage="a password is required." />	
-</div>	
+	ClientSide.OnError="sender.message.visualEffect('appear')"
+	ClientSide.OnSuccess="sender.message.visualEffect('fade')"
+	ErrorMessage="a password is required." />
+</div>
 <div class="create">
 	<com:TButton ID="Create" ValidationGroup="registration" Text="Create New Account"/>
 </div>
@@ -54,7 +54,7 @@
 <div class="username">
 	Login Name:
 	<com:TTextBox ID="UserID" />
-		
+
 	<com:TRequiredFieldValidator
 		ID="UserVal1"
 		ControlToValidate="UserID"
@@ -78,26 +78,26 @@
 <com:TButton ID="login" ValidationGroup="signin" CssClass="button" Text="Sign In" />
 
 <div class="validation">
-	<com:TValidationSummary 
+	<com:TValidationSummary
 		ID="summary2"
 		ValidationGroup="signin"
 		Display="Dynamic"
-		ClientSide.OnHideSummary="Effect.Squish(summary.messages)"
+		ClientSide.OnHideSummary="Effect.Squish(sender.messages)"
 		HeaderText="<p>You could not login because</p>">
 	<prop:ClientSide.OnShowSummary>
-		Effect.Appear(summary.messages)
-		Effect.Shake(summary.messages,{ queue: 'end'})
-	</prop:ClientSide.OnShowSummary>	
+		Effect.Appear(sender.messages)
+		Effect.Shake(sender.messages,{ queue: 'end'})
+	</prop:ClientSide.OnShowSummary>
 	</com:TValidationSummary>
 </div>
 
 </fieldset>
 
-<com:TLinkButton ID="linkButton1" 
-	Text="Click Me" 
+<com:TLinkButton ID="linkButton1"
+	Text="Click Me"
 	OnClick="linkButton1_Clicked">
 	<prop:Attributes.onclick>
-	if(!confirm('<%= Prado::localize("Confirm Delete") %>')) 
+	if(!confirm('<%= Prado::localize("Confirm Delete") %>'))
 		return false;
 	</prop:Attributes.onclick>
 </com:TLinkButton>
diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket278.page b/tests/FunctionalTests/tickets/protected/pages/Ticket278.page
index 75aed4d9..e7341bcc 100644
--- a/tests/FunctionalTests/tickets/protected/pages/Ticket278.page
+++ b/tests/FunctionalTests/tickets/protected/pages/Ticket278.page
@@ -4,16 +4,16 @@
 	<com:TTextBox ID="text1" />
 	<com:TRequiredFieldValidator
 		ID="validator1"
-		ControlToValidate="text1" 
+		ControlToValidate="text1"
 		ErrorMessage="Text 1 is required" />
 	<div>
 	<com:TCheckBox ID="check1" Text="More..." />
 	</div>
-	
-	<com:TPanel ID="panel1" Style="display:none" > 
+
+	<com:TPanel ID="panel1" Style="display:none" >
 		<com:TLabel ForControl="text2" Text="Text 2:" />
 		<com:TTextBox ID="text2" />
-		
+
 	<com:TRequiredFieldValidator
 		ID="validator2"
 		ControlToValidate="text2"
@@ -21,14 +21,14 @@
 		OnPreRender="validate2_onPostValidate"
 		ErrorMessage="Text 2 is required">
 	<prop:ClientSide.OnValidate>
-		validator.enabled = $("<%= $this->check1->ClientID %>").checked;
+		sender.enabled = $("<%= $this->check1->ClientID %>").checked;
 	</prop:ClientSide.OnValidate>
-	</com:TRequiredFieldValidator>	
-	
+	</com:TRequiredFieldValidator>
+
 	</com:TPanel>
-	
+
 	<com:TButton ID="button1" Text="Submit!" />
-	
+
 	<com:TClientScript>
 	Event.OnLoad(function()
 	{
diff --git a/tests/FunctionalTests/tickets/tests/Ticket274TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket274TestCase.php
index ae976a7f..6a5ae0ff 100644
--- a/tests/FunctionalTests/tickets/tests/Ticket274TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket274TestCase.php
@@ -9,15 +9,15 @@ class Ticket274TestCase extends SeleniumTestCase
 		$this->assertTitle('Verifying Ticket 274');
 		$this->assertNotVisible($base.'validator1');
 		$this->assertNotVisible($base.'validator2');
-		
-		$this->click($base.'button1');		
+
+		$this->clickAndWait($base.'button1');
 		$this->assertVisible($base.'validator1');
 		$this->assertNotVisible($base.'validator2');
-		
+
 		$this->type($base.'MyDate', 'asd');
-		$this->click($base.'button1');
+		$this->clickAndWait($base.'button1');
 		$this->assertVisible($base.'validator1');
-		$this->assertNotVisible($base.'validator2');		
+		$this->assertNotVisible($base.'validator2');
 	}
 }
 
-- 
cgit v1.2.3