From 6228873cf9d6471463d2413e7dfd7447f759baf2 Mon Sep 17 00:00:00 2001
From: "christophe.boulain" <>
Date: Wed, 3 Dec 2008 14:22:03 +0000
Subject: Merge from trunk

---
 framework/Web/Javascripts/source/packages.php | 36 +++++++++++++++++----------
 1 file changed, 23 insertions(+), 13 deletions(-)

(limited to 'framework/Web/Javascripts/source/packages.php')

diff --git a/framework/Web/Javascripts/source/packages.php b/framework/Web/Javascripts/source/packages.php
index 1cca7b7c..d6c04e7f 100644
--- a/framework/Web/Javascripts/source/packages.php
+++ b/framework/Web/Javascripts/source/packages.php
@@ -47,7 +47,8 @@ $packages = array(
 	),
 
 	'dragdrop'=>array(
-		SCRIPTACULOUS_DIR.'/dragdrop.js'
+		SCRIPTACULOUS_DIR.'/dragdrop.js',
+		'prado/activecontrols/dragdrop.js'
 	),
 
 	'slider'=>array(
@@ -60,6 +61,14 @@ $packages = array(
 
 	'tabpanel'=>array(
 		'prado/controls/tabpanel.js'
+	),
+	
+	'activedatepicker' => array(
+		'prado/activecontrols/activedatepicker.js'
+	),
+	
+	'activefileupload' => array(
+		'prado/activefileupload/activefileupload.js'
 	),
 	
 );
@@ -67,19 +76,20 @@ $packages = array(
 
 //package names and their dependencies
 $dependencies = array(
-		'prado'			=> array('prado'),
-		'effects'		=> array('prado', 'effects'),
-		'validator'		=> array('prado', 'validator'),
-		'logger'		=> array('prado', 'logger'),
-		'datepicker'	=> array('prado', 'datepicker'),
-		'colorpicker'	=> array('prado', 'colorpicker'),
-		'ajax'			=> array('prado', 'effects', 'ajax'),
-		'dragdrop'		=> array('prado', 'effects', 'dragdrop'),
-		'slider'		=> array('prado', 'slider'),
-		'keyboard'		=> array('prado', 'keyboard'),
-		'tabpanel'		=> array('prado', 'tabpanel'),
+		'prado'				=> array('prado'),
+		'effects'			=> array('prado', 'effects'),
+		'validator'			=> array('prado', 'validator'),
+		'logger'			=> array('prado', 'logger'),
+		'datepicker'		=> array('prado', 'datepicker'),
+		'colorpicker'		=> array('prado', 'colorpicker'),
+		'ajax'				=> array('prado', 'effects', 'ajax'),
+		'dragdrop'			=> array('prado', 'effects', 'ajax', 'dragdrop'),
+		'slider'			=> array('prado', 'slider'),
+		'keyboard'			=> array('prado', 'keyboard'),
+		'tabpanel'			=> array('prado', 'tabpanel'),
+		'activedatepicker' 	=> array('datepicker', 'ajax', 'activedatepicker'),
+		'activefileupload' 	=> array('prado', 'ajax', 'activefileupload'),
 );
 
 return array($packages, $dependencies);
 
-?>
-- 
cgit v1.2.3