From 3c24d31c69dffb6f65214b6d383d446ac122ff14 Mon Sep 17 00:00:00 2001 From: wei <> Date: Wed, 13 Dec 2006 10:07:37 +0000 Subject: Fixed #488. --- .gitattributes | 9 +++++ framework/Web/Javascripts/js/compressed/ajax.js | 5 +-- framework/Web/Javascripts/js/debug/ajax.js | 4 ++- framework/Web/Javascripts/prado/activecontrols3.js | 4 ++- .../protected/pages/CustomValidatorByPass.page | 37 +++++++++++++++++++ .../protected/pages/CustomValidatorByPass.php | 37 +++++++++++++++++++ .../active-controls/protected/pages/MyControl.php | 8 +++++ .../active-controls/protected/pages/MyControl.tpl | 9 +++++ .../protected/pages/MyTabPanelTest.page | 41 +++++++++++++++++++++ .../protected/pages/MyTabPanelTest.php | 42 ++++++++++++++++++++++ .../tickets/protected/pages/Ticket484.page | 10 ++++++ .../tickets/protected/pages/Ticket484.php | 30 ++++++++++++++++ .../tickets/tests/Ticket488TestCase.php | 37 +++++++++++++++++++ 13 files changed, 269 insertions(+), 4 deletions(-) create mode 100644 tests/FunctionalTests/active-controls/protected/pages/CustomValidatorByPass.page create mode 100644 tests/FunctionalTests/active-controls/protected/pages/CustomValidatorByPass.php create mode 100644 tests/FunctionalTests/active-controls/protected/pages/MyControl.php create mode 100644 tests/FunctionalTests/active-controls/protected/pages/MyControl.tpl create mode 100644 tests/FunctionalTests/active-controls/protected/pages/MyTabPanelTest.page create mode 100644 tests/FunctionalTests/active-controls/protected/pages/MyTabPanelTest.php create mode 100644 tests/FunctionalTests/tickets/protected/pages/Ticket484.page create mode 100644 tests/FunctionalTests/tickets/protected/pages/Ticket484.php create mode 100644 tests/FunctionalTests/tickets/tests/Ticket488TestCase.php diff --git a/.gitattributes b/.gitattributes index 546aeeb2..a4aa0858 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2116,6 +2116,8 @@ tests/FunctionalTests/active-controls/protected/pages/CustomTemplateComponent.ph tests/FunctionalTests/active-controls/protected/pages/CustomTemplateComponent.tpl -text tests/FunctionalTests/active-controls/protected/pages/CustomTemplateControlTest.page -text tests/FunctionalTests/active-controls/protected/pages/CustomTemplateControlTest.php -text +tests/FunctionalTests/active-controls/protected/pages/CustomValidatorByPass.page -text +tests/FunctionalTests/active-controls/protected/pages/CustomValidatorByPass.php -text tests/FunctionalTests/active-controls/protected/pages/DelayedCallback.page -text tests/FunctionalTests/active-controls/protected/pages/DelayedCallback.php -text tests/FunctionalTests/active-controls/protected/pages/EventTriggeredCallback.page -text @@ -2130,6 +2132,10 @@ tests/FunctionalTests/active-controls/protected/pages/LTemplate.tpl -text tests/FunctionalTests/active-controls/protected/pages/Master1.php -text tests/FunctionalTests/active-controls/protected/pages/Master1.tpl -text tests/FunctionalTests/active-controls/protected/pages/MasterTest1.page -text +tests/FunctionalTests/active-controls/protected/pages/MyControl.php -text +tests/FunctionalTests/active-controls/protected/pages/MyControl.tpl -text +tests/FunctionalTests/active-controls/protected/pages/MyTabPanelTest.page -text +tests/FunctionalTests/active-controls/protected/pages/MyTabPanelTest.php -text tests/FunctionalTests/active-controls/protected/pages/NullStateTest.page -text tests/FunctionalTests/active-controls/protected/pages/NullStateTest.php -text tests/FunctionalTests/active-controls/protected/pages/PopulateActiveList.page -text @@ -2294,6 +2300,8 @@ tests/FunctionalTests/tickets/protected/pages/Ticket470.page -text tests/FunctionalTests/tickets/protected/pages/Ticket470.php -text tests/FunctionalTests/tickets/protected/pages/Ticket477.page -text tests/FunctionalTests/tickets/protected/pages/Ticket477.php -text +tests/FunctionalTests/tickets/protected/pages/Ticket484.page -text +tests/FunctionalTests/tickets/protected/pages/Ticket484.php -text tests/FunctionalTests/tickets/protected/pages/Ticket54.page -text tests/FunctionalTests/tickets/protected/pages/Ticket54Master.php -text tests/FunctionalTests/tickets/protected/pages/Ticket54Master.tpl -text @@ -2321,6 +2329,7 @@ tests/FunctionalTests/tickets/tests/Ticket439TestCase.php -text tests/FunctionalTests/tickets/tests/Ticket463TestCase.php -text tests/FunctionalTests/tickets/tests/Ticket470TestCase.php -text tests/FunctionalTests/tickets/tests/Ticket477TestCase.php -text +tests/FunctionalTests/tickets/tests/Ticket488TestCase.php -text tests/FunctionalTests/tickets/tests/Ticket54TestCase.php -text tests/FunctionalTests/tickets/tests/Ticket72TestCase.php -text tests/FunctionalTests/tickets/tests/Ticket93TestCase.php -text diff --git a/framework/Web/Javascripts/js/compressed/ajax.js b/framework/Web/Javascripts/js/compressed/ajax.js index 3c23b1d9..e4756b94 100644 --- a/framework/Web/Javascripts/js/compressed/ajax.js +++ b/framework/Web/Javascripts/js/compressed/ajax.js @@ -225,8 +225,9 @@ this.editField=this.cached_selectTag;if(this.options.loadTextURL)this.loadExtern Event.stop(event);}});Prado.WebUI.TActiveRadioButton=Class.extend(Prado.WebUI.TActiveCheckBox);Prado.WebUI.TActiveCheckBoxList=Base.extend({constructor:function(options) {for(var i=0;i + +

