diff options
Diffstat (limited to 'framework/Web')
-rw-r--r-- | framework/Web/Javascripts/packages.php | 7 | ||||
-rw-r--r-- | framework/Web/Javascripts/source/prado/activecontrols/ajax3.js | 45 | ||||
-rw-r--r-- | framework/Web/Javascripts/source/prado/prado.js | 2 |
3 files changed, 25 insertions, 29 deletions
diff --git a/framework/Web/Javascripts/packages.php b/framework/Web/Javascripts/packages.php index bc3bae1e..b7b424f2 100644 --- a/framework/Web/Javascripts/packages.php +++ b/framework/Web/Javascripts/packages.php @@ -12,16 +12,13 @@ $packages = array( 'prototype' => array( PROTOTYPE_DIR.'/prototype.js', SCRIPTACULOUS_DIR.'/builder.js', + SCRIPTACULOUS_DIR.'/effects.js' ), 'prado' => array( 'prado/prado.js', 'prado/controls/controls.js' ), - 'effects' => array( - SCRIPTACULOUS_DIR.'/effects.js' - ), - 'logger' => array( 'prado/logger/logger.js', ), @@ -106,7 +103,7 @@ $packages = array( //package names and their dependencies $dependencies = array( - //'prototype' => array('prototype'), + 'prototype' => array('prototype'), 'jquery' => array('jquery'), 'prado' => array('jquery', 'prado'), 'validator' => array('jquery', 'prado', 'validator'), diff --git a/framework/Web/Javascripts/source/prado/activecontrols/ajax3.js b/framework/Web/Javascripts/source/prado/activecontrols/ajax3.js index e4f4a7fd..8839c1ae 100644 --- a/framework/Web/Javascripts/source/prado/activecontrols/ajax3.js +++ b/framework/Web/Javascripts/source/prado/activecontrols/ajax3.js @@ -75,7 +75,7 @@ Prado.CallbackRequest = jQuery.klass(Prado.PostBack, options : {}, data : '', - initialize: function(target, options) + initialize: function(id, options) { this.options = { RequestTimeOut : 30000, // 30 second timeout. @@ -811,30 +811,29 @@ jQuery(function() // } // }); -// /** -// * Create a new callback request using default settings. -// * @param string callback handler unique ID. -// * @param mixed parameter to pass to callback handler on the server side. -// * @param function client side onSuccess event handler. -// * @param object additional request options. -// * @return boolean always false. -// */ -// Prado.Callback = function(UniqueID, parameter, onSuccess, options) -// { -// var callback = -// { -// 'CallbackParameter' : parameter || '', -// 'onSuccess' : onSuccess || Prototype.emptyFunction -// }; - -// Object.extend(callback, options || {}); - -// var request = new Prado.CallbackRequest(UniqueID, callback); -// request.dispatch(); -// return false; -// }; +/** + * Create a new callback request using default settings. + * @param string callback handler unique ID. + * @param mixed parameter to pass to callback handler on the server side. + * @param function client side onSuccess event handler. + * @param object additional request options. + * @return boolean always false. + */ +Prado.Callback = function(UniqueID, parameter, onSuccess, options) +{ + var callback = + { + 'EventTarget' : UniqueID || '', + 'CallbackParameter' : parameter || '', + 'onSuccess' : onSuccess || jQuery.noop() + }; + jQuery.extend(callback, options || {}); + var request = new Prado.CallbackRequest(UniqueID, callback); + request.dispatch(); + return false; +}; /** * Asset manager classes for lazy loading of scripts and stylesheets diff --git a/framework/Web/Javascripts/source/prado/prado.js b/framework/Web/Javascripts/source/prado/prado.js index 25550bca..96f439b3 100644 --- a/framework/Web/Javascripts/source/prado/prado.js +++ b/framework/Web/Javascripts/source/prado/prado.js @@ -388,7 +388,7 @@ Prado.Element = try { eval("(func = function(event){"+value+"})"); - el[attribute] = func; + el.get(0)[attribute] = func; } catch(e) { |