pradosoft / prado

framework/Web/UI/WebControls/TLabel.php

Braces +2 added lines, -4 removed lines

@@ -69,11 +69,9 @@
 					$this->_forControl=$control->getClientID();
 					parent::render($writer);
 				}
-			}
-			else
+			} else
 				throw new TInvalidDataValueException('label_associatedcontrol_invalid',$aid);
-		}
-		else
+		} else
 			parent::render($writer);
 	}
 

Spacing +7 added lines, -7 removed lines

@@ -37,7 +37,7 @@ 
 	 */
 	protected function getTagName()
 	{
-		return ($this->getForControl()==='')?'span':'label';
+		return ($this->getForControl()==='') ? 'span' : 'label';
 	}
 
 	/**
@@ -48,7 +48,7 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		if($this->_forControl!=='')
-			$writer->addAttribute('for',$this->_forControl);
+			$writer->addAttribute('for', $this->_forControl);
 		parent::addAttributesToRender($writer);
 	}
 
@@ -71,7 +71,7 @@ 
 				}
 			}
 			else
-				throw new TInvalidDataValueException('label_associatedcontrol_invalid',$aid);
+				throw new TInvalidDataValueException('label_associatedcontrol_invalid', $aid);
 		}
 		else
 			parent::render($writer);
@@ -94,7 +94,7 @@ 
 	 */
 	public function getText()
 	{
-		return $this->getViewState('Text','');
+		return $this->getViewState('Text', '');
 	}
 
 	/**
@@ -102,7 +102,7 @@ 
 	 */
 	public function setText($value)
 	{
-		$this->setViewState('Text',TPropertyValue::ensureString($value),'');
+		$this->setViewState('Text', TPropertyValue::ensureString($value), '');
 	}
 
 	/**
@@ -136,7 +136,7 @@ 
 	 */
 	public function getForControl()
 	{
-		return $this->getViewState('ForControl','');
+		return $this->getViewState('ForControl', '');
 	}
 
 	/**
@@ -146,7 +146,7 @@ 
 	 */
 	public function setForControl($value)
 	{
-		$this->setViewState('ForControl',$value,'');
+		$this->setViewState('ForControl', $value, '');
 	}
 }
 

framework/Web/UI/WebControls/TDropDownListColumn.php

Braces +2 added lines, -4 removed lines

@@ -270,8 +270,7 @@ 
 					$cell->getControls()->add($listControl);
 					$cell->registerObject('DropDownList',$listControl);
 					$control=$listControl;
-				}
-				else
+				} else
 					$control=$cell;
 				$control->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
 				break;
@@ -307,8 +306,7 @@ 
 				$value=$text;
 			$formatString=$this->getDataTextFormatString();
 			$text=$this->formatDataValue($formatString,$text);
-		}
-		else
+		} else
 			$text=$value;
 		if($sender instanceof TTableCell)
 			$sender->setText($text);

Spacing +25 added lines, -25 removed lines

@@ -77,7 +77,7 @@ 
 		parent::loadState($state);
 		$this->_stateLoaded=true;
 		if(!$this->_dataBound)
-			$this->_listControl->getItems()->loadState($this->getViewState('Items',null));
+			$this->_listControl->getItems()->loadState($this->getViewState('Items', null));
 	}
 
 	/**
@@ -86,7 +86,7 @@ 
 	 */
 	public function saveState()
 	{
-		$this->setViewState('Items',$this->_listControl->getItems()->saveState(),null);
+		$this->setViewState('Items', $this->_listControl->getItems()->saveState(), null);
 		return parent::saveState();
 	}
 
