diff options
Diffstat (limited to 'framework/Web/Javascripts')
| -rw-r--r-- | framework/Web/Javascripts/TJavaScript.php | 2 | ||||
| -rw-r--r-- | framework/Web/Javascripts/packages.php | 26 | ||||
| -rw-r--r-- | framework/Web/Javascripts/source/prado/prado.js | 2 |
3 files changed, 15 insertions, 15 deletions
diff --git a/framework/Web/Javascripts/TJavaScript.php b/framework/Web/Javascripts/TJavaScript.php index 3684132b..7401e445 100644 --- a/framework/Web/Javascripts/TJavaScript.php +++ b/framework/Web/Javascripts/TJavaScript.php @@ -4,7 +4,7 @@ * * @author Wei Zhuo<weizhuo[at]gmail[dot]com> * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2014 PradoSoft + * @copyright Copyright © 2005-2015 PradoSoft * @license http://www.pradosoft.com/license/ * @package System.Web.Javascripts */ diff --git a/framework/Web/Javascripts/packages.php b/framework/Web/Javascripts/packages.php index 61735847..fe16d979 100644 --- a/framework/Web/Javascripts/packages.php +++ b/framework/Web/Javascripts/packages.php @@ -92,11 +92,11 @@ $packages = array( SCRIPTACULOUS_DIR.'/builder.js', SCRIPTACULOUS_DIR.'/effects.js' ), - - //bootstrap - 'bootstrap' => array( - BOOTSTRAP_DIR.'/js/bootstrap.js', - ), + + //bootstrap + 'bootstrap' => array( + BOOTSTRAP_DIR.'/js/bootstrap.js', + ), 'dragdrop'=>array( SCRIPTACULOUS_DIR.'/dragdrop.js', @@ -118,28 +118,28 @@ $packages = array( $dependencies = array( 'jquery' => array('jquery'), 'prado' => array('jquery', 'prado'), - 'bootstrap' => array('jquery', 'bootstrap'), + 'bootstrap' => array('jquery', 'bootstrap'), 'validator' => array('jquery', 'prado', 'validator'), 'tabpanel' => array('jquery', 'prado', 'tabpanel'), 'ajax' => array('jquery', 'prado', 'ajax'), 'logger' => array('jquery', 'prado', 'logger'), - 'activefileupload' => array('jquery', 'prado', 'ajax', 'activefileupload'), + 'activefileupload' => array('jquery', 'prado', 'ajax', 'activefileupload'), 'effects' => array('jquery', 'jqueryui'), - 'datepicker' => array('jquery', 'prado', 'datepicker'), - 'activedatepicker' => array('jquery', 'prado', 'datepicker', 'ajax', 'activedatepicker'), - 'colorpicker' => array('jquery', 'prado', 'colorpicker'), + 'datepicker' => array('jquery', 'prado', 'datepicker'), + 'activedatepicker' => array('jquery', 'prado', 'datepicker', 'ajax', 'activedatepicker'), + 'colorpicker' => array('jquery', 'prado', 'colorpicker'), 'htmlarea' => array('jquery', 'prado', 'htmlarea'), 'htmlarea4' => array('jquery', 'prado', 'htmlarea4'), 'keyboard' => array('jquery', 'prado', 'keyboard'), 'slider' => array('jquery', 'prado', 'slider'), - 'inlineeditor' => array('jquery', 'prado', 'ajax', 'inlineeditor'), + 'inlineeditor' => array('jquery', 'prado', 'ajax', 'inlineeditor'), 'accordion' => array('jquery', 'prado', 'accordion'), 'ratings' => array('jquery', 'prado', 'ajax', 'ratings'), 'jqueryui' => array('jquery', 'jqueryui'), 'prototype' => array('prototype'), 'dragdrop' => array('prototype', 'jquery', 'prado', 'ajax', 'dragdrop'), - 'dragdropextra' => array('prototype', 'jquery', 'prado', 'ajax', 'dragdrop','dragdropextra'), - 'autocomplete' => array('prototype', 'jquery', 'prado', 'ajax', 'autocomplete'), + 'dragdropextra' => array('prototype', 'jquery', 'prado', 'ajax', 'dragdrop','dragdropextra'), + 'autocomplete' => array('prototype', 'jquery', 'prado', 'ajax', 'autocomplete'), ); return array($packages, $dependencies); diff --git a/framework/Web/Javascripts/source/prado/prado.js b/framework/Web/Javascripts/source/prado/prado.js index 01c0d630..e100dc7b 100644 --- a/framework/Web/Javascripts/source/prado/prado.js +++ b/framework/Web/Javascripts/source/prado/prado.js @@ -271,7 +271,7 @@ var Prado = * Version of Prado clientscripts * @var Version */ - Version: '3.2.3', + Version: '3.3.0', /** * Registry for Prado components |