summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorFabio Bas <ctrlaltca@gmail.com>2014-02-12 00:26:16 +0100
committerFabio Bas <ctrlaltca@gmail.com>2014-02-12 00:26:16 +0100
commitb3c782faadcbd47a723b5cd0b08559e5964f37cf (patch)
tree2c9c99230878460f7bb02d24801e39cc29019a3f /framework
parent031d20c405b922808f4bdf2997f964880b33ab66 (diff)
Fixed TAutoComplete
Diffstat (limited to 'framework')
-rw-r--r--framework/Web/Javascripts/source/prado/activecontrols/autocomplete.js9
1 files changed, 4 insertions, 5 deletions
diff --git a/framework/Web/Javascripts/source/prado/activecontrols/autocomplete.js b/framework/Web/Javascripts/source/prado/activecontrols/autocomplete.js
index 180ceecf..da5f4b56 100644
--- a/framework/Web/Javascripts/source/prado/activecontrols/autocomplete.js
+++ b/framework/Web/Javascripts/source/prado/activecontrols/autocomplete.js
@@ -3,8 +3,7 @@ jQuery.noConflict();
/**
* TAutoComplete control.
*/
-Prado.WebUI.TAutoComplete = Class.create(Autocompleter.Base, Prado.WebUI.TActiveTextBox.prototype);
-Prado.WebUI.TAutoComplete = Class.create(Prado.WebUI.TAutoComplete,
+Prado.WebUI.TAutoComplete = jQuery.klass(Autocompleter.Base, Prado.WebUI.TActiveTextBox.prototype,
{
initialize : function(options)
{
@@ -23,13 +22,13 @@ Prado.WebUI.TAutoComplete = Class.create(Prado.WebUI.TAutoComplete,
Prado.Registry[options.ID] = this;
},
- doCallback : function(event, options)
+ doCallback : function(options, event)
{
if(!this.active)
{
var request = new Prado.CallbackRequest(this.options.EventTarget, options);
request.dispatch();
- Event.stop(event);
+ event.preventDefault();
}
},
@@ -40,7 +39,7 @@ Prado.WebUI.TAutoComplete = Class.create(Prado.WebUI.TAutoComplete,
this.index = element.autocompleteIndex;
this.selectEntry();
this.hide();
- Event.fire(this.element, "change");
+ jQuery(this.element).trigger('change');
},
getUpdatedChoices : function()