From 8b34b4117b43d1e9287c93f031923236cc3deb7f Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Sat, 19 Oct 2013 19:16:51 +0200 Subject: Started work on ajax --- .../source/prado/activecontrols/activecontrols3.js | 63 +- .../source/prado/activecontrols/ajax3.js | 1751 ++++++++++---------- .../source/prado/activecontrols/json2.js | 479 ------ .../Javascripts/source/prado/controls/controls.js | 2 +- framework/Web/Javascripts/source/prado/prado.js | 205 ++- 5 files changed, 1017 insertions(+), 1483 deletions(-) delete mode 100644 framework/Web/Javascripts/source/prado/activecontrols/json2.js (limited to 'framework/Web/Javascripts/source') diff --git a/framework/Web/Javascripts/source/prado/activecontrols/activecontrols3.js b/framework/Web/Javascripts/source/prado/activecontrols/activecontrols3.js index 1b94ef7c..a586c4d9 100644 --- a/framework/Web/Javascripts/source/prado/activecontrols/activecontrols3.js +++ b/framework/Web/Javascripts/source/prado/activecontrols/activecontrols3.js @@ -1,63 +1,63 @@ /** * Generic postback control. */ -Prado.WebUI.CallbackControl = Class.extend(Prado.WebUI.PostBackControl, +Prado.WebUI.CallbackControl = jQuery.klass(Prado.WebUI.PostBackControl, { - onPostBack : function(event, options) + onPostBack : function(options, event) { var request = new Prado.CallbackRequest(options.EventTarget, options); request.dispatch(); - Event.stop(event); + event.preventDefault(); } }); /** * TActiveButton control. */ -Prado.WebUI.TActiveButton = Class.extend(Prado.WebUI.CallbackControl); +Prado.WebUI.TActiveButton = jQuery.klass(Prado.WebUI.CallbackControl); /** * TActiveLinkButton control. */ -Prado.WebUI.TActiveLinkButton = Class.extend(Prado.WebUI.CallbackControl); +Prado.WebUI.TActiveLinkButton = jQuery.klass(Prado.WebUI.CallbackControl); -Prado.WebUI.TActiveImageButton = Class.extend(Prado.WebUI.TImageButton, +Prado.WebUI.TActiveImageButton = jQuery.klass(Prado.WebUI.TImageButton, { - onPostBack : function(event, options) + onPostBack : function(options, event) { this.addXYInput(event,options); var request = new Prado.CallbackRequest(options.EventTarget, options); request.dispatch(); - Event.stop(event); + event.stopPropagation(); this.removeXYInput(event,options); } }); /** * Active check box. */ -Prado.WebUI.TActiveCheckBox = Class.extend(Prado.WebUI.CallbackControl, +Prado.WebUI.TActiveCheckBox = jQuery.klass(Prado.WebUI.CallbackControl, { - onPostBack : function(event, options) + onPostBack : function(options, event) { var request = new Prado.CallbackRequest(options.EventTarget, options); if(request.dispatch()==false) - Event.stop(event); + event.stopPropagation(); } }); /** * TActiveRadioButton control. */ -Prado.WebUI.TActiveRadioButton = Class.extend(Prado.WebUI.TActiveCheckBox); +Prado.WebUI.TActiveRadioButton = jQuery.klass(Prado.WebUI.TActiveCheckBox); -Prado.WebUI.TActiveCheckBoxList = Base.extend( +Prado.WebUI.TActiveCheckBoxList = jQuery.extend( { constructor : function(options) { - Prado.Registry.set(options.ListID, this); + Prado.Registry[options.ListID] = this; for(var i = 0; i