summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/prado/HISTORY8
-rw-r--r--lib/prado/README.md12
-rw-r--r--lib/prado/framework/I18N/TGlobalization.php8
-rw-r--r--lib/prado/framework/PradoBase.php2
-rw-r--r--lib/prado/framework/Web/Javascripts/source/prado/controls/controls.js2
-rw-r--r--lib/prado/framework/Web/Javascripts/source/prado/prado.js2
-rwxr-xr-xlib/prado/framework/Web/UI/ActiveControls/TActiveFileUpload.php2
-rw-r--r--lib/prado/framework/Web/UI/JuiControls/TJuiControlAdapter.php1
-rw-r--r--lib/prado/framework/Web/UI/JuiControls/TJuiDialog.php5
-rw-r--r--lib/prado/framework/Web/UI/TControl.php5
-rw-r--r--lib/prado/framework/pradolite.php17
11 files changed, 35 insertions, 29 deletions
diff --git a/lib/prado/HISTORY b/lib/prado/HISTORY
index 58a6054..2a17246 100644
--- a/lib/prado/HISTORY
+++ b/lib/prado/HISTORY
@@ -1,8 +1,12 @@
-Version 3.3.2 xxx, 2016
+Version 3.3.2 August 23, 2016
-BUG: Issue #592 - Fix TActiveMultiView brokwn on 3.3.1 (ctrlaltca)
+BUG: Issue #592 - Fix TActiveMultiView broken on 3.3.1 (ctrlaltca)
BUG: Issue #588 - Fix reading values of controls inside TJuiDialog (ctrlaltca)
BUG: Issue #597 - TDatePicker::getDateFromPostData selected month issue (Sachat)
+BUG: Issue #599 - Allowing translation message cache to be initialized (emkael)
+BUG: Issue #604 - TActiveImageButton inside TJuiDialog javascript problem (ctrlaltca)
+BUG: Issue #607 - TActiveFileUpload does not work inside TJuiDialog (ctrlaltca)
+BUG: Issue #608 - Fix retrieving value from viewstate (frkinta, ctrlaltca)
ENH: Issue #591 - Support for hyphenated attributes via <prop:*></prop:*> template syntax (emkael)
ENH: Issue #594 - Added ability to check for subcontrols using isset(), empty() (jojoinside)
ENH: Allow TStyle behaviors (LCSKJ)
diff --git a/lib/prado/README.md b/lib/prado/README.md
index d84076f..0b3b43a 100644
--- a/lib/prado/README.md
+++ b/lib/prado/README.md
@@ -53,6 +53,7 @@ The Demos folder has several different example prado applications. You can see m
* northwind-db
* personal
* quickstart
+* site
* soap
* sqlmap
* time-tracker
@@ -70,7 +71,7 @@ Buildfile: /yourcodepath/build.xml
prado > help:
- [echo]
+ [echo]
Welcome to use PRADO build script!
----------------------------------
@@ -81,10 +82,11 @@ prado > help:
where <target name> can be one of the following:
For all PRADO developers:
- - test : run unit tests (results are under /build/test-reports)
- - coverage : run unit tests collecting coverage informations
- - lint : run lint on framework
- - lint-demos : run lint on demos
+ - test : run unit tests (results are under /build/test-reports)
+ - coverage : run unit tests collecting coverage informations
+ - functionaltest : run funcitonal tests (requires Selenium Server)
+ - lint : run lint on framework
+ - lint-demos : run lint on demos
```
diff --git a/lib/prado/framework/I18N/TGlobalization.php b/lib/prado/framework/I18N/TGlobalization.php
index 2965ad1..9a57ec3 100644
--- a/lib/prado/framework/I18N/TGlobalization.php
+++ b/lib/prado/framework/I18N/TGlobalization.php
@@ -225,10 +225,10 @@ class TGlobalization extends TModule
chmod($config['cache'], PRADO_CHMOD); //make it deletable
}
}
- else
- {
- unset($config['cache']);
- }
+ else
+ {
+ unset($config['cache']);
+ }
$this->_translation = $config;
}
diff --git a/lib/prado/framework/PradoBase.php b/lib/prado/framework/PradoBase.php
index 34f8bf0..f6c0312 100644
--- a/lib/prado/framework/PradoBase.php
+++ b/lib/prado/framework/PradoBase.php
@@ -69,7 +69,7 @@ class PradoBase
*/
public static function getVersion()
{
- return '3.3.1';
+ return '3.3.2';
}
/**
diff --git a/lib/prado/framework/Web/Javascripts/source/prado/controls/controls.js b/lib/prado/framework/Web/Javascripts/source/prado/controls/controls.js
index 9eff6a1..022dddc 100644
--- a/lib/prado/framework/Web/Javascripts/source/prado/controls/controls.js
+++ b/lib/prado/framework/Web/Javascripts/source/prado/controls/controls.js
@@ -316,7 +316,7 @@ Prado.WebUI.TImageButton = jQuery.klass(Prado.WebUI.PostBackControl,
y = y < 0 ? 0 : y;
var id = this.element.id;
var name = options['EventTarget'];
- var form = this.element.form;
+ var form = this.element.form || jQuery('#PRADO_PAGESTATE').get(0).form;
var input=null;
input = document.createElement("input");
diff --git a/lib/prado/framework/Web/Javascripts/source/prado/prado.js b/lib/prado/framework/Web/Javascripts/source/prado/prado.js
index 3778903..2000537 100644
--- a/lib/prado/framework/Web/Javascripts/source/prado/prado.js
+++ b/lib/prado/framework/Web/Javascripts/source/prado/prado.js
@@ -271,7 +271,7 @@ var Prado =
* Version of Prado clientscripts
* @var Version
*/
- Version: '3.3.1',
+ Version: '3.3.2',
/**
* Registry for Prado components
diff --git a/lib/prado/framework/Web/UI/ActiveControls/TActiveFileUpload.php b/lib/prado/framework/Web/UI/ActiveControls/TActiveFileUpload.php
index 0435041..4d7d8dc 100755
--- a/lib/prado/framework/Web/UI/ActiveControls/TActiveFileUpload.php
+++ b/lib/prado/framework/Web/UI/ActiveControls/TActiveFileUpload.php
@@ -36,6 +36,8 @@ Prado::using('System.Web.UI.WebControls.TFileUpload');
* a status icon is displayed; either a green checkmark if the upload is successful,
* or a red x if there was an error.
*
+ * TActiveFileUpload needs either an application level cache or a security manager to work securely.
+ *
* @author Bradley Booms <Bradley.Booms@nsighttel.com>
* @author Christophe Boulain <Christophe.Boulain@gmail.com>
* @package System.Web.UI.ActiveControls
diff --git a/lib/prado/framework/Web/UI/JuiControls/TJuiControlAdapter.php b/lib/prado/framework/Web/UI/JuiControls/TJuiControlAdapter.php
index 7feac4f..ea91f15 100644
--- a/lib/prado/framework/Web/UI/JuiControls/TJuiControlAdapter.php
+++ b/lib/prado/framework/Web/UI/JuiControls/TJuiControlAdapter.php
@@ -11,6 +11,7 @@
Prado::using('System.Web.UI.ActiveControls.TActiveControlAdapter');
Prado::using('System.Web.UI.JuiControls.TJuiControlOptions');
+Prado::using('System.Web.UI.ActiveControls.TCallbackEventParameter');
/**
* TJuiControlAdapter class
diff --git a/lib/prado/framework/Web/UI/JuiControls/TJuiDialog.php b/lib/prado/framework/Web/UI/JuiControls/TJuiDialog.php
index cd349f1..3c5e351 100644
--- a/lib/prado/framework/Web/UI/JuiControls/TJuiDialog.php
+++ b/lib/prado/framework/Web/UI/JuiControls/TJuiDialog.php
@@ -82,7 +82,7 @@ class TJuiDialog extends TActivePanel implements IJuiOptions, ICallbackEventHand
*/
public function getValidOptions()
{
- return array('appendTo', 'autoOpen', 'buttons', 'closeOnEscape', 'closeText', 'dialogClass', 'draggable', 'height', 'hide', 'minHeight', 'minWidth', 'maxHeight', 'maxWidth', 'modal', 'position', 'resizeable', 'show', 'title', 'width');
+ return array('appendTo', 'autoOpen', 'buttons', 'closeOnEscape', 'closeText', 'dialogClass', 'draggable', 'height', 'hide', 'minHeight', 'minWidth', 'maxHeight', 'maxWidth', 'modal', 'position', 'resizable', 'show', 'title', 'width');
}
/**
@@ -100,6 +100,9 @@ class TJuiDialog extends TActivePanel implements IJuiOptions, ICallbackEventHand
protected function getPostBackOptions()
{
$options = $this->getOptions()->toArray();
+ // always make the dialog a child of the form, or its inner inputs won't be collected
+ if(!isset($options['appendTo']))
+ $options['appendTo'] = 'form:first';
foreach($this->getControls() as $control)
if($control instanceof TJuiDialogButton)
diff --git a/lib/prado/framework/Web/UI/TControl.php b/lib/prado/framework/Web/UI/TControl.php
index 1b8a213..caf0e0c 100644
--- a/lib/prado/framework/Web/UI/TControl.php
+++ b/lib/prado/framework/Web/UI/TControl.php
@@ -795,10 +795,7 @@ class TControl extends TApplicationComponent implements IRenderable, IBindable
if($this->_trackViewState)
{
unset($this->_tempState[$key]);
- if($value===$defaultValue)
- unset($this->_viewState[$key]);
- else
- $this->_viewState[$key]=$value;
+ $this->_viewState[$key]=$value;
}
else
{
diff --git a/lib/prado/framework/pradolite.php b/lib/prado/framework/pradolite.php
index 6b51484..2c12c05 100644
--- a/lib/prado/framework/pradolite.php
+++ b/lib/prado/framework/pradolite.php
@@ -1,7 +1,7 @@
<?php
/**
* File Name: pradolite.php
- * Last Update: 2016/06/08 16:06:00
+ * Last Update: 2016/08/23 12:36:39
* Generated By: buildscripts/phpbuilder/build.php
*
* This file is used in lieu of prado.php to boost PRADO application performance.
@@ -25,7 +25,7 @@ class PradoBase
protected static $classExists = array();
public static function getVersion()
{
- return '3.3.1';
+ return '3.3.2';
}
public static function initErrorHandlers()
{
@@ -4825,10 +4825,7 @@ class TControl extends TApplicationComponent implements IRenderable, IBindable
if($this->_trackViewState)
{
unset($this->_tempState[$key]);
- if($value===$defaultValue)
- unset($this->_viewState[$key]);
- else
- $this->_viewState[$key]=$value;
+ $this->_viewState[$key]=$value;
}
else
{
@@ -10304,10 +10301,10 @@ class TGlobalization extends TModule
$config['cache']);
chmod($config['cache'], PRADO_CHMOD); }
}
- else
- {
- unset($config['cache']);
- }
+ else
+ {
+ unset($config['cache']);
+ }
$this->_translation = $config;
}
public function getTranslationCatalogue()
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-22 16:21:05 +0000