58 files changed, 28 insertions, 15 deletions

diff --git a/framework/Web/Javascripts/packages.php b/framework/Web/Javascripts/source/packages.php
index c6b6cf67..d951f339 100644
--- a/framework/Web/Javascripts/packages.php
+++ b/framework/Web/Javascripts/source/packages.php
@@ -1,5 +1,7 @@
 <?php

 

+//$Id$

+

 $packages = array(

 	'prado' => array(

 		'prototype/prototype.js',

diff --git a/framework/Web/Javascripts/prado/activecontrols/activecontrols3.js b/framework/Web/Javascripts/source/prado/activecontrols/activecontrols3.js
index 444f3ab2..444f3ab2 100644
--- a/framework/Web/Javascripts/prado/activecontrols/activecontrols3.js
+++ b/framework/Web/Javascripts/source/prado/activecontrols/activecontrols3.js
diff --git a/framework/Web/Javascripts/prado/activecontrols/ajax3.js b/framework/Web/Javascripts/source/prado/activecontrols/ajax3.js
index dbf768a6..dbf768a6 100644
--- a/framework/Web/Javascripts/prado/activecontrols/ajax3.js
+++ b/framework/Web/Javascripts/source/prado/activecontrols/ajax3.js
diff --git a/framework/Web/Javascripts/prado/activecontrols/inlineeditor.js b/framework/Web/Javascripts/source/prado/activecontrols/inlineeditor.js
index f8b8b412..f8b8b412 100644
--- a/framework/Web/Javascripts/prado/activecontrols/inlineeditor.js
+++ b/framework/Web/Javascripts/source/prado/activecontrols/inlineeditor.js
diff --git a/framework/Web/Javascripts/prado/activecontrols/json.js b/framework/Web/Javascripts/source/prado/activecontrols/json.js
index 25b17b5f..25b17b5f 100644
--- a/framework/Web/Javascripts/prado/activecontrols/json.js
+++ b/framework/Web/Javascripts/source/prado/activecontrols/json.js
diff --git a/framework/Web/Javascripts/prado/activeratings/blocks.css b/framework/Web/Javascripts/source/prado/activeratings/blocks.css
index bb846094..bb846094 100644
--- a/framework/Web/Javascripts/prado/activeratings/blocks.css
+++ b/framework/Web/Javascripts/source/prado/activeratings/blocks.css
diff --git a/framework/Web/Javascripts/prado/activeratings/blocks.png b/framework/Web/Javascripts/source/prado/activeratings/blocks.png
index 93a5333e..93a5333e 100644
--- a/framework/Web/Javascripts/prado/activeratings/blocks.png
+++ b/framework/Web/Javascripts/source/prado/activeratings/blocks.png
diff --git a/framework/Web/Javascripts/prado/activeratings/blocks_blank.gif b/framework/Web/Javascripts/source/prado/activeratings/blocks_blank.gif
index c0db17c2..c0db17c2 100644
--- a/framework/Web/Javascripts/prado/activeratings/blocks_blank.gif
+++ b/framework/Web/Javascripts/source/prado/activeratings/blocks_blank.gif
diff --git a/framework/Web/Javascripts/prado/activeratings/blocks_combined.gif b/framework/Web/Javascripts/source/prado/activeratings/blocks_combined.gif
index dfe9da8d..dfe9da8d 100644
--- a/framework/Web/Javascripts/prado/activeratings/blocks_combined.gif
+++ b/framework/Web/Javascripts/source/prado/activeratings/blocks_combined.gif
diff --git a/framework/Web/Javascripts/prado/activeratings/blocks_half.gif b/framework/Web/Javascripts/source/prado/activeratings/blocks_half.gif
index a9e23d7c..a9e23d7c 100644
--- a/framework/Web/Javascripts/prado/activeratings/blocks_half.gif
+++ b/framework/Web/Javascripts/source/prado/activeratings/blocks_half.gif
diff --git a/framework/Web/Javascripts/prado/activeratings/blocks_selected.gif b/framework/Web/Javascripts/source/prado/activeratings/blocks_selected.gif
index f743d27e..f743d27e 100644
--- a/framework/Web/Javascripts/prado/activeratings/blocks_selected.gif
+++ b/framework/Web/Javascripts/source/prado/activeratings/blocks_selected.gif
diff --git a/framework/Web/Javascripts/prado/activeratings/default.css b/framework/Web/Javascripts/source/prado/activeratings/default.css
index ba90eb27..ba90eb27 100644
--- a/framework/Web/Javascripts/prado/activeratings/default.css
+++ b/framework/Web/Javascripts/source/prado/activeratings/default.css
diff --git a/framework/Web/Javascripts/prado/activeratings/default.png b/framework/Web/Javascripts/source/prado/activeratings/default.png
index a3148ff4..a3148ff4 100644
--- a/framework/Web/Javascripts/prado/activeratings/default.png
+++ b/framework/Web/Javascripts/source/prado/activeratings/default.png
diff --git a/framework/Web/Javascripts/prado/activeratings/default_blank.gif b/framework/Web/Javascripts/source/prado/activeratings/default_blank.gif
index 0337ad16..0337ad16 100644
--- a/framework/Web/Javascripts/prado/activeratings/default_blank.gif
+++ b/framework/Web/Javascripts/source/prado/activeratings/default_blank.gif
diff --git a/framework/Web/Javascripts/prado/activeratings/default_combined.gif b/framework/Web/Javascripts/source/prado/activeratings/default_combined.gif
index ddab2e8b..ddab2e8b 100644
--- a/framework/Web/Javascripts/prado/activeratings/default_combined.gif
+++ b/framework/Web/Javascripts/source/prado/activeratings/default_combined.gif
diff --git a/framework/Web/Javascripts/prado/activeratings/default_half.gif b/framework/Web/Javascripts/source/prado/activeratings/default_half.gif
index ed214acd..ed214acd 100644
--- a/framework/Web/Javascripts/prado/activeratings/default_half.gif
+++ b/framework/Web/Javascripts/source/prado/activeratings/default_half.gif
diff --git a/framework/Web/Javascripts/prado/activeratings/default_selected.gif b/framework/Web/Javascripts/source/prado/activeratings/default_selected.gif
index 98704fad..98704fad 100644
--- a/framework/Web/Javascripts/prado/activeratings/default_selected.gif
+++ b/framework/Web/Javascripts/source/prado/activeratings/default_selected.gif
diff --git a/framework/Web/Javascripts/prado/activeratings/ratings.js b/framework/Web/Javascripts/source/prado/activeratings/ratings.js
index 884a695a..884a695a 100644
--- a/framework/Web/Javascripts/prado/activeratings/ratings.js
+++ b/framework/Web/Javascripts/source/prado/activeratings/ratings.js
diff --git a/framework/Web/Javascripts/prado/colorpicker/background.png b/framework/Web/Javascripts/source/prado/colorpicker/background.png
index 91798cf5..91798cf5 100644
--- a/framework/Web/Javascripts/prado/colorpicker/background.png
+++ b/framework/Web/Javascripts/source/prado/colorpicker/background.png
diff --git a/framework/Web/Javascripts/prado/colorpicker/button.gif b/framework/Web/Javascripts/source/prado/colorpicker/button.gif
index 67f17975..67f17975 100644
--- a/framework/Web/Javascripts/prado/colorpicker/button.gif
+++ b/framework/Web/Javascripts/source/prado/colorpicker/button.gif
diff --git a/framework/Web/Javascripts/prado/colorpicker/colorpicker.js b/framework/Web/Javascripts/source/prado/colorpicker/colorpicker.js
index 423338e0..423338e0 100644
--- a/framework/Web/Javascripts/prado/colorpicker/colorpicker.js
+++ b/framework/Web/Javascripts/source/prado/colorpicker/colorpicker.js
diff --git a/framework/Web/Javascripts/prado/colorpicker/default.css b/framework/Web/Javascripts/source/prado/colorpicker/default.css
index 67235c08..67235c08 100644
--- a/framework/Web/Javascripts/prado/colorpicker/default.css
+++ b/framework/Web/Javascripts/source/prado/colorpicker/default.css
diff --git a/framework/Web/Javascripts/prado/colorpicker/hue.gif b/framework/Web/Javascripts/source/prado/colorpicker/hue.gif
index 901e409c..901e409c 100644
--- a/framework/Web/Javascripts/prado/colorpicker/hue.gif
+++ b/framework/Web/Javascripts/source/prado/colorpicker/hue.gif
diff --git a/framework/Web/Javascripts/prado/colorpicker/slider.gif b/framework/Web/Javascripts/source/prado/colorpicker/slider.gif
index 92f9d744..92f9d744 100644
--- a/framework/Web/Javascripts/prado/colorpicker/slider.gif
+++ b/framework/Web/Javascripts/source/prado/colorpicker/slider.gif
diff --git a/framework/Web/Javascripts/prado/colorpicker/spacer.gif b/framework/Web/Javascripts/source/prado/colorpicker/spacer.gif
index fc256098..fc256098 100755
--- a/framework/Web/Javascripts/prado/colorpicker/spacer.gif
+++ b/framework/Web/Javascripts/source/prado/colorpicker/spacer.gif
diff --git a/framework/Web/Javascripts/prado/colorpicker/target_black.gif b/framework/Web/Javascripts/source/prado/colorpicker/target_black.gif
index ebb89f58..ebb89f58 100644
--- a/framework/Web/Javascripts/prado/colorpicker/target_black.gif
+++ b/framework/Web/Javascripts/source/prado/colorpicker/target_black.gif
diff --git a/framework/Web/Javascripts/prado/colorpicker/target_white.gif b/framework/Web/Javascripts/source/prado/colorpicker/target_white.gif
index c3527c86..c3527c86 100644
--- a/framework/Web/Javascripts/prado/colorpicker/target_white.gif
+++ b/framework/Web/Javascripts/source/prado/colorpicker/target_white.gif
diff --git a/framework/Web/Javascripts/prado/controls/controls.js b/framework/Web/Javascripts/source/prado/controls/controls.js
index ff40b0e8..ff40b0e8 100644
--- a/framework/Web/Javascripts/prado/controls/controls.js
+++ b/framework/Web/Javascripts/source/prado/controls/controls.js
diff --git a/framework/Web/Javascripts/prado/datepicker/calendar.png b/framework/Web/Javascripts/source/prado/datepicker/calendar.png
index c245f1b4..c245f1b4 100644
--- a/framework/Web/Javascripts/prado/datepicker/calendar.png
+++ b/framework/Web/Javascripts/source/prado/datepicker/calendar.png
diff --git a/framework/Web/Javascripts/prado/datepicker/datepicker.js b/framework/Web/Javascripts/source/prado/datepicker/datepicker.js
index 2f1e8261..2f1e8261 100644
--- a/framework/Web/Javascripts/prado/datepicker/datepicker.js
+++ b/framework/Web/Javascripts/source/prado/datepicker/datepicker.js
diff --git a/framework/Web/Javascripts/prado/datepicker/default.css b/framework/Web/Javascripts/source/prado/datepicker/default.css
index 9532dad0..9532dad0 100644
--- a/framework/Web/Javascripts/prado/datepicker/default.css
+++ b/framework/Web/Javascripts/source/prado/datepicker/default.css
diff --git a/framework/Web/Javascripts/prado/datepicker/spacer.gif b/framework/Web/Javascripts/source/prado/datepicker/spacer.gif
index fc256098..fc256098 100755
--- a/framework/Web/Javascripts/prado/datepicker/spacer.gif
+++ b/framework/Web/Javascripts/source/prado/datepicker/spacer.gif
diff --git a/framework/Web/Javascripts/prado/logger/logger.js b/framework/Web/Javascripts/source/prado/logger/logger.js
index b21df1ae..b21df1ae 100644
--- a/framework/Web/Javascripts/prado/logger/logger.js
+++ b/framework/Web/Javascripts/source/prado/logger/logger.js
diff --git a/framework/Web/Javascripts/prado/prado.js b/framework/Web/Javascripts/source/prado/prado.js
index dff74f03..dff74f03 100644
--- a/framework/Web/Javascripts/prado/prado.js
+++ b/framework/Web/Javascripts/source/prado/prado.js
diff --git a/framework/Web/Javascripts/prado/ratings/blocks.css b/framework/Web/Javascripts/source/prado/ratings/blocks.css
index 2bf2e904..2bf2e904 100644
--- a/framework/Web/Javascripts/prado/ratings/blocks.css
+++ b/framework/Web/Javascripts/source/prado/ratings/blocks.css
diff --git a/framework/Web/Javascripts/prado/ratings/blocks.png b/framework/Web/Javascripts/source/prado/ratings/blocks.png
index 16a2b249..16a2b249 100644
--- a/framework/Web/Javascripts/prado/ratings/blocks.png
+++ b/framework/Web/Javascripts/source/prado/ratings/blocks.png
diff --git a/framework/Web/Javascripts/prado/ratings/blocks_blank.gif b/framework/Web/Javascripts/source/prado/ratings/blocks_blank.gif
index a68d0e94..a68d0e94 100644
--- a/framework/Web/Javascripts/prado/ratings/blocks_blank.gif
+++ b/framework/Web/Javascripts/source/prado/ratings/blocks_blank.gif
diff --git a/framework/Web/Javascripts/prado/ratings/blocks_half.gif b/framework/Web/Javascripts/source/prado/ratings/blocks_half.gif
index 4cff0148..4cff0148 100644
--- a/framework/Web/Javascripts/prado/ratings/blocks_half.gif
+++ b/framework/Web/Javascripts/source/prado/ratings/blocks_half.gif
diff --git a/framework/Web/Javascripts/prado/ratings/blocks_hover.gif b/framework/Web/Javascripts/source/prado/ratings/blocks_hover.gif
index 58ad7495..58ad7495 100644
--- a/framework/Web/Javascripts/prado/ratings/blocks_hover.gif
+++ b/framework/Web/Javascripts/source/prado/ratings/blocks_hover.gif
diff --git a/framework/Web/Javascripts/prado/ratings/blocks_selected.gif b/framework/Web/Javascripts/source/prado/ratings/blocks_selected.gif
index f91873e2..f91873e2 100644
--- a/framework/Web/Javascripts/prado/ratings/blocks_selected.gif
+++ b/framework/Web/Javascripts/source/prado/ratings/blocks_selected.gif
diff --git a/framework/Web/Javascripts/prado/ratings/default.css b/framework/Web/Javascripts/source/prado/ratings/default.css
index c15a36bd..c15a36bd 100644
--- a/framework/Web/Javascripts/prado/ratings/default.css
+++ b/framework/Web/Javascripts/source/prado/ratings/default.css
diff --git a/framework/Web/Javascripts/prado/ratings/default_blank.gif b/framework/Web/Javascripts/source/prado/ratings/default_blank.gif
index 4e6fda3c..4e6fda3c 100644
--- a/framework/Web/Javascripts/prado/ratings/default_blank.gif
+++ b/framework/Web/Javascripts/source/prado/ratings/default_blank.gif
diff --git a/framework/Web/Javascripts/prado/ratings/default_half.gif b/framework/Web/Javascripts/source/prado/ratings/default_half.gif
index 7cecf0ec..7cecf0ec 100644
--- a/framework/Web/Javascripts/prado/ratings/default_half.gif
+++ b/framework/Web/Javascripts/source/prado/ratings/default_half.gif
diff --git a/framework/Web/Javascripts/prado/ratings/default_hover.gif b/framework/Web/Javascripts/source/prado/ratings/default_hover.gif
index ad0cd28a..ad0cd28a 100644
--- a/framework/Web/Javascripts/prado/ratings/default_hover.gif
+++ b/framework/Web/Javascripts/source/prado/ratings/default_hover.gif
diff --git a/framework/Web/Javascripts/prado/ratings/default_selected.gif b/framework/Web/Javascripts/source/prado/ratings/default_selected.gif
index a19ab39f..a19ab39f 100644
--- a/framework/Web/Javascripts/prado/ratings/default_selected.gif
+++ b/framework/Web/Javascripts/source/prado/ratings/default_selected.gif
diff --git a/framework/Web/Javascripts/prado/ratings/ratings.js b/framework/Web/Javascripts/source/prado/ratings/ratings.js
index e6fd97ba..4e6ae6c5 100644
--- a/framework/Web/Javascripts/prado/ratings/ratings.js
+++ b/framework/Web/Javascripts/source/prado/ratings/ratings.js
@@ -1,5 +1,5 @@
-Prado.WebUI.TRatingList = Class.create();	

-Prado.WebUI.TRatingList.prototype = 

+Prado.WebUI.TRatingList = Class.create();

+Prado.WebUI.TRatingList.prototype =

 {

 	selectedIndex : -1,

 

@@ -14,47 +14,47 @@ Prado.WebUI.TRatingList.prototype =
 			Event.observe(this.radios[i].parentNode, "mouseover", this.hover.bindEvent(this,i));

 			Event.observe(this.radios[i].parentNode, "mouseout", this.recover.bindEvent(this,i));

 			Event.observe(this.radios[i].parentNode, "click", this.click.bindEvent(this, i));

-		}		

+		}

 		this.caption = CAPTION();

 		this.element.appendChild(this.caption);

 		this.selectedIndex = options.selectedIndex;

 		this.setRating(this.selectedIndex);

 	},

