Merge pull request #491 from pradosoft/jquery

Main development switch to Jquery

1 files changed, 30 insertions, 23 deletions

diff --git a/framework/Web/Javascripts/packages.php b/framework/Web/Javascripts/packages.php
index 1d98f60f..b7b424f2 100644
--- a/framework/Web/Javascripts/packages.php
+++ b/framework/Web/Javascripts/packages.php
@@ -4,6 +4,7 @@
 
 // To make future upgrades easier
 if (!defined('PROTOTYPE_DIR')) define ('PROTOTYPE_DIR', 'prototype-1.7');
+if (!defined('JQUERY_DIR')) define ('JQUERY_DIR', 'jquery');
 if (!defined('SCRIPTACULOUS_DIR')) define ('SCRIPTACULOUS_DIR', 'scriptaculous-1.9.0');
 
 //package names and its contents (files relative to the current directory)
@@ -11,16 +12,11 @@ $packages = array(
 	'prototype' => array(
 		PROTOTYPE_DIR.'/prototype.js',
 		SCRIPTACULOUS_DIR.'/builder.js',
+		SCRIPTACULOUS_DIR.'/effects.js'
 	),
 	'prado' => array(
 		'prado/prado.js',
-		'prado/scriptaculous-adapter.js',
-		'prado/controls/controls.js',
-		SCRIPTACULOUS_DIR.'/effects.js'
-	),
-
-	'effects' => array(
-		SCRIPTACULOUS_DIR.'/effects.js'
+		'prado/controls/controls.js'
 	),
 
 	'logger' => array(
@@ -40,8 +36,6 @@ $packages = array(
 	),
 
 	'ajax' => array(
-		SCRIPTACULOUS_DIR.'/controls.js',
-		'prado/activecontrols/json2.js',
 		'prado/activecontrols/ajax3.js',
 		'prado/activecontrols/activecontrols3.js',
 	),
@@ -95,31 +89,44 @@ $packages = array(
 		'prado/activecontrols/inlineeditor.js'
 	),
 
+	// jquery
+	'jquery' => array(
+		JQUERY_DIR.'/jquery.js',
+	),
+	'jqueryui' => array(
+		JQUERY_DIR.'/jquery-ui.js',
+		JQUERY_DIR.'/jquery-ui-i18n.min.js',
+	),
+
 );
 
 
 //package names and their dependencies
 $dependencies = array(
 		'prototype'			=> array('prototype'),
-		'prado'				=> array('prototype', 'prado'),
-		'effects'			=> array('prototype', 'prado', 'effects'),
-		'validator'			=> array('prototype', 'prado', 'validator'),
-		'logger'			=> array('prototype', 'prado', 'logger'),
-		'datepicker'		=> array('prototype', 'prado', 'datepicker'),
-		'colorpicker'		=> array('prototype', 'prado', 'colorpicker'),
-		'ajax'				=> array('prototype', 'prado', 'effects', 'ajax'),
+		'jquery'			=> array('jquery'),
+		'prado'				=> array('jquery', 'prado'),
+		'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'),
+		'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'),
-		'tabpanel'			=> array('prototype', 'prado', 'tabpanel'),
-		'activedatepicker'	=> array('prototype', 'prado', 'datepicker', 'ajax', 'activedatepicker'),
-		'activefileupload'	=> array('prototype', 'prado', 'effects', 'ajax', 'activefileupload'),
 		'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'),
 );
 
 return array($packages, $dependencies);