phpMv / phpMv-UI

Ajax/semantic/components/Visibility.php

Spacing +2 added lines, -2 removed lines

@@ -10,12 +10,12 @@
  * @author jc
  *
  */
-class Visibility extends SimpleSemExtComponent{
+class Visibility extends SimpleSemExtComponent {
 	
 	public function __construct(JsUtils $js) {
 		parent::__construct($js);
 		$this->uiName="visibility";
-		$this->params=["once"=>false,"observeChanges"=>true];
+		$this->params=["once"=>false, "observeChanges"=>true];
 	}
 	
 	public function setOnce($value=false) {

Ajax/common/html/BaseHtml.php

Braces +15 added lines, -11 removed lines

@@ -109,15 +109,18 @@ 
 			$flag=false;
 			$index=0;
 			while ( !$flag && $index < sizeof($elements) ) {
-				if ($elements[$index] instanceof BaseHtml)
-					$flag=($callback($elements[$index]));
+				if ($elements[$index] instanceof BaseHtml) {
+									$flag=($callback($elements[$index]));
+				}
 					$index++;
 			}
-			if ($flag === true)
-				return $elements[$index - 1];
+			if ($flag === true) {
+							return $elements[$index - 1];
+			}
 		} elseif ($elements instanceof BaseHtml) {
-			if ($callback($elements))
-				return $elements;
+			if ($callback($elements)) {
+							return $elements;
+			}
 		}
 		return null;
 	}
@@ -143,8 +146,9 @@ 
 
 	public function fromArray($array) {
 		foreach ( $this as $key => $value ) {
-			if(array_key_exists($key, $array)===true)
-				$this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array);
+			if(array_key_exists($key, $array)===true) {
+							$this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array);
+			}
 		}
 		foreach ( $array as $key => $value ) {
 			if($this->_callSetter($key, $key, $value, $array)===false){
@@ -213,11 +217,11 @@ 
 				if(\strstr($result, "%{$key}%")!==false){
 					if (\is_array($value)) {
 						$v=PropertyWrapper::wrap($value, $js,$view);
-					}elseif($value instanceof \stdClass){
+					} elseif($value instanceof \stdClass){
 							$v=\print_r($value,true);
-					}elseif ($value instanceof BaseHtml){
+					} elseif ($value instanceof BaseHtml){
 						$v=$value->compile($js,$view);
-					}else{
+					} else{
 						$v=$value;
 					}
 					$result=str_replace("%{$key}%", $v, $result);

Spacing +59 added lines, -59 removed lines

@@ -15,11 +15,11 @@ 
  * @version 1.3
  */
 abstract class BaseHtml extends BaseWidget {
-	use BaseHtmlEventsTrait,BaseHtmlPropertiesTrait;
+	use BaseHtmlEventsTrait, BaseHtmlPropertiesTrait;
 	protected $_template;
 	protected $tagName;
-	protected $_wrapBefore=array ();
-	protected $_wrapAfter=array ();
+	protected $_wrapBefore=array();
+	protected $_wrapAfter=array();
 	protected $_bsComponent;
 	protected $_compiled=false;
 	protected $_runned=false;
@@ -33,32 +33,32 @@ 
 	 */
 	abstract public function run(JsUtils $js);
 
-	private function _callSetter($setter,$key,$value,&$array){
+	private function _callSetter($setter, $key, $value, &$array) {
 		$result=false;
-		if (method_exists($this, $setter) && substr($setter, 0, 1) !== "_") {
+		if (method_exists($this, $setter) && substr($setter, 0, 1)!=="_") {
 			try {
 				$this->$setter($value);
 				unset($array[$key]);
 				$result=true;
-			} catch ( \Exception $e ) {
+			}catch (\Exception $e) {
 				$result=false;
 			}
 		}
 		return $result;
 	}
 
-	protected function getTemplate(JsUtils $js=NULL,$view=null) {
-		return PropertyWrapper::wrap($this->_wrapBefore, $js,$view) . $this->_template . PropertyWrapper::wrap($this->_wrapAfter, $js,$view);
+	protected function getTemplate(JsUtils $js=NULL, $view=null) {
+		return PropertyWrapper::wrap($this->_wrapBefore, $js, $view).$this->_template.PropertyWrapper::wrap($this->_wrapAfter, $js, $view);
 	}
 
 	protected function ctrl($name, $value, $typeCtrl) {
 		if (\is_array($typeCtrl)) {
-			if (array_search($value, $typeCtrl) === false) {
-				throw new \Exception("La valeur passée `" . $value . "` à la propriété `" . $name . "` ne fait pas partie des valeurs possibles : {" . implode(",", $typeCtrl) . "}");
+			if (array_search($value, $typeCtrl)===false) {
+				throw new \Exception("La valeur passée `".$value."` à la propriété `".$name."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
 			}
 		} else {
 			if (!$typeCtrl($value)) {
-				throw new \Exception("La fonction " . $typeCtrl . " a retourné faux pour l'affectation de la propriété " . $name);
+				throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$name);
 			}
 		}
 		return true;
@@ -75,7 +75,7 @@ 
 	protected function addToMemberUnique(&$name, $value, $typeCtrl, $separator=" ") {
 		if (\is_array($typeCtrl)) {
 			$this->removeOldValues($name, $typeCtrl);
-			$name.=$separator . $value;
+			$name.=$separator.$value;
 		}
 		return $this;
 	}
@@ -87,12 +87,12 @@ 
 		if (\is_array($typeCtrl)) {
 			$this->removeOldValues($name, $typeCtrl);
 		}
-		$name.=$separator . $value;
+		$name.=$separator.$value;
 		return $this;
 	}
 
 	protected function addToMember(&$name, $value, $separator=" ") {
-		$name=str_ireplace($value, "", $name) . $separator . $value;
+		$name=str_ireplace($value, "", $name).$separator.$value;
 		return $this;
 	}
 
@@ -103,18 +103,18 @@ 
 		$oldValue=trim($oldValue);
 	}
 
-	protected function _getElementBy($callback,$elements){
+	protected function _getElementBy($callback, $elements) {
 		if (\is_array($elements)) {
 			$elements=\array_values($elements);
 			$flag=false;
 			$index=0;
-			while ( !$flag && $index < sizeof($elements) ) {
+			while (!$flag && $index<sizeof($elements)) {
 				if ($elements[$index] instanceof BaseHtml)
 					$flag=($callback($elements[$index]));
 					$index++;
 			}
-			if ($flag === true)
-				return $elements[$index - 1];
+			if ($flag===true)
+				return $elements[$index-1];
 		} elseif ($elements instanceof BaseHtml) {
 			if ($callback($elements))
 				return $elements;
@@ -142,13 +142,13 @@ 
 	}
 
 	public function fromArray($array) {
-		foreach ( $this as $key => $value ) {
-			if(array_key_exists($key, $array)===true)
-				$this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array);
+		foreach ($this as $key => $value) {
+			if (array_key_exists($key, $array)===true)
+				$this->_callSetter("set".ucfirst($key), $key, $array[$key], $array);
 		}
-		foreach ( $array as $key => $value ) {
-			if($this->_callSetter($key, $key, $value, $array)===false){
-				$this->_callSetter("set" . ucfirst($key), $key, $value, $array);
+		foreach ($array as $key => $value) {
+			if ($this->_callSetter($key, $key, $value, $array)===false) {
+				$this->_callSetter("set".ucfirst($key), $key, $value, $array);
 			}
 		}
 		return $array;
@@ -156,7 +156,7 @@ 
 
 	public function fromDatabaseObjects($objects, $function) {
 		if (isset($objects)) {
-			foreach ( $objects as $object ) {
+			foreach ($objects as $object) {
 				$this->fromDatabaseObject($object, $function);
 			}
 		}
@@ -177,7 +177,7 @@ 
 
 
 	public function getElementById($identifier, $elements) {
-		return $this->_getElementBy(function(BaseWidget $element) use ($identifier){return $element->getIdentifier()===$identifier;}, $elements);
+		return $this->_getElementBy(function(BaseWidget $element) use ($identifier){return $element->getIdentifier()===$identifier; }, $elements);
 	}
 
 	public function getBsComponent() {
@@ -190,11 +190,11 @@ 
 	}
 
 	protected function compile_once(JsUtils $js=NULL, &$view=NULL) {
-		if(!$this->_compiled){
-			if(isset($js)){
+		if (!$this->_compiled) {
+			if (isset($js)) {
 				$beforeCompile=$js->getParam("beforeCompileHtml");
-				if(\is_callable($beforeCompile)){
-					$beforeCompile($this,$js,$view);
+				if (\is_callable($beforeCompile)) {
+					$beforeCompile($this, $js, $view);
 				}
 			}
 			$this->callCallback($this->_preCompile);
@@ -204,17 +204,17 @@ 
 	}
 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		$this->compile_once($js,$view);
-		$result=$this->getTemplate($js,$view);
-		foreach ( $this as $key => $value ) {
-				if(\strstr($result, "%{$key}%")!==false){
+		$this->compile_once($js, $view);
+		$result=$this->getTemplate($js, $view);
+		foreach ($this as $key => $value) {
+				if (\strstr($result, "%{$key}%")!==false) {
 					if (\is_array($value)) {
-						$v=PropertyWrapper::wrap($value, $js,$view);
-					}elseif($value instanceof \stdClass){
-							$v=\print_r($value,true);
-					}elseif ($value instanceof BaseHtml){
-						$v=$value->compile($js,$view);
-					}else{
+						$v=PropertyWrapper::wrap($value, $js, $view);
+					}elseif ($value instanceof \stdClass) {
+							$v=\print_r($value, true);
+					}elseif ($value instanceof BaseHtml) {
+						$v=$value->compile($js, $view);
+					} else {
 						$v=$value;
 					}
 					$result=str_replace("%{$key}%", $v, $result);
@@ -222,12 +222,12 @@ 
 		}
 		if (isset($js)===true) {
 			$this->run($js);
-			if (isset($view) === true) {
+			if (isset($view)===true) {
 				$js->addViewElement($this->getLibraryId(), $result, $view);
 			}
 		}
 
-		if(\is_callable($this->_postCompile)){
+		if (\is_callable($this->_postCompile)) {
 			$pc=$this->_postCompile;
 			$pc($this);
 		}
@@ -241,13 +241,13 @@ 
 	 * @param array $parameters default: ["jsCallback"=>"","jqueryDone"=>"append"]
 	 * @return \Ajax\common\html\BaseHtml
 	 */
-	public function setDraggable($attr="id",$dropZone=null,$parameters=[]){
+	public function setDraggable($attr="id", $dropZone=null, $parameters=[]) {
 		$this->setProperty("draggable", "true");
-		$this->addEvent("dragstart",Javascript::draggable($attr));
-		if(isset($dropZone)&& $dropZone instanceof BaseHtml){
-			$jqueryDone="append";$jsCallback="";
+		$this->addEvent("dragstart", Javascript::draggable($attr));
+		if (isset($dropZone) && $dropZone instanceof BaseHtml) {
+			$jqueryDone="append"; $jsCallback="";
 			extract($parameters);
-			$dropZone->asDropZone($jsCallback,$jqueryDone,$parameters);
+			$dropZone->asDropZone($jsCallback, $jqueryDone, $parameters);
 		}
 		return $this;
 	}
@@ -259,11 +259,11 @@ 
 	 * @param array $parameters
 	 * @return \Ajax\common\html\BaseHtml
 	 */
-	public function asDropZone($jsCallback="",$jqueryDone="append",$parameters=[]){
+	public function asDropZone($jsCallback="", $jqueryDone="append", $parameters=[]) {
 		$stopPropagation=false;
-		$this->addEvent("dragover", '', $stopPropagation,true);
+		$this->addEvent("dragover", '', $stopPropagation, true);
 		extract($parameters);
-		$this->addEvent("drop",Javascript::dropZone($jqueryDone,$jsCallback),$stopPropagation,true);
+		$this->addEvent("drop", Javascript::dropZone($jqueryDone, $jsCallback), $stopPropagation, true);
 		return $this;
 	}
 
@@ -271,17 +271,17 @@ 
 		return $this->compile();
 	}
 
-	public function onPostCompile($callback){
+	public function onPostCompile($callback) {
 		$this->_postCompile=$callback;
 	}
 
-	public function onPreCompile($callback){
+	public function onPreCompile($callback) {
 		$this->_preCompile=$this->addCallback($this->_preCompile, $callback);
 	}
 	
-	private function addCallback($originalValue,$callback){
-		if(isset($originalValue)){
-			if(!is_array($originalValue)){
+	private function addCallback($originalValue, $callback) {
+		if (isset($originalValue)) {
+			if (!is_array($originalValue)) {
 				$result=[$originalValue];
 			}
 			$result[]=$callback;
@@ -290,12 +290,12 @@ 
 		return $callback;
 	}
 	
-	private function callCallback($callable){
-		if(\is_callable($callable)){
+	private function callCallback($callable) {
+		if (\is_callable($callable)) {
 			return $callable($this);
 		}
-		if(is_array($callable)){
-			foreach ($callable as $call){
+		if (is_array($callable)) {
+			foreach ($callable as $call) {
 				$this->callCallback($call);
 			}
 		}

Ajax/semantic/html/collections/table/ActiveRow.php

Spacing +4 added lines, -4 removed lines

@@ -21,7 +21,7 @@ 
 	 * @param string $event
 	 * @param boolean $multiple
 	 */
-	public function __construct($table,$class="active",$event="click",$multiple=false){
+	public function __construct($table, $class="active", $event="click", $multiple=false) {
 		$this->table=$table;
 		$this->class=$class;
 		$this->event=$event;
@@ -55,12 +55,12 @@ 
 		return $this;
 	}
 
-	public function run(){
+	public function run() {
 		$multiple="";
-		if(!$this->multiple){
+		if (!$this->multiple) {
 			$multiple="$(this).closest('tbody').children('tr').removeClass('".$this->class."');";
 		}
-		$this->table->onRow($this->event, $multiple."$(this).toggleClass('".$this->class."');".$this->table->jsTrigger("activeRowChange","[this]"),false,false);
+		$this->table->onRow($this->event, $multiple."$(this).toggleClass('".$this->class."');".$this->table->jsTrigger("activeRowChange", "[this]"), false, false);
 	}
 
 }

Ajax/semantic/html/collections/table/HtmlTable.php

Braces +9 added lines, -6 removed lines

@@ -345,8 +345,9 @@ 
 			$result= $this->getBody()->_addRow($result);
 		}
 		if(isset($this->_afterCompileEvents["onNewRow"])){
-			if(\is_callable($this->_afterCompileEvents["onNewRow"]))
-				$this->_afterCompileEvents["onNewRow"]($result,$object);
+			if(\is_callable($this->_afterCompileEvents["onNewRow"])) {
+							$this->_afterCompileEvents["onNewRow"]($result,$object);
+			}
 		}
 		return $result;
 	}
@@ -375,8 +376,9 @@ 
 			}
 		}
 		$result= parent::run($js);
-		if(isset($this->_footer))
-			$this->_footer->run($js);
+		if(isset($this->_footer)) {
+					$this->_footer->run($js);
+		}
 		$this->_runned=true;
 		return $result;
 	}
@@ -417,8 +419,9 @@ 
 
 	public function setColWidth($colIndex,$width){
 		$part=$this->_getFirstPart();
-		if($part!==null && $part->count()>0)
-			$part->getCell(0, $colIndex)->setWidth($width);
+		if($part!==null && $part->count()>0) {
+					$part->getCell(0, $colIndex)->setWidth($width);
+		}
 		return $this;
 	}
 

Spacing +50 added lines, -50 removed lines

@@ -40,10 +40,10 @@ 
 
 	public function __construct($identifier, $rowCount, $colCount) {
 		parent::__construct($identifier, "table", "ui table");
-		$this->content=array ();
+		$this->content=array();
 		$this->setRowCount($rowCount, $colCount);
-		$this->_variations=[ Variation::CELLED,Variation::PADDED,Variation::COMPACT ];
-		$this->_compileParts=["thead","tbody","tfoot"];
+		$this->_variations=[Variation::CELLED, Variation::PADDED, Variation::COMPACT];
+		$this->_compileParts=["thead", "tbody", "tfoot"];
 		$this->_afterCompileEvents=[];
 	}
 
@@ -53,17 +53,17 @@ 
 	 * @return HtmlTableContent
 	 */
 	public function getPart($key) {
-		if (\array_key_exists($key, $this->content) === false) {
+		if (\array_key_exists($key, $this->content)===false) {
 			$this->content[$key]=new HtmlTableContent("", $key);
-			if ($key !== "tbody") {
+			if ($key!=="tbody") {
 				$this->content[$key]->setRowCount(1, $this->_colCount);
 			}
 		}
 		return $this->content[$key];
 	}
 
-	protected function _getFirstPart(){
-		if(isset($this->content["thead"])){
+	protected function _getFirstPart() {
+		if (isset($this->content["thead"])) {
 			return $this->content["thead"];
 		}
 		return $this->content["tbody"];
@@ -108,7 +108,7 @@ 
 	 * @return boolean
 	 */
 	public function hasPart($key) {
-		return \array_key_exists($key, $this->content) === true;
+		return \array_key_exists($key, $this->content)===true;
 	}
 
 	/**
@@ -268,8 +268,8 @@ 
 		return $this->colAlign($colIndex, "colLeftFromRight");
 	}
 
-	public function setColAlignment($colIndex,$alignment){
-		switch ($alignment){
+	public function setColAlignment($colIndex, $alignment) {
+		switch ($alignment) {
 			case TextAlignment::LEFT:
 				$function="colLeft";
 				break;
@@ -289,8 +289,8 @@ 
 		return $this;
 	}
 	
-	public function setColAlignmentFromRight($colIndex,$alignment){
-		switch ($alignment){
+	public function setColAlignmentFromRight($colIndex, $alignment) {
+		switch ($alignment) {
 			case TextAlignment::LEFT:
 				$function="colLeftFromRight";
 				break;
@@ -312,7 +312,7 @@ 
 
 	private function colAlign($colIndex, $function) {
 		if (\is_array($colIndex)) {
-			foreach ( $colIndex as $cIndex ) {
+			foreach ($colIndex as $cIndex) {
 				$this->colAlign($cIndex, $function);
 			}
 		} else {
@@ -373,7 +373,7 @@ 
 	 * @see HtmlSemDoubleElement::compile()
 	 */
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		if(\sizeof($this->_compileParts)<3){
+		if (\sizeof($this->_compileParts)<3) {
 			$this->_template="%content%";
 			$this->refresh($js);
 		}
@@ -382,9 +382,9 @@ 
 	}
 
 	protected function compile_once(JsUtils $js=NULL, &$view=NULL) {
-		parent::compile_once($js,$view);
+		parent::compile_once($js, $view);
 		if ($this->propertyContains("class", "sortable")) {
-			$this->addEvent("execute", "$('#" . $this->identifier . "').tablesort().data('tablesort').sort($('th.default-sort'));");
+			$this->addEvent("execute", "$('#".$this->identifier."').tablesort().data('tablesort').sort($('th.default-sort'));");
 		}
 	}
 
@@ -397,13 +397,13 @@ 
 	public function fromDatabaseObject($object, $function) {
 		$result=$function($object);
 		if (\is_array($result)) {
-			$result= $this->addRow($function($object));
+			$result=$this->addRow($function($object));
 		} else {
-			$result= $this->getBody()->_addRow($result);
+			$result=$this->getBody()->_addRow($result);
 		}
-		if(isset($this->_afterCompileEvents["onNewRow"])){
-			if(\is_callable($this->_afterCompileEvents["onNewRow"]))
-				$this->_afterCompileEvents["onNewRow"]($result,$object);
+		if (isset($this->_afterCompileEvents["onNewRow"])) {
+			if (\is_callable($this->_afterCompileEvents["onNewRow"]))
+				$this->_afterCompileEvents["onNewRow"]($result, $object);
 		}
 		return $result;
 	}
@@ -418,26 +418,26 @@ 
 		return $this;
 	}
 	
-	public function refreshTR(){
+	public function refreshTR() {
 		$this->setCompileParts();
 		$this->getPart("tbody")->refreshTR();
 	}
 
-	public function refresh($js){
+	public function refresh($js) {
 		$this->_footer=$this->getFooter();
-		if(isset($js)){
-			$js->exec('$("#'.$this->identifier.' tfoot").replaceWith("'.\addslashes($this->_footer).'");',true);
+		if (isset($js)) {
+			$js->exec('$("#'.$this->identifier.' tfoot").replaceWith("'.\addslashes($this->_footer).'");', true);
 		}
 	}
 
-	public function run(JsUtils $js){
-		if(!$this->_runned){
-			if(isset($this->_activeRowSelector)){
+	public function run(JsUtils $js) {
+		if (!$this->_runned) {
+			if (isset($this->_activeRowSelector)) {
 				$this->_activeRowSelector->run();
 			}
 		}
-		$result= parent::run($js);
-		if(isset($this->_footer))
+		$result=parent::run($js);
+		if (isset($this->_footer))
 			$this->_footer->run($js);
 		$this->_runned=true;
 		return $result;
@@ -461,51 +461,51 @@ 
 	 * @param boolean $multiple
 	 * @return HtmlTable
 	 */
-	public function setActiveRowSelector($class="active",$event="click",$multiple=false){
-		$this->_activeRowSelector=new ActiveRow($this,$class,$event,$multiple);
+	public function setActiveRowSelector($class="active", $event="click", $multiple=false) {
+		$this->_activeRowSelector=new ActiveRow($this, $class, $event, $multiple);
 		return $this;
 	}
 	
-	public function hasActiveRowSelector(){
+	public function hasActiveRowSelector() {
 		return isset($this->_activeRowSelector);
 	}
 
-	public function hideColumn($colIndex){
-		if(isset($this->content["thead"])){
+	public function hideColumn($colIndex) {
+		if (isset($this->content["thead"])) {
 			$this->content["thead"]->hideColumn($colIndex);
 		}
 		$this->content["tbody"]->hideColumn($colIndex);
-		if(isset($this->content["tfoot"])){
+		if (isset($this->content["tfoot"])) {
 			$this->content["tfoot"]->hideColumn($colIndex);
 		}
 		return $this;
 	}
 
-	public function setColWidth($colIndex,$width){
+	public function setColWidth($colIndex, $width) {
 		$part=$this->_getFirstPart();
-		if($part!==null && $part->count()>0)
+		if ($part!==null && $part->count()>0)
 			$part->getCell(0, $colIndex)->setWidth($width);
 		return $this;
 	}
 
-	public function setColWidths($widths){
+	public function setColWidths($widths) {
 		$part=$this->_getFirstPart();
-		if($part!==null && $part->count()>0){
+		if ($part!==null && $part->count()>0) {
 			$count=$part->getColCount();
-			if(!\is_array($widths)){
+			if (!\is_array($widths)) {
 				$widths=\array_fill(0, $count, $widths);
 			}
-			$max=\min(\sizeof($widths),$count);
-			for($i=0;$i<$max;$i++){
+			$max=\min(\sizeof($widths), $count);
+			for ($i=0; $i<$max; $i++) {
 				$part->getCell(0, $i)->setWidth($widths[$i]);
 			}
 		}
 		return $this;
 	}
 
-	public function mergeIdentiqualValues($colIndex,$function="strip_tags"){
+	public function mergeIdentiqualValues($colIndex, $function="strip_tags") {
 		$body=$this->getBody();
-		$body->mergeIdentiqualValues($colIndex,$function);
+		$body->mergeIdentiqualValues($colIndex, $function);
 		return $this;
 	}
 	/**
@@ -519,16 +519,16 @@ 
 	 * @param mixed $_innerScript
 	 */
 	public function setInnerScript($_innerScript) {
-		$this->_innerScript = $_innerScript;
+		$this->_innerScript=$_innerScript;
 	}
 	
-	public function onActiveRowChange($jsCode){
-		$this->on("activeRowChange",$jsCode);
+	public function onActiveRowChange($jsCode) {
+		$this->on("activeRowChange", $jsCode);
 		return $this;
 	}
 	
-	public function addMergeRow($colCount,$value=null){
-		return $this->getBody()->addMergeRow($colCount,$value);
+	public function addMergeRow($colCount, $value=null) {
+		return $this->getBody()->addMergeRow($colCount, $value);
 	}
 
 	/**

Ajax/semantic/html/collections/menus/HtmlPaginationMenu.php

Spacing +11 added lines, -11 removed lines

@@ -6,32 +6,32 @@ 
 
 use Ajax\semantic\html\elements\HtmlIcon;
 
-class HtmlPaginationMenu extends HtmlMenu{
+class HtmlPaginationMenu extends HtmlMenu {
 	private $_page;
 	private $_pages;
 	private $_max;
-	public function __construct( $identifier, $items=array() ){
-		parent::__construct( $identifier,$items);
+	public function __construct($identifier, $items=array()) {
+		parent::__construct($identifier, $items);
 		$this->_pages=$items;
 	}
 	/**
 	 * {@inheritDoc}
 	 * @see \Ajax\common\html\BaseHtml::compile()
 	 */
-	public function compile(JsUtils $js=NULL,&$view=NULL){
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
 		$max=$this->_max;
-		if(!$this->_compiled){
-			foreach ($this->content as $item){
+		if (!$this->_compiled) {
+			foreach ($this->content as $item) {
 				$item->addClass("pageNum");
 			}
-			$this->insertItem(new HtmlIcon("", "left chevron"))->setProperty("data-page", \max([1,$this->_page-1]))->addToProperty("class","_firstPage no-active");
-			$this->addItem(new HtmlIcon("", "right chevron"))->setProperty("data-page", \min([$max,$this->_page+1]))->setProperty("data-max", $max)->addToProperty("class","_lastPage no-active");
+			$this->insertItem(new HtmlIcon("", "left chevron"))->setProperty("data-page", \max([1, $this->_page-1]))->addToProperty("class", "_firstPage no-active");
+			$this->addItem(new HtmlIcon("", "right chevron"))->setProperty("data-page", \min([$max, $this->_page+1]))->setProperty("data-max", $max)->addToProperty("class", "_lastPage no-active");
 			$this->asPagination();
 		}
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 
-	public function setActivePage($page){
+	public function setActivePage($page) {
 		$index=$page-$this->_pages[0];
 		$this->setActiveItem($index);
 		$this->_page=$page;
@@ -45,7 +45,7 @@ 
 	 * @param mixed $_max
 	 */
 	public function setMax($_max) {
-		$this->_max = $_max;
+		$this->_max=$_max;
 	}
 
 

Ajax/common/html/HtmlCollection.php

Spacing +55 added lines, -55 removed lines

@@ -14,44 +14,44 @@ 
  */
 abstract class HtmlCollection extends HtmlDoubleElement {
 
-	public function __construct($identifier,$tagName="div"){
-		parent::__construct($identifier,$tagName);
+	public function __construct($identifier, $tagName="div") {
+		parent::__construct($identifier, $tagName);
 		$this->content=array();
 	}
 
-	public function addItems($items){
-		if(JArray::isAssociative($items)){
-			foreach ($items as $k=>$v){
-				$this->addItem([$k,$v]);
+	public function addItems($items) {
+		if (JArray::isAssociative($items)) {
+			foreach ($items as $k=>$v) {
+				$this->addItem([$k, $v]);
 			}
-		}else{
-			foreach ($items as $item){
+		} else {
+			foreach ($items as $item) {
 				$this->addItem($item);
 			}
 		}
 		return $this;
 	}
 
-	public function setItems($items){
+	public function setItems($items) {
 		$this->content=$items;
 		return $this;
 	}
 
-	public function getItems(){
+	public function getItems() {
 		return $this->content;
 	}
 
-	protected function getItemToAdd($item){
+	protected function getItemToAdd($item) {
 		$itemO=$item;
-		if($this->createCondition($item)===true){
+		if ($this->createCondition($item)===true) {
 			$itemO=$this->createItem($item);
 		}
 		return $itemO;
 	}
 
-	protected function setItemIdentifier($item,$classname,$index){
-		if($item instanceof BaseWidget){
-			if(JString::isNull($item->getIdentifier())){
+	protected function setItemIdentifier($item, $classname, $index) {
+		if ($item instanceof BaseWidget) {
+			if (JString::isNull($item->getIdentifier())) {
 				$item->setIdentifier($classname."-".$this->identifier."-".$index);
 			}
 		}
@@ -62,15 +62,15 @@ 
 	 * @param HtmlDoubleElement|string|array $item
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addItem($item){
+	public function addItem($item) {
 		$itemO=$this->getItemToAdd($item);
 		$this->addContent($itemO);
 		return $itemO;
 	}
 
-	public function insertItem($item,$position=0){
+	public function insertItem($item, $position=0) {
 		$itemO=$this->getItemToAdd($item);
-		\array_splice( $this->content, $position, 0, array($itemO));
+		\array_splice($this->content, $position, 0, array($itemO));
 		return $itemO;
 	}
 
@@ -80,7 +80,7 @@ 
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
 	public function getItem($index) {
-		if (is_int($index)&& isset($this->content[$index]))
+		if (is_int($index) && isset($this->content[$index]))
 			return $this->content[$index];
 		else {
 			$elm=$this->getElementById($index, $this->content);
@@ -93,11 +93,11 @@ 
 		return $this;
 	}
 
-	public function removeItem($index){
+	public function removeItem($index) {
 		return array_splice($this->content, $index, 1);
 	}
 
-	public function count(){
+	public function count() {
 		return \sizeof($this->content);
 	}
 
@@ -108,8 +108,8 @@ 
 		return $this->addItem($function($object));
 	}
 
-	public function apply($callBack){
-		foreach ($this->content as $item){
+	public function apply($callBack) {
+		foreach ($this->content as $item) {
 			$callBack($item);
 		}
 		return $this;
@@ -129,23 +129,23 @@ 
 	 */
 	abstract protected function createItem($value);
 
-	protected function createCondition($value){
+	protected function createCondition($value) {
 		return \is_object($value)===false;
 	}
 
-	protected function contentAs($tagName){
-		foreach ($this->content as $item){
+	protected function contentAs($tagName) {
+		foreach ($this->content as $item) {
 			$item->setTagName($tagName);
 		}
 		return $this;
 	}
 
-	public function setProperties($properties){
+	public function setProperties($properties) {
 		$i=0;
-		foreach ($properties as $k=>$v){
+		foreach ($properties as $k=>$v) {
 			$c=$this->content[$i++];
-			if(isset($c))
-				$c->setProperty($k,$v);
+			if (isset($c))
+				$c->setProperty($k, $v);
 			else
 				return $this;
 		}
@@ -158,15 +158,15 @@ 
 	 * @param array|mixed $values
 	 * @return $this
 	 */
-	public function setPropertyValues($property,$values){
-		if(\is_array($values)===false){
-			$values=\array_fill(0, $this->count(),$values);
+	public function setPropertyValues($property, $values) {
+		if (\is_array($values)===false) {
+			$values=\array_fill(0, $this->count(), $values);
 		}
-		foreach ($values as $i=>$value){
-			if(isset($this->content[$i])){
-				$this->content[$i]->setProperty($property,$value);
+		foreach ($values as $i=>$value) {
+			if (isset($this->content[$i])) {
+				$this->content[$i]->setProperty($property, $value);
 			}
-			else{
+			else {
 				return $this;
 			}
 		}
@@ -179,15 +179,15 @@ 
 	 * @param array|mixed $values
 	 * @return $this
 	 */
-	public function addPropertyValues($property,$values){
-		if(\is_array($values)===false){
-			$values=\array_fill(0, $this->count(),$values);
+	public function addPropertyValues($property, $values) {
+		if (\is_array($values)===false) {
+			$values=\array_fill(0, $this->count(), $values);
 		}
-		foreach ($values as $i=>$value){
-			if(isset($this->content[$i])){
-				$this->content[$i++]->addToProperty($property,$value);
+		foreach ($values as $i=>$value) {
+			if (isset($this->content[$i])) {
+				$this->content[$i++]->addToProperty($property, $value);
 			}
-			else{
+			else {
 				return $this;
 			}
 		}
@@ -197,13 +197,13 @@ 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
 		$index=0;
 		$classname=\strtolower(JReflection::shortClassName($this));
-		foreach ($this->content as $item){
-			$this->setItemIdentifier($item,$classname,$index++);
+		foreach ($this->content as $item) {
+			$this->setItemIdentifier($item, $classname, $index++);
 		}
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 
-	public function getItemById($identifier){
+	public function getItemById($identifier) {
 		return $this->getElementById($identifier, $this->content);
 	}
 
@@ -212,13 +212,13 @@ 
 	 * @param string $target
 	 * @return HtmlCollection
 	 */
-	public function asLinks($hrefs=[],$target=NUll) {
-		foreach ( $this->content as $index=>$item ) {
-			if($item instanceof HtmlDoubleElement){
+	public function asLinks($hrefs=[], $target=NUll) {
+		foreach ($this->content as $index=>$item) {
+			if ($item instanceof HtmlDoubleElement) {
 				$href="";
-				if(isset($hrefs[$index]))
+				if (isset($hrefs[$index]))
 					$href=$hrefs[$index];
-				$item->asLink($href,$target);
+				$item->asLink($href, $target);
 			}
 		}
 		return $this;
@@ -230,8 +230,8 @@ 
 	 * @param int $length  If length is omitted, removes everything from offset to the end of the array. If length is specified and is positive, then that many elements will be removed. If length is specified and is negative then the end of the removed portion will be that many elements from the end of the array. If length is specified and is zero, no elements will be removed. Tip: to remove everything from offset to the end of the array when replacement is also specified, use count($input) for length. 
 	 * @return $this
 	 */
-	public function splice($offset,$length=null){
-		$this->content=array_slice($this->content, $offset,$length);
+	public function splice($offset, $length=null) {
+		$this->content=array_slice($this->content, $offset, $length);
 		return $this;
 	}
 }

Braces +14 added lines, -14 removed lines

@@ -24,7 +24,7 @@ 
 			foreach ($items as $k=>$v){
 				$this->addItem([$k,$v]);
 			}
-		}else{
+		} else{
 			foreach ($items as $item){
 				$this->addItem($item);
 			}
@@ -80,9 +80,9 @@ 
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
 	public function getItem($index) {
-		if (is_int($index)&& isset($this->content[$index]))
-			return $this->content[$index];
-		else {
+		if (is_int($index)&& isset($this->content[$index])) {
+					return $this->content[$index];
+		} else {
 			$elm=$this->getElementById($index, $this->content);
 			return $elm;
 		}
@@ -144,10 +144,11 @@ 
 		$i=0;
 		foreach ($properties as $k=>$v){
 			$c=$this->content[$i++];
-			if(isset($c))
-				$c->setProperty($k,$v);
-			else
-				return $this;
+			if(isset($c)) {
+							$c->setProperty($k,$v);
+			} else {
+							return $this;
+			}
 		}
 		return $this;
 	}
@@ -165,8 +166,7 @@ 
 		foreach ($values as $i=>$value){
 			if(isset($this->content[$i])){
 				$this->content[$i]->setProperty($property,$value);
-			}
-			else{
+			} else{
 				return $this;
 			}
 		}
@@ -186,8 +186,7 @@ 
 		foreach ($values as $i=>$value){
 			if(isset($this->content[$i])){
 				$this->content[$i++]->addToProperty($property,$value);
-			}
-			else{
+			} else{
 				return $this;
 			}
 		}
@@ -216,8 +215,9 @@ 
 		foreach ( $this->content as $index=>$item ) {
 			if($item instanceof HtmlDoubleElement){
 				$href="";
-				if(isset($hrefs[$index]))
-					$href=$hrefs[$index];
+				if(isset($hrefs[$index])) {
+									$href=$hrefs[$index];
+				}
 				$item->asLink($href,$target);
 			}
 		}

Ajax/common/html/traits/BaseHtmlPropertiesTrait.php

Spacing +12 added lines, -12 removed lines

@@ -8,12 +8,12 @@ 
  * @author jc
  * @property BaseWidget $_self
  */
-trait BaseHtmlPropertiesTrait{
+trait BaseHtmlPropertiesTrait {
 
-	protected $properties=array ();
+	protected $properties=array();
 	abstract protected function ctrl($name, $value, $typeCtrl);
 	abstract protected function removeOldValues(&$oldValue, $allValues);
-	abstract protected function _getElementBy($callback,$elements);
+	abstract protected function _getElementBy($callback, $elements);
 	public function getProperties() {
 		return $this->_self->properties;
 	}
@@ -45,14 +45,14 @@ 
 	 */
 	public function addToProperty($name, $value, $separator=" ") {
 		if (\is_array($value)) {
-			foreach ( $value as $v ) {
+			foreach ($value as $v) {
 				$this->_self->addToProperty($name, $v, $separator);
 			}
-		} else if ($value !== "" && $this->_self->propertyContains($name, $value) === false) {
-			if(isset($this->_self->properties[$name])){
+		} else if ($value!=="" && $this->_self->propertyContains($name, $value)===false) {
+			if (isset($this->_self->properties[$name])) {
 				$v=$this->_self->properties[$name];
-				if (isset($v) && $v !== ""){
-					$value=$v . $separator . $value;
+				if (isset($v) && $v!=="") {
+					$value=$v.$separator.$value;
 				}
 			}
 			return $this->_self->setProperty($name, $value);
@@ -89,7 +89,7 @@ 
 	}
 
 	public function addToPropertyCtrlCheck($name, $value, $typeCtrl) {
-		if ($this->_self->ctrl($name, $value, $typeCtrl) === true) {
+		if ($this->_self->ctrl($name, $value, $typeCtrl)===true) {
 			return $this->_self->addToProperty($name, $value);
 		}
 		return $this;
@@ -110,12 +110,12 @@ 
 	}
 
 	protected function setPropertyCtrl($name, $value, $typeCtrl) {
-		if ($this->_self->ctrl($name, $value, $typeCtrl) === true)
+		if ($this->_self->ctrl($name, $value, $typeCtrl)===true)
 			return $this->_self->setProperty($name, $value);
 			return $this;
 	}
 
-	protected function getElementByPropertyValue($propertyName,$value, $elements) {
-		return $this->_self->_getElementBy(function(BaseHtml $element) use ($propertyName,$value){return $element->propertyContains($propertyName, $value) === true;}, $elements);
+	protected function getElementByPropertyValue($propertyName, $value, $elements) {
+		return $this->_self->_getElementBy(function(BaseHtml $element) use ($propertyName, $value){return $element->propertyContains($propertyName, $value)===true; }, $elements);
 	}
 }

Braces +12 added lines, -8 removed lines

@@ -33,8 +33,9 @@ 
 	}
 
 	public function getProperty($name) {
-		if (array_key_exists($name, $this->_self->properties))
-			return $this->_self->properties[$name];
+		if (array_key_exists($name, $this->_self->properties)) {
+					return $this->_self->properties[$name];
+		}
 	}
 
 	/**
@@ -76,8 +77,9 @@ 
 	}
 
 	protected function addToPropertyUnique($name, $value, $typeCtrl) {
-		if (is_string($typeCtrl) && @class_exists($typeCtrl, true))
-			$typeCtrl=$typeCtrl::getConstants();
+		if (is_string($typeCtrl) && @class_exists($typeCtrl, true)) {
+					$typeCtrl=$typeCtrl::getConstants();
+		}
 			if (\is_array($typeCtrl)) {
 				$this->_self->removeOldValues($this->_self->properties[$name], $typeCtrl);
 			}
@@ -96,8 +98,9 @@ 
 	}
 
 	public function removeProperty($name) {
-		if (\array_key_exists($name, $this->_self->properties))
-			unset($this->_self->properties[$name]);
+		if (\array_key_exists($name, $this->_self->properties)) {
+					unset($this->_self->properties[$name]);
+		}
 			return $this;
 	}
 
@@ -110,8 +113,9 @@ 
 	}
 
 	protected function setPropertyCtrl($name, $value, $typeCtrl) {
-		if ($this->_self->ctrl($name, $value, $typeCtrl) === true)
-			return $this->_self->setProperty($name, $value);
+		if ($this->_self->ctrl($name, $value, $typeCtrl) === true) {
+					return $this->_self->setProperty($name, $value);
+		}
 			return $this;
 	}
 

Ajax/semantic/traits/SemanticWidgetsTrait.php

Spacing +16 added lines, -16 removed lines

@@ -19,8 +19,8 @@ 
 	 * @param array $instances
 	 * @return DataTable
 	 */
-	public function dataTable($identifier,$model, $instances=null){
-		return $this->addHtmlComponent(new DataTable($identifier,$model,$instances));
+	public function dataTable($identifier, $model, $instances=null) {
+		return $this->addHtmlComponent(new DataTable($identifier, $model, $instances));
 	}
 
 	/**
@@ -29,8 +29,8 @@ 
 	 * @param array $instances
 	 * @return JsonDataTable
 	 */
-	public function jsonDataTable($identifier,$model, $instances=null){
-		return $this->addHtmlComponent(new JsonDataTable($identifier,$model,$instances));
+	public function jsonDataTable($identifier, $model, $instances=null) {
+		return $this->addHtmlComponent(new JsonDataTable($identifier, $model, $instances));
 	}
 
 	/**
@@ -38,8 +38,8 @@ 
 	 * @param object $instance
 	 * @return DataElement
 	 */
-	public function dataElement($identifier, $instance=null){
-		return $this->addHtmlComponent(new DataElement($identifier,$instance));
+	public function dataElement($identifier, $instance=null) {
+		return $this->addHtmlComponent(new DataElement($identifier, $instance));
 	}
 
 	/**
@@ -47,8 +47,8 @@ 
 	 * @param object $instance
 	 * @return DataForm
 	 */
-	public function dataForm($identifier, $instance){
-		return $this->addHtmlComponent(new DataForm($identifier,$instance));
+	public function dataForm($identifier, $instance) {
+		return $this->addHtmlComponent(new DataForm($identifier, $instance));
 	}
 
 	/**
@@ -56,8 +56,8 @@ 
 	 * @param object $instance
 	 * @return FormLogin
 	 */
-	public function defaultLogin($identifier,$instance=null){
-		return $this->addHtmlComponent(FormLogin::regular($identifier,$instance));
+	public function defaultLogin($identifier, $instance=null) {
+		return $this->addHtmlComponent(FormLogin::regular($identifier, $instance));
 	}
 
 	/**
@@ -65,8 +65,8 @@ 
 	 * @param object $instance
 	 * @return FormLogin
 	 */
-	public function smallLogin($identifier,$instance=null){
-		return $this->addHtmlComponent(FormLogin::small($identifier,$instance));
+	public function smallLogin($identifier, $instance=null) {
+		return $this->addHtmlComponent(FormLogin::small($identifier, $instance));
 	}
 
 	/**
@@ -74,8 +74,8 @@ 
 	 * @param object $instance
 	 * @return FormLogin
 	 */
-	public function segmentedLogin($identifier,$instance=null){
-		return $this->addHtmlComponent(FormLogin::attachedSegment($identifier,$instance));
+	public function segmentedLogin($identifier, $instance=null) {
+		return $this->addHtmlComponent(FormLogin::attachedSegment($identifier, $instance));
 	}
 
 	/**
@@ -83,7 +83,7 @@ 
 	 * @param object $instance
 	 * @return FormAccount
 	 */
-	public function defaultAccount($identifier,$instance=null){
-		return $this->addHtmlComponent(FormAccount::regular($identifier,$instance));
+	public function defaultAccount($identifier, $instance=null) {
+		return $this->addHtmlComponent(FormAccount::regular($identifier, $instance));
 	}
 }

Ajax/semantic/widgets/datatable/JsonDataTable.php

Spacing +32 added lines, -32 removed lines

@@ -22,25 +22,25 @@ 
 		$this->_rowClass="_json _element";
 	}
 
-	protected function _generateContent($table){
+	protected function _generateContent($table) {
 		$this->_addRowModel($table);
 		parent::_generateContent($table);
 	}
 
-	protected function _addRowModel($table){
+	protected function _addRowModel($table) {
 		$fields=$this->_instanceViewer->getSimpleProperties();
-		$row=$this->_createRow($table, $this->_modelClass,$fields);
-		$row->setProperty("style","display:none;");
+		$row=$this->_createRow($table, $this->_modelClass, $fields);
+		$row->setProperty("style", "display:none;");
 		$table->getBody()->_addRow($row);
 	}
 
-	protected function _createRow($table,$rowClass,$fields){
+	protected function _createRow($table, $rowClass, $fields) {
 		$object=JReflection::jsonObject($this->_model);
-		if(isset($this->_rowModelCallback)){
+		if (isset($this->_rowModelCallback)) {
 			$callback=$this->_rowModelCallback;
 			$callback($object);
 		}
-		$row=$this->_generateRow($object, $fields,$table,"_jsonArrayChecked");
+		$row=$this->_generateRow($object, $fields, $table, "_jsonArrayChecked");
 		$row->setClass($rowClass." _element");
 		return $row;
 	}
@@ -49,24 +49,24 @@ 
 	 * {@inheritDoc}
 	 * @see DataTable::_associatePaginationBehavior()
 	 */
-	protected function _associatePaginationBehavior(JsUtils $js=NULL,$offset=null){
+	protected function _associatePaginationBehavior(JsUtils $js=NULL, $offset=null) {
 		$callback=null;
 		$menu=$this->_pagination->getMenu();
 		
-		if(isset($js)){
+		if (isset($js)) {
 			$id=$this->identifier;
 			$callback=$js->getScript($offset).$this->getHtmlComponent()->getInnerScript();
-			$callback.=$js->trigger("#".$id." [name='selection[]']","change",false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js));
+			$callback.=$js->trigger("#".$id." [name='selection[]']", "change", false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js));
 			$callback.=$this->_generatePaginationScript($id);
-			if(isset($this->_urls["refresh"])){
-				if(isset($menu))
-				$js->jsonArrayOn("click", "#".$menu->getIdentifier()." a","#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"],"post",["params"=>"{'p':$(this).attr('data-page'),'_model':'".JString::doubleBackSlashes($this->_model)."'}","jsCallback"=>$callback]);
+			if (isset($this->_urls["refresh"])) {
+				if (isset($menu))
+				$js->jsonArrayOn("click", "#".$menu->getIdentifier()." a", "#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"], "post", ["params"=>"{'p':$(this).attr('data-page'),'_model':'".JString::doubleBackSlashes($this->_model)."'}", "jsCallback"=>$callback]);
 			}
 		}
 
 	}
 	
-	protected function _generatePaginationScript($id){
+	protected function _generatePaginationScript($id) {
 		return ";var page=parseInt($(self).attr('data-page')) || 1;var pages_visibles=$('#pagination-{$id} .item').length-2;
 			var lastPage=$('#pagination-{$id} ._lastPage');
 			var middle= Math.ceil((pages_visibles-1)/ 2);
@@ -86,16 +86,16 @@ 
 			lastPage.attr('data-page',Math.min(lastPage.attr('data-max'),page+1));
 			$('#{$id}').trigger('pageChange');$('#{$id}').trigger('activeRowChange');$('#pagination-{$id}').show();";
 	}
-	protected function _compileSearchFieldBehavior(JsUtils $js=NULL){
+	protected function _compileSearchFieldBehavior(JsUtils $js=NULL) {
 		
 	}
-	protected function _associateSearchFieldBehavior(JsUtils $js=NULL,$offset=null){
-		if(isset($this->_searchField) && isset($js) && isset($this->_urls["refresh"])){
+	protected function _associateSearchFieldBehavior(JsUtils $js=NULL, $offset=null) {
+		if (isset($this->_searchField) && isset($js) && isset($this->_urls["refresh"])) {
 			$id=$this->identifier;
 			$callback=$js->getScript($offset).$this->getHtmlComponent()->getInnerScript();
-			$callback.=$js->trigger("#".$id." [name='selection[]']","change",false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js));
+			$callback.=$js->trigger("#".$id." [name='selection[]']", "change", false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js));
 			$callback.="$('#pagination-{$id}').hide();$('#".$this->identifier."').trigger('searchTerminate',[$(self).val()]);";
-			$js->jsonArrayOn("change", "#".$this->_searchField->getDataField()->getIdentifier(),"#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"],"post",["params"=>"{'s':$(self).val(),'_model':'".JString::doubleBackSlashes($this->_model)."'}","jsCallback"=>$callback]);
+			$js->jsonArrayOn("change", "#".$this->_searchField->getDataField()->getIdentifier(), "#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"], "post", ["params"=>"{'s':$(self).val(),'_model':'".JString::doubleBackSlashes($this->_model)."'}", "jsCallback"=>$callback]);
 		}
 	}
 	
@@ -109,29 +109,29 @@ 
 	 * @param string $jsCallback
 	 * @return AjaxCall
 	 */
-	public function jsJsonArray($url, $method="get", $params="{}", $jsCallback=NULL,$parameters=[]){
-		$parameters=\array_merge($parameters,["modelSelector"=>"#".$this->_identifier." tr.".$this->_modelClass,"url"=>$url,"method"=>$method,"params"=>$params,"jsCallback"=>$jsCallback]);
+	public function jsJsonArray($url, $method="get", $params="{}", $jsCallback=NULL, $parameters=[]) {
+		$parameters=\array_merge($parameters, ["modelSelector"=>"#".$this->_identifier." tr.".$this->_modelClass, "url"=>$url, "method"=>$method, "params"=>$params, "jsCallback"=>$jsCallback]);
 		return new AjaxCall("jsonArray", $parameters);
 	}
 
-	public function jsClear(){
+	public function jsClear() {
 		return "$('#{$this->identifier} tbody').find('._json').remove();";
 	}
 
-	public function clearOn(BaseHtml $element,$event, $stopPropagation=false, $preventDefault=false){
-		return $element->addEvent($event, $this->jsClear(),$stopPropagation,$preventDefault);
+	public function clearOn(BaseHtml $element, $event, $stopPropagation=false, $preventDefault=false) {
+		return $element->addEvent($event, $this->jsClear(), $stopPropagation, $preventDefault);
 	}
 
-	public function clearOnClick(BaseHtml $element,$stopPropagation=false, $preventDefault=false){
-		return $this->clearOn($element, "click",$stopPropagation,$preventDefault);
+	public function clearOnClick(BaseHtml $element, $stopPropagation=false, $preventDefault=false) {
+		return $this->clearOn($element, "click", $stopPropagation, $preventDefault);
 	}
 
-	public function jsonArrayOn(BaseHtml $element,$event,$url, $method="get", $params="{}", $jsCallback=NULL,$parameters=[]){
-		return $element->_addEvent($event, $this->jsJsonArray($url,$method,$params,$jsCallback,$parameters));
+	public function jsonArrayOn(BaseHtml $element, $event, $url, $method="get", $params="{}", $jsCallback=NULL, $parameters=[]) {
+		return $element->_addEvent($event, $this->jsJsonArray($url, $method, $params, $jsCallback, $parameters));
 	}
 
-	public function jsonArrayOnClick(BaseHtml $element,$url, $method="get", $params="{}", $jsCallback=NULL,$parameters=[]){
-		return $this->jsonArrayOn($element, "click", $url,$method,$params,$jsCallback,$parameters);
+	public function jsonArrayOnClick(BaseHtml $element, $url, $method="get", $params="{}", $jsCallback=NULL, $parameters=[]) {
+		return $this->jsonArrayOn($element, "click", $url, $method, $params, $jsCallback, $parameters);
 	}
 
 	/**
@@ -142,8 +142,8 @@ 
 	 * @param number $pages_visibles The number of visible pages in the Pagination component
 	 * @return DataTable
 	 */
-	public function paginate($page,$total_rowcount,$items_per_page=10,$pages_visibles=null){
-		return parent::paginate($page, $total_rowcount,$items_per_page,$pages_visibles);
+	public function paginate($page, $total_rowcount, $items_per_page=10, $pages_visibles=null) {
+		return parent::paginate($page, $total_rowcount, $items_per_page, $pages_visibles);
 	}
 
 	public function setRowModelCallback($_rowModelCallback) {

Braces +3 added lines, -2 removed lines

@@ -59,8 +59,9 @@
 			$callback.=$js->trigger("#".$id." [name='selection[]']","change",false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js));
 			$callback.=$this->_generatePaginationScript($id);
 			if(isset($this->_urls["refresh"])){
-				if(isset($menu))
-				$js->jsonArrayOn("click", "#".$menu->getIdentifier()." a","#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"],"post",["params"=>"{'p':$(this).attr('data-page'),'_model':'".JString::doubleBackSlashes($this->_model)."'}","jsCallback"=>$callback]);
+				if(isset($menu)) {
+								$js->jsonArrayOn("click", "#".$menu->getIdentifier()." a","#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"],"post",["params"=>"{'p':$(this).attr('data-page'),'_model':'".JString::doubleBackSlashes($this->_model)."'}","jsCallback"=>$callback]);
+				}
 			}
 		}