pradosoft / prado

framework/Web/UI/ActiveControls/TCallbackClientScript.php

Doc Comments +10 added lines

@@ -84,6 +84,7 @@ 
 	 * Executes a client-side statement.
 	 * @param string javascript function name
 	 * @param array list of arguments for the function
+	 * @param string $function
 	 */
 	public function callClientFunction($function, $params=array())
 	{
@@ -144,6 +145,7 @@ 
 	 * @param string selection method
 	 * @param string|int the value or index to select/check.
 	 * @param string selection control type, either 'check' or 'select'
+	 * @param boolean $value
 	 */
 	public function select($control, $method='Value', $value=null, $type=null)
 	{
@@ -210,6 +212,7 @@ 
 	 * @param TControl control element or element id
 	 * @param string attribute name
 	 * @param string attribute value
+	 * @param TControl $control
 	 */
 	public function setAttribute($control, $name, $value)
 	{
@@ -359,6 +362,7 @@ 
 	 * key is the style property and the value is the style value.
 	 * @param TControl control element or element id
 	 * @param array list of key-value pairs as style property and style value.
+	 * @param TControl $element
 	 */
 	public function setStyle($element, $styles)
 	{
@@ -413,6 +417,7 @@ 
 	 * @param TControl control element or HTML element id.
 	 * @param string HTML fragement or the control to be rendered.
 	 * @param boolean whether to fully replace the element or just its inner content.
+	 * @param boolean $self
 	 * @see insertAbout
 	 * @see insertBelow
 	 * @see insertBefore
@@ -441,6 +446,7 @@ 
 	 * @param TControl control element or HTML element id.
 	 * @param string HTML fragement or the control to be rendered.
 	 * @param boolean whether to fully replace the element or just its inner content, defaults to true.
+	 * @param TControl $element
 	 */
 	public function replaceContent($element, $content, $self=true)
 	{
@@ -492,6 +498,7 @@ 
 	 * component developers. The render() method is defered to be called in the
 	 * TActivePageAdapter class.
 	 * @param TControl control to be rendered on callback response.
+	 * @param TControl $control
 	 * @return string the boundary for which the rendered content is wrapped.
 	 */
 	private function getRenderedContentBoundary($control)
@@ -504,6 +511,7 @@ 
 
 	/**
 	 * @param THtmlWriter the writer responsible for rendering html content.
+	 * @param THtmlWriter $html
 	 * @return string content boundary.
 	 */
 	private function getResponseContentBoundary($html)
@@ -523,6 +531,7 @@ 
 	 * @param string visual effect function name.
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
+	 * @param string $type
 	 */
 	public function visualEffect($type, $element, $options=array())
 	{
@@ -630,6 +639,7 @@ 
 	 * @param string visual effect function name.
 	 * @param TControl control element or element id
 	 * @param array effect options.
+	 * @param string $effect
 	 */
 	public function juiEffect($element, $effect, $options=array())
 	{

Braces +3 added lines, -6 removed lines

@@ -424,13 +424,11 @@ 
 		{
 			$boundary = $this->getRenderedContentBoundary($content);
 			$content = null;
-		}
-		else if($content instanceof THtmlWriter)
+		} else if($content instanceof THtmlWriter)
 		{
 			$boundary = $this->getResponseContentBoundary($content);
 			$content = null;
-		}
-		else
+		} else
 			$boundary = null;
 
 		$this->callClientFunction('Prado.Element.replace', array($element, $content, $boundary, $self));
@@ -477,8 +475,7 @@ 
 		if($content instanceof TControl)
 		{
 			$boundary = $this->getRenderedContentBoundary($content);
-		}
-		elseif($content instanceof THtmlWriter)
+		} elseif($content instanceof THtmlWriter)
 		{
 			$boundary = $this->getResponseContentBoundary($content);
 		}

Spacing +36 added lines, -36 removed lines

@@ -68,7 +68,7 @@ 
 	 */
 	public function __construct()
 	{
-		$this->_actions = new TList;
+		$this->_actions=new TList;
 	}
 
 	/**
@@ -88,14 +88,14 @@ 
 	public function callClientFunction($function, $params=array())
 	{
 		if(!is_array($params))
-			$params = array($params);
+			$params=array($params);
 
 		if(count($params) > 0)
 		{
-			if ($params[0] instanceof ISurroundable)
-				$params[0] = $params[0]->getSurroundingTagID();
+			if($params[0] instanceof ISurroundable)
+				$params[0]=$params[0]->getSurroundingTagID();
 			elseif($params[0] instanceof TControl)
-				$params[0] = $params[0]->getClientID();
+				$params[0]=$params[0]->getClientID();
 		}
 		$this->_actions->add(array($function => $params));
 	}
@@ -108,13 +108,13 @@ 
 	 */
 	public function jQuery($element, $method, $params=array())
 	{
-		if ($element instanceof ISurroundable)
-			$element = $element->getSurroundingTagID();
+		if($element instanceof ISurroundable)
+			$element=$element->getSurroundingTagID();
 		elseif($element instanceof TControl)
-			$element = $element->getClientID();
+			$element=$element->getClientID();
 
 		if(!is_array($params))
-			$params = array($params);
+			$params=array($params);
 
 		$this->_actions->add(array('Prado.Element.j' => array($element, $method, $params)));
 	}
@@ -147,14 +147,14 @@ 
 	 */
 	public function select($control, $method='Value', $value=null, $type=null)
 	{
-		$method = TPropertyValue::ensureEnum($method,
+		$method=TPropertyValue::ensureEnum($method,
 				'Value', 'Index', 'Clear', 'Indices', 'Values', 'All', 'Invert');
-		$type = ($type===null) ? $this->getSelectionControlType($control) : $type;
-		$total = $this->getSelectionControlIsListType($control) ? $control->getItemCount() : 1;
+		$type=($type===null) ? $this->getSelectionControlType($control) : $type;
+		$total=$this->getSelectionControlIsListType($control) ? $control->getItemCount() : 1;
 
 		// pass the ID to avoid getting the surrounding elements (ISurroundable)
 		if($control instanceof TControl)
-			$control = $control->getClientID();
+			$control=$control->getClientID();
 
 		$this->callClientFunction('Prado.Element.select',
 				array($control, $type.$method, $value, $total));
@@ -214,9 +214,9 @@ 
 	public function setAttribute($control, $name, $value)
 	{
 		// Attributes should be applied on Surrounding tag, except for 'disabled' attribute
-		if ($control instanceof ISurroundable && strtolower($name)!=='disabled')
+		if($control instanceof ISurroundable && strtolower($name)!=='disabled')
 			$control=$control->getSurroundingTagID();
-		$this->callClientFunction('Prado.Element.setAttribute',array($control, $name, $value));
+		$this->callClientFunction('Prado.Element.setAttribute', array($control, $name, $value));
 	}
 
 	/**
@@ -226,25 +226,25 @@ 
 	 */
 	public function setListItems($control, $items)
 	{
-		$options = array();
+		$options=array();
 		if($control instanceof TListControl)
 		{
-			$promptText		= $control->getPromptText();
-			$promptValue	= $control->getPromptValue();
+			$promptText=$control->getPromptText();
+			$promptValue=$control->getPromptValue();
 
 			if($promptValue==='')
-				$promptValue = $promptText;
+				$promptValue=$promptText;
 
 			if($promptValue!=='')
-				$options[] = array($promptText, $promptValue);
+				$options[]=array($promptText, $promptValue);
 		}
 
 		foreach($items as $item)
 		{
 			if($item->getHasAttributes())
-				$options[] =  array($item->getText(),$item->getValue(), $item->getAttributes()->itemAt('Group'));
+				$options[]=array($item->getText(), $item->getValue(), $item->getAttributes()->itemAt('Group'));
 			else
-				$options[] = array($item->getText(),$item->getValue());
+				$options[]=array($item->getText(), $item->getValue());
 		}
 		$this->callClientFunction('Prado.Element.setOptions', array($control, $options));
 	}
@@ -422,16 +422,16 @@ 
 	{
 		if($content instanceof TControl)
 		{
-			$boundary = $this->getRenderedContentBoundary($content);
-			$content = null;
+			$boundary=$this->getRenderedContentBoundary($content);
+			$content=null;
 		}
 		else if($content instanceof THtmlWriter)
 		{
-			$boundary = $this->getResponseContentBoundary($content);
-			$content = null;
+			$boundary=$this->getResponseContentBoundary($content);
+			$content=null;
 		}
 		else
-			$boundary = null;
+			$boundary=null;
 
 		$this->callClientFunction('Prado.Element.replace', array($element, $content, $boundary, $self));
 	}
@@ -456,11 +456,11 @@ 
 	{
 		if($writer instanceof THtmlWriter)
 		{
-			$boundary = $this->getResponseContentBoundary($writer);
-			$content = null;
+			$boundary=$this->getResponseContentBoundary($writer);
+			$content=null;
 		} else {
-			$boundary = null;
-			$content = $writer;
+			$boundary=null;
+			$content=$writer;
 		}
 
 		$this->callClientFunction('Prado.Element.evaluateScript', array($content, $boundary));
@@ -476,11 +476,11 @@ 
 	{
 		if($content instanceof TControl)
 		{
-			$boundary = $this->getRenderedContentBoundary($content);
+			$boundary=$this->getRenderedContentBoundary($content);
 		}
 		elseif($content instanceof THtmlWriter)
 		{
-			$boundary = $this->getResponseContentBoundary($content);
+			$boundary=$this->getResponseContentBoundary($content);
 		}
 
 		$this->callClientFunction('Prado.Element.appendScriptBlock', array($boundary));
@@ -496,8 +496,8 @@ 
 	 */
 	private function getRenderedContentBoundary($control)
 	{
-		$writer = $this->getResponse()->createHtmlWriter();
-		$adapter = $control->getPage()->getAdapter();
+		$writer=$this->getResponse()->createHtmlWriter();
+		$adapter=$control->getPage()->getAdapter();
 		$adapter->registerControlToRender($control, $writer);
 		return $writer->getWriter()->getBoundary();
 	}
@@ -561,7 +561,7 @@ 
 	 */
 	public function fadeTo($element, $value, $duration=500)
 	{
-		$value = TPropertyValue::ensureFloat($value);
+		$value=TPropertyValue::ensureFloat($value);
 		$this->visualEffect('fadeTo', $element, array($duration, $value));
 	}
 

framework/Web/UI/ActiveControls/TDraggable.php

Doc Comments +2 added lines, -2 removed lines

@@ -53,7 +53,7 @@ 
 	 *   o 'True' or 'Revert' : The draggable will revert to it's original position
 	 *   o 'False' or 'None' : The draggable won't revert to it's original position
 	 *   o 'Failure' : The draggable will only revert if it's dropped on a non droppable area
-	 * @return TDraggableRevertOption true to revert
+	 * @return string true to revert
 	 */
 	public function getRevert()
 	{
@@ -118,7 +118,7 @@ 
 
 	/**
 	 * Determine if the element should be constrainted in one direction or not
-	 * @return CDraggableConstraint
+	 * @return string
 	 */
 	public function getConstraint()
 	{

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * TDraggable class file
- *
- * @author Christophe BOULAIN (Christophe.Boulain@gmail.com)
- * @copyright Copyright &copy; 2008, PradoSoft
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Web.UI.ActiveControls
- */
+	  * TDraggable class file
+	  *
+	  * @author Christophe BOULAIN (Christophe.Boulain@gmail.com)
+	  * @copyright Copyright &copy; 2008, PradoSoft
+	  * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	  * @package System.Web.UI.ActiveControls
+	  */
 
 /**
  * TDraggable is a control which can be dragged

Spacing +17 added lines, -17 removed lines

@@ -32,7 +32,7 @@ 
 	 * Set the handle id or css class
 	 * @param string
 	 */
-	public function setHandle ($value)
+	public function setHandle($value)
 	{
 		$this->setViewState('DragHandle', TPropertyValue::ensureString($value), null);
 	}
@@ -41,7 +41,7 @@ 
 	 * Get the handle id or css class
 	 * @return string
 	 */
-	public function getHandle ()
+	public function getHandle()
 	{
 		return $this->getViewState('DragHandle', null);
 	}
@@ -71,9 +71,9 @@ 
 	 */
 	public function setRevert($value)
 	{
-		if (strcasecmp($value,'true')==0 || $value===true)
+		if(strcasecmp($value, 'true')==0 || $value===true)
 			$value=TDraggableRevertOptions::Revert;
-		elseif (strcasecmp($value,'false')==0 || $value===false)
+		elseif(strcasecmp($value, 'false')==0 || $value===false)
 			$value=TDraggableRevertOptions::None;
 		$this->setViewState('Revert', TPropertyValue::ensureEnum($value, 'TDraggableRevertOptions'), true);
 	}
@@ -90,7 +90,7 @@ 
 	 *
 	 * @return TDraggableGhostingOption to clone the element
 	 */
-	public function getGhosting ()
+	public function getGhosting()
 	{
 		return $this->getViewState('Ghosting', TDraggableGhostingOptions::None);
 	}
@@ -107,11 +107,11 @@ 
 	 *  o "False" or "None" means no Ghosting options
 	 *
 	 */
-	public function setGhosting ($value)
+	public function setGhosting($value)
 	{
-		if (strcasecmp($value,'true')==0 || $value===true)
+		if(strcasecmp($value, 'true')==0 || $value===true)
 			$value=TDraggableGhostingOptions::Ghosting;
-		elseif (strcasecmp($value,'false')==0 || $value===false)
+		elseif(strcasecmp($value, 'false')==0 || $value===false)
 			$value=TDraggableGhostingOptions::None;
 		$this->setViewState('Ghosting', TPropertyValue::ensureEnum($value, 'TDraggableGhostingOptions'), TDraggableGhostingOptions::None);
 	}
@@ -154,11 +154,11 @@ 
 		parent::addAttributesToRender($writer);
 
 		$cs=$this->getPage()->getClientScript();
-		if ($this->getGhosting()==TDraggableGhostingOptions::SuperGhosting)
+		if($this->getGhosting()==TDraggableGhostingOptions::SuperGhosting)
 			$cs->registerPradoScript('dragdropextra');
 		else
 			$cs->registerPradoScript('dragdrop');
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 		$options=TJavascript::encode($this->getPostBackOptions());
 		$class=$this->getClientClassName();
 		$code="new {$class}('{$this->getClientId()}', {$options}) ";
@@ -170,7 +170,7 @@ 
 	 * This method overrides the parent implementation.
 	 * @return string the javascript class name
 	 */
-	protected function getClientClassName ()
+	protected function getClientClassName()
 	{
 		return 'Draggable';
 	}
@@ -181,17 +181,17 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options['ID'] = $this->getClientID();
+		$options['ID']=$this->getClientID();
 
-		if (($handle=$this->getHandle())!== null) $options['handle']=$handle;
-		if (($revert=$this->getRevert())===TDraggableRevertOptions::None)
+		if(($handle=$this->getHandle())!==null) $options['handle']=$handle;
+		if(($revert=$this->getRevert())===TDraggableRevertOptions::None)
 			$options['revert']=false;
-		elseif ($revert==TDraggableRevertOptions::Revert)
+		elseif($revert==TDraggableRevertOptions::Revert)
 			$options['revert']=true;
 		else
 			$options['revert']=strtolower($revert);
-		if (($constraint=$this->getConstraint())!==TDraggableConstraint::None) $options['constraint']=strtolower($constraint);
-		switch ($this->getGhosting())
+		if(($constraint=$this->getConstraint())!==TDraggableConstraint::None) $options['constraint']=strtolower($constraint);
+		switch($this->getGhosting())
 		{
 			case TDraggableGhostingOptions::SuperGhosting:
 				$options['superghosting']=true;

framework/Web/UI/ActiveControls/TDropContainer.php

Doc Comments -1 removed lines

@@ -127,7 +127,6 @@
 	 * Raises the onDrop event.
 	 * The drop parameters are encapsulated into a {@link TDropContainerEventParameter}
 	 *
-	 * @param object $dropControlId
 	 */
 	public function onDrop ($dropParams)
 	{

Braces +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
 		if ($this->sourcepath === NULL)
 		{
 			$this->sourcepath = $sourcepath;
-		}
-		else
+		} else
 		{
 			$this->sourcepath->append($sourcepath);
 		}

Spacing +35 added lines, -35 removed lines

@@ -129,9 +129,9 @@ 
 	 *
 	 * @param object $dropControlId
 	 */
-	public function onDrop ($dropParams)
+	public function onDrop($dropParams)
 	{
-		$this->raiseEvent('OnDrop', $this, new TDropContainerEventParameter ($dropParams));
+		$this->raiseEvent('OnDrop', $this, new TDropContainerEventParameter($dropParams));
 
 	}
 
@@ -153,11 +153,11 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options['ID'] = $this->getClientID();
-		$options['EventTarget'] = $this->getUniqueID();
+		$options['ID']=$this->getClientID();
+		$options['EventTarget']=$this->getUniqueID();
 
-		$options['accept'] = $this->getAcceptCssClass();
-		$options['hoverclass'] = $this->getHoverCssClass();
+		$options['accept']=$this->getAcceptCssClass();
+		$options['hoverclass']=$this->getHoverCssClass();
 		return $options;
 	}
 
@@ -189,7 +189,7 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		parent::addAttributesToRender($writer);
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 
 		$this->getPage()->getClientScript()->registerPradoScript('dragdrop');
 		$this->getActiveControl()->registerCallbackClientScript(
@@ -202,9 +202,9 @@ 
 	 * child controls. This container will be a TActivePanel, in order to allow user
 	 * to update its content on callback.
 	 */
-	public function createChildControls ()
+	public function createChildControls()
 	{
-		if ($this->_container===null)
+		if($this->_container===null)
 		{
 			$this->_container=Prado::CreateComponent('System.Web.UI.ActiveControls.TActivePanel');
 			$this->_container->setId($this->getId(false).'_content');
@@ -230,17 +230,17 @@ 
 	 * is defered until OnPreRender event is raised.
 	 * @param THtmlWriter html writer
 	 */
-	public function render ($writer)
+	public function render($writer)
 	{
 		if($this->getHasPreRendered())
 		{
 			parent::render($writer);
 			if($this->getActiveControl()->canUpdateClientSide())
-				$this->getPage()->getCallbackClient()->replaceContent($this->_container,$writer);
+				$this->getPage()->getCallbackClient()->replaceContent($this->_container, $writer);
 		}
 		else
 		{
-			$this->getPage()->getAdapter()->registerControlToRender($this->_container,$writer);
+			$this->getPage()->getAdapter()->registerControlToRender($this->_container, $writer);
 		}
 	}
 
@@ -272,28 +272,28 @@ 
 
 	public function __construct($dropParams)
 	{
-		$this->_dragElementId = $dropParams->DragElementID;
-		$this->_screenX = $dropParams->ScreenX;
-		$this->_screenY = $dropParams->ScreenY;
-		$this->_offsetX = isset($dropParams->OffsetX) ? $dropParams->OffsetX : false;
-		$this->_offsetY = isset($dropParams->OffsetY) ? $dropParams->OffsetY : false;
-		$this->_clientX = $dropParams->ClientX;
-		$this->_clientY = $dropParams->ClientY;
-		$this->_shiftKey = TPropertyValue::ensureBoolean($dropParams->ShiftKey);
-		$this->_ctrlKey = TPropertyValue::ensureBoolean($dropParams->CtrlKey);
-		$this->_altKey = TPropertyValue::ensureBoolean($dropParams->AltKey);
+		$this->_dragElementId=$dropParams->DragElementID;
+		$this->_screenX=$dropParams->ScreenX;
+		$this->_screenY=$dropParams->ScreenY;
+		$this->_offsetX=isset($dropParams->OffsetX) ? $dropParams->OffsetX : false;
+		$this->_offsetY=isset($dropParams->OffsetY) ? $dropParams->OffsetY : false;
+		$this->_clientX=$dropParams->ClientX;
+		$this->_clientY=$dropParams->ClientY;
+		$this->_shiftKey=TPropertyValue::ensureBoolean($dropParams->ShiftKey);
+		$this->_ctrlKey=TPropertyValue::ensureBoolean($dropParams->CtrlKey);
+		$this->_altKey=TPropertyValue::ensureBoolean($dropParams->AltKey);
 	}
 
-	public function getDragElementId()			{ return $this->_dragElementId; }
-	public function getScreenX()				{ return $this->_screenX; }
-	public function getScreenY()				{ return $this->_screenY; }
-	public function getOffsetX()				{ return $this->_offsetX; }
-	public function geOffsetY()					{ return $this->_offsetY; }
-	public function getClientX()				{ return $this->_clientX; }
-	public function getClientY()				{ return $this->_clientY; }
-	public function getShiftKey()				{ return $this->_shiftKey; }
-	public function getCtrlKey()				{ return $this->_ctrlKey; }
-	public function getAltKey()					{ return $this->_altKey; }
+	public function getDragElementId() { return $this->_dragElementId; }
+	public function getScreenX() { return $this->_screenX; }
+	public function getScreenY() { return $this->_screenY; }
+	public function getOffsetX() { return $this->_offsetX; }
+	public function geOffsetY() { return $this->_offsetY; }
+	public function getClientX() { return $this->_clientX; }
+	public function getClientY() { return $this->_clientY; }
+	public function getShiftKey() { return $this->_shiftKey; }
+	public function getCtrlKey() { return $this->_ctrlKey; }
+	public function getAltKey() { return $this->_altKey; }
 
 	/**
 	 * GetDroppedControl
@@ -301,15 +301,15 @@ 
 	 * Compatibility method to get the dropped control
 	 * @return TControl dropped control, or null if not found
 	 */
-	 public function getDroppedControl ()
+	 public function getDroppedControl()
 	 {
 		 $control=null;
 		 $service=prado::getApplication()->getService();
-		 if ($service instanceof TPageService)
+		 if($service instanceof TPageService)
 		 {
 			// Find the control
 			// Warning, this will not work if you have a '_' in your control Id !
-			$dropControlId=str_replace(TControl::CLIENT_ID_SEPARATOR,TControl::ID_SEPARATOR,$this->_dragElementId);
+			$dropControlId=str_replace(TControl::CLIENT_ID_SEPARATOR, TControl::ID_SEPARATOR, $this->_dragElementId);
 			$control=$service->getRequestedPage()->findControl($dropControlId);
 		 }
 		 return $control;

framework/Web/UI/ActiveControls/TInPlaceTextBox.php

Doc Comments +3 added lines

@@ -92,6 +92,8 @@ 
 	 * Calls the client-side static method for this control class.
 	 * @param string static method name
 	 * @param mixed method parmaeter
+	 * @param string $func
+	 * @param boolean $value
 	 */
 	protected function callClientFunction($func,$value)
 	{
@@ -239,6 +241,7 @@ 
 	 * Raised when editing the content is requsted to be loaded from the
 	 * server side.
 	 * @param TCallbackEventParameter event parameter to be passed to the event handlers
+	 * @param TCallbackEventParameter $param
 	 */
 	public function onLoadingText($param)
 	{

Braces +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
 		if ($this->sourcepath === NULL)
 		{
 			$this->sourcepath = $sourcepath;
-		}
-		else
+		} else
 		{
 			$this->sourcepath->append($sourcepath);
 		}

Spacing +29 added lines, -29 removed lines

@@ -74,10 +74,10 @@ 
 	 */
 	public function setDisplayTextBox($value)
 	{
-		$value = TPropertyValue::ensureBoolean($value);
-		$this->setViewState('DisplayTextBox', $value,false);
+		$value=TPropertyValue::ensureBoolean($value);
+		$this->setViewState('DisplayTextBox', $value, false);
 		if($this->getActiveControl()->canUpdateClientSide())
-			$this->callClientFunction('setDisplayTextBox',$value);
+			$this->callClientFunction('setDisplayTextBox', $value);
 	}
 
 	/**
@@ -93,11 +93,11 @@ 
 	 * @param string static method name
 	 * @param mixed method parmaeter
 	 */
-	protected function callClientFunction($func,$value)
+	protected function callClientFunction($func, $value)
 	{
-		$client = $this->getPage()->getCallbackClient();
-		$code = $this->getClientClassName().'.'.$func;
-		$client->callClientFunction($code,array($this,$value));
+		$client=$this->getPage()->getCallbackClient();
+		$code=$this->getClientClassName().'.'.$func;
+		$client->callClientFunction($code, array($this, $value));
 	}
 
 	/**
@@ -121,9 +121,9 @@ 
 	 */
 	protected function getExternalControlID()
 	{
-		$extID = $this->getEditTriggerControlID();
+		$extID=$this->getEditTriggerControlID();
 		if($extID===null) return '';
-		if(($control = $this->findControl($extID))!==null)
+		if(($control=$this->findControl($extID))!==null)
 			return $control->getClientID();
 		return $extID;
 	}
@@ -138,7 +138,7 @@ 
 		TTextBox::setText($value);
 		if($this->getActiveControl()->canUpdateClientSide())
 		{
-			$client = $this->getPage()->getCallbackClient();
+			$client=$this->getPage()->getCallbackClient();
 			$client->update($this->getLabelClientID(), $value);
 			$client->setValue($this, $value);
 		}
@@ -149,11 +149,11 @@ 
 	 * @param boolean value
 	 * @since 3.1.2
 	 */
-	public function setReadOnly ($value)
+	public function setReadOnly($value)
 	{
 		$value=TPropertyValue::ensureBoolean($value);
 		TTextBox::setReadOnly($value);
-		if ($this->getActiveControl()->canUpdateClientSide())
+		if($this->getActiveControl()->canUpdateClientSide())
 		{
 			$this->callClientFunction('setReadOnly', $value);
 		}
@@ -196,10 +196,10 @@ 
 	 */
 	public function onCallback($param)
 	{
-		$action = $param->getCallbackParameter();
-		if(is_array($action) && $action[0] === '__InlineEditor_loadExternalText__')
+		$action=$param->getCallbackParameter();
+		if(is_array($action) && $action[0]==='__InlineEditor_loadExternalText__')
 		{
-			$parameter = new TCallbackEventParameter($this->getResponse(), $action[1]);
+			$parameter=new TCallbackEventParameter($this->getResponse(), $action[1]);
 			$this->onLoadingText($parameter);
 		}
 		$this->raiseEvent('OnCallback', $this, $param);
@@ -210,26 +210,26 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options = parent::getPostBackOptions();
-		$options['ID'] = $this->getLabelClientID();
-		$options['TextBoxID'] = $this->getClientID();
-		$options['ExternalControl'] = $this->getExternalControlID();
-		$options['AutoHide'] = $this->getAutoHideTextBox() == false ? '' : true;
-		$options['AutoPostBack'] = $this->getAutoPostBack() == false ? '' : true;
-		$options['Columns'] = $this->getColumns();
+		$options=parent::getPostBackOptions();
+		$options['ID']=$this->getLabelClientID();
+		$options['TextBoxID']=$this->getClientID();
+		$options['ExternalControl']=$this->getExternalControlID();
+		$options['AutoHide']=$this->getAutoHideTextBox()==false ? '' : true;
+		$options['AutoPostBack']=$this->getAutoPostBack()==false ? '' : true;
+		$options['Columns']=$this->getColumns();
 		if($this->getTextMode()==='MultiLine')
 		{
-			$options['Rows'] = $this->getRows();
-			$options['Wrap'] = $this->getWrap()== false ? '' : true;
+			$options['Rows']=$this->getRows();
+			$options['Wrap']=$this->getWrap()==false ? '' : true;
 		}
 		else
 		{
-			$length = $this->getMaxLength();
-			$options['MaxLength'] = $length > 0 ? $length : '';
+			$length=$this->getMaxLength();
+			$options['MaxLength']=$length > 0 ? $length : '';
 		}
 
 		if($this->hasEventHandler('OnLoadingText'))
-			$options['LoadTextOnEdit'] = true;
+			$options['LoadTextOnEdit']=true;
 
 		$options['ReadOnly']=$this->getReadOnly();
 		return $options;
@@ -242,7 +242,7 @@ 
 	 */
 	public function onLoadingText($param)
 	{
-		$this->raiseEvent('OnLoadingText',$this,$param);
+		$this->raiseEvent('OnLoadingText', $this, $param);
 	}
 
 	/**
@@ -261,7 +261,7 @@ 
 	{
 		//calls the TWebControl to avoid rendering other attribute normally render for a textbox.
 		TWebControl::addAttributesToRender($writer);
-		$writer->addAttribute('id',$this->getLabelClientID());
+		$writer->addAttribute('id', $this->getLabelClientID());
 		$this->getActiveControl()->registerCallbackClientScript(
 			$this->getClientClassName(), $this->getPostBackOptions());
 	}

framework/Web/UI/ActiveControls/TTriggeredCallback.php

Doc Comments +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 	}
 
 	/**
-	 * @return array list of trigger callback options.
+	 * @return string list of trigger callback options.
 	 */
 	protected function getTriggerOptions()
 	{

Spacing +4 added lines, -4 removed lines

@@ -44,7 +44,7 @@ 
 	 */
 	protected function getTargetControl()
 	{
-		$id = $this->getControlID();
+		$id=$this->getControlID();
 		if(($control=$this->findControl($id)) instanceof TControl)
 			return $control->getClientID();
 		if($id==='')
@@ -60,9 +60,9 @@ 
 	 */
 	protected function getTriggerOptions()
 	{
-		$options['ID'] = $this->getClientID();
-		$options['EventTarget'] = $this->getUniqueID();
-		$options['ControlID'] = $this->getTargetControl();
+		$options['ID']=$this->getClientID();
+		$options['EventTarget']=$this->getUniqueID();
+		$options['ControlID']=$this->getTargetControl();
 		return $options;
 	}
 }

framework/Web/UI/JuiControls/TJuiAutoComplete.php

Doc Comments +3 added lines

@@ -252,6 +252,7 @@ 
 	 * method, be sure to call the parent implementation so that the event
 	 * handler can be invoked.
 	 * @param TCallbackEventParameter event parameter to be passed to the event handlers
+	 * @param TJuiAutoCompleteEventParameter $param
 	 */
 	public function onSuggest($param)
 	{
@@ -264,6 +265,7 @@ 
 	 * method, be sure to call the parent implementation so that the event
 	 * handler can be invoked.
 	 * @param TCallbackEventParameter event parameter to be passed to the event handlers
+	 * @param TJuiAutoCompleteEventParameter $param
 	 */
 	public function onSuggestionSelected($param)
 	{
@@ -441,6 +443,7 @@ 
 
 	/**
 	 * Creates a new TCallbackEventParameter.
+	 * @param THttpResponse $response
 	 */
 	public function __construct($response, $parameter, $index=-1)
 	{

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * TJuiAutoComplete class file.
- *
- * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2015 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Web.UI.ActiveControls
- */
+	 * TJuiAutoComplete class file.
+	 *
+	 * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2015 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Web.UI.ActiveControls
+	 */
 
 /**
  * Load active text box.

Braces +2 added lines, -4 removed lines

@@ -235,14 +235,12 @@
 			{
 				$parameter = new TJuiAutoCompleteEventParameter($this->getResponse(), $token[0]);
 				$this->onSuggest($parameter);
-			}
-			else if($token[1] === '__TJuiAutoComplete_onSuggestionSelected__')
+			} else if($token[1] === '__TJuiAutoComplete_onSuggestionSelected__')
 			{
 				$parameter = new TJuiAutoCompleteEventParameter($this->getResponse(), null, $token[0]);
 				$this->onSuggestionSelected($parameter);
 			}
-		}
-		else if($this->getAutoPostBack())
+		} else if($this->getAutoPostBack())
 			parent::raiseCallbackEvent($param);
 	}
 

Spacing +31 added lines, -31 removed lines

@@ -123,7 +123,7 @@ 
 	 */
 	public function getOptions()
 	{
-		if (($options=$this->getViewState('JuiOptions'))===null)
+		if(($options=$this->getViewState('JuiOptions'))===null)
 		{
 		  $options=new TJuiControlOptions($this);
 		  $this->setViewState('JuiOptions', $options);
@@ -204,7 +204,7 @@ 
 	 */
 	public function getMinChars()
 	{
-		return $this->getViewState('minChars','');
+		return $this->getViewState('minChars', '');
 	}
 
 	/**
@@ -228,17 +228,17 @@ 
 	 */
  	public function raiseCallbackEvent($param)
 	{
-		$token = $param->getCallbackParameter();
-		if(is_array($token) && count($token) == 2)
+		$token=$param->getCallbackParameter();
+		if(is_array($token) && count($token)==2)
 		{
-			if($token[1] === '__TJuiAutoComplete_onSuggest__')
+			if($token[1]==='__TJuiAutoComplete_onSuggest__')
 			{
-				$parameter = new TJuiAutoCompleteEventParameter($this->getResponse(), $token[0]);
+				$parameter=new TJuiAutoCompleteEventParameter($this->getResponse(), $token[0]);
 				$this->onSuggest($parameter);
 			}
-			else if($token[1] === '__TJuiAutoComplete_onSuggestionSelected__')
+			else if($token[1]==='__TJuiAutoComplete_onSuggestionSelected__')
 			{
-				$parameter = new TJuiAutoCompleteEventParameter($this->getResponse(), null, $token[0]);
+				$parameter=new TJuiAutoCompleteEventParameter($this->getResponse(), null, $token[0]);
 				$this->onSuggestionSelected($parameter);
 			}
 		}
@@ -295,7 +295,7 @@ 
 	public function getResultPanel()
 	{
 		if($this->_resultPanel===null)
-			$this->_resultPanel = $this->createResultPanel();
+			$this->_resultPanel=$this->createResultPanel();
 		return $this->_resultPanel;
 	}
 
@@ -304,7 +304,7 @@ 
 	 */
 	protected function createResultPanel()
 	{
-		$panel = Prado::createComponent('System.Web.UI.WebControls.TPanel');
+		$panel=Prado::createComponent('System.Web.UI.WebControls.TPanel');
 		$this->getControls()->add($panel);
 		$panel->setID('result');
 		return $panel;
@@ -316,7 +316,7 @@ 
 	public function getSuggestions()
 	{
 		if($this->_repeater===null)
-			$this->_repeater = $this->createRepeater();
+			$this->_repeater=$this->createRepeater();
 		return $this->_repeater;
 	}
 
@@ -325,8 +325,8 @@ 
 	 */
 	protected function createRepeater()
 	{
-		$repeater = Prado::createComponent('System.Web.UI.WebControls.TRepeater');
-		$repeater->setItemTemplate(new TTemplate('<%# $this->Data %>',null));
+		$repeater=Prado::createComponent('System.Web.UI.WebControls.TRepeater');
+		$repeater->setItemTemplate(new TTemplate('<%# $this->Data %>', null));
 		$this->getControls()->add($repeater);
 		return $repeater;
 	}
@@ -368,12 +368,12 @@ 
 		{
 			$data=array();
 			$items=$this->getSuggestions()->getItems();
-			$writer = new TTextWriter;
-			for($i=0; $i<$items->Count; $i++)
+			$writer=new TTextWriter;
+			for($i=0; $i < $items->Count; $i++)
 			{
 				$items->itemAt($i)->render($writer);
 				$item=$writer->flush();
-				$data[]=array( 'id' => $i, 'label' => $item);
+				$data[]=array('id' => $i, 'label' => $item);
 			}
 
 			$this->getResponse()->getAdapter()->setResponseData($data);
@@ -385,25 +385,25 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options = $this->getOptions()->toArray();
+		$options=$this->getOptions()->toArray();
 
-		if(strlen($separator = $this->getSeparator()))
-			$options['Separators'] = $separator;
+		if(strlen($separator=$this->getSeparator()))
+			$options['Separators']=$separator;
 
 		if($this->getAutoPostBack())
 		{
-			$options = array_merge($options,parent::getPostBackOptions());
-			$options['AutoPostBack'] = true;
+			$options=array_merge($options, parent::getPostBackOptions());
+			$options['AutoPostBack']=true;
 		}
-		if(strlen($textCssClass = $this->getTextCssClass()))
-			$options['textCssClass'] = $textCssClass;
-		$options['minLength'] = $this->getMinChars();
-		$options['delay'] = $this->getFrequency()*1000.0;
-		$options['appendTo'] = '#'.$this->getResultPanel()->getClientID();
-		$options['ID'] = $this->getClientID();
-		$options['EventTarget'] = $this->getUniqueID();
-		$options['CausesValidation'] = $this->getCausesValidation();
-		$options['ValidationGroup'] = $this->getValidationGroup();
+		if(strlen($textCssClass=$this->getTextCssClass()))
+			$options['textCssClass']=$textCssClass;
+		$options['minLength']=$this->getMinChars();
+		$options['delay']=$this->getFrequency() * 1000.0;
+		$options['appendTo']='#'.$this->getResultPanel()->getClientID();
+		$options['ID']=$this->getClientID();
+		$options['EventTarget']=$this->getUniqueID();
+		$options['CausesValidation']=$this->getCausesValidation();
+		$options['ValidationGroup']=$this->getValidationGroup();
 		return $options;
 	}
 
@@ -481,7 +481,7 @@ 
 
 	public function __construct($template)
 	{
-		$this->_template = $template;
+		$this->_template=$template;
 	}
 	/**
 	 * Instantiates the template.

framework/Web/UI/JuiControls/TJuiControlAdapter.php

Doc Comments +2 added lines, -2 removed lines

@@ -78,7 +78,7 @@ 
 
 	/**
 	 * Publish the jQuery-ui style Css asset file.
-	 * @param file name
+	 * @param file string
 	 * @return string Css file url.
 	 */
 	public function publishJuiStyle($file)
@@ -153,7 +153,7 @@ 
 	 * Gets a control instance named after a returned control id.
 	 * Example: if a $param->draggable control id is returned from clientside,
 	 * calling $param->DraggableControl will return the control instance
-	 * @return mixed control or null if not set.
+	 * @return null|TControl control or null if not set.
 	 */
 	public function __get($name)
 	{

Indentation +19 added lines, -19 removed lines

@@ -1,13 +1,13 @@ 
 <?php
 /**
- * TJuiControlAdapter class file.
- *
- * @author Fabio Bas <ctrlaltca@gmail.com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2013-2015 PradoSoft
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Web.UI.JuiControls
- */
+	 * TJuiControlAdapter class file.
+	 *
+	 * @author Fabio Bas <ctrlaltca@gmail.com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2013-2015 PradoSoft
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Web.UI.JuiControls
+	 */
 
 Prado::using('System.Web.UI.ActiveControls.TActiveControlAdapter');
 Prado::using('System.Web.UI.JuiControls.TJuiControlOptions');
@@ -96,7 +96,7 @@ 
 	 */
 	public function loadState() {
 	  parent::loadState();
-    $this->getControl()->getOptions()->setControl($this->getControl());
+	$this->getControl()->getOptions()->setControl($this->getControl());
 	}
 
 }
@@ -130,10 +130,10 @@ 
 class TJuiEventParameter extends TCallbackEventParameter
 {
  	/**
-	 * getControl
-	 *
-	 * Compatibility method to get a control from its clientside id
-	 * @return TControl control, or null if not found
+ 	 * getControl
+ 	 *
+ 	 * Compatibility method to get a control from its clientside id
+ 	 * @return TControl control, or null if not found
  	 */
 	public function getControl($id)
 	{
@@ -184,9 +184,9 @@ 
    */
   protected function addStatesToTrack()
   {
-    parent::addStatesToTrack();
-    $states = $this->getStatesToTrack();
-    $states['JuiOptions'] = array('TMapCollectionDiff', array($this, 'updateJuiOptions'));
+	parent::addStatesToTrack();
+	$states = $this->getStatesToTrack();
+	$states['JuiOptions'] = array('TMapCollectionDiff', array($this, 'updateJuiOptions'));
   }
 
 	/**
@@ -195,9 +195,9 @@ 
 	 */
   protected function updateJuiOptions($options)
   {
-    foreach ($options as $key => $value) $options[$key] = $key . ': ' . (is_string($value) ? "'{$value}'" : TPropertyValue::ensureString($value));
-    $code = "jQuery('#{$this->_control->getWidgetID()}').{$this->_control->getWidget()}('option', { " . implode(', ', $options) . " });";
-    $this->_control->getPage()->getClientScript()->registerEndScript(sprintf('%08X', crc32($code)), $code);
+	foreach ($options as $key => $value) $options[$key] = $key . ': ' . (is_string($value) ? "'{$value}'" : TPropertyValue::ensureString($value));
+	$code = "jQuery('#{$this->_control->getWidgetID()}').{$this->_control->getWidget()}('option', { " . implode(', ', $options) . " });";
+	$this->_control->getPage()->getClientScript()->registerEndScript(sprintf('%08X', crc32($code)), $code);
   }
 
 }
\ No newline at end of file

Spacing +13 added lines, -13 removed lines

@@ -25,9 +25,9 @@ 
  */
 class TJuiControlAdapter extends TActiveControlAdapter
 {
-	const SCRIPT_PATH = 'jquery';
-	const CSS_PATH = 'css';
-	const BASE_CSS_FILENAME ='jquery-ui.css';
+	const SCRIPT_PATH='jquery';
+	const CSS_PATH='css';
+	const BASE_CSS_FILENAME='jquery-ui.css';
 
 	/**
 	 * Replace default StateTracker with {@link TJuiCallbackPageStateTracker} for
@@ -72,7 +72,7 @@ 
 	 */
 	protected function getAssetUrl($file='')
 	{
-		$base = $this->getPage()->getClientScript()->getPradoScriptAssetUrl();
+		$base=$this->getPage()->getClientScript()->getPradoScriptAssetUrl();
 		return $base.'/'.self::SCRIPT_PATH.'/'.$file;
 	}
 
@@ -83,8 +83,8 @@ 
 	 */
 	public function publishJuiStyle($file)
 	{
-		$url = $this->getAssetUrl(self::CSS_PATH.'/'.$this->getJuiBaseStyle().'/'.$file);
-		$cs = $this->getPage()->getClientScript();
+		$url=$this->getAssetUrl(self::CSS_PATH.'/'.$this->getJuiBaseStyle().'/'.$file);
+		$cs=$this->getPage()->getClientScript();
 		if(!$cs->isStyleSheetFileRegistered($url))
 			$cs->registerStyleSheetFile($url, $url);
 		return $url;
@@ -139,11 +139,11 @@ 
 	{
 		$control=null;
 		$service=prado::getApplication()->getService();
-		if ($service instanceof TPageService)
+		if($service instanceof TPageService)
 		{
 			// Find the control
 			// Warning, this will not work if you have a '_' in your control Id !
-			$controlId=str_replace(TControl::CLIENT_ID_SEPARATOR,TControl::ID_SEPARATOR,$id);
+			$controlId=str_replace(TControl::CLIENT_ID_SEPARATOR, TControl::ID_SEPARATOR, $id);
 			$control=$service->getRequestedPage()->findControl($controlId);
 		}
 		return $control;
@@ -157,7 +157,7 @@ 
 	 */
 	public function __get($name)
 	{
-		$pos=strpos($name, 'Control',1);
+		$pos=strpos($name, 'Control', 1);
 		$name=strtolower(substr($name, 0, $pos));
 
 		$cp=$this->getCallbackParameter();
@@ -185,8 +185,8 @@ 
   protected function addStatesToTrack()
   {
     parent::addStatesToTrack();
-    $states = $this->getStatesToTrack();
-    $states['JuiOptions'] = array('TMapCollectionDiff', array($this, 'updateJuiOptions'));
+    $states=$this->getStatesToTrack();
+    $states['JuiOptions']=array('TMapCollectionDiff', array($this, 'updateJuiOptions'));
   }
 
 	/**
@@ -195,8 +195,8 @@ 
 	 */
   protected function updateJuiOptions($options)
   {
-    foreach ($options as $key => $value) $options[$key] = $key . ': ' . (is_string($value) ? "'{$value}'" : TPropertyValue::ensureString($value));
-    $code = "jQuery('#{$this->_control->getWidgetID()}').{$this->_control->getWidget()}('option', { " . implode(', ', $options) . " });";
+    foreach($options as $key => $value) $options[$key]=$key.': '.(is_string($value) ? "'{$value}'" : TPropertyValue::ensureString($value));
+    $code="jQuery('#{$this->_control->getWidgetID()}').{$this->_control->getWidget()}('option', { ".implode(', ', $options)." });";
     $this->_control->getPage()->getClientScript()->registerEndScript(sprintf('%08X', crc32($code)), $code);
   }
 

framework/Web/UI/JuiControls/TJuiControlOptions.php

Doc Comments +16 added lines, -1 removed lines

@@ -21,9 +21,24 @@ 
  */
 interface IJuiOptions
 {
+	/**
+	 * @return string
+	 */
 	public function getWidget();
+
+	/**
+	 * @return string
+	 */
 	public function getWidgetID();
+
+	/**
+	 * @return TJuiControlOptions
+	 */
 	public function getOptions();
+
+	/**
+	 * @return string[]
+	 */
 	public function getValidOptions();
 	public function getValidEvents();
 }
@@ -139,7 +154,7 @@ 
 
 	/**
 	 * Only serialize the options itself, not the corresponding parent control.
-	 * @return mixed array with the names of all variables of that object that should be serialized.
+	 * @return string[] array with the names of all variables of that object that should be serialized.
 	 */
 	public function __sleep() {
 	  return array('_options');

Indentation +10 added lines, -10 removed lines

@@ -1,13 +1,13 @@ 
 <?php
 /**
- * TJuiControlOptions class file.
- *
- * @author Fabio Bas <ctrlaltca@gmail.com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2013-2015 PradoSoft
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Web.UI.JuiControls
- */
+	 * TJuiControlOptions class file.
+	 *
+	 * @author Fabio Bas <ctrlaltca@gmail.com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2013-2015 PradoSoft
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Web.UI.JuiControls
+	 */
 
 /**
  * IJuiOptions interface
@@ -61,7 +61,7 @@ 
 	 */
 	public function __construct($control)
 	{
-    $this->setControl($control);
+	$this->setControl($control);
 	}
 
 	/**
@@ -72,7 +72,7 @@ 
 	public function setControl($control)
 	{
 	  if(!$control instanceof IJuiOptions)
-	    throw new THttpException(500,'juioptions_control_invalid',$control->ID);
+		throw new THttpException(500,'juioptions_control_invalid',$control->ID);
 	  $this->_control=$control;
 	}
 

Spacing +19 added lines, -19 removed lines

@@ -72,7 +72,7 @@ 
 	public function setControl($control)
 	{
 	  if(!$control instanceof IJuiOptions)
-	    throw new THttpException(500,'juioptions_control_invalid',$control->ID);
+	    throw new THttpException(500, 'juioptions_control_invalid', $control->ID);
 	  $this->_control=$control;
 	}
 
@@ -83,36 +83,36 @@ 
 	 * @param mixed option value.
 	 * @throws THttpException
 	 */
-	public function __set($name,$value)
+	public function __set($name, $value)
 	{
 		if($this->_options===null)
 			$this->_options=array();
 
 		foreach($this->_control->getValidOptions() as $option)
 		{
-			if(0 == strcasecmp($name, $option))
+			if(0==strcasecmp($name, $option))
 			{
-				$low = strtolower($value);
-				if($low === 'null')
+				$low=strtolower($value);
+				if($low==='null')
 				{
-					$this->_options[$option] = null;
-				} elseif($low === 'true') {
-					$this->_options[$option] = true;
-				} elseif($low === 'false') {
-					$this->_options[$option] = false;
+					$this->_options[$option]=null;
+				} elseif($low==='true') {
+					$this->_options[$option]=true;
+				} elseif($low==='false') {
+					$this->_options[$option]=false;
 				} elseif(is_numeric($value)) {
 					// trick to get float or integer automatically when needed
-					$this->_options[$option] = $value + 0;
-				} elseif(substr($low,0,8)=='function') {
-					$this->_options[$option] = new TJavaScriptLiteral($value);
+					$this->_options[$option]=$value + 0;
+				} elseif(substr($low, 0, 8)=='function') {
+					$this->_options[$option]=new TJavaScriptLiteral($value);
 				} else {
-					$this->_options[$option] = $value;
+					$this->_options[$option]=$value;
 				}
 				return;
 			}
 		}
 
-		throw new TConfigurationException('juioptions_option_invalid',$this->_control->ID, $name);
+		throw new TConfigurationException('juioptions_option_invalid', $this->_control->ID, $name);
 	}
 
 	/**
@@ -128,7 +128,7 @@ 
 
 		foreach($this->_control->getValidOptions() as $option)
 		{
-			if(0 == strcasecmp($name, $option) && isset($this->_options[$option]))
+			if(0==strcasecmp($name, $option) && isset($this->_options[$option]))
 			{
 				return $this->_options[$option];
 			}
@@ -150,7 +150,7 @@ 
 	 */
 	public function toArray()
 	{
-		$ret= ($this->_options===null) ? array() : $this->_options;
+		$ret=($this->_options===null) ? array() : $this->_options;
 
 		foreach($this->_control->getValidEvents() as $event)
 			if($this->_control->hasEventHandler('on'.$event))
@@ -168,10 +168,10 @@ 
 		$callbackParam=$param->CallbackParameter;
 		if(isset($callbackParam->event))
 		{
-			$eventName = 'On'.ucfirst($callbackParam->event);
+			$eventName='On'.ucfirst($callbackParam->event);
 			if($this->_control->hasEventHandler($eventName))
 			{
-				$this->_control->$eventName( new TJuiEventParameter(
+				$this->_control->$eventName(new TJuiEventParameter(
 					$this->_control->getResponse(),
 					isset($callbackParam->ui) ? $callbackParam->ui : null)
 				);

framework/Web/UI/JuiControls/TJuiDialog.php

Doc Comments +3 added lines

@@ -158,6 +158,9 @@
 		$this->triggerClientMethod('close');
 	}
 
+	/**
+	 * @param string $method
+	 */
 	private function triggerClientMethod($method)
 	{
 		$cs = $this->getPage()->getClientScript();

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * TJuiDialog class file.
- *
- * @author  David Otto <ottodavid[at]gmx[dot]net>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2013-2015 PradoSoft
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Web.UI.JuiControls
- */
+	 * TJuiDialog class file.
+	 *
+	 * @author  David Otto <ottodavid[at]gmx[dot]net>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2013-2015 PradoSoft
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Web.UI.JuiControls
+	 */
 
 Prado::using('System.Web.UI.JuiControls.TJuiControlAdapter');
 Prado::using('System.Web.UI.ActiveControls.TActivePanel');

Spacing +12 added lines, -12 removed lines

@@ -68,7 +68,7 @@ 
 	 */
 	public function getOptions()
 	{
-		if (($options=$this->getViewState('JuiOptions'))===null)
+		if(($options=$this->getViewState('JuiOptions'))===null)
 		{
 		  $options=new TJuiControlOptions($this);
 		  $this->setViewState('JuiOptions', $options);
@@ -99,11 +99,11 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options = $this->getOptions()->toArray();
+		$options=$this->getOptions()->toArray();
 
 		foreach($this->getControls() as $control)
 			if($control instanceof TJuiDialogButton)
-				$options['buttons'][] = $control->getPostBackOptions();
+				$options['buttons'][]=$control->getPostBackOptions();
 
 		return $options;
 	}
@@ -116,7 +116,7 @@ 
 	{
 		parent::addAttributesToRender($writer);
 
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 		$options=TJavascript::encode($this->getPostBackOptions());
 		$cs=$this->getPage()->getClientScript();
 		$code="jQuery('#".$this->getWidgetID()."').".$this->getWidget()."(".$options.");";
@@ -137,7 +137,7 @@ 
 	 * Raises the OnCreate event
 	 * @param object $params event parameters
 	 */
-	public function onOpen ($params)
+	public function onOpen($params)
 	{
 		$this->raiseEvent('OnOpen', $this, $params);
 	}
@@ -160,8 +160,8 @@ 
 
 	private function triggerClientMethod($method)
 	{
-		$cs = $this->getPage()->getClientScript();
-		$code = "jQuery(document).ready(function() { jQuery('#".$this->getClientId()."').dialog('".$method."'); })";
+		$cs=$this->getPage()->getClientScript();
+		$code="jQuery(document).ready(function() { jQuery('#".$this->getClientId()."').dialog('".$method."'); })";
 		$cs->registerEndScript(sprintf('%08X', crc32($code)), $code);
 	}
 
@@ -241,7 +241,7 @@ 
 		return array(
 			'text' => $this->getText(),
 			'click' => new TJavaScriptLiteral("function(){new Prado.Callback('".$this->getUniqueID()."', 'onClick');}"
-			)) ;
+			));
 	}
 
 	/**
@@ -249,7 +249,7 @@ 
 	 */
 	public function getText()
 	{
-		return $this->getViewState('Text','');
+		return $this->getViewState('Text', '');
 	}
 
 	/**
@@ -257,14 +257,14 @@ 
 	 */
 	public function setText($value)
 	{
-		$this->setViewState('Text',$value,'');
+		$this->setViewState('Text', $value, '');
 	}
 
 	/**
 	 * Raises the OnClick event
 	 * @param object $params event parameters
 	 */
-	public function onClick ($params)
+	public function onClick($params)
 	{
 		$this->raiseEvent('OnClick', $this, $params);
 	}
@@ -276,7 +276,7 @@ 
 	 */
 	public function raiseCallbackEvent($param)
 	{
-		if($param->CallbackParameter === 'onClick')
+		if($param->CallbackParameter==='onClick')
 			$this->onClick($param);
 	}
 

Braces +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
 		if ($this->sourcepath === NULL)
 		{
 			$this->sourcepath = $sourcepath;
-		}
-		else
+		} else
 		{
 			$this->sourcepath->append($sourcepath);
 		}