Custom Login

+ + + + + + + \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/CustomValidatorByPass.php b/tests/FunctionalTests/active-controls/protected/pages/CustomValidatorByPass.php new file mode 100644 index 00000000..e88f10de --- /dev/null +++ b/tests/FunctionalTests/active-controls/protected/pages/CustomValidatorByPass.php @@ -0,0 +1,37 @@ +validator2->getActiveControl()->getClientSide(); + + $Client->setOnLoading('$(\'loginLoader\').show();'); + $Client->setOnComplete('$(\'loginLoader\').hide();'); + + //$Client->setOnValidationError('alert(\'Authentication Failed\');'); + $Client->setOnValidationSuccess('new Effect.Fade(\'loginBox\')'); + + } + + public function validateUser($sender,$param) + { + $param->IsValid = $this->Password->Text=='test'; + } + + public function doLogin($sender,$param) + { + + /* This isnt even getting called */ + if($this->Page->IsValid) + { + // Re-Render the active panel + } + + } +} + +?> \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/MyControl.php b/tests/FunctionalTests/active-controls/protected/pages/MyControl.php new file mode 100644 index 00000000..2c6b7f5b --- /dev/null +++ b/tests/FunctionalTests/active-controls/protected/pages/MyControl.php @@ -0,0 +1,8 @@ + \ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/MyControl.tpl b/tests/FunctionalTests/active-controls/protected/pages/MyControl.tpl new file mode 100644 index 00000000..5cc17772 --- /dev/null +++ b/tests/FunctionalTests/active-controls/protected/pages/MyControl.tpl @@ -0,0 +1,9 @@ +
+ +

