phpMv / phpMv-UI

Ajax/service/AjaxTransition.php

Spacing +8 added lines, -8 removed lines

@@ -3,26 +3,26 @@
 use Ajax\semantic\html\base\constants\Transition;
 
 class AjaxTransition {
-	public static function none($responseElement,$jqueryDone="html"){
+	public static function none($responseElement, $jqueryDone="html") {
 		return "$({$responseElement}).{$jqueryDone}( data )";
 	}
 
-	public static function jqFade($responseElement,$jqueryDone="html"){
+	public static function jqFade($responseElement, $jqueryDone="html") {
 		return "$({$responseElement}).hide().{$jqueryDone}( data ).fadeIn()";
 	}
 
-	public static function jqSlide($responseElement,$jqueryDone="html"){
+	public static function jqSlide($responseElement, $jqueryDone="html") {
 		return "$({$responseElement}).hide().{$jqueryDone}( data ).slideDown()";
 	}
 
-	public static function random($responseElement,$jqueryDone="html"){
+	public static function random($responseElement, $jqueryDone="html") {
 		$transitions=Transition::getConstantValues();
-		$transition=$transitions[\rand(0,\sizeof($transitions)-1)];
-		return self::__callStatic($transition, [$responseElement,$jqueryDone]);
+		$transition=$transitions[\rand(0, \sizeof($transitions)-1)];
+		return self::__callStatic($transition, [$responseElement, $jqueryDone]);
 	}
 
-	public static function __callStatic($name, $arguments){
-		if(\sizeof($arguments)==2){
+	public static function __callStatic($name, $arguments) {
+		if (\sizeof($arguments)==2) {
 			$responseElement=$arguments[0];
 			$jqueryDone=$arguments[1];
 			$name=JString::camelCaseToSeparated($name);

Ajax/semantic/html/base/constants/Transition.php

Spacing +7 added lines, -7 removed lines

@@ -3,12 +3,12 @@
 use Ajax\common\BaseEnum;
 abstract class Transition extends BaseEnum {
 	const SCALE="scale",
-	FADE="fade",FADE_UP="fadeUp",FADE_DOWN="fadeDown",FADE_LEFT="fadeLeft",FADE_RIGHT="fadeRight",
-	HORIZONTAL_FLIP="horizontalFlip",VERTICAL_FLIP="verticalFlip",
+	FADE="fade", FADE_UP="fadeUp", FADE_DOWN="fadeDown", FADE_LEFT="fadeLeft", FADE_RIGHT="fadeRight",
+	HORIZONTAL_FLIP="horizontalFlip", VERTICAL_FLIP="verticalFlip",
 	DROP="drop",
-	FLY_LEFT="flyLeft",FLY_RIGHT="flyRight",FLY_UP="flyUp",FLY_DOWN="flyDown",
-	SWING_LEFT="swingLeft",SWING_RIGHT="swingRight",SWING_UP="swingUp",SWING_DOWN="swingDown",
-	BROWSE="browse",BROWSE_RIGHT="browseRight",
-	SLIDE_LEFT="slideLeft",SLIDE_RIGHT="slideRight",SLIDE_UP="slideUp",SLIDE_DOWN="slideDown",
-	JIGGLE="jiggle",FLASH="flash",SHAKE="shake",PULSE="pulse",TADA="tada",BOUNCE="bounce";
+	FLY_LEFT="flyLeft", FLY_RIGHT="flyRight", FLY_UP="flyUp", FLY_DOWN="flyDown",
+	SWING_LEFT="swingLeft", SWING_RIGHT="swingRight", SWING_UP="swingUp", SWING_DOWN="swingDown",
+	BROWSE="browse", BROWSE_RIGHT="browseRight",
+	SLIDE_LEFT="slideLeft", SLIDE_RIGHT="slideRight", SLIDE_UP="slideUp", SLIDE_DOWN="slideDown",
+	JIGGLE="jiggle", FLASH="flash", SHAKE="shake", PULSE="pulse", TADA="tada", BOUNCE="bounce";
 }
\ No newline at end of file

Ajax/service/JReflection.php

Spacing +2 added lines, -2 removed lines

@@ -3,8 +3,8 @@
 namespace Ajax\service;
 
 class JReflection {
-	public static function shortClassName($object){
-		$classNameWithNamespace = get_class($object);
+	public static function shortClassName($object) {
+		$classNameWithNamespace=get_class($object);
 		return substr($classNameWithNamespace, strrpos($classNameWithNamespace, '\\')+1);
 	}
 }
\ No newline at end of file

Ajax/php/ci/JsUtils.php

Spacing +39 added lines, -39 removed lines

@@ -1,39 +1,39 @@ 
 <?php
 namespace Ajax\php\ci;
 
-class JsUtils extends \Ajax\JsUtils{
+class JsUtils extends \Ajax\JsUtils {
 	protected $ci;
-	protected $_my_controller_paths= array();
-	protected $_my_controllers= array();
+	protected $_my_controller_paths=array();
+	protected $_my_controllers=array();
 
-	public function __construct($params=array(),$injected=NULL){
-		parent::__construct($params,$injected);
-		$this->_my_controller_paths = array(APPPATH);
+	public function __construct($params=array(), $injected=NULL) {
+		parent::__construct($params, $injected);
+		$this->_my_controller_paths=array(APPPATH);
 	}
-	public function getUrl($url){
+	public function getUrl($url) {
 		return site_url($url);
 	}
 
-	public function getCi(){
-		if(isset($this->ci)===false){
-			$this->ci =& get_instance();
+	public function getCi() {
+		if (isset($this->ci)===false) {
+			$this->ci=& get_instance();
 			$this->ci->load->helper('url');
 		}
 		return $this->ci;
 	}
 
-	public function addViewElement($identifier,$content,&$view){
-		if(\array_key_exists("q", $view)===false){
+	public function addViewElement($identifier, $content, &$view) {
+		if (\array_key_exists("q", $view)===false) {
 			$view["q"]=array();
 		}
 		$view["q"][$identifier]=$content;
 	}
 
-	public function createScriptVariable(&$view,$view_var, $output){
+	public function createScriptVariable(&$view, $view_var, $output) {
 		$view[$view_var]=$output;
 	}
 
-	public function forward($initialControllerInstance,$controllerName,$actionName,$params=NULL){
+	public function forward($initialControllerInstance, $controllerName, $actionName, $params=NULL) {
 		$ci=$this->getCi();
 		$controllerName=strtolower($controllerName);
 		$this->controller($controllerName);
@@ -44,64 +44,64 @@ 
 		return $result;
 	}
 
-	public function renderContent($initialControllerInstance,$viewName, $params=NULL) {
+	public function renderContent($initialControllerInstance, $viewName, $params=NULL) {
 		return $initialControllerInstance->load->view($viewName, $params, true);
 	}
 
-	public function fromDispatcher($dispatcher){
+	public function fromDispatcher($dispatcher) {
 		return array_values($dispatcher->uri->segment_array());
 	}
 
-	public function controller($controller, $name = '', $db_conn = FALSE){
-		if (\is_array($controller)){
-			foreach ($controller as $babe){
+	public function controller($controller, $name='', $db_conn=FALSE) {
+		if (\is_array($controller)) {
+			foreach ($controller as $babe) {
 				$this->controller($babe);
 			}
 			return;
 		}
-		if ($controller == ''){
+		if ($controller=='') {
 			return;
 		}
-		$path = '';
+		$path='';
 		// Is the controller in a sub-folder? If so, parse out the filename and path.
-		if (($last_slash = strrpos($controller, '/')) !== FALSE){
+		if (($last_slash=strrpos($controller, '/'))!==FALSE) {
 			// The path is in front of the last slash
-			$path = substr($controller, 0, $last_slash + 1);
+			$path=substr($controller, 0, $last_slash+1);
 			// And the controller name behind it
-			$controller = substr($controller, $last_slash + 1);
+			$controller=substr($controller, $last_slash+1);
 		}
 
-		if ($name == ''){
-			$name = $controller;
+		if ($name=='') {
+			$name=$controller;
 		}
 
-		if (in_array($name, $this->_my_controllers, TRUE)){
+		if (in_array($name, $this->_my_controllers, TRUE)) {
 			return;
 		}
 
-		$CI =$this->getCi();
-		if (isset($CI->$name)){
+		$CI=$this->getCi();
+		if (isset($CI->$name)) {
 			show_error('The controller name you are loading is the name of a resource that is already being used: '.$name);
 		}
-		$controller = strtolower($controller);
-		foreach ($this->_my_controller_paths as $mod_path){
-			if ( ! file_exists($mod_path.'controllers/'.$path.$controller.'.php')){
+		$controller=strtolower($controller);
+		foreach ($this->_my_controller_paths as $mod_path) {
+			if (!file_exists($mod_path.'controllers/'.$path.$controller.'.php')) {
 				continue;
 			}
-			if ($db_conn !== FALSE && ! class_exists('CI_DB')){
-				if ($db_conn === TRUE){
-					$db_conn = '';
+			if ($db_conn!==FALSE && !class_exists('CI_DB')) {
+				if ($db_conn===TRUE) {
+					$db_conn='';
 				}
 				$CI->load->database($db_conn, FALSE, TRUE);
 			}
-			if ( ! class_exists('CI_Controller')){
+			if (!class_exists('CI_Controller')) {
 				load_class('Controller', 'core');
 			}
 			require_once($mod_path.'controllers/'.$path.$controller.'.php');
-			$controller = ucfirst($controller);
-			$CI->$name = new $controller();
+			$controller=ucfirst($controller);
+			$CI->$name=new $controller();
 
-			$this->_my_controllers[] = $name;
+			$this->_my_controllers[]=$name;
 			return;
 		}
 		show_error('Unable to locate the controller you have specified: '.$controller);

Ajax/semantic/widgets/base/FieldAsTrait.php

Spacing +98 added lines, -98 removed lines

@@ -24,23 +24,23 @@ 
  * @property boolean $_edition
  * @property mixed _modelInstance
  */
-trait FieldAsTrait{
+trait FieldAsTrait {
 
-	abstract protected function _getFieldIdentifier($prefix,$name="");
-	abstract public function setValueFunction($index,$callback);
+	abstract protected function _getFieldIdentifier($prefix, $name="");
+	abstract public function setValueFunction($index, $callback);
 	abstract protected function _getFieldName($index);
 	abstract protected function _getFieldCaption($index);
-	abstract protected function _buttonAsSubmit(HtmlButton &$button,$event,$url,$responseElement=NULL,$parameters=NULL);
+	abstract protected function _buttonAsSubmit(HtmlButton&$button, $event, $url, $responseElement=NULL, $parameters=NULL);
 
 	/**
 	 * @param HtmlFormField $element
 	 * @param array $attributes
 	 */
-	protected function _applyAttributes($element,&$attributes,$index){
-		if(isset($attributes["callback"])){
+	protected function _applyAttributes($element, &$attributes, $index) {
+		if (isset($attributes["callback"])) {
 			$callback=$attributes["callback"];
-			if(\is_callable($callback)){
-				$callback($element,$this->_modelInstance,$index);
+			if (\is_callable($callback)) {
+				$callback($element, $this->_modelInstance, $index);
 				unset($attributes["callback"]);
 			}
 		}
@@ -50,42 +50,42 @@ 
 		$element->fromArray($attributes);
 	}
 
-	private function _getLabelField($caption,$icon=NULL){
-		$label=new HtmlLabel($this->_getFieldIdentifier("lbl"),$caption,$icon);
+	private function _getLabelField($caption, $icon=NULL) {
+		$label=new HtmlLabel($this->_getFieldIdentifier("lbl"), $caption, $icon);
 		return $label;
 	}
 
-	protected function _addRules($element,&$attributes){
-		if(isset($attributes["rules"])){
+	protected function _addRules($element, &$attributes) {
+		if (isset($attributes["rules"])) {
 			$rules=$attributes["rules"];
-			if(\is_array($rules)){
+			if (\is_array($rules)) {
 				$element->addRules($rules);
 			}
-			else{
+			else {
 				$element->addRule($rules);
 			}
 			unset($attributes["rules"]);
 		}
 	}
 
-	protected function _prepareFormFields(&$field,$name,&$attributes){
+	protected function _prepareFormFields(&$field, $name, &$attributes) {
 		$field->setName($name);
 		$this->_addRules($field, $attributes);
 		return $field;
 	}
 
-	protected function _fieldAs($elementCallback,$index,$attributes=NULL,$prefix=null){
-		$this->setValueFunction($index,function($value) use ($index,&$attributes,$elementCallback,$prefix){
+	protected function _fieldAs($elementCallback, $index, $attributes=NULL, $prefix=null) {
+		$this->setValueFunction($index, function($value) use ($index, &$attributes, $elementCallback, $prefix){
 			$caption=$this->_getFieldCaption($index);
 			$name=$this->_getFieldName($index);
-			$id=$this->_getFieldIdentifier($prefix,$name);
-			if(isset($attributes["name"])){
+			$id=$this->_getFieldIdentifier($prefix, $name);
+			if (isset($attributes["name"])) {
 				$name=$attributes["name"];
 				unset($attributes["name"]);
 			}
-			$element=$elementCallback($id,$name,$value,$caption);
-			if(\is_array($attributes)){
-				$this->_applyAttributes($element, $attributes,$index);
+			$element=$elementCallback($id, $name, $value, $caption);
+			if (\is_array($attributes)) {
+				$this->_applyAttributes($element, $attributes, $index);
 			}
 			$element->setDisabled(!$this->_edition);
 			return $element;
@@ -94,160 +94,160 @@ 
 	}
 
 
-	public function fieldAsProgress($index,$label=NULL, $attributes=array()){
-		$this->setValueFunction($index,function($value) use($label,$attributes){
-			$pb=new HtmlProgress($this->_getFieldIdentifier("pb"),$value,$label,$attributes);
+	public function fieldAsProgress($index, $label=NULL, $attributes=array()) {
+		$this->setValueFunction($index, function($value) use($label, $attributes){
+			$pb=new HtmlProgress($this->_getFieldIdentifier("pb"), $value, $label, $attributes);
 			return $pb;
 		});
 			return $this;
 	}
 
-	public function fieldAsRating($index,$max=5, $icon=""){
-		$this->setValueFunction($index,function($value) use($max,$icon){
-			$rating=new HtmlRating($this->_getFieldIdentifier("rat"),$value,$max,$icon);
+	public function fieldAsRating($index, $max=5, $icon="") {
+		$this->setValueFunction($index, function($value) use($max, $icon){
+			$rating=new HtmlRating($this->_getFieldIdentifier("rat"), $value, $max, $icon);
 			return $rating;
 		});
 			return $this;
 	}
 
-	public function fieldAsLabel($index,$icon=NULL){
-		$this->setValueFunction($index,function($caption) use($icon){
-			$lbl=$this->_getLabelField($caption,$icon);
+	public function fieldAsLabel($index, $icon=NULL) {
+		$this->setValueFunction($index, function($caption) use($icon){
+			$lbl=$this->_getLabelField($caption, $icon);
 			return $lbl;
 		});
 			return $this;
 	}
 
-	public function fieldAsHeader($index,$niveau=1,$icon=NULL,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value) use($niveau,$icon){
-			$header=new HtmlHeader($id,$niveau,$value);
-			if(isset($icon))
+	public function fieldAsHeader($index, $niveau=1, $icon=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) use($niveau, $icon){
+			$header=new HtmlHeader($id, $niveau, $value);
+			if (isset($icon))
 				$header->asIcon($icon, $value);
 			return $header;
-		}, $index,$attributes,"header");
+		}, $index, $attributes, "header");
 	}
 
 
-	public function fieldAsImage($index,$size=Size::MINI,$circular=false){
-		$this->setValueFunction($index,function($img) use($size,$circular){
-			$image=new HtmlImage($this->_getFieldIdentifier("image"),$img);$image->setSize($size);if($circular)$image->setCircular();
+	public function fieldAsImage($index, $size=Size::MINI, $circular=false) {
+		$this->setValueFunction($index, function($img) use($size, $circular){
+			$image=new HtmlImage($this->_getFieldIdentifier("image"), $img); $image->setSize($size); if ($circular)$image->setCircular();
 			return $image;
 		});
 			return $this;
 	}
 
-	public function fieldAsAvatar($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value){
-			$img=new HtmlImage($id,$value);
+	public function fieldAsAvatar($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) {
+			$img=new HtmlImage($id, $value);
 			$img->asAvatar();
 			return $img;
-		}, $index,$attributes,"avatar");
+		}, $index, $attributes, "avatar");
 	}
 
-	public function fieldAsRadio($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value){
-			$input= new HtmlRadio($id,$name,$value,$value);
+	public function fieldAsRadio($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) {
+			$input=new HtmlRadio($id, $name, $value, $value);
 			return $input;
-		}, $index,$attributes,"radio");
+		}, $index, $attributes, "radio");
 	}
 
-	public function fieldAsRadios($index,$elements=[],$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($elements){
-			return HtmlFormFields::radios($name,$elements,$caption,$value);
-		}, $index,$attributes,"radios");
+	public function fieldAsRadios($index, $elements=[], $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($elements){
+			return HtmlFormFields::radios($name, $elements, $caption, $value);
+		}, $index, $attributes, "radios");
 	}
 
-	public function fieldAsInput($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($attributes){
-			$input= new HtmlFormInput($id,$caption,"text",$value);
+	public function fieldAsInput($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes){
+			$input=new HtmlFormInput($id, $caption, "text", $value);
 			return $this->_prepareFormFields($input, $name, $attributes);
-		}, $index,$attributes,"input");
+		}, $index, $attributes, "input");
 	}
 
-	public function fieldAsTextarea($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption){
-			$textarea=new HtmlFormTextarea($id,$caption,$value);
+	public function fieldAsTextarea($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
+			$textarea=new HtmlFormTextarea($id, $caption, $value);
 			$textarea->setName($name);
 			return $textarea;
-		}, $index,$attributes,"textarea");
+		}, $index, $attributes, "textarea");
 	}
 
-	public function fieldAsHidden($index,$attributes=NULL){
-		if(!\is_array($attributes)){
+	public function fieldAsHidden($index, $attributes=NULL) {
+		if (!\is_array($attributes)) {
 			$attributes=[];
 		}
 		$attributes["imputType"]="hidden";
-		return $this->fieldAsInput($index,$attributes);
+		return $this->fieldAsInput($index, $attributes);
 	}
 
-	public function fieldAsCheckbox($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption){
-			$input=new HtmlFormCheckbox($id,$caption,$this->_instanceViewer->getIdentifier());
+	public function fieldAsCheckbox($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
+			$input=new HtmlFormCheckbox($id, $caption, $this->_instanceViewer->getIdentifier());
 			$input->setChecked(JString::isBooleanTrue($value));
 			$input->setName($name);
 			return $input;
-		}, $index,$attributes,"ck");
+		}, $index, $attributes, "ck");
 	}
 
-	public function fieldAsDropDown($index,$elements=[],$multiple=false,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use($elements,$multiple){
-			$dd=new HtmlFormDropdown($id,$elements,$caption,$value);
-			$dd->asSelect($name,$multiple);
+	public function fieldAsDropDown($index, $elements=[], $multiple=false, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use($elements, $multiple){
+			$dd=new HtmlFormDropdown($id, $elements, $caption, $value);
+			$dd->asSelect($name, $multiple);
 			return $dd;
-		}, $index,$attributes,"dd");
+		}, $index, $attributes, "dd");
 	}
 
-	public function fieldAsMessage($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption){
-			$mess= new HtmlMessage("message-".$id,$value);
+	public function fieldAsMessage($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
+			$mess=new HtmlMessage("message-".$id, $value);
 			$mess->addHeader($caption);
 			return $mess;
-		}, $index,$attributes,"message");
+		}, $index, $attributes, "message");
 	}
 
 	/**Change fields type
 	 * @param array $types an array or associative array $type=>$attribute
 	 */
-	public function fieldsAs(array $types){
+	public function fieldsAs(array $types) {
 		$i=0;
-		if(JArray::isAssociative($types)){
-			foreach ($types as $type=>$attributes){
-				if(\is_int($type))
-					$this->fieldAs($i++,$attributes,[]);
+		if (JArray::isAssociative($types)) {
+			foreach ($types as $type=>$attributes) {
+				if (\is_int($type))
+					$this->fieldAs($i++, $attributes, []);
 				else
-					$this->fieldAs($i++,$type,$attributes);
+					$this->fieldAs($i++, $type, $attributes);
 			}
-		}else{
-			foreach ($types as $type){
-				$this->fieldAs($i++,$type);
+		} else {
+			foreach ($types as $type) {
+				$this->fieldAs($i++, $type);
 			}
 		}
 	}
 
-	public function fieldAs($index,$type,$attributes=NULL){
+	public function fieldAs($index, $type, $attributes=NULL) {
 		$method="fieldAs".\ucfirst($type);
-		if(\method_exists($this, $method)){
-			if(!\is_array($attributes)){
+		if (\method_exists($this, $method)) {
+			if (!\is_array($attributes)) {
 				$attributes=[$index];
-			}else{
+			} else {
 				\array_unshift($attributes, $index);
 			}
-			\call_user_func_array([$this,$method], $attributes);
+			\call_user_func_array([$this, $method], $attributes);
 		}
 	}
 
-	public function fieldAsSubmit($index,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle,$attributes){
-			$button=new HtmlButton($id,$value,$cssStyle);
-			$this->_buttonAsSubmit($button,"click",$url,$responseElement,@$attributes["ajax"]);
+	public function fieldAsSubmit($index, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($url, $responseElement, $cssStyle, $attributes){
+			$button=new HtmlButton($id, $value, $cssStyle);
+			$this->_buttonAsSubmit($button, "click", $url, $responseElement, @$attributes["ajax"]);
 			return $button;
-		}, $index,$attributes,"submit");
+		}, $index, $attributes, "submit");
 	}
 
-	public function fieldAsButton($index,$cssStyle=NULL,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($cssStyle){
-			$button=new HtmlButton($id,$value,$cssStyle);
+	public function fieldAsButton($index, $cssStyle=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($cssStyle){
+			$button=new HtmlButton($id, $value, $cssStyle);
 			return $button;
-		}, $index,$attributes,"button");
+		}, $index, $attributes, "button");
 	}
 }
\ No newline at end of file

Ajax/semantic/widgets/datatable/DataTableFieldAsTrait.php

Spacing +51 added lines, -51 removed lines

@@ -12,19 +12,19 @@ 
  * @property boolean $_visibleHover
  * @property InstanceViewer $_instanceViewer
  */
-trait DataTableFieldAsTrait{
+trait DataTableFieldAsTrait {
 	abstract public function addField($field);
-	abstract public function insertField($index,$field);
-	abstract public function insertInField($index,$field);
-	abstract public function fieldAs($index,$type,$attributes=NULL);
+	abstract public function insertField($index, $field);
+	abstract public function insertInField($index, $field);
+	abstract public function fieldAs($index, $type, $attributes=NULL);
 	/**
 	 * @param string $caption
 	 * @param callable $callback
 	 * @param boolean $visibleHover
 	 * @return callable
 	 */
-	private function getFieldButtonCallable($caption,$visibleHover=true,$callback=null){
-		return $this->getCallable("getFieldButton",[$caption,$visibleHover],$callback);
+	private function getFieldButtonCallable($caption, $visibleHover=true, $callback=null) {
+		return $this->getCallable("getFieldButton", [$caption, $visibleHover], $callback);
 	}
 
 	/**
@@ -33,19 +33,19 @@ 
 	 * @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->propertyContains("class","visibleover")){
+			if ($object instanceof HtmlSemDoubleElement) {
+				$object->setProperty("data-ajax", $this->_instanceViewer->getIdentifier());
+				if ($object->propertyContains("class", "visibleover")) {
 					$this->_visibleHover=true;
-					$object->setProperty("style","visibility:hidden;");
+					$object->setProperty("style", "visibility:hidden;");
 				}
 			}
 			return $object;
@@ -57,9 +57,9 @@ 
 	 * @param string $caption
 	 * @return HtmlButton
 	 */
-	private function getFieldButton($caption,$visibleHover=true){
-		$bt= new HtmlButton("",$caption);
-		if($visibleHover)
+	private function getFieldButton($caption, $visibleHover=true) {
+		$bt=new HtmlButton("", $caption);
+		if ($visibleHover)
 			$this->_visibleOver($bt);
 			return $bt;
 	}
@@ -73,19 +73,19 @@ 
 	 * @param array $attributes associative array (<b>ajax</b> key is for ajax post)
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
 	 */
-	public function fieldAsSubmit($index,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle,$index,$attributes){
-			$button=new HtmlButton($id,$value,$cssStyle);
-			$button->postOnClick($url,"$(event.target).closest('tr').find(':input').serialize()",$responseElement,$attributes["ajax"]);
-			if(!isset($attributes["visibleHover"]) || $attributes["visibleHover"])
+	public function fieldAsSubmit($index, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($url, $responseElement, $cssStyle, $index, $attributes){
+			$button=new HtmlButton($id, $value, $cssStyle);
+			$button->postOnClick($url, "$(event.target).closest('tr').find(':input').serialize()", $responseElement, $attributes["ajax"]);
+			if (!isset($attributes["visibleHover"]) || $attributes["visibleHover"])
 				$this->_visibleOver($button);
 				return $button;
-		}, $index,$attributes);
+		}, $index, $attributes);
 	}
 
-	protected function _visibleOver($element){
+	protected function _visibleOver($element) {
 		$this->_visibleHover=true;
-		return $element->addToProperty("class", "visibleover")->setProperty("style","visibility:hidden;");
+		return $element->addToProperty("class", "visibleover")->setProperty("style", "visibility:hidden;");
 	}
 
 	/**
@@ -95,8 +95,8 @@ 
 	 * @param boolean $visibleHover
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
 	 */
-	public function addFieldButton($caption,$visibleHover=true,$callback=null){
-		$this->addField($this->getCallable("getFieldButton",[$caption,$visibleHover],$callback));
+	public function addFieldButton($caption, $visibleHover=true, $callback=null) {
+		$this->addField($this->getCallable("getFieldButton", [$caption, $visibleHover], $callback));
 		return $this;
 	}
 
@@ -107,8 +107,8 @@ 
 	 * @param callable $callback
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
 	 */
-	public function insertFieldButton($index,$caption,$visibleHover=true,$callback=null){
-		$this->insertField($index, $this->getFieldButtonCallable($caption,$visibleHover,$callback));
+	public function insertFieldButton($index, $caption, $visibleHover=true, $callback=null) {
+		$this->insertField($index, $this->getFieldButtonCallable($caption, $visibleHover, $callback));
 		return $this;
 	}
 
@@ -119,25 +119,25 @@ 
 	 * @param callable $callback
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
 	 */
-	public function insertInFieldButton($index,$caption,$visibleHover=true,$callback=null){
-		$this->insertInField($index, $this->getFieldButtonCallable($caption,$visibleHover,$callback));
+	public function insertInFieldButton($index, $caption, $visibleHover=true, $callback=null) {
+		$this->insertInField($index, $this->getFieldButtonCallable($caption, $visibleHover, $callback));
 		return $this;
 	}
 
-	private function addDefaultButton($icon,$class=null,$visibleHover=true,$callback=null){
-		$this->addField($this->getCallable("getDefaultButton",[$icon,$class,$visibleHover],$callback));
+	private function addDefaultButton($icon, $class=null, $visibleHover=true, $callback=null) {
+		$this->addField($this->getCallable("getDefaultButton", [$icon, $class, $visibleHover], $callback));
 		return $this;
 	}
 
-	private function insertDefaultButtonIn($index,$icon,$class=null,$visibleHover=true,$callback=null){
-		$this->insertInField($index,$this->getCallable("getDefaultButton",[$icon,$class,$visibleHover],$callback));
+	private function insertDefaultButtonIn($index, $icon, $class=null, $visibleHover=true, $callback=null) {
+		$this->insertInField($index, $this->getCallable("getDefaultButton", [$icon, $class, $visibleHover], $callback));
 		return $this;
 	}
 
-	private function getDefaultButton($icon,$class=null,$visibleHover=true){
-		$bt=$this->getFieldButton("",$visibleHover);
+	private function getDefaultButton($icon, $class=null, $visibleHover=true) {
+		$bt=$this->getFieldButton("", $visibleHover);
 		$bt->asIcon($icon);
-		if(isset($class))
+		if (isset($class))
 			$bt->addClass($class);
 		return $bt;
 	}
@@ -148,30 +148,30 @@ 
 	 * @param callable $callback
 	 * @return DataTable
 	 */
-	public function addDeleteButton($visibleHover=true,$deleteBehavior=[],$callback=null){
+	public function addDeleteButton($visibleHover=true, $deleteBehavior=[], $callback=null) {
 		$this->_deleteBehavior=$deleteBehavior;
-		return $this->addDefaultButton("remove","_delete red basic",$visibleHover,$callback);
+		return $this->addDefaultButton("remove", "_delete red basic", $visibleHover, $callback);
 	}
 
-	public function addEditButton($visibleHover=true,$editBehavior=[],$callback=null){
+	public function addEditButton($visibleHover=true, $editBehavior=[], $callback=null) {
 		$this->_editBehavior=$editBehavior;
-		return $this->addDefaultButton("edit","_edit basic",$visibleHover,$callback);
+		return $this->addDefaultButton("edit", "_edit basic", $visibleHover, $callback);
 	}
 
-	public function addEditDeleteButtons($visibleHover=true,$behavior=[],$callbackEdit=null,$callbackDelete=null){
-		$this->addEditButton($visibleHover,$behavior,$callbackEdit);
+	public function addEditDeleteButtons($visibleHover=true, $behavior=[], $callbackEdit=null, $callbackDelete=null) {
+		$this->addEditButton($visibleHover, $behavior, $callbackEdit);
 		$index=$this->_instanceViewer->visiblePropertiesCount()-1;
-		$this->insertDeleteButtonIn($index,$visibleHover,$behavior,$callbackDelete);
+		$this->insertDeleteButtonIn($index, $visibleHover, $behavior, $callbackDelete);
 		return $this;
 	}
 
-	public function insertDeleteButtonIn($index,$visibleHover=true,$deleteBehavior=[],$callback=null){
+	public function insertDeleteButtonIn($index, $visibleHover=true, $deleteBehavior=[], $callback=null) {
 		$this->_deleteBehavior=$deleteBehavior;
-		return $this->insertDefaultButtonIn($index,"remove","_delete red basic",$visibleHover,$callback);
+		return $this->insertDefaultButtonIn($index, "remove", "_delete red basic", $visibleHover, $callback);
 	}
 
-	public function insertEditButtonIn($index,$visibleHover=true,$editBehavior=[],$callback=null){
+	public function insertEditButtonIn($index, $visibleHover=true, $editBehavior=[], $callback=null) {
 		$this->_editBehavior=$editBehavior;
-		return $this->insertDefaultButtonIn($index,"edit","_edit basic",$visibleHover,$callback);
+		return $this->insertDefaultButtonIn($index, "edit", "_edit basic", $visibleHover, $callback);
 	}
 }
\ No newline at end of file

Ajax/semantic/html/collections/form/traits/FormTrait.php

Spacing +27 added lines, -27 removed lines

@@ -12,28 +12,28 @@ 
  * @author jc
  *
  */
-trait FormTrait{
+trait FormTrait {
 
 	/**
 	 * @return HtmlForm
 	 */
 	abstract protected function getForm();
 
-	protected function addCompoValidation($compo,$field){
+	protected function addCompoValidation($compo, $field) {
 		$validation=$field->getValidation();
-		if(isset($validation)){
+		if (isset($validation)) {
 			$validation->setIdentifier($field->getDataField()->getIdentifier());
 			$compo->addFieldValidation($validation);
 		}
 		return $compo;
 	}
 
-	protected function _runValidationParams(&$compo,JsUtils $js=NULL){
+	protected function _runValidationParams(&$compo, JsUtils $js=NULL) {
 		$form=$this->getForm();
 		$params=$form->getValidationParams();
-		if(isset($params["_ajaxSubmit"]) && $params["_ajaxSubmit"] instanceof AjaxCall){
+		if (isset($params["_ajaxSubmit"]) && $params["_ajaxSubmit"] instanceof AjaxCall) {
 			$compilation=$params["_ajaxSubmit"]->compile($js);
-			$compilation=str_ireplace("\"","%quote%", $compilation);
+			$compilation=str_ireplace("\"", "%quote%", $compilation);
 			$this->onSuccess($compilation);
 			$form->removeValidationParam("_ajaxSubmit");
 		}
@@ -46,14 +46,14 @@ 
 		return $this->getForm()->addToProperty("class", "loading");
 	}
 
-	public function setAttached($value=true){
+	public function setAttached($value=true) {
 		$form=$this->getForm();
-		if($value)
-			$form->addToPropertyCtrl("class", "attached", array ("attached" ));
+		if ($value)
+			$form->addToPropertyCtrl("class", "attached", array("attached"));
 		return $form;
 	}
 
-	public function addErrorMessage(){
+	public function addErrorMessage() {
 		return $this->getForm()->addContent((new HtmlMessage(""))->setError());
 	}
 
@@ -68,38 +68,38 @@ 
 	 * @param string $responseElement
 	 * @return \Ajax\semantic\html\collections\form\HtmlForm
 	 */
-	public function submitOn($event,$identifier,$url,$responseElement){
+	public function submitOn($event, $identifier, $url, $responseElement) {
 		$form=$this->getForm();
 		$elem=$form->getElementById($identifier, $form->getContent());
-		if(isset($elem)){
-			$this->_buttonAsSubmit($elem, $event,$url,$responseElement);
+		if (isset($elem)) {
+			$this->_buttonAsSubmit($elem, $event, $url, $responseElement);
 		}
 		return $form;
 	}
 
-	public function submitOnClick($identifier,$url,$responseElement){
+	public function submitOnClick($identifier, $url, $responseElement) {
 		return $this->submitOn("click", $identifier, $url, $responseElement);
 	}
 
-	public function addSubmit($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL){
-		$bt=$this->getForm()->addButton($identifier, $value,$cssStyle);
-		return $this->_buttonAsSubmit($bt, "click",$url,$responseElement);
+	public function addSubmit($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL) {
+		$bt=$this->getForm()->addButton($identifier, $value, $cssStyle);
+		return $this->_buttonAsSubmit($bt, "click", $url, $responseElement);
 	}
 
-	protected function _buttonAsSubmit(HtmlButton &$button,$event,$url,$responseElement=NULL,$parameters=NULL){
+	protected function _buttonAsSubmit(HtmlButton&$button, $event, $url, $responseElement=NULL, $parameters=NULL) {
 		$form=$this->getForm();
-		if(isset($url) && isset($responseElement)){
-			$button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');",true,true);
-			$params=["form"=>$form->getIdentifier(),"responseElement"=>$responseElement,"url"=>$url,"stopPropagation"=>true];
-			if(\is_array($parameters))
-				$params=\array_merge($params,$parameters);
+		if (isset($url) && isset($responseElement)) {
+			$button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');", true, true);
+			$params=["form"=>$form->getIdentifier(), "responseElement"=>$responseElement, "url"=>$url, "stopPropagation"=>true];
+			if (\is_array($parameters))
+				$params=\array_merge($params, $parameters);
 			$form->addValidationParam("_ajaxSubmit", new AjaxCall("postForm", $params));
 		}
 		return $button;
 	}
 
-	public function addReset($identifier,$value,$cssStyle=NULL){
-		$bt=$this->getForm()->addButton($identifier, $value,$cssStyle);
+	public function addReset($identifier, $value, $cssStyle=NULL) {
+		$bt=$this->getForm()->addButton($identifier, $value, $cssStyle);
 		$bt->setProperty("type", "reset");
 		return $bt;
 	}
@@ -109,7 +109,7 @@ 
 	 * @param string $jsCode
 	 * @return \Ajax\semantic\html\collections\form\HtmlForm
 	 */
-	public function onValid($jsCode){
+	public function onValid($jsCode) {
 		$form=$this->getForm();
 		$form->addValidationParam("onValid", "%function(){".$jsCode."}%");
 		return $form;
@@ -120,7 +120,7 @@ 
 	 * @param string $jsCode can use event and fields parameters
 	 * @return HtmlForm
 	 */
-	public function onSuccess($jsCode){
+	public function onSuccess($jsCode) {
 		$form=$this->getForm();
 		$form->addValidationParam("onSuccess", "%function(event,fields){console.log(fields);".$jsCode."}%");
 		return $form;

Ajax/semantic/html/elements/HtmlButtonGroups.php

Spacing +13 added lines, -13 removed lines

@@ -16,24 +16,24 @@ 
 
 	public function __construct($identifier, $elements=array(), $asIcons=false) {
 		parent::__construct($identifier, "div", "ui buttons");
-		if ($asIcons === true)
+		if ($asIcons===true)
 			$this->asIcons();
 		$this->addElements($elements, $asIcons);
 	}
-	protected function createItem($value){
+	protected function createItem($value) {
 		return new HtmlButton("", $value);
 	}
 
 
 	public function addElement($element, $asIcon=false) {
 		$item=$this->addItem($element);
-		if($asIcon)
+		if ($asIcon)
 			$item->asIcon($element);
 		return $item;
 	}
 
 	public function addElements($elements, $asIcons=false) {
-		foreach ( $elements as $element ) {
+		foreach ($elements as $element) {
 			$this->addElement($element, $asIcons);
 		}
 		return $this;
@@ -42,7 +42,7 @@ 
 	public function insertOr($aferIndex=0, $or="or") {
 		$orElement=new HtmlSemDoubleElement("", "div", "or");
 		$orElement->setProperty("data-text", $or);
-		array_splice($this->content, $aferIndex + 1, 0, array ($orElement ));
+		array_splice($this->content, $aferIndex+1, 0, array($orElement));
 		return $this;
 	}
 
@@ -55,8 +55,8 @@ 
 	}
 
 	public function asIcons() {
-		foreach ( $this->content as $item ) {
-			if($item instanceof HtmlButton)
+		foreach ($this->content as $item) {
+			if ($item instanceof HtmlButton)
 			$item->asIcon($item->getContent());
 		}
 		return $this->addToProperty("class", "icons");
@@ -89,7 +89,7 @@ 
 	 * @see \Ajax\bootstrap\html\base\BaseHtml::on()
 	 */
 	public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) {
-		foreach ( $this->content as $element ) {
+		foreach ($this->content as $element) {
 			$element->on($event, $jsCode, $stopPropagation, $preventDefault);
 		}
 		return $this;
@@ -101,10 +101,10 @@ 
 
 	public function addClasses($classes=array()) {
 		$i=0;
-		if(!\is_array($classes)){
-			$classes=array_fill (0,$this->count(),$classes);
+		if (!\is_array($classes)) {
+			$classes=array_fill(0, $this->count(), $classes);
 		}
-		foreach ( $this->content as $button ) {
+		foreach ($this->content as $button) {
 			$button->addToProperty("class", $classes[$i++]);
 		}
 		return $this;
@@ -118,8 +118,8 @@ 
 		$this->addElement($function($object));
 	}
 
-	public function run(JsUtils $js){
-		$result= parent::run($js);
+	public function run(JsUtils $js) {
+		$result=parent::run($js);
 		return $result->setItemSelector(".ui.button");
 	}
 }
\ No newline at end of file

Ajax/common/Widget.php

Spacing +69 added lines, -69 removed lines

@@ -19,7 +19,7 @@ 
 use Ajax\common\html\BaseWidget;
 
 abstract class Widget extends HtmlDoubleElement {
-	use FieldAsTrait,FormTrait;
+	use FieldAsTrait, FormTrait;
 
 	/**
 	 * @var string classname
@@ -52,12 +52,12 @@ 
 	protected $_generated;
 
 
-	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(\is_array($modelInstance)){
+		if (isset($modelInstance)) {
+			if (\is_array($modelInstance)) {
 				$modelInstance=\json_decode(\json_encode($modelInstance), FALSE);
 			}
 			$this->show($modelInstance);
@@ -65,28 +65,28 @@ 
 		$this->_generated=false;
 	}
 
-	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,$name=""){
+	protected function _getFieldIdentifier($prefix, $name="") {
 		return $this->identifier."-{$prefix}-".$this->_instanceViewer->getIdentifier();
 	}
 
-	protected function _getFieldName($index){
+	protected function _getFieldName($index) {
 		return $this->_instanceViewer->getFieldName($index);
 	}
 
-	protected function _getFieldCaption($index){
+	protected function _getFieldCaption($index) {
 		return $this->_instanceViewer->getCaption($index);
 	}
 
-	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;
 	}
 
@@ -110,56 +110,56 @@ 
 
 	abstract public function getHtmlComponent();
 
-	public function setAttached($value=true){
+	public function setAttached($value=true) {
 		return $this->getHtmlComponent()->setAttached($value);
 	}
 
-	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 addMessage($attributes=NULL,$fieldName="message"){
+	public function addMessage($attributes=NULL, $fieldName="message") {
 		$this->_instanceViewer->addField($fieldName);
 		$count=$this->_instanceViewer->visiblePropertiesCount();
-		return $this->fieldAsMessage($count-1,$attributes);
+		return $this->fieldAsMessage($count-1, $attributes);
 	}
 
-	public function addErrorMessage(){
-		return $this->addMessage(["error"=>true],"message");
+	public function addErrorMessage() {
+		return $this->addMessage(["error"=>true], "message");
 	}
 
-	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;
 	}
@@ -167,8 +167,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);
 		}
 		return $this->_toolbar;
@@ -180,15 +180,15 @@ 
 	 * @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($element instanceof BaseWidget){
-			if($element->getIdentifier()===""){
+		if ($element instanceof BaseWidget) {
+			if ($element->getIdentifier()==="") {
 				$element->setIdentifier("tb-item-".$this->identifier."-".$tb->count());
 			}
 		}
-		if(isset($callback)){
-			if(\is_callable($callback)){
+		if (isset($callback)) {
+			if (\is_callable($callback)) {
 				$callback($element);
 			}
 		}
@@ -201,9 +201,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;
 	}
@@ -213,14 +213,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;
@@ -232,12 +232,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);
 	}
 
 	/**
@@ -246,9 +246,9 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addButtonInToolbar($caption,$cssStyle=null,$callback=NULL){
-		$bt=new HtmlButton("bt-".$caption,$caption,$cssStyle);
-		return $this->addInToolbar($bt,$callback);
+	public function addButtonInToolbar($caption, $cssStyle=null, $callback=NULL) {
+		$bt=new HtmlButton("bt-".$caption, $caption, $cssStyle);
+		return $this->addInToolbar($bt, $callback);
 	}
 
 	/**
@@ -257,9 +257,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);
 	}
 
 	/**
@@ -269,15 +269,15 @@ 
 	 * @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);
 	}
 
-	public function addSubmitInToolbar($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$parameters=NULL){
-		$button=new HtmlButton($identifier,$value,$cssStyle);
-		$this->_buttonAsSubmit($button,"click",$url,$responseElement,$parameters);
+	public function addSubmitInToolbar($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $parameters=NULL) {
+		$button=new HtmlButton($identifier, $value, $cssStyle);
+		$this->_buttonAsSubmit($button, "click", $url, $responseElement, $parameters);
 		return $this->addInToolbar($button);
 	}
 
@@ -307,7 +307,7 @@ 
 	 * @param callable $defaultValueFunction function parameters are : $name : the field name, $value : the field value ,$index : the field index, $instance : the active instance of model
 	 * @return \Ajax\common\Widget
 	 */
-	public function setDefaultValueFunction($defaultValueFunction){
+	public function setDefaultValueFunction($defaultValueFunction) {
 		$this->_instanceViewer->setDefaultValueFunction($defaultValueFunction);
 		return $this;
 	}
@@ -316,7 +316,7 @@ 
 	 * @param string|boolean $disable
 	 * @return string
 	 */
-	public function jsDisabled($disable=true){
+	public function jsDisabled($disable=true) {
 		return "$('#".$this->identifier." .ui.input,#".$this->identifier." .ui.dropdown,#".$this->identifier." .ui.checkbox').toggleClass('disabled',".$disable.");";
 	}
 
@@ -325,12 +325,12 @@ 
 	 * @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->setActive($this->_edition);
 		$bt->onClick($this->jsDisabled(Javascript::prep_value("!$(event.target).hasClass('active')")));
-		return $this->addInToolbar($bt,$callback);
+		return $this->addInToolbar($bt, $callback);
 	}
 
 	public function setToolbar(HtmlMenu $_toolbar) {
@@ -344,35 +344,35 @@ 
 	}
 
 	public function getForm() {
-		if(!isset($this->_form)){
+		if (!isset($this->_form)) {
 			$this->_form=new HtmlForm("frm-".$this->identifier);
 			$this->setEdition(true);
 		}
 		return $this->_form;
 	}
 
-	public function run(JsUtils $js){
+	public function run(JsUtils $js) {
 		$result=parent::run($js);
-		if(isset($this->_form)){
+		if (isset($this->_form)) {
 			$result=$this->runForm($js);
 		}
 		return $result;
 	}
 
-	protected function runForm(JsUtils $js){
+	protected function runForm(JsUtils $js) {
 		$fields=$this->getContentInstances(HtmlFormField::class);
-		foreach ($fields as $field){
+		foreach ($fields as $field) {
 			$this->_form->addField($field);
 		}
 		return $this->_form->run($js);
 	}
 
-	protected function _compileForm(){
-		if(isset($this->_form)){
+	protected function _compileForm() {
+		if (isset($this->_form)) {
 			$noValidate="";
-			if(\sizeof($this->_form->getValidationParams())>0)
+			if (\sizeof($this->_form->getValidationParams())>0)
 				$noValidate="novalidate";
-			$this->wrapContent("<form class='ui form' id='frm-".$this->identifier."' name='frm-".$this->identifier."' ".$noValidate.">","</form>");
+			$this->wrapContent("<form class='ui form' id='frm-".$this->identifier."' name='frm-".$this->identifier."' ".$noValidate.">", "</form>");
 		}
 	}