phpMv / phpMv-UI

Ajax/semantic/traits/SemanticHtmlModulesTrait.php

Spacing +3 added lines, -3 removed lines

@@ -86,7 +86,7 @@ 
 	 * @return HtmlModal
 	 */
 	public function htmlModal($identifier, $header="", $content="", $actions=array()) {
-		return $this->addHtmlComponent(new HtmlModal($identifier, $header,$content,$actions));
+		return $this->addHtmlComponent(new HtmlModal($identifier, $header, $content, $actions));
 	}
 
 	/**
@@ -117,8 +117,8 @@ 
 	 * @param boolean $associative
 	 * @return HtmlDropdown
 	 */
-	public function htmlDropdown($identifier, $value="", $items=array(),$associative=true) {
-		return $this->addHtmlComponent(new HtmlDropdown($identifier, $value, $items,$associative));
+	public function htmlDropdown($identifier, $value="", $items=array(), $associative=true) {
+		return $this->addHtmlComponent(new HtmlDropdown($identifier, $value, $items, $associative));
 	}
 
 	/**

Ajax/semantic/html/content/InternalPopup.php

Spacing +17 added lines, -17 removed lines

@@ -14,60 +14,60 @@
 	protected $params;
 	protected $semElement;
 
-	public function __construct($semElement,$title="",$content="",$variation=NULL,$params=array()){
+	public function __construct($semElement, $title="", $content="", $variation=NULL, $params=array()) {
 		$this->semElement=$semElement;
 		$this->title=$title;
 		$this->content=$content;
-		$this->setAttributes($variation,$params);
+		$this->setAttributes($variation, $params);
 	}
 
 	public function setHtml($html) {
-		$this->html= $html;
+		$this->html=$html;
 		return $this;
 	}
 
-	public function setAttributes($variation=NULL,$params=array()){
+	public function setAttributes($variation=NULL, $params=array()) {
 		$this->variation=$variation;
 		$this->params=$params;
 	}
 
-	public function onShow($jsCode){
+	public function onShow($jsCode) {
 		$this->params["onShow"]=$jsCode;
 	}
 
-	public function compile(JsUtils $js=NULL){
-		if(JString::isNotNull($this->title)){
+	public function compile(JsUtils $js=NULL) {
+		if (JString::isNotNull($this->title)) {
 			$this->semElement->addToProperty("data-title", $this->title);
 		}
-		if(JString::isNotNull($this->content)){
+		if (JString::isNotNull($this->content)) {
 			$this->semElement->addToProperty("data-content", $this->content);
 		}
-		if(JString::isNotNull($this->html)){
+		if (JString::isNotNull($this->html)) {
 			$html=$this->html;
-			if(\is_array($html)){
+			if (\is_array($html)) {
 				\array_walk($html, function(&$item) use($js){
-					if($item instanceof HtmlSemDoubleElement){
+					if ($item instanceof HtmlSemDoubleElement) {
 						$comp=$item->compile($js);
-						if(isset($js)){
+						if (isset($js)) {
 							$bs=$item->run($js);
-							if(isset($bs))
+							if (isset($bs))
 								$this->params['onShow']=$bs->getScript();
 						}
 						$item=$comp;
 					}
 				});
-				$html=\implode("",$html);
+				$html=\implode("", $html);
 			}
 			$html=\str_replace("\"", "'", $html);
 			$this->semElement->addToProperty("data-html", $html);
 		}
-		if(JString::isNotNull($this->variation)){
+		if (JString::isNotNull($this->variation)) {
 			$this->semElement->addToProperty("data-variation", $this->variation);
 		}
 	}
 
-	public function run(JsUtils $js){
-		$js->semantic()->popup("#".$this->semElement->getIdentifier(),$this->params);
+	public function run(JsUtils $js) {
+		$js->semantic()->popup("#".$this->semElement->getIdentifier(), $this->params);
 	}
 
 }
\ No newline at end of file

Braces +3 added lines, -2 removed lines

@@ -50,8 +50,9 @@
 						$comp=$item->compile($js);
 						if(isset($js)){
 							$bs=$item->run($js);
-							if(isset($bs))
-								$this->params['onShow']=$bs->getScript();
+							if(isset($bs)) {
+															$this->params['onShow']=$bs->getScript();
+							}
 						}
 						$item=$comp;
 					}

Ajax/common/html/BaseHtml.php

Doc Comments +27 added lines

@@ -124,6 +124,10 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param string $name
+	 * @param string[] $typeCtrl
+	 */
 	protected function setMemberCtrl(&$name, $value, $typeCtrl) {
 		if ($this->ctrl($name, $value, $typeCtrl) === true) {
 			return $name=$value;
@@ -139,22 +143,35 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param string $name
+	 */
 	protected function removePropertyValue($name, $value) {
 		$this->properties[$name]=\str_replace($value, "", $this->properties[$name]);
 		return $this;
 	}
 
+	/**
+	 * @param string $name
+	 */
 	protected function removePropertyValues($name, $values) {
 		$this->removeOldValues($this->properties[$name], $values);
 		return $this;
 	}
 
+	/**
+	 * @param string $name
+	 */
 	public function removeProperty($name) {
 		if (\array_key_exists($name, $this->properties))
 			unset($this->properties[$name]);
 		return $this;
 	}
 
+	/**
+	 * @param string $name
+	 * @param string[] $typeCtrl
+	 */
 	protected function addToMemberCtrl(&$name, $value, $typeCtrl, $separator=" ") {
 		if ($this->ctrl($name, $value, $typeCtrl) === true) {
 			if (is_array($typeCtrl)) {
@@ -165,6 +182,9 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param string $name
+	 */
 	protected function addToMember(&$name, $value, $separator=" ") {
 		$name=str_ireplace($value, "", $name) . $separator . $value;
 		return $this;
@@ -179,6 +199,9 @@ 
 		return $this->addToProperty($name, $value);
 	}
 
+	/**
+	 * @param string $name
+	 */
 	public function addToPropertyCtrl($name, $value, $typeCtrl) {
 		return $this->addToPropertyUnique($name, $value, $typeCtrl);
 	}
@@ -283,6 +306,10 @@ 
 		return null;
 	}
 
+	/**
+	 * @param string $propertyName
+	 * @param string $value
+	 */
 	protected function getElementByPropertyValue($propertyName,$value, $elements) {
 		if (is_array($elements)) {
 			$flag=false;

Spacing +42 added lines, -42 removed lines

@@ -17,9 +17,9 @@ 
 	use BaseHtmlEventsTrait;
 	protected $_template;
 	protected $tagName;
-	protected $properties=array ();
-	protected $_wrapBefore=array ();
-	protected $_wrapAfter=array ();
+	protected $properties=array();
+	protected $_wrapBefore=array();
+	protected $_wrapAfter=array();
 	protected $_bsComponent;
 
 	public function getBsComponent() {
@@ -32,7 +32,7 @@ 
 	}
 
 	protected function getTemplate(JsUtils $js=NULL) {
-		return PropertyWrapper::wrap($this->_wrapBefore, $js) . $this->_template . PropertyWrapper::wrap($this->_wrapAfter, $js);
+		return PropertyWrapper::wrap($this->_wrapBefore, $js).$this->_template.PropertyWrapper::wrap($this->_wrapAfter, $js);
 	}
 
 	public function getProperties() {
@@ -56,13 +56,13 @@ 
 
 	public function addToProperty($name, $value, $separator=" ") {
 		if (\is_array($value)) {
-			foreach ( $value as $v ) {
+			foreach ($value as $v) {
 				$this->addToProperty($name, $v, $separator);
 			}
-		} else if ($value !== "" && $this->propertyContains($name, $value) === false) {
+		} else if ($value!=="" && $this->propertyContains($name, $value)===false) {
 			$v=@$this->properties[$name];
-			if (isset($v) && $v !== "")
-				$v=$v . $separator . $value;
+			if (isset($v) && $v!=="")
+				$v=$v.$separator.$value;
 			else
 				$v=$value;
 
@@ -78,19 +78,19 @@ 
 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
 		$result=$this->getTemplate($js);
-		foreach ( $this as $key => $value ) {
-			if (JString::startswith($key, "_") === false && $key !== "events") {
+		foreach ($this as $key => $value) {
+			if (JString::startswith($key, "_")===false && $key!=="events") {
 				if (is_array($value)) {
 					$v=PropertyWrapper::wrap($value, $js);
 				} else {
 					$v=$value;
 				}
-				$result=str_ireplace("%" . $key . "%", $v, $result);
+				$result=str_ireplace("%".$key."%", $v, $result);
 			}
 		}
 		if (isset($js)===true) {
 			$this->run($js);
-			if (isset($view) === true) {
+			if (isset($view)===true) {
 				$js->addViewElement($this->identifier, $result, $view);
 			}
 		}
@@ -99,12 +99,12 @@ 
 
 	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;
@@ -119,13 +119,13 @@ 
 	}
 
 	protected function setPropertyCtrl($name, $value, $typeCtrl) {
-		if ($this->ctrl($name, $value, $typeCtrl) === true)
+		if ($this->ctrl($name, $value, $typeCtrl)===true)
 			return $this->setProperty($name, $value);
 		return $this;
 	}
 
 	protected function setMemberCtrl(&$name, $value, $typeCtrl) {
-		if ($this->ctrl($name, $value, $typeCtrl) === true) {
+		if ($this->ctrl($name, $value, $typeCtrl)===true) {
 			return $name=$value;
 		}
 		return $this;
@@ -134,7 +134,7 @@ 
 	protected function addToMemberUnique(&$name, $value, $typeCtrl, $separator=" ") {
 		if (is_array($typeCtrl)) {
 			$this->removeOldValues($name, $typeCtrl);
-			$name.=$separator . $value;
+			$name.=$separator.$value;
 		}
 		return $this;
 	}
@@ -156,17 +156,17 @@ 
 	}
 
 	protected function addToMemberCtrl(&$name, $value, $typeCtrl, $separator=" ") {
-		if ($this->ctrl($name, $value, $typeCtrl) === true) {
+		if ($this->ctrl($name, $value, $typeCtrl)===true) {
 			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;
 	}
 
@@ -184,7 +184,7 @@ 
 	}
 
 	public function addToPropertyCtrlCheck($name, $value, $typeCtrl) {
-		if ($this->ctrl($name, $value, $typeCtrl) === true) {
+		if ($this->ctrl($name, $value, $typeCtrl)===true) {
 			return $this->addToProperty($name, $value);
 		}
 		return $this;
@@ -212,26 +212,26 @@ 
 	}
 
 	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;
 	}
 
-	private function _callSetter($setter,$key,$value,&$array){
+	private function _callSetter($setter, $key, $value, &$array) {
 		$result=false;
 		if (method_exists($this, $setter) && !JString::startswith($key, "_")) {
 			try {
 				$this->$setter($value);
 				unset($array[$key]);
 				$result=true;
-			} catch ( \Exception $e ) {
+			}catch (\Exception $e) {
 				$result=false;
 			}
 		}
@@ -240,7 +240,7 @@ 
 
 	public function fromDatabaseObjects($objects, $function) {
 		if (isset($objects)) {
-			foreach ( $objects as $object ) {
+			foreach ($objects as $object) {
 				$this->fromDatabaseObject($object, $function);
 			}
 		}
@@ -264,33 +264,33 @@ 
 		if (is_array($elements)) {
 			$flag=false;
 			$index=0;
-			while ( !$flag && $index < sizeof($elements) ) {
+			while (!$flag && $index<sizeof($elements)) {
 				if ($elements[$index] instanceof BaseHtml)
-					$flag=($elements[$index]->getIdentifier() === $identifier);
+					$flag=($elements[$index]->getIdentifier()===$identifier);
 				$index++;
 			}
-			if ($flag === true)
-				return $elements[$index - 1];
+			if ($flag===true)
+				return $elements[$index-1];
 		} elseif ($elements instanceof BaseHtml) {
-			if ($elements->getIdentifier() === $identifier)
+			if ($elements->getIdentifier()===$identifier)
 				return $elements;
 		}
 		return null;
 	}
 
-	protected function getElementByPropertyValue($propertyName,$value, $elements) {
+	protected function getElementByPropertyValue($propertyName, $value, $elements) {
 		if (is_array($elements)) {
 			$flag=false;
 			$index=0;
-			while ( !$flag && $index < sizeof($elements) ) {
+			while (!$flag && $index<sizeof($elements)) {
 				if ($elements[$index] instanceof BaseHtml)
-					$flag=($elements[$index]->propertyContains($propertyName, $value) === true);
+					$flag=($elements[$index]->propertyContains($propertyName, $value)===true);
 					$index++;
 			}
-			if ($flag === true)
-				return $elements[$index - 1];
+			if ($flag===true)
+				return $elements[$index-1];
 		} elseif ($elements instanceof BaseHtml) {
-			if ($elements->propertyContains($propertyName, $value) === true)
+			if ($elements->propertyContains($propertyName, $value)===true)
 				return $elements;
 		}
 		return null;

Braces +38 added lines, -26 removed lines

@@ -50,8 +50,9 @@ 
 	}
 
 	public function getProperty($name) {
-		if (array_key_exists($name, $this->properties))
-			return $this->properties[$name];
+		if (array_key_exists($name, $this->properties)) {
+					return $this->properties[$name];
+		}
 	}
 
 	public function addToProperty($name, $value, $separator=" ") {
@@ -61,10 +62,11 @@ 
 			}
 		} else if ($value !== "" && $this->propertyContains($name, $value) === false) {
 			$v=@$this->properties[$name];
-			if (isset($v) && $v !== "")
-				$v=$v . $separator . $value;
-			else
-				$v=$value;
+			if (isset($v) && $v !== "") {
+							$v=$v . $separator . $value;
+			} else {
+							$v=$value;
+			}
 
 			return $this->setProperty($name, $v);
 		}
@@ -119,8 +121,9 @@ 
 	}
 
 	protected function setPropertyCtrl($name, $value, $typeCtrl) {
-		if ($this->ctrl($name, $value, $typeCtrl) === true)
-			return $this->setProperty($name, $value);
+		if ($this->ctrl($name, $value, $typeCtrl) === true) {
+					return $this->setProperty($name, $value);
+		}
 		return $this;
 	}
 
@@ -150,8 +153,9 @@ 
 	}
 
 	public function removeProperty($name) {
-		if (\array_key_exists($name, $this->properties))
-			unset($this->properties[$name]);
+		if (\array_key_exists($name, $this->properties)) {
+					unset($this->properties[$name]);
+		}
 		return $this;
 	}
 
@@ -171,8 +175,9 @@ 
 	}
 
 	protected function addToPropertyUnique($name, $value, $typeCtrl) {
-		if (@class_exists($typeCtrl, true))
-			$typeCtrl=$typeCtrl::getConstants();
+		if (@class_exists($typeCtrl, true)) {
+					$typeCtrl=$typeCtrl::getConstants();
+		}
 		if (is_array($typeCtrl)) {
 			$this->removeOldValues($this->properties[$name], $typeCtrl);
 		}
@@ -213,8 +218,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){
@@ -265,15 +271,18 @@ 
 			$flag=false;
 			$index=0;
 			while ( !$flag && $index < sizeof($elements) ) {
-				if ($elements[$index] instanceof BaseHtml)
-					$flag=($elements[$index]->getIdentifier() === $identifier);
+				if ($elements[$index] instanceof BaseHtml) {
+									$flag=($elements[$index]->getIdentifier() === $identifier);
+				}
 				$index++;
 			}
-			if ($flag === true)
-				return $elements[$index - 1];
+			if ($flag === true) {
+							return $elements[$index - 1];
+			}
 		} elseif ($elements instanceof BaseHtml) {
-			if ($elements->getIdentifier() === $identifier)
-				return $elements;
+			if ($elements->getIdentifier() === $identifier) {
+							return $elements;
+			}
 		}
 		return null;
 	}
@@ -283,15 +292,18 @@ 
 			$flag=false;
 			$index=0;
 			while ( !$flag && $index < sizeof($elements) ) {
-				if ($elements[$index] instanceof BaseHtml)
-					$flag=($elements[$index]->propertyContains($propertyName, $value) === true);
+				if ($elements[$index] instanceof BaseHtml) {
+									$flag=($elements[$index]->propertyContains($propertyName, $value) === true);
+				}
 					$index++;
 			}
-			if ($flag === true)
-				return $elements[$index - 1];
+			if ($flag === true) {
+							return $elements[$index - 1];
+			}
 		} elseif ($elements instanceof BaseHtml) {
-			if ($elements->propertyContains($propertyName, $value) === true)
-				return $elements;
+			if ($elements->propertyContains($propertyName, $value) === true) {
+							return $elements;
+			}
 		}
 		return null;
 	}

Ajax/service/Javascript.php

Spacing +2 added lines, -2 removed lines

@@ -3,8 +3,8 @@
 namespace Ajax\service;
 
 class Javascript {
-	public static function containsCode($expression){
-		return strrpos($expression, 'this')!==false||strrpos($expression, 'event')!==false||strrpos($expression, 'self')!==false;
+	public static function containsCode($expression) {
+		return strrpos($expression, 'this')!==false || strrpos($expression, 'event')!==false || strrpos($expression, 'self')!==false;
 	}
 
 	/**

Ajax/common/Widget.php

Braces +4 added lines, -3 removed lines

@@ -141,8 +141,9 @@ 
 
 	public function addItemInToolbar($caption,$icon=NULL,$callback=NULL){
 		$result=$this->addInToolbar($caption,$callback);
-		if(isset($icon))
-			$result->addIcon($icon);
+		if(isset($icon)) {
+					$result->addIcon($icon);
+		}
 		return $result;
 	}
 
@@ -151,7 +152,7 @@ 
 			foreach ($items as $icon=>$item){
 				$this->addItemInToolbar($item,$icon,$callback);
 			}
-		}else{
+		} else{
 			foreach ($items as $item){
 				$this->addItemInToolbar($item,null,$callback);
 			}

Spacing +46 added lines, -46 removed lines

@@ -37,28 +37,28 @@ 
 	protected $_edition;
 
 
-	public function __construct($identifier,$model,$modelInstance=NULL) {
+	public function __construct($identifier, $model, $modelInstance=NULL) {
 		parent::__construct($identifier);
 		$this->_template="%wrapContentBefore%%content%%wrapContentAfter%";
 		$this->setModel($model);
-		if(isset($modelInstance));
+		if (isset($modelInstance));
 			$this->show($modelInstance);
 	}
 
-	protected function _init($instanceViewer,$contentKey,$content,$edition){
+	protected function _init($instanceViewer, $contentKey, $content, $edition) {
 		$this->_instanceViewer=$instanceViewer;
 		$this->content=[$contentKey=>$content];
 		$this->_toolbarPosition=PositionInTable::BEFORETABLE;
 		$this->_edition=$edition;
 	}
 
-	protected function _getFieldIdentifier($prefix){
+	protected function _getFieldIdentifier($prefix) {
 		return $this->identifier."-{$prefix}-".$this->_instanceViewer->getIdentifier();
 	}
 
-	abstract protected  function _setToolbarPosition($table,$captions=NULL);
+	abstract protected  function _setToolbarPosition($table, $captions=NULL);
 
-	public function show($modelInstance){
+	public function show($modelInstance) {
 		$this->_modelInstance=$modelInstance;
 	}
 
@@ -82,42 +82,42 @@ 
 
 	abstract public function getHtmlComponent();
 
-	public function setColor($color){
+	public function setColor($color) {
 		return $this->getHtmlComponent()->setColor($color);
 	}
 
 
-	public function setCaptions($captions){
+	public function setCaptions($captions) {
 		$this->_instanceViewer->setCaptions($captions);
 		return $this;
 	}
 
-	public function setFields($fields){
+	public function setFields($fields) {
 		$this->_instanceViewer->setVisibleProperties($fields);
 		return $this;
 	}
 
-	public function addField($field){
+	public function addField($field) {
 		$this->_instanceViewer->addField($field);
 		return $this;
 	}
 
-	public function insertField($index,$field){
+	public function insertField($index, $field) {
 		$this->_instanceViewer->insertField($index, $field);
 		return $this;
 	}
 
-	public function insertInField($index,$field){
+	public function insertInField($index, $field) {
 		$this->_instanceViewer->insertInField($index, $field);
 		return $this;
 	}
 
-	public function setValueFunction($index,$callback){
+	public function setValueFunction($index, $callback) {
 		$this->_instanceViewer->setValueFunction($index, $callback);
 		return $this;
 	}
 
-	public function setIdentifierFunction($callback){
+	public function setIdentifierFunction($callback) {
 		$this->_instanceViewer->setIdentifierFunction($callback);
 		return $this;
 	}
@@ -125,8 +125,8 @@ 
 	/**
 	 * @return \Ajax\semantic\html\collections\menus\HtmlMenu
 	 */
-	public function getToolbar(){
-		if(isset($this->_toolbar)===false){
+	public function getToolbar() {
+		if (isset($this->_toolbar)===false) {
 			$this->_toolbar=new HtmlMenu("toolbar-".$this->identifier);
 			//$this->_toolbar->setSecondary();
 		}
@@ -139,10 +139,10 @@ 
 	 * @param callable $callback function to call on $element
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addInToolbar($element,$callback=NULL){
+	public function addInToolbar($element, $callback=NULL) {
 		$tb=$this->getToolbar();
-		if(isset($callback)){
-			if(\is_callable($callback)){
+		if (isset($callback)) {
+			if (\is_callable($callback)) {
 				$callback($element);
 			}
 		}
@@ -155,9 +155,9 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addItemInToolbar($caption,$icon=NULL,$callback=NULL){
-		$result=$this->addInToolbar($caption,$callback);
-		if(isset($icon))
+	public function addItemInToolbar($caption, $icon=NULL, $callback=NULL) {
+		$result=$this->addInToolbar($caption, $callback);
+		if (isset($icon))
 			$result->addIcon($icon);
 		return $result;
 	}
@@ -167,14 +167,14 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\Widget
 	 */
-	public function addItemsInToolbar(array $items,$callback=NULL){
-		if(JArray::isAssociative($items)){
-			foreach ($items as $icon=>$item){
-				$this->addItemInToolbar($item,$icon,$callback);
+	public function addItemsInToolbar(array $items, $callback=NULL) {
+		if (JArray::isAssociative($items)) {
+			foreach ($items as $icon=>$item) {
+				$this->addItemInToolbar($item, $icon, $callback);
 			}
-		}else{
-			foreach ($items as $item){
-				$this->addItemInToolbar($item,null,$callback);
+		} else {
+			foreach ($items as $item) {
+				$this->addItemInToolbar($item, null, $callback);
 			}
 		}
 		return $this;
@@ -186,12 +186,12 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addDropdownInToolbar($value,$items,$callback=NULL){
+	public function addDropdownInToolbar($value, $items, $callback=NULL) {
 		$dd=$value;
 		if (\is_string($value)) {
-			$dd=new HtmlDropdown("dropdown-". $this->identifier."-".$value, $value, $items);
+			$dd=new HtmlDropdown("dropdown-".$this->identifier."-".$value, $value, $items);
 		}
-		return $this->addInToolbar($dd,$callback);
+		return $this->addInToolbar($dd, $callback);
 	}
 
 	/**
@@ -199,9 +199,9 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addButtonInToolbar($caption,$callback=NULL){
-		$bt=new HtmlButton("",$caption);
-		return $this->addInToolbar($bt,$callback);
+	public function addButtonInToolbar($caption, $callback=NULL) {
+		$bt=new HtmlButton("", $caption);
+		return $this->addInToolbar($bt, $callback);
 	}
 
 	/**
@@ -210,9 +210,9 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addButtonsInToolbar(array $captions,$asIcon=false,$callback=NULL){
-		$bts=new HtmlButtonGroups("",$captions,$asIcon);
-		return $this->addInToolbar($bts,$callback);
+	public function addButtonsInToolbar(array $captions, $asIcon=false, $callback=NULL) {
+		$bts=new HtmlButtonGroups("", $captions, $asIcon);
+		return $this->addInToolbar($bts, $callback);
 	}
 
 	/**
@@ -222,9 +222,9 @@ 
 	 * @param boolean $labeled
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addLabelledIconButtonInToolbar($caption,$icon,$before=true,$labeled=false){
-		$bt=new HtmlButton("",$caption);
-		$bt->addIcon($icon,$before,$labeled);
+	public function addLabelledIconButtonInToolbar($caption, $icon, $before=true, $labeled=false) {
+		$bt=new HtmlButton("", $caption);
+		$bt->addIcon($icon, $before, $labeled);
 		return $this->addInToolbar($bt);
 	}
 
@@ -254,12 +254,12 @@ 
 	 * @param callable $defaultValueFunction
 	 * @return \Ajax\common\Widget
 	 */
-	public function setDefaultValueFunction($defaultValueFunction){
+	public function setDefaultValueFunction($defaultValueFunction) {
 		$this->_instanceViewer->setDefaultValueFunction($defaultValueFunction);
 		return $this;
 	}
 
-	public function jsDisabled($disable=true){
+	public function jsDisabled($disable=true) {
 		return "$('#".$this->identifier." .ui.input').toggleClass('disabled',".$disable.");";
 	}
 
@@ -268,11 +268,11 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addEditButtonInToolbar($caption,$callback=NULL){
-		$bt=new HtmlButton($this->identifier."-editBtn",$caption);
+	public function addEditButtonInToolbar($caption, $callback=NULL) {
+		$bt=new HtmlButton($this->identifier."-editBtn", $caption);
 		$bt->setToggle();
 		$bt->onClick($this->jsDisabled(Javascript::prep_value("$(event.target).hasClass('active')")));
-		return $this->addInToolbar($bt,$callback);
+		return $this->addInToolbar($bt, $callback);
 	}
 
 }
\ No newline at end of file

Ajax/semantic/html/elements/HtmlStep.php

Spacing +23 added lines, -23 removed lines

@@ -9,11 +9,11 @@ 
 use Ajax\common\html\HtmlDoubleElement;
 use Ajax\semantic\html\base\constants\Side;
 
-class HtmlStep extends HtmlSemCollection{
+class HtmlStep extends HtmlSemCollection {
 	protected $_activeStep;
 
-	public function __construct( $identifier,$steps=array()){
-		parent::__construct( $identifier,"div", "ui steps");
+	public function __construct($identifier, $steps=array()) {
+		parent::__construct($identifier, "div", "ui steps");
 		$this->addItems($steps);
 	}
 
@@ -23,7 +23,7 @@ 
 	 * @see \Ajax\common\html\html5\HtmlCollection::createItem()
 	 */
 	protected function createItem($value) {
-		$itemO=new HtmlStepItem("item-".\sizeof($this->content),$value);
+		$itemO=new HtmlStepItem("item-".\sizeof($this->content), $value);
 		return $itemO;
 	}
 
@@ -31,50 +31,50 @@ 
 	 * @param string|array $step
 	 * @return HtmlStepItem
 	 */
-	public function addStep($step){
+	public function addStep($step) {
 		return $this->addItem($step);
 	}
 
-	public function setOrdered(){
+	public function setOrdered() {
 		return $this->addToProperty("class", "ordered");
 	}
 
-	public function isOrdered(){
+	public function isOrdered() {
 		return $this->propertyContains("class", "ordered");
 	}
 
-	public function setVertical(){
+	public function setVertical() {
 		return $this->addToProperty("class", "vertical");
 	}
 
-	protected function defineActiveStep(){
+	protected function defineActiveStep() {
 		$activestep=$this->_activeStep;
 		$count=$this->count();
-		if($this->isOrdered()){
-			for($i=0;$i<$count;$i++){
+		if ($this->isOrdered()) {
+			for ($i=0; $i<$count; $i++) {
 				$step=$this->content[$i];
 				$step->removeStatus();
-				if($i<$activestep)
+				if ($i<$activestep)
 					$step->setCompleted();
 				elseif ($i===$activestep)
 					$step->setActive();
 				else
 					$step->setDisabled();
 			}
-		}else{
-			foreach ($this->content as $step){
+		} else {
+			foreach ($this->content as $step) {
 				$step->removeStatus();
 			}
-			if($activestep<$count)
+			if ($activestep<$count)
 				$this->content[$activestep]->setActive();
 		}
 		return $this;
 	}
 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		if(isset($this->_activeStep) && \is_numeric($this->_activeStep))
+		if (isset($this->_activeStep) && \is_numeric($this->_activeStep))
 			$this->defineActiveStep();
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 
 	public function setActiveStep($_activeStep) {
@@ -82,15 +82,15 @@ 
 		return $this;
 	}
 
-	public function setAttached($side="",HtmlDoubleElement $toElement=NULL){
-		if(isset($toElement)){
-			$toElement->addToPropertyCtrl("class", "attached",array("attached"));
+	public function setAttached($side="", HtmlDoubleElement $toElement=NULL) {
+		if (isset($toElement)) {
+			$toElement->addToPropertyCtrl("class", "attached", array("attached"));
 		}
-		return $this->addToPropertyCtrl("class", $side." attached",Side::getConstantValues("attached"));
+		return $this->addToPropertyCtrl("class", $side." attached", Side::getConstantValues("attached"));
 	}
 
-	public function asLink(){
-		foreach ($this->content as $step){
+	public function asLink() {
+		foreach ($this->content as $step) {
 			$step->asLink();
 		}
 		return $this;

Braces +14 added lines, -11 removed lines

@@ -54,26 +54,29 @@
 			for($i=0;$i<$count;$i++){
 				$step=$this->content[$i];
 				$step->removeStatus();
-				if($i<$activestep)
-					$step->setCompleted();
-				elseif ($i===$activestep)
-					$step->setActive();
-				else
-					$step->setDisabled();
+				if($i<$activestep) {
+									$step->setCompleted();
+				} elseif ($i===$activestep) {
+									$step->setActive();
+				} else {
+									$step->setDisabled();
+				}
 			}
-		}else{
+		} else{
 			foreach ($this->content as $step){
 				$step->removeStatus();
 			}
-			if($activestep<$count)
-				$this->content[$activestep]->setActive();
+			if($activestep<$count) {
+							$this->content[$activestep]->setActive();
+			}
 		}
 		return $this;
 	}
 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		if(isset($this->_activeStep) && \is_numeric($this->_activeStep))
-			$this->defineActiveStep();
+		if(isset($this->_activeStep) && \is_numeric($this->_activeStep)) {
+					$this->defineActiveStep();
+		}
 		return parent::compile($js,$view);
 	}
 

Ajax/Jquery.php

Spacing +22 added lines, -22 removed lines

@@ -15,16 +15,16 @@ 
  * @license Apache 2 http://www.apache.org/licenses/
  **/
 class Jquery {
-	use JqueryEventsTrait,JqueryAjaxTrait,JqueryActionsTrait;
+	use JqueryEventsTrait, JqueryAjaxTrait, JqueryActionsTrait;
 	protected $_ui;
 	protected $_bootstrap;
 	protected $_semantic;
-	protected $jquery_code_for_compile=array ();
+	protected $jquery_code_for_compile=array();
 	protected $jsUtils;
 	protected $params;
 
-	protected $jquery_events=array (
-			"bind","blur","change","click","dblclick","delegate","die","error","focus","focusin","focusout","hover","keydown","keypress","keyup","live","load","mousedown","mousseenter","mouseleave","mousemove","mouseout","mouseover","mouseup","off","on","one","ready","resize","scroll","select","submit","toggle","trigger","triggerHandler","undind","undelegate","unload"
+	protected $jquery_events=array(
+			"bind", "blur", "change", "click", "dblclick", "delegate", "die", "error", "focus", "focusin", "focusout", "hover", "keydown", "keypress", "keyup", "live", "load", "mousedown", "mousseenter", "mouseleave", "mousemove", "mouseout", "mouseover", "mouseup", "off", "on", "one", "ready", "resize", "scroll", "select", "submit", "toggle", "trigger", "triggerHandler", "undind", "undelegate", "unload"
 	);
 
 	public function ui($ui=NULL) {
@@ -48,9 +48,9 @@ 
 		return $this->_semantic;
 	}
 
-	public function __construct($params,$jsUtils) {
+	public function __construct($params, $jsUtils) {
 		$this->params=array();
-		foreach ( $params as $key => $val ) {
+		foreach ($params as $key => $val) {
 				$this->params[$key]=$params[$key];
 		}
 		$this->jsUtils=$jsUtils;
@@ -114,12 +114,12 @@ 
 	 */
 	public function _output($array_js='') {
 		if (!is_array($array_js)) {
-			$array_js=array (
+			$array_js=array(
 					$array_js
 			);
 		}
 
-		foreach ( $array_js as $js ) {
+		foreach ($array_js as $js) {
 			$this->jquery_code_for_compile[]="\t$js\n";
 		}
 	}
@@ -131,7 +131,7 @@ 
 	 * @param string $param
 	 * @param boolean $immediatly delayed if false
 	 */
-	public function _genericCallValue($jQueryCall,$element='this', $param="", $immediatly=false) {
+	public function _genericCallValue($jQueryCall, $element='this', $param="", $immediatly=false) {
 		$element=Javascript::prep_element($element);
 		if (isset($param)) {
 			$param=Javascript::prep_value($param);
@@ -150,7 +150,7 @@ 
 	 * @param boolean $immediatly delayed if false
 	 * @return string
 	 */
-	public function _genericCallElement($jQueryCall,$to='this', $element, $immediatly=false) {
+	public function _genericCallElement($jQueryCall, $to='this', $element, $immediatly=false) {
 		$to=Javascript::prep_element($to);
 		$element=Javascript::prep_element($element);
 		$str="$({$to}).{$jQueryCall}({$element});";
@@ -168,8 +168,8 @@ 
 	 */
 	public function sortable($element, $options=array()) {
 		if (count($options)>0) {
-			$sort_options=array ();
-			foreach ( $options as $k => $v ) {
+			$sort_options=array();
+			foreach ($options as $k => $v) {
 				$sort_options[]="\n\t\t".$k.': '.$v."";
 			}
 			$sort_options=implode(",", $sort_options);
@@ -201,7 +201,7 @@ 
 	 * @param boolean $stopPropagation Prevents the event from bubbling up the DOM tree, preventing any parent handlers from being notified of the event.
 	 * @return string
 	 */
-	public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true) {
+	public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true) {
 		if (is_array($js)) {
 			$js=implode("\n\t\t", $js);
 		}
@@ -215,7 +215,7 @@ 
 			$event="\n\t$(".Javascript::prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n";
 		else
 			$event="\n\t$(".Javascript::prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n";
-		if($immediatly)
+		if ($immediatly)
 			$this->jquery_code_for_compile[]=$event;
 		return $event;
 	}
@@ -247,18 +247,18 @@ 
 		$script.='});';
 
 		$this->jquery_code_for_compile=array();
-		if($this->params["debug"]==false){
+		if ($this->params["debug"]==false) {
 			$script=$this->minify($script);
 		}
 		$output=($script_tags===FALSE) ? $script : $this->inline($script);
 
-		if ($view!==NULL){
-			$this->jsUtils->createScriptVariable($view,$view_var, $output);
+		if ($view!==NULL) {
+			$this->jsUtils->createScriptVariable($view, $view_var, $output);
 		}
 		return $output;
 	}
 
-	private function _compileLibrary($library){
+	private function _compileLibrary($library) {
 		if ($library!=NULL) {
 			if ($library->isAutoCompile()) {
 				$library->compile(true);
@@ -276,7 +276,7 @@ 
 	 * @return void
 	 */
 	public function _clear_compile() {
-		$this->jquery_code_for_compile=array ();
+		$this->jquery_code_for_compile=array();
 	}
 
 	/**
@@ -285,18 +285,18 @@ 
 	 */
 	public function _document_ready($js) {
 		if (!is_array($js)) {
-			$js=array (
+			$js=array(
 					$js
 			);
 		}
 
-		foreach ( $js as $script ) {
+		foreach ($js as $script) {
 			$this->jquery_code_for_compile[]=$script;
 		}
 	}
 
 	private function minify($input) {
-	if(trim($input) === "") return $input;
+	if (trim($input)==="") return $input;
 	return preg_replace(
 			array(
 					// Remove comment(s)

Braces +20 added lines, -13 removed lines

@@ -136,10 +136,12 @@ 
 		if (isset($param)) {
 			$param=Javascript::prep_value($param);
 			$str="$({$element}).{$jQueryCall}({$param});";
-		} else
-			$str="$({$element}).{$jQueryCall}();";
-			if ($immediatly)
-				$this->jquery_code_for_compile[]=$str;
+		} else {
+					$str="$({$element}).{$jQueryCall}();";
+		}
+			if ($immediatly) {
+							$this->jquery_code_for_compile[]=$str;
+			}
 			return $str;
 	}
 	/**
@@ -154,8 +156,9 @@ 
 		$to=Javascript::prep_element($to);
 		$element=Javascript::prep_element($element);
 		$str="$({$to}).{$jQueryCall}({$element});";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 			return $str;
 	}
 
@@ -211,12 +214,14 @@ 
 		if ($stopPropagation===true) {
 			$js="event.stopPropagation();\n".$js;
 		}
-		if (array_search($event, $this->jquery_events)===false)
-			$event="\n\t$(".Javascript::prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n";
-		else
-			$event="\n\t$(".Javascript::prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n";
-		if($immediatly)
-			$this->jquery_code_for_compile[]=$event;
+		if (array_search($event, $this->jquery_events)===false) {
+					$event="\n\t$(".Javascript::prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n";
+		} else {
+					$event="\n\t$(".Javascript::prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n";
+		}
+		if($immediatly) {
+					$this->jquery_code_for_compile[]=$event;
+		}
 		return $event;
 	}
 
@@ -296,7 +301,9 @@ 
 	}
 
 	private function minify($input) {
-	if(trim($input) === "") return $input;
+	if(trim($input) === "") {
+		return $input;
+	}
 	return preg_replace(
 			array(
 					// Remove comment(s)

Ajax/semantic/widgets/datatable/DataTable.php

Braces +6 added lines, -4 removed lines

@@ -68,8 +68,9 @@ 
 
 		$table->setRowCount(0, \sizeof($captions));
 		$table->setHeaderValues($captions);
-		if(isset($this->_compileParts))
-			$table->setCompileParts($this->_compileParts);
+		if(isset($this->_compileParts)) {
+					$table->setCompileParts($this->_compileParts);
+		}
 		if(isset($this->_searchField) && isset($js)){
 			$this->_searchField->postOn("change", $this->_urls,"{'s':$(this).val()}","-#".$this->identifier." tbody",["preventDefault"=>false]);
 		}
@@ -275,8 +276,9 @@ 
 	private function getDefaultButton($icon,$class=null){
 		$bt=$this->getFieldButton("");
 		$bt->asIcon($icon);
-		if(isset($class))
-			$bt->addToProperty("class", $class);
+		if(isset($class)) {
+					$bt->addToProperty("class", $class);
+		}
 		return $bt;
 	}
 

Spacing +78 added lines, -78 removed lines

@@ -30,8 +30,8 @@ 
 	protected $_hasCheckboxes;
 	protected $_compileParts;
 
-	public function run(JsUtils $js){
-		if($this->_hasCheckboxes && isset($js)){
+	public function run(JsUtils $js) {
+		if ($this->_hasCheckboxes && isset($js)) {
 			$js->execOn("change", "#".$this->identifier." [name='selection[]']", "
 		var \$parentCheckbox=\$('#ck-main-ck-{$this->identifier}'),\$checkbox=\$('#{$this->identifier} [name=\"selection[]\"]'),allChecked=true,allUnchecked=true;
 		\$checkbox.each(function() {if($(this).prop('checked')){allUnchecked = false;}else{allChecked = false;}});
@@ -40,9 +40,9 @@ 
 		parent::run($js);
 	}
 
-	public function __construct($identifier,$model,$modelInstance=NULL) {
-		parent::__construct($identifier, $model,$modelInstance);
-		$this->_init(new InstanceViewer($identifier), "table", new HtmlTable($identifier, 0,0), false);
+	public function __construct($identifier, $model, $modelInstance=NULL) {
+		parent::__construct($identifier, $model, $modelInstance);
+		$this->_init(new InstanceViewer($identifier), "table", new HtmlTable($identifier, 0, 0), false);
 	}
 
 	/**
@@ -54,61 +54,61 @@ 
 	}
 
 
-	public function compile(JsUtils $js=NULL,&$view=NULL){
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
 		$this->_instanceViewer->setInstance($this->_model);
 		$captions=$this->_instanceViewer->getCaptions();
 
 		$table=$this->content["table"];
 
-		if($this->_hasCheckboxes){
+		if ($this->_hasCheckboxes) {
 			$this->_generateMainCheckbox($captions);
 		}
 
 		$table->setRowCount(0, \sizeof($captions));
 		$table->setHeaderValues($captions);
-		if(isset($this->_compileParts))
+		if (isset($this->_compileParts))
 			$table->setCompileParts($this->_compileParts);
-		if(isset($this->_searchField) && isset($js)){
-			$this->_searchField->postOn("change", $this->_urls,"{'s':$(this).val()}","-#".$this->identifier." tbody",["preventDefault"=>false]);
+		if (isset($this->_searchField) && isset($js)) {
+			$this->_searchField->postOn("change", $this->_urls, "{'s':$(this).val()}", "-#".$this->identifier." tbody", ["preventDefault"=>false]);
 		}
 
 		$this->_generateContent($table);
 
-		if($this->_hasCheckboxes && $table->hasPart("thead")){
-				$table->getHeader()->getCell(0, 0)->addToProperty("class","no-sort");
+		if ($this->_hasCheckboxes && $table->hasPart("thead")) {
+				$table->getHeader()->getCell(0, 0)->addToProperty("class", "no-sort");
 		}
 
-		if(isset($this->_pagination) && $this->_pagination->getVisible()){
+		if (isset($this->_pagination) && $this->_pagination->getVisible()) {
 			$this->_generatePagination($table);
 		}
-		if(isset($this->_toolbar)){
+		if (isset($this->_toolbar)) {
 			$this->_setToolbarPosition($table, $captions);
 		}
-		$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"table",PositionInTable::AFTERTABLE]);
-		return parent::compile($js,$view);
+		$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "table", PositionInTable::AFTERTABLE]);
+		return parent::compile($js, $view);
 	}
 
-	private function _generateMainCheckbox(&$captions){
-		$ck=new HtmlCheckbox("main-ck-".$this->identifier,"");
+	private function _generateMainCheckbox(&$captions) {
+		$ck=new HtmlCheckbox("main-ck-".$this->identifier, "");
 		$ck->setOnChecked("$('#".$this->identifier." [name=%quote%selection[]%quote%]').prop('checked',true);");
 		$ck->setOnUnchecked("$('#".$this->identifier." [name=%quote%selection[]%quote%]').prop('checked',false);");
 		\array_unshift($captions, $ck);
 	}
 
-	protected function _generateContent($table){
+	protected function _generateContent($table) {
 		$objects=$this->_modelInstance;
-		if(isset($this->_pagination)){
+		if (isset($this->_pagination)) {
 			$objects=$this->_pagination->getObjects($this->_modelInstance);
 		}
 		InstanceViewer::setIndex(0);
-		$table->fromDatabaseObjects($objects, function($instance){
+		$table->fromDatabaseObjects($objects, function($instance) {
 			$this->_instanceViewer->setInstance($instance);
 			InstanceViewer::$index++;
-			$result= $this->_instanceViewer->getValues();
-			if($this->_hasCheckboxes){
-				$ck=new HtmlCheckbox("ck-".$this->identifier,"");
+			$result=$this->_instanceViewer->getValues();
+			if ($this->_hasCheckboxes) {
+				$ck=new HtmlCheckbox("ck-".$this->identifier, "");
 				$field=$ck->getField();
-				$field->setProperty("value",$this->_instanceViewer->getIdentifier());
+				$field->setProperty("value", $this->_instanceViewer->getIdentifier());
 				$field->setProperty("name", "selection[]");
 				\array_unshift($result, $ck);
 			}
@@ -116,25 +116,25 @@ 
 		});
 	}
 
-	private function _generatePagination($table){
+	private function _generatePagination($table) {
 		$footer=$table->getFooter();
 		$footer->mergeCol();
-		$menu=new HtmlPaginationMenu("pagination-".$this->identifier,$this->_pagination->getPagesNumbers());
+		$menu=new HtmlPaginationMenu("pagination-".$this->identifier, $this->_pagination->getPagesNumbers());
 		$menu->floatRight();
 		$menu->setActiveItem($this->_pagination->getPage()-1);
 		$footer->setValues($menu);
-		$menu->postOnClick($this->_urls,"{'p':$(this).attr('data-page')}","-#".$this->identifier." tbody",["preventDefault"=>false]);
+		$menu->postOnClick($this->_urls, "{'p':$(this).attr('data-page')}", "-#".$this->identifier." tbody", ["preventDefault"=>false]);
 	}
 
-	protected function _setToolbarPosition($table,$captions=NULL){
-		switch ($this->_toolbarPosition){
+	protected function _setToolbarPosition($table, $captions=NULL) {
+		switch ($this->_toolbarPosition) {
 			case PositionInTable::BEFORETABLE:case PositionInTable::AFTERTABLE:
-				if(isset($this->_compileParts)===false){
+				if (isset($this->_compileParts)===false) {
 					$this->content[$this->_toolbarPosition]=$this->_toolbar;
 				}
 				break;
 			case PositionInTable::HEADER:case PositionInTable::FOOTER: case PositionInTable::BODY:
-				$this->addToolbarRow($this->_toolbarPosition,$table, $captions);
+				$this->addToolbarRow($this->_toolbarPosition, $table, $captions);
 				break;
 		}
 	}
@@ -146,18 +146,18 @@ 
 	 * @param callable $callback function called after the field compilation
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
 	 */
-	public function afterCompile($index,$callback){
-		$this->_instanceViewer->afterCompile($index,$callback);
+	public function afterCompile($index, $callback) {
+		$this->_instanceViewer->afterCompile($index, $callback);
 		return $this;
 	}
 
-	private function addToolbarRow($part,$table,$captions){
+	private function addToolbarRow($part, $table, $captions) {
 		$row=$table->getPart($part)->addRow(\sizeof($captions));
 		$row->mergeCol();
 		$row->setValues([$this->_toolbar]);
 	}
 
-	public function getHtmlComponent(){
+	public function getHtmlComponent() {
 		return $this->content["table"];
 	}
 
@@ -170,8 +170,8 @@ 
 		return $this;
 	}
 
-	public function paginate($items_per_page=10,$page=1){
-		$this->_pagination=new Pagination($items_per_page,4,$page);
+	public function paginate($items_per_page=10, $page=1) {
+		$this->_pagination=new Pagination($items_per_page, 4, $page);
 	}
 
 	public function getHasCheckboxes() {
@@ -183,7 +183,7 @@ 
 		return $this;
 	}
 
-	public function refresh($compileParts=["tbody"]){
+	public function refresh($compileParts=["tbody"]) {
 		$this->_compileParts=$compileParts;
 		return $this;
 	}
@@ -192,8 +192,8 @@ 
 	 * @param callable $callback
 	 * @return callable
 	 */
-	private function getFieldButtonCallable($caption,$callback=null){
-		return $this->getCallable("getFieldButton",[$caption],$callback);
+	private function getFieldButtonCallable($caption, $callback=null) {
+		return $this->getCallable("getFieldButton", [$caption], $callback);
 	}
 
 	/**
@@ -201,16 +201,16 @@ 
 	 * @param callable $callback
 	 * @return callable
 	 */
-	private function getCallable($thisCallback,$parameters,$callback=null){
-		$result=function($instance) use($thisCallback,$parameters,$callback){
-			$object=call_user_func_array(array($this,$thisCallback), $parameters);
-			if(isset($callback)){
-				if(\is_callable($callback)){
-					$callback($object,$instance);
+	private function getCallable($thisCallback, $parameters, $callback=null) {
+		$result=function($instance) use($thisCallback, $parameters, $callback){
+			$object=call_user_func_array(array($this, $thisCallback), $parameters);
+			if (isset($callback)) {
+				if (\is_callable($callback)) {
+					$callback($object, $instance);
 				}
 			}
-			if($object instanceof HtmlSemDoubleElement){
-				$object->setProperty("data-ajax",$this->_instanceViewer->getIdentifier());
+			if ($object instanceof HtmlSemDoubleElement) {
+				$object->setProperty("data-ajax", $this->_instanceViewer->getIdentifier());
 			}
 			return $object;
 		};
@@ -221,8 +221,8 @@ 
 	 * @param string $caption
 	 * @return HtmlButton
 	 */
-	private function getFieldButton($caption){
-		return new HtmlButton("",$caption);
+	private function getFieldButton($caption) {
+		return new HtmlButton("", $caption);
 	}
 
 	/**
@@ -231,8 +231,8 @@ 
 	 * @param callable $callback
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
 	 */
-	public function addFieldButton($caption,$callback=null){
-		$this->addField($this->getCallable("getFieldButton",[$caption],$callback));
+	public function addFieldButton($caption, $callback=null) {
+		$this->addField($this->getCallable("getFieldButton", [$caption], $callback));
 		return $this;
 	}
 
@@ -243,8 +243,8 @@ 
 	 * @param callable $callback
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
 	 */
-	public function insertFieldButton($index,$caption,$callback=null){
-		$this->insertField($index, $this->getFieldButtonCallable($caption,$callback));
+	public function insertFieldButton($index, $caption, $callback=null) {
+		$this->insertField($index, $this->getFieldButtonCallable($caption, $callback));
 		return $this;
 	}
 
@@ -255,60 +255,60 @@ 
 	 * @param callable $callback
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
 	 */
-	public function insertInFieldButton($index,$caption,$callback=null){
-		$this->insertInField($index, $this->getFieldButtonCallable($caption,$callback));
+	public function insertInFieldButton($index, $caption, $callback=null) {
+		$this->insertInField($index, $this->getFieldButtonCallable($caption, $callback));
 		return $this;
 	}
 
-	private function addDefaultButton($icon,$class=null,$callback=null){
-		$this->addField($this->getCallable("getDefaultButton",[$icon,$class],$callback));
+	private function addDefaultButton($icon, $class=null, $callback=null) {
+		$this->addField($this->getCallable("getDefaultButton", [$icon, $class], $callback));
 		return $this;
 	}
 
-	private function insertDefaultButtonIn($index,$icon,$class=null,$callback=null){
-		$this->insertInField($index,$this->getCallable("getDefaultButton",[$icon,$class],$callback));
+	private function insertDefaultButtonIn($index, $icon, $class=null, $callback=null) {
+		$this->insertInField($index, $this->getCallable("getDefaultButton", [$icon, $class], $callback));
 		return $this;
 	}
 
-	private function getDefaultButton($icon,$class=null){
+	private function getDefaultButton($icon, $class=null) {
 		$bt=$this->getFieldButton("");
 		$bt->asIcon($icon);
-		if(isset($class))
+		if (isset($class))
 			$bt->addToProperty("class", $class);
 		return $bt;
 	}
 
-	public function addDeleteButton($callback=null){
-		return $this->addDefaultButton("remove","delete red basic",$callback);
+	public function addDeleteButton($callback=null) {
+		return $this->addDefaultButton("remove", "delete red basic", $callback);
 	}
 
-	public function addEditButton($callback=null){
-		return $this->addDefaultButton("edit","edit basic",$callback);
+	public function addEditButton($callback=null) {
+		return $this->addDefaultButton("edit", "edit basic", $callback);
 	}
 
-	public function addEditDeleteButtons($callbackEdit=null,$callbackDelete=null){
+	public function addEditDeleteButtons($callbackEdit=null, $callbackDelete=null) {
 		$this->addEditButton($callbackEdit);
 		$index=$this->_instanceViewer->visiblePropertiesCount()-1;
-		$this->insertDeleteButtonIn($index,$callbackDelete);
+		$this->insertDeleteButtonIn($index, $callbackDelete);
 		return $this;
 	}
 
-	public function insertDeleteButtonIn($index,$callback=null){
-		return $this->insertDefaultButtonIn($index,"remove","delete red basic",$callback);
+	public function insertDeleteButtonIn($index, $callback=null) {
+		return $this->insertDefaultButtonIn($index, "remove", "delete red basic", $callback);
 	}
 
-	public function insertEditButtonIn($index,$callback=null){
-		return $this->insertDefaultButtonIn($index,"edit","edit basic",$callback);
+	public function insertEditButtonIn($index, $callback=null) {
+		return $this->insertDefaultButtonIn($index, "edit", "edit basic", $callback);
 	}
 
-	public function addSearchInToolbar($position=Direction::RIGHT){
+	public function addSearchInToolbar($position=Direction::RIGHT) {
 		return $this->addInToolbar($this->getSearchField())->setPosition($position);
 	}
 
-	public function getSearchField(){
-		if(isset($this->_searchField)===false){
-			$this->_searchField=new HtmlInput("search-".$this->identifier,"search","","Search...");
-			$this->_searchField->addIcon("search",Direction::RIGHT);
+	public function getSearchField() {
+		if (isset($this->_searchField)===false) {
+			$this->_searchField=new HtmlInput("search-".$this->identifier, "search", "", "Search...");
+			$this->_searchField->addIcon("search", Direction::RIGHT);
 		}
 		return $this->_searchField;
 	}

Doc Comments +18 added lines, -3 removed lines

@@ -40,6 +40,10 @@ 
 		parent::run($js);
 	}
 
+	/**
+	 * @param string $identifier
+	 * @param string $model
+	 */
 	public function __construct($identifier,$model,$modelInstance=NULL) {
 		parent::__construct($identifier, $model,$modelInstance);
 		$this->_init(new InstanceViewer($identifier), "table", new HtmlTable($identifier, 0,0), false);
@@ -151,6 +155,9 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param PositionInTable $part
+	 */
 	private function addToolbarRow($part,$table,$captions){
 		$row=$table->getPart($part)->addRow(\sizeof($captions));
 		$row->mergeCol();
@@ -190,7 +197,7 @@ 
 	/**
 	 * @param string $caption
 	 * @param callable $callback
-	 * @return callable
+	 * @return \Closure
 	 */
 	private function getFieldButtonCallable($caption,$callback=null){
 		return $this->getCallable("getFieldButton",[$caption],$callback);
@@ -198,9 +205,9 @@ 
 
 	/**
 	 * @param callable $thisCallback
-	 * @param array $parameters
+	 * @param string[] $parameters
 	 * @param callable $callback
-	 * @return callable
+	 * @return \Closure
 	 */
 	private function getCallable($thisCallback,$parameters,$callback=null){
 		$result=function($instance) use($thisCallback,$parameters,$callback){
@@ -261,11 +268,19 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param string $icon
+	 * @param string $class
+	 */
 	private function addDefaultButton($icon,$class=null,$callback=null){
 		$this->addField($this->getCallable("getDefaultButton",[$icon,$class],$callback));
 		return $this;
 	}
 
+	/**
+	 * @param string $icon
+	 * @param string $class
+	 */
 	private function insertDefaultButtonIn($index,$icon,$class=null,$callback=null){
 		$this->insertInField($index,$this->getCallable("getDefaultButton",[$icon,$class],$callback));
 		return $this;

Ajax/common/html/traits/BaseHtmlEventsTrait.php

Spacing +22 added lines, -22 removed lines

@@ -10,16 +10,16 @@ 
  * @property SimpleExtComponent $_bsComponent
  * @property string identifier
  */
-trait BaseHtmlEventsTrait{
+trait BaseHtmlEventsTrait {
 
-	protected $_events=array ();
+	protected $_events=array();
 
 	public function addEvent($event, $jsCode, $stopPropagation=false, $preventDefault=false) {
-		if ($stopPropagation === true) {
-			$jsCode="event.stopPropagation();" . $jsCode;
+		if ($stopPropagation===true) {
+			$jsCode="event.stopPropagation();".$jsCode;
 		}
-		if ($preventDefault === true) {
-			$jsCode="event.preventDefault();" . $jsCode;
+		if ($preventDefault===true) {
+			$jsCode="event.preventDefault();".$jsCode;
 		}
 		return $this->_addEvent($event, $jsCode);
 	}
@@ -29,7 +29,7 @@ 
 			if (is_array($this->_events[$event])) {
 				$this->_events[$event][]=$jsCode;
 			} else {
-				$this->_events[$event]=array ($this->_events[$event],$jsCode );
+				$this->_events[$event]=array($this->_events[$event], $jsCode);
 			}
 		} else {
 			$this->_events[$event]=$jsCode;
@@ -49,10 +49,10 @@ 
 		return $this->onClick($jsCode);
 	}
 
-	public function onCreate($jsCode){
-		if(isset($this->_events["_create"])){
+	public function onCreate($jsCode) {
+		if (isset($this->_events["_create"])) {
 			$this->_events["_create"][]=$jsCode;
-		}else{
+		} else {
 			$this->_events["_create"]=[$jsCode];
 		}
 		return $this;
@@ -61,15 +61,15 @@ 
 	public function addEventsOnRun(JsUtils $js=NULL) {
 		$this->_eventsOnCreate($js);
 		if (isset($this->_bsComponent)) {
-			foreach ( $this->_events as $event => $jsCode ) {
+			foreach ($this->_events as $event => $jsCode) {
 				$code=$jsCode;
 				if (is_array($jsCode)) {
 					$code="";
-					foreach ( $jsCode as $jsC ) {
+					foreach ($jsCode as $jsC) {
 						if ($jsC instanceof AjaxCall) {
-							$code.="\n" . $jsC->compile($js);
+							$code.="\n".$jsC->compile($js);
 						} else {
-							$code.="\n" . $jsC;
+							$code.="\n".$jsC;
 						}
 					}
 				} elseif ($jsCode instanceof AjaxCall) {
@@ -77,24 +77,24 @@ 
 				}
 				$this->_bsComponent->addEvent($event, $code);
 			}
-			$this->_events=array ();
+			$this->_events=array();
 		}
 	}
 
-	protected function _eventsOnCreate(JsUtils $js=NULL){
-		if(isset($this->_events["_create"])){
+	protected function _eventsOnCreate(JsUtils $js=NULL) {
+		if (isset($this->_events["_create"])) {
 			$create=$this->_events["_create"];
-			if(\is_array($create)){
+			if (\is_array($create)) {
 				$create=\implode("", $create);
 			}
-			if(isset($js) && $create!=="")
-				$js->exec($create,true);
+			if (isset($js) && $create!=="")
+				$js->exec($create, true);
 			unset($this->_events["_create"]);
 		}
 	}
 
 	public function _ajaxOn($operation, $event, $url, $responseElement="", $parameters=array()) {
-		$params=array ("url" => $url,"responseElement" => $responseElement );
+		$params=array("url" => $url, "responseElement" => $responseElement);
 		$params=array_merge($params, $parameters);
 		$this->_addEvent($event, new AjaxCall($operation, $params));
 		return $this;
@@ -127,7 +127,7 @@ 
 	}
 
 	public function jsDoJquery($jqueryCall, $param="") {
-		return "$('#" . $this->identifier . "')." . $jqueryCall . "(" . Javascript::prep_value($param) . ");";
+		return "$('#".$this->identifier."').".$jqueryCall."(".Javascript::prep_value($param).");";
 	}
 
 	public function executeOnRun($jsCode) {

Braces +4 added lines, -3 removed lines

@@ -52,7 +52,7 @@ 
 	public function onCreate($jsCode){
 		if(isset($this->_events["_create"])){
 			$this->_events["_create"][]=$jsCode;
-		}else{
+		} else{
 			$this->_events["_create"]=[$jsCode];
 		}
 		return $this;
@@ -87,8 +87,9 @@ 
 			if(\is_array($create)){
 				$create=\implode("", $create);
 			}
-			if(isset($js) && $create!=="")
-				$js->exec($create,true);
+			if(isset($js) && $create!=="") {
+							$js->exec($create,true);
+			}
 			unset($this->_events["_create"]);
 		}
 	}