summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitattributes1
-rw-r--r--framework/Web/Javascripts/source/prado/activecontrols/activecontrols3.js1
-rw-r--r--tests/FunctionalTests/active-controls/tests/ActiveDropDownListTestCase.php4
-rw-r--r--tests/FunctionalTests/selenium.css0
4 files changed, 3 insertions, 3 deletions
diff --git a/.gitattributes b/.gitattributes
index 15f87658..94651891 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3865,6 +3865,7 @@ tests/FunctionalTests/quickstart/Controls/Wizard3TestCase.php -text
tests/FunctionalTests/quickstart/Controls/Wizard4TestCase.php -text
tests/FunctionalTests/quickstart/Controls/Wizard5TestCase.php -text
tests/FunctionalTests/quickstart/Fundamentals/HangmanTestCase.php -text
+tests/FunctionalTests/selenium.css -text
tests/FunctionalTests/tickets.php -text
tests/FunctionalTests/tickets/index.php -text
tests/FunctionalTests/tickets/index700.php -text
diff --git a/framework/Web/Javascripts/source/prado/activecontrols/activecontrols3.js b/framework/Web/Javascripts/source/prado/activecontrols/activecontrols3.js
index 24c1f30d..7dbdbe2a 100644
--- a/framework/Web/Javascripts/source/prado/activecontrols/activecontrols3.js
+++ b/framework/Web/Javascripts/source/prado/activecontrols/activecontrols3.js
@@ -101,6 +101,7 @@ Prado.WebUI.TAutoComplete = Class.extend(Prado.WebUI.TAutoComplete,
initialize : function(options)
{
this.options = options;
+ this.observers = new Array();
this.hasResults = false;
this.baseInitialize(options.ID, options.ResultPanel, options);
Object.extend(this.options,
diff --git a/tests/FunctionalTests/active-controls/tests/ActiveDropDownListTestCase.php b/tests/FunctionalTests/active-controls/tests/ActiveDropDownListTestCase.php
index cb5d349c..9dd210df 100644
--- a/tests/FunctionalTests/active-controls/tests/ActiveDropDownListTestCase.php
+++ b/tests/FunctionalTests/active-controls/tests/ActiveDropDownListTestCase.php
@@ -21,9 +21,7 @@ class ActiveDropDownListTestCase extends SeleniumTestCase
$this->pause(800);
$this->assertSelected("list1", "item 2");
- // due to clearing selection and then updating the selection
- // otherwise it should not fire the changed event (fired by js because of change to options).
- $this->assertText("label1", "Label 1");
+ $this->assertText("label1", "Selection 1: value 1");
$this->select("list1", "item 1");
$this->pause(800);
diff --git a/tests/FunctionalTests/selenium.css b/tests/FunctionalTests/selenium.css
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/tests/FunctionalTests/selenium.css