summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
Diffstat (limited to 'framework')
-rw-r--r--framework/3rdParty/adodb/adodb-time.inc.php3
-rw-r--r--framework/Util/TDateTimeStamp.php4
-rw-r--r--framework/Web/UI/ActiveControls/TBaseActiveControl.php18
-rw-r--r--framework/Web/UI/ActiveControls/TCallbackClientScript.php11
4 files changed, 33 insertions, 3 deletions
diff --git a/framework/3rdParty/adodb/adodb-time.inc.php b/framework/3rdParty/adodb/adodb-time.inc.php
index 51f69f76..195998c2 100644
--- a/framework/3rdParty/adodb/adodb-time.inc.php
+++ b/framework/3rdParty/adodb/adodb-time.inc.php
@@ -383,7 +383,8 @@ define('ADODB_DATE_VERSION',0.24);
http://lists.debian.org/debian-glibc/2002/debian-glibc-200205/msg00010.html
*/
-if (!defined('ADODB_ALLOW_NEGATIVE_TS')) define('ADODB_NO_NEGATIVE_TS',1);
+if (!defined('ADODB_ALLOW_NEGATIVE_TS')
+ && !defined('ADODB_NO_NEGATIVE_TS')) define('ADODB_NO_NEGATIVE_TS',1);
function adodb_date_test_date($y1,$m,$d=13)
{
diff --git a/framework/Util/TDateTimeStamp.php b/framework/Util/TDateTimeStamp.php
index 6a5bd9e6..d7093ec3 100644
--- a/framework/Util/TDateTimeStamp.php
+++ b/framework/Util/TDateTimeStamp.php
@@ -28,8 +28,8 @@
http://lists.debian.org/debian-glibc/2002/debian-glibc-200205/msg00010.html
*/
-if (!defined('ADODB_ALLOW_NEGATIVE_TS')) define('ADODB_NO_NEGATIVE_TS',1);
-
+if (!defined('ADODB_ALLOW_NEGATIVE_TS')
+ && !defined('ADODB_NO_NEGATIVE_TS')) define('ADODB_NO_NEGATIVE_TS',1);
/**
* TDateTimeStamp Class
*
diff --git a/framework/Web/UI/ActiveControls/TBaseActiveControl.php b/framework/Web/UI/ActiveControls/TBaseActiveControl.php
index ed2e50db..0c54521d 100644
--- a/framework/Web/UI/ActiveControls/TBaseActiveControl.php
+++ b/framework/Web/UI/ActiveControls/TBaseActiveControl.php
@@ -302,6 +302,23 @@ class TBaseActiveCallbackControl extends TBaseActiveControl
}
/**
+ * @param mixed callback parameter value.
+ */
+ public function setCallbackParameter($value)
+ {
+ $this->setOption('CallbackParameter', $value, '');
+ }
+
+ /**
+ * @return mixed callback parameter value.
+ */
+ public function getCallbackParameter()
+ {
+ return $this->getOption('CallbackParameter', '');
+ }
+
+
+ /**
* @return array list of callback javascript options.
*/
protected function getClientSideOptions()
@@ -311,6 +328,7 @@ class TBaseActiveCallbackControl extends TBaseActiveControl
$validate = $this->getCausesValidation();
$options['CausesValidation']= $validate ? '' : false;
$options['ValidationGroup']=$this->getValidationGroup();
+ $options['params'] = $this->getCallbackParameter();
return $options;
}
diff --git a/framework/Web/UI/ActiveControls/TCallbackClientScript.php b/framework/Web/UI/ActiveControls/TCallbackClientScript.php
index bdbe6b1c..498aa681 100644
--- a/framework/Web/UI/ActiveControls/TCallbackClientScript.php
+++ b/framework/Web/UI/ActiveControls/TCallbackClientScript.php
@@ -146,6 +146,17 @@ class TCallbackClientScript extends TApplicationComponent
}
/**
+ * Raise the client side event (given by $eventName) on a particular element.
+ * @param TControl|string control element or element id
+ * @param string Event name, e.g. "click"
+ */
+ public function raiseClientEvent($control, $eventName)
+ {
+ $this->callClientFunction('Event.fireEvent',
+ array($control, strtolower($eventName)));
+ }
+
+ /**
* Sets the attribute of a particular control.
* @param TControl|string control element or element id
* @param string attribute name