@@ -111,7 +111,7 @@ 
 	 */
 	public function getDataTextField()
 	{
-		return $this->getViewState('DataTextField','');
+		return $this->getViewState('DataTextField', '');
 	}
 
 	/**
@@ -122,7 +122,7 @@ 
 	 */
 	public function setDataTextField($value)
 	{
-		$this->setViewState('DataTextField',$value,'');
+		$this->setViewState('DataTextField', $value, '');
 	}
 
 	/**
@@ -130,7 +130,7 @@ 
 	 */
 	public function getDataTextFormatString()
 	{
-		return $this->getViewState('DataTextFormatString','');
+		return $this->getViewState('DataTextFormatString', '');
 	}
 
 	/**
@@ -138,7 +138,7 @@ 
 	 */
 	public function setDataTextFormatString($value)
 	{
-		$this->setViewState('DataTextFormatString',$value,'');
+		$this->setViewState('DataTextFormatString', $value, '');
 	}
 
 	/**
@@ -146,7 +146,7 @@ 
 	 */
 	public function getDataValueField()
 	{
-		return $this->getViewState('DataValueField','');
+		return $this->getViewState('DataValueField', '');
 	}
 
 	/**
@@ -157,7 +157,7 @@ 
 	 */
 	public function setDataValueField($value)
 	{
-		$this->setViewState('DataValueField',$value,'');
+		$this->setViewState('DataValueField', $value, '');
 	}
 
 	/**
@@ -165,7 +165,7 @@ 
 	 */
 	public function getReadOnly()
 	{
-		return $this->getViewState('ReadOnly',false);
+		return $this->getViewState('ReadOnly', false);
 	}
 
 	/**
@@ -173,7 +173,7 @@ 
 	 */
 	public function setReadOnly($value)
 	{
-		$this->setViewState('ReadOnly',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('ReadOnly', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -197,7 +197,7 @@ 
 	 */
 	public function getListValueField()
 	{
-		return $this->getViewState('ListValueField','');
+		return $this->getViewState('ListValueField', '');
 	}
 
 	/**
@@ -205,7 +205,7 @@ 
 	 */
 	public function setListValueField($value)
 	{
-		$this->setViewState('ListValueField',$value,'');
+		$this->setViewState('ListValueField', $value, '');
 	}
 
 	/**
@@ -213,7 +213,7 @@ 
 	 */
 	public function getListTextField()
 	{
-		return $this->getViewState('ListTextField','');
+		return $this->getViewState('ListTextField', '');
 	}
 
 	/**
@@ -221,7 +221,7 @@ 
 	 */
 	public function setListTextField($value)
 	{
-		$this->setViewState('ListTextField',$value,'');
+		$this->setViewState('ListTextField', $value, '');
 	}
 
 	/**
@@ -229,7 +229,7 @@ 
 	 */
 	public function getListTextFormatString()
 	{
-		return $this->getViewState('ListTextFormatString','');
+		return $this->getViewState('ListTextFormatString', '');
 	}
 
 	/**
@@ -237,7 +237,7 @@ 
 	 */
 	public function setListTextFormatString($value)
 	{
-		$this->setViewState('ListTextFormatString',$value,'');
+		$this->setViewState('ListTextFormatString', $value, '');
 	}
 
 	/**
@@ -251,7 +251,7 @@ 
 	 * @param integer the index to the Columns property that the cell resides in.
 	 * @param string the type of cell (Header,Footer,Item,AlternatingItem,EditItem,SelectedItem)
 	 */
-	public function initializeCell($cell,$columnIndex,$itemType)
+	public function initializeCell($cell, $columnIndex, $itemType)
 	{
 		if(!$this->_dataBound && $this->_listControl->getDataSource()!==null)
 		{
@@ -268,21 +268,21 @@ 
 				{
 					$listControl=clone $this->_listControl;
 					$cell->getControls()->add($listControl);
-					$cell->registerObject('DropDownList',$listControl);
+					$cell->registerObject('DropDownList', $listControl);
 					$control=$listControl;
 				}
 				else
 					$control=$cell;
-				$control->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
+				$control->attachEventHandler('OnDataBinding', array($this, 'dataBindColumn'));
 				break;
 			case TListItemType::Item:
 			case TListItemType::AlternatingItem:
 			case TListItemType::SelectedItem:
 				if($this->getDataTextField()!=='' || $this->getDataValueField()!=='')
-					$cell->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
+					$cell->attachEventHandler('OnDataBinding', array($this, 'dataBindColumn'));
 				break;
 			default:
-				parent::initializeCell($cell,$columnIndex,$itemType);
+				parent::initializeCell($cell, $columnIndex, $itemType);
 				break;
 		}
 	}
@@ -292,21 +292,21 @@ 
 	 * This method is invoked when datagrid performs databinding.
 	 * It populates the content of the cell with the relevant data from data source.
 	 */
-	public function dataBindColumn($sender,$param)
+	public function dataBindColumn($sender, $param)
 	{
 		$item=$sender->getNamingContainer();
 		$data=$item->getData();
 		if(($valueField=$this->getDataValueField())!=='')
-			$value=$this->getDataFieldValue($data,$valueField);
+			$value=$this->getDataFieldValue($data, $valueField);
 		else
 			$value='';
 		if(($textField=$this->getDataTextField())!=='')
 		{
-			$text=$this->getDataFieldValue($data,$textField);
+			$text=$this->getDataFieldValue($data, $textField);
 			if($valueField==='')
 				$value=$text;
 			$formatString=$this->getDataTextFormatString();
-			$text=$this->formatDataValue($formatString,$text);
+			$text=$this->formatDataValue($formatString, $text);
 		}
 		else
 			$text=$value;

framework/Web/UI/WebControls/TLinkButton.php

Braces +1 added lines, -2 removed lines

@@ -98,8 +98,7 @@
 		{
 			$this->renderLinkButtonHref($writer);
 			$this->renderClientControlScript($writer);
-		}
-		else if($this->getEnabled()) // in this case, parent will not render 'disabled'
+		} else if($this->getEnabled()) // in this case, parent will not render 'disabled'
 			$writer->addAttribute('disabled','disabled');
 	}
 

Spacing +27 added lines, -27 removed lines

@@ -70,7 +70,7 @@ 
 	 */
 	public function getEnableClientScript()
 	{
-		return $this->getViewState('EnableClientScript',true);
+		return $this->getViewState('EnableClientScript', true);
 	}
 
 	/**
@@ -78,7 +78,7 @@ 
 	 */
 	public function setEnableClientScript($value)
 	{
-		$this->setViewState('EnableClientScript',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('EnableClientScript', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -91,7 +91,7 @@ 
 		$page=$this->getPage();
 		$page->ensureRenderInForm($this);
 
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 
 		// We call parent implementation here because some attributes
 		// may be overwritten in the following
@@ -103,7 +103,7 @@ 
 			$this->renderClientControlScript($writer);
 		}
 		else if($this->getEnabled()) // in this case, parent will not render 'disabled'
-			$writer->addAttribute('disabled','disabled');
+			$writer->addAttribute('disabled', 'disabled');
 	}
 
 	/**
@@ -112,8 +112,8 @@ 
 	 */
 	protected function renderClientControlScript($writer)
 	{
-		$cs = $this->getPage()->getClientScript();
-		$cs->registerPostBackControl($this->getClientClassName(),$this->getPostBackOptions());
+		$cs=$this->getPage()->getClientScript();
+		$cs->registerPostBackControl($this->getClientClassName(), $this->getPostBackOptions());
 	}
 
 	/**
@@ -121,7 +121,7 @@ 
 	 */
 	public function setIsDefaultButton($value)
 	{
-		$this->setViewState('IsDefaultButton', TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('IsDefaultButton', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -139,7 +139,7 @@ 
 	protected function renderLinkButtonHref($writer)
 	{
 		//create unique no-op url references
-		$nop = "javascript:;//".$this->getClientID();
+		$nop="javascript:;//".$this->getClientID();
 		$writer->addAttribute('href', $nop);
 	}
 
@@ -160,11 +160,11 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options['ID'] = $this->getClientID();
-		$options['EventTarget'] = $this->getUniqueID();
-		$options['CausesValidation'] = $this->getCausesValidation();
-		$options['ValidationGroup'] = $this->getValidationGroup();
-		$options['StopEvent'] = true;
+		$options['ID']=$this->getClientID();
+		$options['EventTarget']=$this->getUniqueID();
+		$options['CausesValidation']=$this->getCausesValidation();
+		$options['ValidationGroup']=$this->getValidationGroup();
+		$options['StopEvent']=true;
 
 		return $options;
 	}
@@ -188,7 +188,7 @@ 
 	 */
 	public function getText()
 	{
-		return $this->getViewState('Text','');
+		return $this->getViewState('Text', '');
 	}
 
 	/**
@@ -196,7 +196,7 @@ 
 	 */
 	public function setText($value)
 	{
-		$this->setViewState('Text',$value,'');
+		$this->setViewState('Text', $value, '');
 	}
 
 	/**
@@ -230,7 +230,7 @@ 
 	 */
 	public function getCommandName()
 	{
-		return $this->getViewState('CommandName','');
+		return $this->getViewState('CommandName', '');
 	}
 
 	/**
@@ -238,7 +238,7 @@ 
 	 */
 	public function setCommandName($value)
 	{
-		$this->setViewState('CommandName',$value,'');
+		$this->setViewState('CommandName', $value, '');
 	}
 
 	/**
@@ -246,7 +246,7 @@ 
 	 */
 	public function getCommandParameter()
 	{
-		return $this->getViewState('CommandParameter','');
+		return $this->getViewState('CommandParameter', '');
 	}
 
 	/**
@@ -254,7 +254,7 @@ 
 	 */
 	public function setCommandParameter($value)
 	{
-		$this->setViewState('CommandParameter',$value,'');
+		$this->setViewState('CommandParameter', $value, '');
 	}
 
 	/**
@@ -262,7 +262,7 @@ 
 	 */
 	public function getCausesValidation()
 	{
-		return $this->getViewState('CausesValidation',true);
+		return $this->getViewState('CausesValidation', true);
 	}
 
 	/**
@@ -271,7 +271,7 @@ 
 	 */
 	public function setCausesValidation($value)
 	{
-		$this->setViewState('CausesValidation',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('CausesValidation', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -279,7 +279,7 @@ 
 	 */
 	public function getValidationGroup()
 	{
-		return $this->getViewState('ValidationGroup','');
+		return $this->getViewState('ValidationGroup', '');
 	}
 
 	/**
@@ -287,7 +287,7 @@ 
 	 */
 	public function setValidationGroup($value)
 	{
-		$this->setViewState('ValidationGroup',$value,'');
+		$this->setViewState('ValidationGroup', $value, '');
 	}
 
 	/**
@@ -304,7 +304,7 @@ 
 		if($this->getCausesValidation())
 			$this->getPage()->validate($this->getValidationGroup());
 		$this->onClick(null);
-		$this->onCommand(new \Prado\Web\UI\TCommandEventParameter($this->getCommandName(),$this->getCommandParameter()));
+		$this->onCommand(new \Prado\Web\UI\TCommandEventParameter($this->getCommandName(), $this->getCommandParameter()));
 	}
 
 	/**
@@ -316,7 +316,7 @@ 
 	 */
 	public function onClick($param)
 	{
-		$this->raiseEvent('OnClick',$this,$param);
+		$this->raiseEvent('OnClick', $this, $param);
 	}
 
 	/**
@@ -328,8 +328,8 @@ 
 	 */
 	public function onCommand($param)
 	{
-		$this->raiseEvent('OnCommand',$this,$param);
-		$this->raiseBubbleEvent($this,$param);
+		$this->raiseEvent('OnCommand', $this, $param);
+		$this->raiseBubbleEvent($this, $param);
 	}
 }
 

Doc Comments +1 added lines

@@ -325,6 +325,7 @@
 	 * If you override this method, be sure to call the parent implementation
 	 * so that the event handlers can be invoked.
 	 * @param \Prado\Web\UI\TCommandEventParameter event parameter to be passed to the event handlers
+	 * @param \Prado\Web\UI\TCommandEventParameter $param
 	 */
 	public function onCommand($param)
 	{

framework/Web/UI/WebControls/TDataListItemRenderer.php

Braces +2 added lines, -4 removed lines

@@ -84,8 +84,7 @@ 
 		{
 			$this->raiseBubbleEvent($this,new TDataListCommandEventParameter($this,$sender,$param));
 			return true;
-		}
-		else
+		} else
 			return false;
 	}
 
@@ -130,8 +129,7 @@ 
 			$this->renderBeginTag($writer);
 			$this->renderContents($writer);
 			$this->renderEndTag($writer);
-		}
-		else
+		} else
 			$this->renderContents($writer);
 	}
 

Spacing +6 added lines, -6 removed lines

@@ -44,7 +44,7 @@ 
 	 */
 	public function getHasStyle()
 	{
-		return $this->getViewState('Style',null)!==null;
+		return $this->getViewState('Style', null)!==null;
 	}
 
 	/**
@@ -52,12 +52,12 @@ 
 	 */
 	public function getStyle()
 	{
-		if($style=$this->getViewState('Style',null))
+		if($style=$this->getViewState('Style', null))
 			return $style;
 		else
 		{
 			$style=$this->createStyle();
-			$this->setViewState('Style',$style,null);
+			$this->setViewState('Style', $style, null);
 			return $style;
 		}
 	}
@@ -77,11 +77,11 @@ 
 	 * @param TEventParameter event parameter
 	 * @return boolean whether the event bubbling should stop here.
 	 */
-	public function bubbleEvent($sender,$param)
+	public function bubbleEvent($sender, $param)
 	{
 		if($param instanceof \Prado\Web\UI\TCommandEventParameter)
 		{
-			$this->raiseBubbleEvent($this,new TDataListCommandEventParameter($this,$sender,$param));
+			$this->raiseBubbleEvent($this, new TDataListCommandEventParameter($this, $sender, $param));
 			return true;
 		}
 		else
@@ -108,7 +108,7 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		if($style=$this->getViewState('Style',null))
+		if($style=$this->getViewState('Style', null))
 			$style->addAttributesToRender($writer);
 	}
 

framework/Web/UI/WebControls/TMultiView.php

Braces +3 added lines, -6 removed lines

@@ -97,8 +97,7 @@ 
 			$this->_cachedActiveViewIndex=-1;
 			if($index>=0)
 				$this->activateView($views->itemAt($index),true);
-		}
-		else
+		} else
 			throw new TInvalidDataValueException('multiview_activeviewindex_invalid',$index);
 	}
 