-	

+

 	hover : function(ev,index)

 	{

 		for(var i = 0; i<this.radios.length; i++)

 			this.radios[i].parentNode.className = (i<=index) ? "rating_hover" : "";

 		this.setCaption(index);

 	},

-	

+

 	recover : function(ev,index)

 	{

 		for(var i = 0; i<=index; i++)

 			Element.removeClassName(this.radios[i].parentNode, "rating_hover");

 		this.setRating(this.selectedIndex);

 	},

-	

+

 	click : function(ev, index)

 	{

 		for(var i = 0; i<this.radios.length; i++)

 			this.radios[i].checked = (i == index);

 		this.selectedIndex = index;

 		this.setRating(index);

-		if(isFunction(this.options.onChange))

-			this.options.onChange(this,index);		

+		if(typeof(this.options.onChange)=="function")

+			this.options.onChange(this,index);

 	},

-	

+

 	setRating: function(index)

 	{

 		for(var i = 0; i<=index; i++)

 			this.radios[i].parentNode.className = "rating_selected";

 		this.setCaption(index);

 	},

-	

+

 	setCaption : function(index)

 	{

-		this.caption.innerHTML = index > -1 ? 

-			this.radios[index].value : this.options.caption;	

+		this.caption.innerHTML = index > -1 ?

+			this.radios[index].value : this.options.caption;

 	}

 }
