summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorFabio Bas <ctrlaltca@gmail.com>2013-11-23 14:51:50 +0100
committerFabio Bas <ctrlaltca@gmail.com>2013-11-26 11:42:52 +0100
commit9dc6db70c6c59c9b5cd01492cd6ca25e639c1d64 (patch)
tree3b66c7c433b37681746f3c6c55fca96a22eacb1e /framework
parent6f515b1ff6f82cef83aa03330e343ce3363419e4 (diff)
Re-enabled prototype, moved scriptaculous inside it
Diffstat (limited to 'framework')
-rw-r--r--framework/Web/Javascripts/packages.php7
1 files changed, 2 insertions, 5 deletions
diff --git a/framework/Web/Javascripts/packages.php b/framework/Web/Javascripts/packages.php
index bc3bae1e..b7b424f2 100644
--- a/framework/Web/Javascripts/packages.php
+++ b/framework/Web/Javascripts/packages.php
@@ -12,16 +12,13 @@ $packages = array(
'prototype' => array(
PROTOTYPE_DIR.'/prototype.js',
SCRIPTACULOUS_DIR.'/builder.js',
+ SCRIPTACULOUS_DIR.'/effects.js'
),
'prado' => array(
'prado/prado.js',
'prado/controls/controls.js'
),
- 'effects' => array(
- SCRIPTACULOUS_DIR.'/effects.js'
- ),
-
'logger' => array(
'prado/logger/logger.js',
),
@@ -106,7 +103,7 @@ $packages = array(
//package names and their dependencies
$dependencies = array(
- //'prototype' => array('prototype'),
+ 'prototype' => array('prototype'),
'jquery' => array('jquery'),
'prado' => array('jquery', 'prado'),
'validator' => array('jquery', 'prado', 'validator'),