@@ -153,8 +152,7 @@ 
 					$view->onActivate(null);
 					$this->onActiveViewChanged(null);
 				}
-			}
-			else if($v->getActive())
+			} else if($v->getActive())
 			{
 				$v->setActive(false);
 				if($triggerEvent)
@@ -232,8 +230,7 @@ 
 					{
 						$this->setActiveView($view);
 						return true;
-					}
-					else
+					} else
 						throw new TInvalidDataValueException('multiview_viewid_invalid', $viewID);
 				case self::CMD_SWITCHVIEWINDEX:
 					$index=TPropertyValue::ensureInteger($param->getCommandParameter());

Spacing +23 added lines, -23 removed lines

@@ -80,10 +80,10 @@ 
 	 */
 	public function getActiveViewIndex()
 	{
-		if($this->_cachedActiveViewIndex>-1)
+		if($this->_cachedActiveViewIndex > -1)
 			return $this->_cachedActiveViewIndex;
 		else
-			return $this->getControlState('ActiveViewIndex',-1);
+			return $this->getControlState('ActiveViewIndex', -1);
 	}
 
 	/**
@@ -92,21 +92,21 @@ 
 	 */
 	public function setActiveViewIndex($value)
 	{
-		if(($index=TPropertyValue::ensureInteger($value))<0)
+		if(($index=TPropertyValue::ensureInteger($value)) < 0)
 			$index=-1;
 		$views=$this->getViews();
 		$count=$views->getCount();
-		if($count===0 && $this->getControlStage()<TControl::CS_CHILD_INITIALIZED)
+		if($count===0 && $this->getControlStage() < TControl::CS_CHILD_INITIALIZED)
 			$this->_cachedActiveViewIndex=$index;
-		else if($index<$count)
+		else if($index < $count)
 		{
-			$this->setControlState('ActiveViewIndex',$index,-1);
+			$this->setControlState('ActiveViewIndex', $index, -1);
 			$this->_cachedActiveViewIndex=-1;
-			if($index>=0)
-				$this->activateView($views->itemAt($index),true);
+			if($index >= 0)
+				$this->activateView($views->itemAt($index), true);
 		}
 		else
-			throw new TInvalidDataValueException('multiview_activeviewindex_invalid',$index);
+			throw new TInvalidDataValueException('multiview_activeviewindex_invalid', $index);
 	}
 
 	/**
@@ -117,13 +117,13 @@ 
 	{
 		$index=$this->getActiveViewIndex();
 		$views=$this->getViews();
-		if($index>=$views->getCount())
-			throw new TInvalidDataValueException('multiview_activeviewindex_invalid',$index);
-		if($index<0)
+		if($index >= $views->getCount())
+			throw new TInvalidDataValueException('multiview_activeviewindex_invalid', $index);
+		if($index < 0)
 			return null;
 		$view=$views->itemAt($index);
 		if(!$view->getActive())
-			$this->activateView($view,false);
+			$this->activateView($view, false);
 		return $view;
 	}
 
@@ -133,7 +133,7 @@ 
 	 */
 	public function setActiveView($view)
 	{
-		if(($index=$this->getViews()->indexOf($view))>=0)
+		if(($index=$this->getViews()->indexOf($view)) >= 0)
 			$this->setActiveViewIndex($index);
 		else
 			throw new TInvalidOperationException('multiview_view_inexistent');
@@ -145,11 +145,11 @@ 
 	 * @param TView the view to be activated
 	 * @param boolean whether to trigger OnActiveViewChanged event.
 	 */
-	protected function activateView($view,$triggerViewChangedEvent=true)
+	protected function activateView($view, $triggerViewChangedEvent=true)
 	{
 		if($view->getActive())
 			return;
-		$triggerEvent=$triggerViewChangedEvent && ($this->getControlStage()>=\Prado\Web\UI\TControl::CS_STATE_LOADED || ($this->getPage() && !$this->getPage()->getIsPostBack()));
+		$triggerEvent=$triggerViewChangedEvent && ($this->getControlStage() >= \Prado\Web\UI\TControl::CS_STATE_LOADED || ($this->getPage() && !$this->getPage()->getIsPostBack()));
 		foreach($this->getViews() as $v)
 		{
 			if($v===$view)
@@ -196,7 +196,7 @@ 
 	public function onInit($param)
 	{
 		parent::onInit($param);
-		if($this->_cachedActiveViewIndex>=0)
+		if($this->_cachedActiveViewIndex >= 0)
 			$this->setActiveViewIndex($this->_cachedActiveViewIndex);
 	}
 
@@ -207,7 +207,7 @@ 
 	 */
 	public function onActiveViewChanged($param)
 	{
-		$this->raiseEvent('OnActiveViewChanged',$this,$param);
+		$this->raiseEvent('OnActiveViewChanged', $this, $param);
 	}
 
 	/**
@@ -217,21 +217,21 @@ 
 	 * @param mixed event parameter
 	 * @return boolean whether this event is handled
 	 */
-	public function bubbleEvent($sender,$param)
+	public function bubbleEvent($sender, $param)
 	{
 		if(!$this->_ignoreBubbleEvents && ($param instanceof \Prado\Web\UI\TCommandEventParameter))
 		{
 			switch($param->getCommandName())
 			{
 				case self::CMD_NEXTVIEW:
-					if(($index=$this->getActiveViewIndex())<$this->getViews()->getCount()-1)
-						$this->setActiveViewIndex($index+1);
+					if(($index=$this->getActiveViewIndex()) < $this->getViews()->getCount() - 1)
+						$this->setActiveViewIndex($index + 1);
 					else
 						$this->setActiveViewIndex(-1);
 					return true;
 				case self::CMD_PREVIOUSVIEW:
-					if(($index=$this->getActiveViewIndex())>=0)
-						$this->setActiveViewIndex($index-1);
+					if(($index=$this->getActiveViewIndex()) >= 0)
+						$this->setActiveViewIndex($index - 1);
 					return true;
 				case self::CMD_SWITCHVIEWID:
 					$view=$this->findControl($viewID=$param->getCommandParameter());

framework/Web/UI/WebControls/TEditCommandColumn.php

Braces +2 added lines, -4 removed lines

@@ -211,8 +211,7 @@ 
 			$button=$this->createButton('Edit',$this->getEditText(),false,'');
 			$cell->getControls()->add($button);
 			$cell->registerObject('EditButton',$button);
-		}
-		else if($itemType===TListItemType::EditItem)
+		} else if($itemType===TListItemType::EditItem)
 		{
 			$controls=$cell->getControls();
 			$button=$this->createButton('Update',$this->getUpdateText(),$this->getCausesValidation(),$this->getValidationGroup());
@@ -222,8 +221,7 @@ 
 			$button=$this->createButton('Cancel',$this->getCancelText(),false,'');
 			$controls->add($button);
 			$cell->registerObject('CancelButton',$button);
-		}
-		else
+		} else
 			parent::initializeCell($cell,$columnIndex,$itemType);
 	}
 

Doc Comments +4 added lines

@@ -233,6 +233,10 @@
 	 * @param string button caption
 	 * @param boolean whether the button should cause validation
 	 * @param string the validation group that the button belongs to
+	 * @param string $commandName
+	 * @param string $text
+	 * @param boolean $causesValidation
+	 * @param string $validationGroup
 	 * @return mixed the newly created button.
 	 */
 	protected function createButton($commandName,$text,$causesValidation,$validationGroup)

Spacing +32 added lines, -32 removed lines

@@ -55,7 +55,7 @@ 
 	 */
 	public function getButtonType()
 	{
-		return $this->getViewState('ButtonType',TButtonColumnType::LinkButton);
+		return $this->getViewState('ButtonType', TButtonColumnType::LinkButton);
 	}
 
 	/**
@@ -63,7 +63,7 @@ 
 	 */
 	public function setButtonType($value)
 	{
-		$this->setViewState('ButtonType',TPropertyValue::ensureEnum($value,'Prado\\Web\\UI\\WebControls\\TButtonColumnType'),TButtonColumnType::LinkButton);
+		$this->setViewState('ButtonType', TPropertyValue::ensureEnum($value, 'Prado\\Web\\UI\\WebControls\\TButtonColumnType'), TButtonColumnType::LinkButton);
 	}
 
 	/**
@@ -71,7 +71,7 @@ 
 	 */
 	public function getEditText()
 	{
-		return $this->getViewState('EditText','Edit');
+		return $this->getViewState('EditText', 'Edit');
 	}
 
 	/**
@@ -79,7 +79,7 @@ 
 	 */
 	public function setEditText($value)
 	{
-		$this->setViewState('EditText',$value,'Edit');
+		$this->setViewState('EditText', $value, 'Edit');
 	}
 
 	/**
@@ -87,7 +87,7 @@ 
 	 */
 	public function getEditImageUrl()
 	{
-		return $this->getViewState('EditImageUrl','');
+		return $this->getViewState('EditImageUrl', '');
 	}
 
 	/**
@@ -95,7 +95,7 @@ 
 	 */
 	public function setEditImageUrl($value)
 	{
-		$this->setViewState('EditImageUrl',$value,'');
+		$this->setViewState('EditImageUrl', $value, '');
 	}
 
 	/**
@@ -103,7 +103,7 @@ 
 	 */
 	public function getUpdateText()
 	{
-		return $this->getViewState('UpdateText','Update');
+		return $this->getViewState('UpdateText', 'Update');
 	}
 
 	/**
@@ -111,7 +111,7 @@ 
 	 */
 	public function setUpdateText($value)
 	{
-		$this->setViewState('UpdateText',$value,'Update');
+		$this->setViewState('UpdateText', $value, 'Update');
 	}
 
 	/**
@@ -119,7 +119,7 @@ 
 	 */
 	public function getUpdateImageUrl()
 	{
-		return $this->getViewState('UpdateImageUrl','');
+		return $this->getViewState('UpdateImageUrl', '');
 	}
 
 	/**
@@ -127,7 +127,7 @@ 
 	 */
 	public function setUpdateImageUrl($value)
 	{
-		$this->setViewState('UpdateImageUrl',$value,'');
+		$this->setViewState('UpdateImageUrl', $value, '');
 	}
 
 	/**
@@ -135,7 +135,7 @@ 
 	 */
 	public function getCancelText()
 	{
-		return $this->getViewState('CancelText','Cancel');
+		return $this->getViewState('CancelText', 'Cancel');
 	}
 
 	/**
@@ -143,7 +143,7 @@ 
 	 */
 	public function setCancelText($value)
 	{
-		$this->setViewState('CancelText',$value,'Cancel');
+		$this->setViewState('CancelText', $value, 'Cancel');
 	}
 
 	/**
@@ -151,7 +151,7 @@ 
 	 */
 	public function getCancelImageUrl()
 	{
-		return $this->getViewState('CancelImageUrl','');
+		return $this->getViewState('CancelImageUrl', '');
 	}
 
 	/**
@@ -159,7 +159,7 @@ 
 	 */
 	public function setCancelImageUrl($value)
 	{
-		$this->setViewState('CancelImageUrl',$value,'');
+		$this->setViewState('CancelImageUrl', $value, '');
 	}
 
 	/**
@@ -167,7 +167,7 @@ 
 	 */
 	public function getCausesValidation()
 	{
-		return $this->getViewState('CausesValidation',true);
+		return $this->getViewState('CausesValidation', true);
 	}
 
 	/**
@@ -175,7 +175,7 @@ 
 	 */
 	public function setCausesValidation($value)
 	{
-		$this->setViewState('CausesValidation',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('CausesValidation', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -183,7 +183,7 @@ 
 	 */
 	public function getValidationGroup()
 	{
-		return $this->getViewState('ValidationGroup','');
+		return $this->getViewState('ValidationGroup', '');
 	}
 
 	/**
@@ -191,7 +191,7 @@ 
 	 */
 	public function setValidationGroup($value)
 	{
-		$this->setViewState('ValidationGroup',$value,'');
+		$this->setViewState('ValidationGroup', $value, '');
 	}
 
 	/**
@@ -203,27 +203,27 @@ 
 	 * @param integer the index to the Columns property that the cell resides in.
 	 * @param string the type of cell (Header,Footer,Item,AlternatingItem,EditItem,SelectedItem)
 	 */
-	public function initializeCell($cell,$columnIndex,$itemType)
+	public function initializeCell($cell, $columnIndex, $itemType)
 	{
 		if($itemType===TListItemType::Item || $itemType===TListItemType::AlternatingItem || $itemType===TListItemType::SelectedItem)
 		{
-			$button=$this->createButton('Edit',$this->getEditText(),false,'');
+			$button=$this->createButton('Edit', $this->getEditText(), false, '');
 			$cell->getControls()->add($button);
-			$cell->registerObject('EditButton',$button);
+			$cell->registerObject('EditButton', $button);
 		}
 		else if($itemType===TListItemType::EditItem)
 		{
 			$controls=$cell->getControls();
-			$button=$this->createButton('Update',$this->getUpdateText(),$this->getCausesValidation(),$this->getValidationGroup());
+			$button=$this->createButton('Update', $this->getUpdateText(), $this->getCausesValidation(), $this->getValidationGroup());
 			$controls->add($button);
-			$cell->registerObject('UpdateButton',$button);
+			$cell->registerObject('UpdateButton', $button);
 			$controls->add(' ');
-			$button=$this->createButton('Cancel',$this->getCancelText(),false,'');
+			$button=$this->createButton('Cancel', $this->getCancelText(), false, '');
 			$controls->add($button);
-			$cell->registerObject('CancelButton',$button);
+			$cell->registerObject('CancelButton', $button);
 		}
 		else
-			parent::initializeCell($cell,$columnIndex,$itemType);
+			parent::initializeCell($cell, $columnIndex, $itemType);
 	}
 
 	/**
@@ -235,18 +235,18 @@ 
 	 * @param string the validation group that the button belongs to
 	 * @return mixed the newly created button.
 	 */
-	protected function createButton($commandName,$text,$causesValidation,$validationGroup)
+	protected function createButton($commandName, $text, $causesValidation, $validationGroup)
 	{
 		if($this->getButtonType()===TButtonColumnType::LinkButton)
-			$button= new TLinkButton;
+			$button=new TLinkButton;
 		else if($this->getButtonType()===TButtonColumnType::PushButton)
-			$button= new TButton;
+			$button=new TButton;
 		else	// image buttons
 		{
-			$button= new TImageButton;
-			if(strcasecmp($commandName,'Update')===0)
+			$button=new TImageButton;
+			if(strcasecmp($commandName, 'Update')===0)
 				$url=$this->getUpdateImageUrl();
-			else if(strcasecmp($commandName,'Cancel')===0)
+			else if(strcasecmp($commandName, 'Cancel')===0)
 				$url=$this->getCancelImageUrl();
 			else
 				$url=$this->getEditImageUrl();

framework/Web/UI/WebControls/TImageButton.php

Braces +2 added lines, -4 removed lines

@@ -106,8 +106,7 @@ 
 		{
 			if($this->getEnableClientScript() && $this->needPostBackScript())
 				$this->renderClientControlScript($writer);
-		}
-		else if($this->getEnabled()) // in this case, parent will not render 'disabled'
+		} else if($this->getEnabled()) // in this case, parent will not render 'disabled'
 			$writer->addAttribute('disabled','disabled');
 		parent::addAttributesToRender($writer);
 	}
@@ -141,8 +140,7 @@ 
 		{
 			$group=$this->getValidationGroup();
 			return $this->getPage()->getValidators($group)->getCount()>0;
-		}
-		else
+		} else
 			return false;
 	}
 

Spacing +28 added lines, -28 removed lines

@@ -78,7 +78,7 @@ 
 	 */
 	public function getEnableClientScript()
 	{
-		return $this->getViewState('EnableClientScript',true);
+		return $this->getViewState('EnableClientScript', true);
 	}
 
 	/**
@@ -86,7 +86,7 @@ 
 	 */
 	public function setEnableClientScript($value)
 	{
-		$this->setViewState('EnableClientScript',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('EnableClientScript', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -98,16 +98,16 @@ 
 	{
 		$page=$this->getPage();
 		$page->ensureRenderInForm($this);
-		$writer->addAttribute('type','image');
+		$writer->addAttribute('type', 'image');
 		if(($uniqueID=$this->getUniqueID())!=='')
-			$writer->addAttribute('name',$uniqueID);
+			$writer->addAttribute('name', $uniqueID);
 		if($this->getEnabled(true))
 		{
 			if($this->getEnableClientScript() && $this->needPostBackScript())
 				$this->renderClientControlScript($writer);
 		}
 		else if($this->getEnabled()) // in this case, parent will not render 'disabled'
-			$writer->addAttribute('disabled','disabled');
+			$writer->addAttribute('disabled', 'disabled');
 		parent::addAttributesToRender($writer);
 	}
 
@@ -116,9 +116,9 @@ 
 	 */
 	protected function renderClientControlScript($writer)
 	{
-		$writer->addAttribute('id',$this->getClientID());
-		$cs = $this->getPage()->getClientScript();
-		$cs->registerPostBackControl($this->getClientClassName(),$this->getPostBackOptions());
+		$writer->addAttribute('id', $this->getClientID());
+		$cs=$this->getPage()->getClientScript();
+		$cs->registerPostBackControl($this->getClientClassName(), $this->getPostBackOptions());
 	}
 
 	/**
@@ -139,7 +139,7 @@ 
 		if($this->getCausesValidation())
 		{
 			$group=$this->getValidationGroup();
-			return $this->getPage()->getValidators($group)->getCount()>0;
+			return $this->getPage()->getValidators($group)->getCount() > 0;
 		}
 		else
 			return false;
@@ -150,7 +150,7 @@ 
 	 */
 	public function setIsDefaultButton($value)
 	{
-		$this->setViewState('IsDefaultButton', TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('IsDefaultButton', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -176,10 +176,10 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options['ID'] = $this->getClientID();
-		$options['CausesValidation'] = $this->getCausesValidation();
-		$options['ValidationGroup'] = $this->getValidationGroup();
-		$options['EventTarget'] = $this->getUniqueID();
+		$options['ID']=$this->getClientID();
+		$options['CausesValidation']=$this->getCausesValidation();
+		$options['ValidationGroup']=$this->getValidationGroup();
+		$options['EventTarget']=$this->getUniqueID();
 
 		return $options;
 	}
@@ -191,7 +191,7 @@ 
 	 * @param array the input data collection
 	 * @return boolean whether the data of the component has been changed
 	 */
-	public function loadPostData($key,$values)
+	public function loadPostData($key, $values)
 	{
 		$uid=$this->getUniqueID();
 		if(isset($values["{$uid}_x"]) && isset($values["{$uid}_y"]))
@@ -222,7 +222,7 @@ 
 	 */
 	public function onClick($param)
 	{
-		$this->raiseEvent('OnClick',$this,$param);
+		$this->raiseEvent('OnClick', $this, $param);
 	}
 
 	/**
@@ -234,8 +234,8 @@ 
 	 */
 	public function onCommand($param)
 	{
-		$this->raiseEvent('OnCommand',$this,$param);
-		$this->raiseBubbleEvent($this,$param);
+		$this->raiseEvent('OnCommand', $this, $param);
+		$this->raiseBubbleEvent($this, $param);
 	}
 
 	/**
@@ -251,8 +251,8 @@ 
 	{
 		if($this->getCausesValidation())
 			$this->getPage()->validate($this->getValidationGroup());
-		$this->onClick(new TImageClickEventParameter($this->_x,$this->_y));
-		$this->onCommand(new \Prado\Web\UI\TCommandEventParameter($this->getCommandName(),$this->getCommandParameter()));
+		$this->onClick(new TImageClickEventParameter($this->_x, $this->_y));
+		$this->onCommand(new \Prado\Web\UI\TCommandEventParameter($this->getCommandName(), $this->getCommandParameter()));
 	}
 
 	/**
@@ -270,7 +270,7 @@ 
 	 */
 	public function getCausesValidation()
 	{
-		return $this->getViewState('CausesValidation',true);
+		return $this->getViewState('CausesValidation', true);
 	}
 
 	/**
@@ -278,7 +278,7 @@ 
 	 */
 	public function setCausesValidation($value)
 	{
-		$this->setViewState('CausesValidation',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('CausesValidation', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -286,7 +286,7 @@ 
 	 */
 	public function getCommandName()
 	{
-		return $this->getViewState('CommandName','');
+		return $this->getViewState('CommandName', '');
 	}
 
 	/**
@@ -294,7 +294,7 @@ 
 	 */
 	public function setCommandName($value)
 	{
-		$this->setViewState('CommandName',$value,'');
+		$this->setViewState('CommandName', $value, '');
 	}
 
 	/**
@@ -302,7 +302,7 @@ 
 	 */
 	public function getCommandParameter()
 	{
-		return $this->getViewState('CommandParameter','');
+		return $this->getViewState('CommandParameter', '');
 	}
 
 	/**
@@ -310,7 +310,7 @@ 
 	 */
 	public function setCommandParameter($value)
 	{
-		$this->setViewState('CommandParameter',$value,'');
+		$this->setViewState('CommandParameter', $value, '');
 	}
 
 	/**
@@ -318,7 +318,7 @@ 
 	 */
 	public function getValidationGroup()
 	{
-		return $this->getViewState('ValidationGroup','');
+		return $this->getViewState('ValidationGroup', '');
 	}
 
 	/**
@@ -326,7 +326,7 @@ 
 	 */
 	public function setValidationGroup($value)
 	{
-		$this->setViewState('ValidationGroup',$value,'');
+		$this->setViewState('ValidationGroup', $value, '');
 	}
 
 	/**

Doc Comments +2 added lines

@@ -219,6 +219,7 @@ 
 	 * If you override this method, be sure to call the parent implementation
 	 * so that the event handler can be invoked.
 	 * @param TImageClickEventParameter event parameter to be passed to the event handlers
+	 * @param TImageClickEventParameter $param
 	 */
 	public function onClick($param)
 	{
@@ -231,6 +232,7 @@ 
 	 * If you override this method, be sure to call the parent implementation
 	 * so that the event handlers can be invoked.
 	 * @param \Prado\Web\UI\TCommandEventParameter event parameter to be passed to the event handlers
+	 * @param \Prado\Web\UI\TCommandEventParameter $param
 	 */
 	public function onCommand($param)
 	{

framework/Web/UI/JuiControls/TJuiAutoComplete.php

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);
 	}
 

Doc Comments +2 added lines

@@ -260,6 +260,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)
 	{
@@ -272,6 +273,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)
 	{

Spacing +30 added lines, -30 removed lines

@@ -131,7 +131,7 @@ 
 	 */
 	public function getOptions()
 	{
-		if (($options=$this->getViewState('JuiOptions'))===null)
+		if(($options=$this->getViewState('JuiOptions'))===null)
 		{
 		  $options=new TJuiControlOptions($this);
 		  $this->setViewState('JuiOptions', $options);
@@ -212,7 +212,7 @@ 
 	 */
 	public function getMinChars()
 	{
-		return $this->getViewState('minChars','');
+		return $this->getViewState('minChars', '');
 	}
 
 	/**
@@ -236,17 +236,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);
 			}
 		}
@@ -303,7 +303,7 @@ 
 	public function getResultPanel()
 	{
 		if($this->_resultPanel===null)
-			$this->_resultPanel = $this->createResultPanel();
+			$this->_resultPanel=$this->createResultPanel();
 		return $this->_resultPanel;
 	}
 
@@ -312,7 +312,7 @@ 
 	 */
 	protected function createResultPanel()
 	{
-		$panel = new TPanel;
+		$panel=new TPanel;
 		$this->getControls()->add($panel);
 		$panel->setID('result');
 		return $panel;
@@ -324,7 +324,7 @@ 
 	public function getSuggestions()
 	{
 		if($this->_repeater===null)
-			$this->_repeater = $this->createRepeater();
+			$this->_repeater=$this->createRepeater();
 		return $this->_repeater;
 	}
 
@@ -333,8 +333,8 @@ 
 	 */
 	protected function createRepeater()
 	{
-		$repeater = new TRepeater;
-		$repeater->setItemTemplate(new TTemplate('<%# $this->Data %>',null));
+		$repeater=new TRepeater;
+		$repeater->setItemTemplate(new TTemplate('<%# $this->Data %>', null));
 		$this->getControls()->add($repeater);
 		return $repeater;
 	}
@@ -376,12 +376,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);
@@ -393,25 +393,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;
 	}
 

framework/Web/UI/ActiveControls/TActiveDataList.php

Braces +1 added lines, -2 removed lines

@@ -79,8 +79,7 @@
     if($this->getHasPreRendered()) {
       $this->renderDataList($writer);
       if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(),$writer);
-    }
-    else {
+    } else {
       $this->getPage()->getAdapter()->registerControlToRender($this,$writer);
     }
   }

Spacing +4 added lines, -4 removed lines

@@ -55,7 +55,7 @@ 
     parent::setDataSource($value);
     if($this->getActiveControl()->canUpdateClientSide()) {
       $this->renderPager();
-      $this->getPage()->getAdapter()->registerControlToRender($this,$this->getResponse()->createHtmlWriter());
+      $this->getPage()->getAdapter()->registerControlToRender($this, $this->getResponse()->createHtmlWriter());
     }
   }
 
@@ -78,10 +78,10 @@ 
   {
     if($this->getHasPreRendered()) {
       $this->renderDataList($writer);
-      if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(),$writer);
+      if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(), $writer);
     }
     else {
-      $this->getPage()->getAdapter()->registerControlToRender($this,$writer);
+      $this->getPage()->getAdapter()->registerControlToRender($this, $writer);
     }
   }
 
@@ -97,7 +97,7 @@ 
     {
       if($item->ControlToPaginate==$this->ID) {
         $writer=$this->getResponse()->createHtmlWriter();
-        $this->getPage()->getAdapter()->registerControlToRender($item,$writer);
+        $this->getPage()->getAdapter()->registerControlToRender($item, $writer);
       }
     }
   }

Indentation +27 added lines, -27 removed lines

@@ -34,8 +34,8 @@ 
    */
   public function __construct()
   {
-    parent::__construct();
-    $this->setAdapter(new TActiveControlAdapter($this));
+	parent::__construct();
+	$this->setAdapter(new TActiveControlAdapter($this));
   }
 
   /**
@@ -43,7 +43,7 @@ 
    */
   public function getActiveControl()
   {
-    return $this->getAdapter()->getBaseActiveControl();
+	return $this->getAdapter()->getBaseActiveControl();
   }
 
   /**
@@ -55,11 +55,11 @@ 
    */
   public function setDataSource($value)
   {
-    parent::setDataSource($value);
-    if($this->getActiveControl()->canUpdateClientSide()) {
-      $this->renderPager();
-      $this->getPage()->getAdapter()->registerControlToRender($this,$this->getResponse()->createHtmlWriter());
-    }
+	parent::setDataSource($value);
+	if($this->getActiveControl()->canUpdateClientSide()) {
+	  $this->renderPager();
+	  $this->getPage()->getAdapter()->registerControlToRender($this,$this->getResponse()->createHtmlWriter());
+	}
   }
 
   /**
@@ -68,7 +68,7 @@ 
    */
   protected function getContainerID()
   {
-    return $this->ClientID.'_Container';
+	return $this->ClientID.'_Container';
   }
 
   /**
@@ -79,13 +79,13 @@ 
    */
   public function render($writer)
   {
-    if($this->getHasPreRendered()) {
-      $this->renderDataList($writer);
-      if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(),$writer);
-    }
-    else {
-      $this->getPage()->getAdapter()->registerControlToRender($this,$writer);
-    }
+	if($this->getHasPreRendered()) {
+	  $this->renderDataList($writer);
+	  if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(),$writer);
+	}
+	else {
+	  $this->getPage()->getAdapter()->registerControlToRender($this,$writer);
+	}
   }
 
   /**
@@ -95,14 +95,14 @@ 
    */
   private function renderPager()
   {
-    $pager=$this->getPage()->findControlsByType('Prado\Web\UI\ActiveControls\TActivePager', false);
-    foreach($pager as $item)
-    {
-      if($item->ControlToPaginate==$this->ID) {
-        $writer=$this->getResponse()->createHtmlWriter();
-        $this->getPage()->getAdapter()->registerControlToRender($item,$writer);
-      }
-    }
+	$pager=$this->getPage()->findControlsByType('Prado\Web\UI\ActiveControls\TActivePager', false);
+	foreach($pager as $item)
+	{
+	  if($item->ControlToPaginate==$this->ID) {
+		$writer=$this->getResponse()->createHtmlWriter();
+		$this->getPage()->getAdapter()->registerControlToRender($item,$writer);
+	  }
+	}
   }
 
   /**
@@ -112,8 +112,8 @@ 
    */
   private function renderDataList($writer)
   {
-    $writer->write('<span id="'.$this->getContainerID().'">');
-    parent::render($writer);
-    $writer->write('</span>');
+	$writer->write('<span id="'.$this->getContainerID().'">');
+	parent::render($writer);
+	$writer->write('</span>');
   }
 }