\ No newline at end of file
diff --git a/framework/Web/Javascripts/prado/ratings/stars1.png b/framework/Web/Javascripts/source/prado/ratings/stars1.png
index e4dd3c25..e4dd3c25 100644
--- a/framework/Web/Javascripts/prado/ratings/stars1.png
+++ b/framework/Web/Javascripts/source/prado/ratings/stars1.png
diff --git a/framework/Web/Javascripts/prado/scriptaculous-adapter.js b/framework/Web/Javascripts/source/prado/scriptaculous-adapter.js
index 63b49600..5ace2598 100644
--- a/framework/Web/Javascripts/prado/scriptaculous-adapter.js
+++ b/framework/Web/Javascripts/source/prado/scriptaculous-adapter.js
@@ -323,12 +323,23 @@ Prado.Element =
 

 	extractContent : function(text, boundary)

 	{

-		var f = RegExp('(<!--'+boundary+'-->)([\\s\\S\\w\\W]*)(<!--//'+boundary+'-->)',"m");

+		var tagStart = '<!--'+boundary+'-->';

+		var tagEnd = '<!--//'+boundary+'-->';

+		var start = text.indexOf(tagStart);

+		if(start > -1)

+		{

+			start += tagStart.length;

+			var end = text.indexOf(tagEnd,start);

+			if(end > -1)

+				return text.substring(start,end);

+		}

+		return null;

+		/*var f = RegExp('(?:<!--'+boundary+'-->)((?:.|\n|\r)+?)(?:<!--//'+boundary+'-->)',"m");

 		var result = text.match(f);

 		if(result && result.length >= 2)

-			return result[2];

+			return result[1];

 		else

-			return null;

+			return null;*/

 	},

 

 	evaluateScript : function(content)

