From da21818ddfa4f76756435b0e7ab35fa86d7842f4 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Fri, 30 Mar 2018 22:55:31 +0200 Subject: [PATCH] Prepare 4.0.1 release --- .apigen.yaml | 2 +- HISTORY.md | 2 +- UPGRADE.md | 2 +- composer.json | 2 +- framework/PradoBase.php | 2 +- framework/Web/Javascripts/source/prado/prado.js | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.apigen.yaml b/.apigen.yaml index cbd560cdb..9f45ec969 100644 --- a/.apigen.yaml +++ b/.apigen.yaml @@ -17,7 +17,7 @@ annotationGroups: - todo - deprecated groups: auto -title: Prado 4.0 API Manual +title: Prado 4.0.1 API Manual tree: true version: true sourceCode: no diff --git a/HISTORY.md b/HISTORY.md index 7974f97a6..13d81c48f 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,4 +1,4 @@ -## Version 4.0.1 - in development +## Version 4.0.1 - Apr 1, 2018 CHG: Removed all deprecated code (ctrlaltca) CHG: Removed deprecated components based on the prototype jajascript library (ctrlaltca) diff --git a/UPGRADE.md b/UPGRADE.md index 8ed0eabfd..18a9499d8 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -1,4 +1,4 @@ -# Upgrading Instructions for PRADO Framework v4.0 +# Upgrading Instructions for PRADO Framework v4.0.1 ### !!!IMPORTANT!!! diff --git a/composer.json b/composer.json index 8dfe70828..1ef0c6481 100644 --- a/composer.json +++ b/composer.json @@ -68,7 +68,7 @@ "pradosoft/prado-apigen-theme" : "*" }, "provide" : { - "pradosoft/prado" : "4.0" + "pradosoft/prado" : "4.0.1" }, "suggest" : { "ext-apc" : "Enables the use of TAPCCache as a cache handler", diff --git a/framework/PradoBase.php b/framework/PradoBase.php index 5dd9ea3aa..90c2ab2d4 100644 --- a/framework/PradoBase.php +++ b/framework/PradoBase.php @@ -91,7 +91,7 @@ class PradoBase */ public static function getVersion() { - return '4.0.0'; + return '4.0.1'; } public static function init() diff --git a/framework/Web/Javascripts/source/prado/prado.js b/framework/Web/Javascripts/source/prado/prado.js index facdc1ae0..be4ab0c9f 100644 --- a/framework/Web/Javascripts/source/prado/prado.js +++ b/framework/Web/Javascripts/source/prado/prado.js @@ -273,7 +273,7 @@ var Prado = * Version of Prado clientscripts * @var Version */ - Version: '4.0.0', + Version: '4.0.1', /** * Registry for Prado components @@ -453,7 +453,7 @@ Prado.Element = setTimeout(function(){ jQuery("#"+element).focus(); }, 100); - } else { + } else { jQuery("#"+element).focus(); } }, @@ -546,7 +546,7 @@ Prado.Element = } if(self) jQuery('#'+element).replaceWith(content); - else + else jQuery('#'+element).html(content); },