merge from 3.0 branch till 1769.

1 files changed, 12 insertions, 51 deletions

diff --git a/buildscripts/jsbuilder/build.php b/buildscripts/jsbuilder/build.php
index 30c99ac1..19824932 100644
--- a/buildscripts/jsbuilder/build.php
+++ b/buildscripts/jsbuilder/build.php
@@ -40,7 +40,9 @@ define('DOC_OUTPUT_DIR', realpath(dirname(__FILE__).'/../../docs/Javascript'));
  */

 define('BUILD_DOC', sprintf('perl "%s" --no-sources -d "%s" ', JS_DOC, DOC_OUTPUT_DIR).'%s');

 

-include_once(dirname(__FILE__).'/jsmin.php');

+define('JSMIN_AS_LIB',true);

+

+include(dirname(__FILE__).'/jsmin.php');

 

 if(SOURCE_DIR===false || TARGET_DIR===false)

 	die('Unable to determine the build path.');

@@ -55,33 +57,14 @@ $libraries = array(
 

 		//base javascript functions

 		'prototype/prototype.js',

-		'prototype/base.js',

+		'effects/builder.js',

+

 		'extended/base.js',

-		'prototype/string.js',

 		'extended/string.js',

-		'prototype/enumerable.js',

-		'prototype/array.js',

-		'prototype/hash.js',

-		'prototype/range.js',

-

-		//dom functions

-		'prototype/dom.js',

-		'prototype/form.js',

-		'prototype/event.js',

 		'extended/event.js',

-		'prototype/position.js',

-

-		//element selectors

-		'prototype/selector.js',

-

-		//build dom elements with DIV, A, UL, etc functions

-		'effects/builder.js',

+		'extended/date.js',

 		'extended/builder.js',

 

-//		'extra/getElementsBySelector.js',

-//		'extra/behaviour.js',

-

-		'extended/date.js',

 

 		//prado core

 		'prado/prado.js',

@@ -89,42 +72,20 @@ $libraries = array(
 		'prado/element.js',

 

 		//controls

-		'prado/controls.js'

+		'prado/controls.js',

+		'ratings/ratings.js'

 	),

 

 	//effects

 	'effects.js' => array(

-		'effects/effects.js',

-		'extended/effects.js'

-	),

-	//active controls

-	'ajax.js' => array(

-		'prototype/ajax.js',

-		'prado/ajax3.js',

-		'extra/json.js',

-		'effects/controls.js',

-		'prado/activecontrols3.js',

-		'prado/inlineeditor.js',

-		'ratings/ratings.js'

-//		'effects/dragdrop.js',

-//		'effects/slider.js',

-//		'prado/activecontrols.js'

+		'effects/effects.js'

 	),

+

 	//logging

 	'logger.js' => array(

 		'extra/logger.js',

 	),

 

-	'containers.js' => array(

-		'effects/dragdrop.js',

-	),

-

-	//rico

-	'rico.js' => array(

-		'rico/rico.js',

-		'rico/extension.js'

-	),

-

 	//validator

 	'validator.js' => array(

 		'prado/validation3.js'

@@ -176,7 +137,7 @@ foreach($libraries as $jsFile => $sourceFiles)
 	$jsMin = new JSMin($debugFile, $compressFile);

 	$jsMin -> minify();

 	unset($jsMin);

-	@unlink($tempFile);

+	//@unlink($tempFile);

 	echo "Saving file {$jsFile}\n";

 	$builds++;

 }

@@ -197,4 +158,4 @@ else if($builds > 0)
 else

 	echo "No files to build.";

 

-?>

+?>
\ No newline at end of file