diff options
| author | Daniel <darthdaniel85@gmail.com> | 2013-11-22 15:35:07 -0500 |
|---|---|---|
| committer | Daniel <darthdaniel85@gmail.com> | 2013-11-22 15:35:07 -0500 |
| commit | efde949d00b808f55710abbd3d82ceb490545116 (patch) | |
| tree | 25dd2d54b1432bb3317e6f3cbdc326bf5f48a355 /framework/Web/Javascripts/packages.php | |
| parent | ab6effd64caefa732ef0994d6c3048f5cd474bf6 (diff) | |
| parent | 0dfd57339fe3c92103767b556c9b20002323df56 (diff) | |
Merge branch 'jquery' of https://github.com/pradosoft/prado into jquery
Diffstat (limited to 'framework/Web/Javascripts/packages.php')
| -rw-r--r-- | framework/Web/Javascripts/packages.php | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/framework/Web/Javascripts/packages.php b/framework/Web/Javascripts/packages.php index 6f962760..bc3bae1e 100644 --- a/framework/Web/Javascripts/packages.php +++ b/framework/Web/Javascripts/packages.php @@ -114,20 +114,21 @@ $dependencies = array( 'ajax' => array('jquery', 'prado', 'ajax'), 'logger' => array('jquery', 'prado', 'logger'), 'activefileupload' => array('jquery', 'prado', 'ajax', 'activefileupload'), - - 'effects' => array('prototype', 'prado', 'effects'), - 'datepicker' => array('prototype', 'prado', 'datepicker'), - 'colorpicker' => array('prototype', 'prado', 'colorpicker'), + 'effects' => array('jquery', 'jqueryui'), + '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'), +/* 'dragdrop' => array('prototype', 'prado', 'effects', 'ajax', 'dragdrop'), - 'slider' => array('prototype', 'prado', 'slider'), - 'keyboard' => array('prototype', 'prado', 'keyboard'), - 'activedatepicker' => array('prototype', 'prado', 'datepicker', 'ajax', 'activedatepicker'), 'dragdropextra' => array('prototype', 'prado', 'effects', 'ajax', 'dragdrop','dragdropextra'), 'accordion' => array('prototype', 'prado', 'effects', 'accordion'), - 'htmlarea' => array('prototype', 'prado', 'htmlarea'), - 'htmlarea4' => array('prototype', 'prado', 'htmlarea4'), 'ratings' => array('prototype', 'prado', 'effects', 'ajax', 'ratings'), 'inlineeditor' => array('prototype', 'prado', 'effects', 'ajax', 'inlineeditor'), + */ 'jqueryui' => array('jquery', 'jqueryui'), ); |