+ + + This is just some text.
+ This is just some text.
+ +
diff --git a/tests/FunctionalTests/active-controls/protected/pages/MyTabPanelTest.page b/tests/FunctionalTests/active-controls/protected/pages/MyTabPanelTest.page new file mode 100644 index 00000000..7371086a --- /dev/null +++ b/tests/FunctionalTests/active-controls/protected/pages/MyTabPanelTest.page @@ -0,0 +1,41 @@ + + +

My Tab Panel Test

+ + +
    +
  • + + + +
    • +
  • + + + +
    • +
  • + + + +
    • +
+ + + This is the contents of panel A + + + + + This is the contents of panel B + + + + This is the contents of panel C + + + + + diff --git a/tests/FunctionalTests/active-controls/protected/pages/MyTabPanelTest.php b/tests/FunctionalTests/active-controls/protected/pages/MyTabPanelTest.php new file mode 100644 index 00000000..723af42d --- /dev/null +++ b/tests/FunctionalTests/active-controls/protected/pages/MyTabPanelTest.php @@ -0,0 +1,42 @@ +panels as $panel) + { + if($id == $panel) + { + $this->$panel->setAttribute('style', 'display: block;'); + $this->$panel->setVisible(true); + $this->$panel->render($param->NewWriter); + } + else + { + $this->$panel->setVisible(false); + } + } + } + + public function onShowPanelA($sender, $param) + { + $this->showPanel('pnlContentsA', $param); + } + + public function onShowPanelB($sender, $param) + { + $this->showPanel('pnlContentsB', $param); + } + + public function onShowPanelC($sender, $param) + { + $this->showPanel('pnlContentsC', $param); + } +} + + + +?> \ No newline at end of file diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket484.page b/tests/FunctionalTests/tickets/protected/pages/Ticket484.page new file mode 100644 index 00000000..0b1b2c5f --- /dev/null +++ b/tests/FunctionalTests/tickets/protected/pages/Ticket484.page @@ -0,0 +1,10 @@ + + +

TActiveButton Functional Test

+ + + + + + \ No newline at end of file diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket484.php b/tests/FunctionalTests/tickets/protected/pages/Ticket484.php new file mode 100644 index 00000000..813ccc23 --- /dev/null +++ b/tests/FunctionalTests/tickets/protected/pages/Ticket484.php @@ -0,0 +1,30 @@ +Text = "Label ".$i; + $this->Controls[] = $ctl; + } + } + + function button2_onclick($sender, $param) + { + $this->label1->Text = "Button 1 was clicked "; + } + + function button2_oncallback($sender, $param) + { + $this->label1->Text .= "using callback!"; + } +} + +?> \ No newline at end of file diff --git a/tests/FunctionalTests/tickets/tests/Ticket488TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket488TestCase.php new file mode 100644 index 00000000..c54b4170 --- /dev/null +++ b/tests/FunctionalTests/tickets/tests/Ticket488TestCase.php @@ -0,0 +1,37 @@ +open('active-controls/index.php?page=CustomValidatorByPass'); + $this->assertTextPresent('Custom Login'); + $this->assertNotVisible('loginBox'); + $this->click("showLogin"); + $this->assertVisible("loginBox"); + $this->assertNotVisible("validator1"); + $this->assertNotVisible("validator2"); + + $this->click("checkLogin"); + $this->pause(800); + $this->assertVisible("validator1"); + $this->assertVisible("validator2"); + + $this->type('Username', 'tea'); + $this->type('Password', 'mmama'); + + $this->click("checkLogin"); + $this->pause(800); + $this->assertNotVisible("validator1"); + $this->assertVisible("validator2"); + + $this->type('Password', 'test'); + $this->pause(800); + $this->assertNotVisible("validator1"); + $this->assertNotVisible("validator2"); + $this->assertNotVisible('loginBox'); + } + +} + +?> \ No newline at end of file -- cgit v1.2.3