Issue 62

7 files changed, 21 insertions, 21 deletions

diff --git a/framework/Web/TAssetManager.php b/framework/Web/TAssetManager.php
index 0ea8fed7..7925d209 100644
--- a/framework/Web/TAssetManager.php
+++ b/framework/Web/TAssetManager.php
@@ -113,7 +113,7 @@ class TAssetManager extends TModule
 		{

 			$this->_basePath=Prado::getPathOfNamespace($value);

 			if($this->_basePath===null || !is_dir($this->_basePath) || !is_writable($this->_basePath))

-				throw new TInvalidDataValueException('assetmanage_basepath_invalid',$value);

+				throw new TInvalidDataValueException('assetmanager_basepath_invalid',$value);

 		}

 	}

 

diff --git a/framework/Web/UI/ActiveControls/TActiveControlAdapter.php b/framework/Web/UI/ActiveControls/TActiveControlAdapter.php
index cb1773e4..34872f98 100644
--- a/framework/Web/UI/ActiveControls/TActiveControlAdapter.php
+++ b/framework/Web/UI/ActiveControls/TActiveControlAdapter.php
@@ -4,7 +4,7 @@
  *

  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>

  * @link http://www.pradosoft.com/

- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2008 PradoSoft

  * @license http://www.pradosoft.com/license/

  * @version $Id$

  * @package System.Web.UI.ActiveControls

@@ -97,7 +97,7 @@ class TActiveControlAdapter extends TControlAdapter
 			$data = $this->getPage()->getPostDataLoaders();

 			if(count($data) > 0)

 			{

-				$options = TJavascript::encode($data,false);

+				$options = TJavaScript::encode($data,false);

 				$script = "Prado.CallbackRequest.addPostLoaders({$options});";

 				$cs->registerEndScript($key, $script);

 			}

@@ -146,12 +146,12 @@ class TActiveControlAdapter extends TControlAdapter
 	 * Starts viewstate tracking if necessary after when controls has been loaded

 	 */

 	public function onLoad($param)

-	{
+	{

 		if($this->getIsTrackingPageState())

 		{

 			$this->_stateTracker = new TCallbackPageStateTracker($this->getControl());

 			$this->_stateTracker->trackChanges();

-		}
+		}

 		parent::onLoad($param);

 	}

 

diff --git a/framework/Web/UI/ActiveControls/TActivePageAdapter.php b/framework/Web/UI/ActiveControls/TActivePageAdapter.php
index 6c039361..c52f0775 100644
--- a/framework/Web/UI/ActiveControls/TActivePageAdapter.php
+++ b/framework/Web/UI/ActiveControls/TActivePageAdapter.php
@@ -155,7 +155,7 @@ class TActivePageAdapter extends TControlAdapter
 			$responseData = $response->getAdapter()->getResponseData();
 			if(!is_null($responseData))
 			{
-				$data = TJavascript::jsonEncode($responseData);
+				$data = TJavaScript::jsonEncode($responseData);
 
 				$this->appendContentPart($response, self::CALLBACK_DATA_HEADER, $data);
 				//$response->appendHeader(self::CALLBACK_DATA_HEADER.': '.$data);
@@ -186,7 +186,7 @@ class TActivePageAdapter extends TControlAdapter
 
 		//output the actions
 		$executeJavascript = $this->getCallbackClientHandler()->getClientFunctionsToExecute();
-		$actions = TJavascript::jsonEncode($executeJavascript);
+		$actions = TJavaScript::jsonEncode($executeJavascript);
 		$this->appendContentPart($response, self::CALLBACK_ACTION_HEADER, $actions);
 		//$response->appendHeader(self::CALLBACK_ACTION_HEADER.': '.$actions);
 	}
@@ -264,7 +264,7 @@ class TActivePageAdapter extends TControlAdapter
 		{
 			$param = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_PARAMETER);
 			if(strlen($param) > 0)
-				$this->_callbackEventParameter=TJavascript::jsonDecode((string)$param);
+				$this->_callbackEventParameter=TJavaScript::jsonDecode((string)$param);
 		}
 		return $this->_callbackEventParameter;
 	}
@@ -315,7 +315,7 @@ class TCallbackErrorHandler extends TErrorHandler
 		if($this->getApplication()->getMode()===TApplication::STATE_DEBUG)
 		{
 			$response = $this->getApplication()->getResponse();
-			$trace = TJavascript::jsonEncode($this->getExceptionStackTrace($exception));
+			$trace = TJavaScript::jsonEncode($this->getExceptionStackTrace($exception));
 			$response->appendHeader('HTTP/1.0 500 Internal Error');
 			$response->appendHeader(TActivePageAdapter::CALLBACK_ERROR_HEADER.': '.$trace);
 		}
diff --git a/framework/Web/UI/ActiveControls/TAutoComplete.php b/framework/Web/UI/ActiveControls/TAutoComplete.php
index 4a36099a..5a3633ec 100644
--- a/framework/Web/UI/ActiveControls/TAutoComplete.php
+++ b/framework/Web/UI/ActiveControls/TAutoComplete.php
@@ -4,7 +4,7 @@
  *

  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>

  * @link http://www.pradosoft.com/

- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2008 PradoSoft

  * @license http://www.pradosoft.com/license/

  * @version $Id$

  * @package System.Web.UI.ActiveControls

@@ -328,7 +328,7 @@ class TAutoComplete extends TActiveTextBox implements INamingContainer
 		{

 			$string = strtr($string,array('\t'=>"\t",'\n'=>"\n",'\r'=>"\r"));

 			$token = preg_split('//', $string, -1, PREG_SPLIT_NO_EMPTY);

-			$options['tokens'] = TJavascript::encode($token,false);

+			$options['tokens'] = TJavaScript::encode($token,false);

 		}

 		if($this->getAutoPostBack())

 		{

@@ -343,8 +343,8 @@ class TAutoComplete extends TActiveTextBox implements INamingContainer
 		if(($minchars=$this->getMinChars())!=='')

 			$options['minChars'] = $minchars;

 		if(($frequency=$this->getFrequency())!=='')

-			$options['frequency'] = $frequency;
-		$options['CausesValidation'] = $this->getCausesValidation();
+			$options['frequency'] = $frequency;

+		$options['CausesValidation'] = $this->getCausesValidation();

 		$options['ValidationGroup'] = $this->getValidationGroup();

 		return $options;

 	}

diff --git a/framework/Web/UI/ActiveControls/TBaseActiveControl.php b/framework/Web/UI/ActiveControls/TBaseActiveControl.php
index b0bc5f58..8f55e27b 100644
--- a/framework/Web/UI/ActiveControls/TBaseActiveControl.php
+++ b/framework/Web/UI/ActiveControls/TBaseActiveControl.php
@@ -4,7 +4,7 @@
  *

  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>

  * @link http://www.pradosoft.com/

- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2008 PradoSoft

  * @license http://www.pradosoft.com/license/

  * @version $Id$

  * @package System.Web.UI.ActiveControls

@@ -385,7 +385,7 @@ class TBaseActiveCallbackControl extends TBaseActiveControl
 	 */

 	public function getJsCallbackOptions()

 	{

-		return TJavascript::encode($this->getClientSideOptions());

+		return TJavaScript::encode($this->getClientSideOptions());

 	}

 }

 

diff --git a/framework/Web/UI/TClientScriptManager.php b/framework/Web/UI/TClientScriptManager.php
index 8ecc2d9c..f0eb6157 100644
--- a/framework/Web/UI/TClientScriptManager.php
+++ b/framework/Web/UI/TClientScriptManager.php
@@ -233,7 +233,7 @@ class TClientScriptManager extends TApplicationComponent
 		$class = new TReflectionClass($callbackHandler);
 		$clientSide = $callbackHandler->getActiveControl()->getClientSide();
 		$options = array_merge($options, $clientSide->getOptions()->toArray());
-		$optionString = TJavascript::encode($options);
+		$optionString = TJavaScript::encode($options);
 		$this->registerPradoScriptInternal('ajax');
 		$id = $callbackHandler->getUniqueID();
 		return "new Prado.CallbackRequest('{$id}',{$optionString})";
@@ -680,8 +680,8 @@ abstract class TClientSideOptions extends TComponent
 	 */
 	protected function setFunction($name, $code)
 	{
-		if(!TJavascript::isFunction($code))
-			$code = TJavascript::quoteFunction($this->ensureFunction($code));
+		if(!TJavaScript::isFunction($code))
+			$code = TJavaScript::quoteFunction($this->ensureFunction($code));
 		$this->setOption($name, $code);
 	}
 
diff --git a/framework/Web/UI/WebControls/TSlider.php b/framework/Web/UI/WebControls/TSlider.php
index abd5eca6..ee725e99 100644
--- a/framework/Web/UI/WebControls/TSlider.php
+++ b/framework/Web/UI/WebControls/TSlider.php
@@ -4,7 +4,7 @@
  *

  * @author Christophe Boulain <Christophe.Boulain@gmail.com>

  * @link http://www.pradosoft.com/

- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2008 PradoSoft

  * @license http://www.pradosoft.com/license/

  * @version $Id$

  * @package System.Web.UI.WebControls

@@ -218,7 +218,7 @@ class TSlider extends TWebControl implements IPostBackDataHandler, IDataRenderer
 	public function setValues($value)

 	{

 		$this->setViewState('Values', TPropertyValue::ensureArray($value), array());

-	}
+	}

 	

 	/**

 	 * @return boolean a value indicating whether an automatic postback to the server

@@ -488,7 +488,7 @@ class TSlider extends TWebControl implements IPostBackDataHandler, IDataRenderer
 			// Add max if it's not in the array because of step

 			if (!in_array($maxValue, $values)) $values[]=$maxValue;

 		}

-		$options['values'] = TJavascript::Encode($values,false);

+		$options['values'] = TJavaScript::Encode($values,false);

 		if($this->_clientScript!==null)

 			$options = array_merge($options,$this->_clientScript->getOptions()->toArray());

 		return $options;