From aed2fa6fd84390e9509aebd9c745048594a29c1d Mon Sep 17 00:00:00 2001
From: wei <>
Date: Wed, 22 Feb 2006 04:28:21 +0000
Subject: Remove empty string values from javascript encoding

---
 framework/Web/Javascripts/TJavaScript.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'framework/Web/Javascripts/TJavaScript.php')

diff --git a/framework/Web/Javascripts/TJavaScript.php b/framework/Web/Javascripts/TJavaScript.php
index 0d081e02..861b973a 100644
--- a/framework/Web/Javascripts/TJavaScript.php
+++ b/framework/Web/Javascripts/TJavaScript.php
@@ -32,7 +32,7 @@ class TJavaScript
 	{
 		$str='';
 		foreach($files as $file)
-			$str.='<script type="text/javascript" src="'.THttpUtility::htmlEncode($file)."\"></script>\n";
+			$str.= $this->renderScriptFile($file);
 		return $str;
 	}
 
@@ -125,7 +125,8 @@ class TJavaScript
 			if($toMap)
 			{
 				foreach($value as $k=>$v)
-					$results[]="'{$k}':".self::encode($v,$toMap);
+					if(is_string($v) && strlen($v) > 0)
+						$results[]="'{$k}':".self::encode($v,$toMap);
 				return '{'.implode(',',$results).'}';
 			}
 			else
-- 
cgit v1.2.3