diff options
| author | Jean-Luc Gyger <jean-luc.gyger@vysual.ch> | 2016-02-11 10:01:12 +0100 |
|---|---|---|
| committer | Jean-Luc Gyger <jean-luc.gyger@vysual.ch> | 2016-02-11 10:01:12 +0100 |
| commit | d70861a8f9368773f2f0291454e9420174e6c14a (patch) | |
| tree | e44a32e401211422fb05da355c9eef4d5934d9e9 /framework/Web/Javascripts/packages.php | |
| parent | d32f65815eb6feb4bcb8a0c85572f722d7826342 (diff) | |
| parent | 275f16b90a92c62935cb691d11e0bd124acf64e4 (diff) | |
Merge branch 'master' of https://github.com/majuca/prado
Diffstat (limited to 'framework/Web/Javascripts/packages.php')
| -rw-r--r-- | framework/Web/Javascripts/packages.php | 26 |
1 files changed, 13 insertions, 13 deletions
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); |