diff --git a/framework/Web/Javascripts/prado/validator/validation3.js b/framework/Web/Javascripts/source/prado/validator/validation3.js
index 5fa879a5..5fa879a5 100644
--- a/framework/Web/Javascripts/prado/validator/validation3.js
+++ b/framework/Web/Javascripts/source/prado/validator/validation3.js
diff --git a/framework/Web/Javascripts/prototype/prototype.js b/framework/Web/Javascripts/source/prototype/prototype.js
index 2a1fef0d..2a1fef0d 100644
--- a/framework/Web/Javascripts/prototype/prototype.js
+++ b/framework/Web/Javascripts/source/prototype/prototype.js
diff --git a/framework/Web/Javascripts/scriptaculous/CHANGELOG b/framework/Web/Javascripts/source/scriptaculous/CHANGELOG
index 323ca859..323ca859 100644
--- a/framework/Web/Javascripts/scriptaculous/CHANGELOG
+++ b/framework/Web/Javascripts/source/scriptaculous/CHANGELOG
diff --git a/framework/Web/Javascripts/scriptaculous/MIT-LICENSE b/framework/Web/Javascripts/source/scriptaculous/MIT-LICENSE
index 30ff1248..30ff1248 100644
--- a/framework/Web/Javascripts/scriptaculous/MIT-LICENSE
+++ b/framework/Web/Javascripts/source/scriptaculous/MIT-LICENSE
diff --git a/framework/Web/Javascripts/scriptaculous/README b/framework/Web/Javascripts/source/scriptaculous/README
index 94ff1307..94ff1307 100644
--- a/framework/Web/Javascripts/scriptaculous/README
+++ b/framework/Web/Javascripts/source/scriptaculous/README
diff --git a/framework/Web/Javascripts/scriptaculous/builder.js b/framework/Web/Javascripts/source/scriptaculous/builder.js
index c110e0c7..c110e0c7 100644
--- a/framework/Web/Javascripts/scriptaculous/builder.js
+++ b/framework/Web/Javascripts/source/scriptaculous/builder.js
diff --git a/framework/Web/Javascripts/scriptaculous/controls.js b/framework/Web/Javascripts/source/scriptaculous/controls.js
index bbd00d69..bbd00d69 100644
--- a/framework/Web/Javascripts/scriptaculous/controls.js
+++ b/framework/Web/Javascripts/source/scriptaculous/controls.js
diff --git a/framework/Web/Javascripts/scriptaculous/dragdrop.js b/framework/Web/Javascripts/source/scriptaculous/dragdrop.js
index 81e95c5c..81e95c5c 100644
--- a/framework/Web/Javascripts/scriptaculous/dragdrop.js
+++ b/framework/Web/Javascripts/source/scriptaculous/dragdrop.js
diff --git a/framework/Web/Javascripts/scriptaculous/effects.js b/framework/Web/Javascripts/source/scriptaculous/effects.js
index 8a4a4f9f..8a4a4f9f 100644
--- a/framework/Web/Javascripts/scriptaculous/effects.js
+++ b/framework/Web/Javascripts/source/scriptaculous/effects.js
diff --git a/framework/Web/Javascripts/scriptaculous/slider.js b/framework/Web/Javascripts/source/scriptaculous/slider.js
index 64115199..64115199 100644
--- a/framework/Web/Javascripts/scriptaculous/slider.js
+++ b/framework/Web/Javascripts/source/scriptaculous/slider.js