phpMv / phpMv-UI

Ajax/semantic/components/SimpleSemExtComponent.php

Spacing +6 added lines, -6 removed lines

@@ -12,9 +12,9 @@ 
 		$this->paramParts=array();
 	}
 
-	protected function generateParamParts(){
+	protected function generateParamParts() {
 		$results=[];
-		foreach ($this->paramParts as $paramPart){
+		foreach ($this->paramParts as $paramPart) {
 			$results[]="{$this->uiName}(".\implode(",", $paramPart).")";
 		}
 		return \implode(".", $results);
@@ -22,9 +22,9 @@ 
 
 	public function getScript() {
 		$allParams=$this->params;
-		$this->jquery_code_for_compile=array ();
+		$this->jquery_code_for_compile=array();
 		$paramParts="";
-		if(\sizeof($this->paramParts)>0){
+		if (\sizeof($this->paramParts)>0) {
 			$paramParts=".".$this->generateParamParts();
 		}
 		$this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).{$this->uiName}(".$this->getParamsAsJSON($allParams).")".$paramParts.";";
@@ -37,8 +37,8 @@ 
 		return $this;
 	}
 
-	public function addComponentEvent($event,$jsCode){
-		$jsCode=str_ireplace("\"","%quote%", $jsCode);
+	public function addComponentEvent($event, $jsCode) {
+		$jsCode=str_ireplace("\"", "%quote%", $jsCode);
 		return $this->setParam($event, "%function(){".$jsCode."}%");
 	}
 

Ajax/semantic/components/validation/FieldValidation.php

Spacing +10 added lines, -10 removed lines

@@ -7,7 +7,7 @@ 
  * @version 1.001
  * Generates a JSON field validator
  */
-class FieldValidation implements \JsonSerializable{
+class FieldValidation implements \JsonSerializable {
 	/**
 	 * @var string
 	 */
@@ -24,7 +24,7 @@ 
 
 	protected $optional;
 
-	public function __construct($identifier){
+	public function __construct($identifier) {
 		$this->identifier=$identifier;
 		$this->rules=[];
 	}
@@ -42,20 +42,20 @@ 
 		return $this->rules;
 	}
 
-	public function addRule($type,$prompt=NULL,$value=NULL){
-		if($type instanceof  Rule)
+	public function addRule($type, $prompt=NULL, $value=NULL) {
+		if ($type instanceof  Rule)
 			$this->rules[]=$type;
-		else if(\is_array($type)){
+		else if (\is_array($type)) {
 			$value=JArray::getValue($type, "value", 2);
 			$prompt=JArray::getValue($type, "prompt", 1);
 			$type=JArray::getValue($type, "type", 0);
-			$this->rules[]=new Rule($type,$prompt,$value);
-		}else
-			$this->rules[]=new Rule($type,$prompt,$value);
+			$this->rules[]=new Rule($type, $prompt, $value);
+		} else
+			$this->rules[]=new Rule($type, $prompt, $value);
 	}
 
-	public function jsonSerialize(){
-		return ["identifier"=>$this->identifier,"rules"=>$this->rules];
+	public function jsonSerialize() {
+		return ["identifier"=>$this->identifier, "rules"=>$this->rules];
 	}
 
 	public function setDepends($depends) {

Braces +6 added lines, -5 removed lines

@@ -43,15 +43,16 @@
 	}
 
 	public function addRule($type,$prompt=NULL,$value=NULL){
-		if($type instanceof  Rule)
-			$this->rules[]=$type;
-		else if(\is_array($type)){
+		if($type instanceof  Rule) {
+					$this->rules[]=$type;
+		} else if(\is_array($type)){
 			$value=JArray::getValue($type, "value", 2);
 			$prompt=JArray::getValue($type, "prompt", 1);
 			$type=JArray::getValue($type, "type", 0);
 			$this->rules[]=new Rule($type,$prompt,$value);
-		}else
-			$this->rules[]=new Rule($type,$prompt,$value);
+		} else {
+					$this->rules[]=new Rule($type,$prompt,$value);
+		}
 	}
 
 	public function jsonSerialize(){

Ajax/semantic/components/validation/Rule.php

Spacing +47 added lines, -47 removed lines

@@ -5,7 +5,7 @@ 
  * @version 1.001
  * Generates a JSON Rule for the validation of a field
  */
-class Rule implements \JsonSerializable{
+class Rule implements \JsonSerializable {
 	/**
 	 * @var string
 	 */
@@ -20,7 +20,7 @@ 
 	 */
 	private $value;
 
-	public function __construct($type,$prompt=NULL,$value=NULL){
+	public function __construct($type, $prompt=NULL, $value=NULL) {
 		$this->type=$type;
 		$this->prompt=$prompt;
 		$this->value=$value;
@@ -54,10 +54,10 @@ 
 	}
 
 	public function jsonSerialize() {
-		$result= ["type"=>$this->type];
-		if(isset($this->prompt))
+		$result=["type"=>$this->type];
+		if (isset($this->prompt))
 			$result["prompt"]=$this->prompt;
-		if(isset($this->value))
+		if (isset($this->value))
 			$result["value"]=$this->value;
 		return $result;
 	}
@@ -68,8 +68,8 @@ 
 	 * @param string $prompt
 	 * @return \Ajax\semantic\components\validation\Rule
 	 */
-	public static function match($name,$prompt=NULL){
-		return new Rule("match[".$name."]",$prompt);
+	public static function match($name, $prompt=NULL) {
+		return new Rule("match[".$name."]", $prompt);
 	}
 
 	/**
@@ -78,8 +78,8 @@ 
 	 * @param string $prompt
 	 * @return \Ajax\semantic\components\validation\Rule
 	 */
-	public static function different($name,$prompt=NULL){
-		return new Rule("different[".$name."]",$prompt);
+	public static function different($name, $prompt=NULL) {
+		return new Rule("different[".$name."]", $prompt);
 	}
 
 	/**
@@ -89,78 +89,78 @@ 
 	 * @param string $prompt
 	 * @return \Ajax\semantic\components\validation\Rule
 	 */
-	public static function integer($min=NULL,$max=NULL,$prompt=NULL){
-		if(\is_int($min) && \is_int($max))
-			return new Rule("integer[{$min}..{$max}]",$prompt);
-		return new Rule("integer",$prompt);
+	public static function integer($min=NULL, $max=NULL, $prompt=NULL) {
+		if (\is_int($min) && \is_int($max))
+			return new Rule("integer[{$min}..{$max}]", $prompt);
+		return new Rule("integer", $prompt);
 	}
 
-	public static function decimal($prompt=NULL){
-		return new Rule("decimal",$prompt);
+	public static function decimal($prompt=NULL) {
+		return new Rule("decimal", $prompt);
 	}
 
-	public static function number($prompt=NULL){
-		return new Rule("number",$prompt);
+	public static function number($prompt=NULL) {
+		return new Rule("number", $prompt);
 	}
 
-	public static function is($value,$prompt=NULL){
-		return new Rule("is[".$value."]",$prompt);
+	public static function is($value, $prompt=NULL) {
+		return new Rule("is[".$value."]", $prompt);
 	}
 
-	public static function isExactly($value,$prompt=NULL){
-		return new Rule("isExactly[".$value."]",$prompt);
+	public static function isExactly($value, $prompt=NULL) {
+		return new Rule("isExactly[".$value."]", $prompt);
 	}
 
-	public static function not($value,$prompt=NULL){
-		return new Rule("not[".$value."]",$prompt);
+	public static function not($value, $prompt=NULL) {
+		return new Rule("not[".$value."]", $prompt);
 	}
 
-	public static function notExactly($value,$prompt=NULL){
-		return new Rule("notExactly[".$value."]",$prompt);
+	public static function notExactly($value, $prompt=NULL) {
+		return new Rule("notExactly[".$value."]", $prompt);
 	}
 
-	public static function contains($value,$prompt=NULL){
-		return new Rule("contains[".$value."]",$prompt);
+	public static function contains($value, $prompt=NULL) {
+		return new Rule("contains[".$value."]", $prompt);
 	}
 
-	public static function containsExactly($value,$prompt=NULL){
-		return new Rule("containsExactly[".$value."]",$prompt);
+	public static function containsExactly($value, $prompt=NULL) {
+		return new Rule("containsExactly[".$value."]", $prompt);
 	}
 
-	public static function doesntContain($value,$prompt=NULL){
-		return new Rule("doesntContain[".$value."]",$prompt);
+	public static function doesntContain($value, $prompt=NULL) {
+		return new Rule("doesntContain[".$value."]", $prompt);
 	}
 
-	public static function doesntContainExactly($value,$prompt=NULL){
-		return new Rule("doesntContainExactly[".$value."]",$prompt);
+	public static function doesntContainExactly($value, $prompt=NULL) {
+		return new Rule("doesntContainExactly[".$value."]", $prompt);
 	}
 
-	public static function minCount($value,$prompt=NULL){
-		return new Rule("minCount[".$value."]",$prompt);
+	public static function minCount($value, $prompt=NULL) {
+		return new Rule("minCount[".$value."]", $prompt);
 	}
 
-	public static function maxCount($value,$prompt=NULL){
-		return new Rule("maxCount[".$value."]",$prompt);
+	public static function maxCount($value, $prompt=NULL) {
+		return new Rule("maxCount[".$value."]", $prompt);
 	}
 
-	public static function exactCount($value,$prompt=NULL){
-		return new Rule("exactCount[".$value."]",$prompt);
+	public static function exactCount($value, $prompt=NULL) {
+		return new Rule("exactCount[".$value."]", $prompt);
 	}
 
-	public static function email($prompt=NULL){
-		return new Rule("email",$prompt);
+	public static function email($prompt=NULL) {
+		return new Rule("email", $prompt);
 	}
 
-	public static function url($prompt=NULL){
-		return new Rule("url",$prompt);
+	public static function url($prompt=NULL) {
+		return new Rule("url", $prompt);
 	}
 
-	public static function regExp($value,$prompt=NULL){
-		return new Rule("regExp",$prompt,$value);
+	public static function regExp($value, $prompt=NULL) {
+		return new Rule("regExp", $prompt, $value);
 	}
 
-	public static function custom($name,$jsFunction){
-		return "$.fn.form.settings.rules.".$name." =".$jsFunction ;
+	public static function custom($name, $jsFunction) {
+		return "$.fn.form.settings.rules.".$name." =".$jsFunction;
 	}
 
 }
\ No newline at end of file

Braces +9 added lines, -6 removed lines

@@ -55,10 +55,12 @@ 
 
 	public function jsonSerialize() {
 		$result= ["type"=>$this->type];
-		if(isset($this->prompt))
-			$result["prompt"]=$this->prompt;
-		if(isset($this->value))
-			$result["value"]=$this->value;
+		if(isset($this->prompt)) {
+					$result["prompt"]=$this->prompt;
+		}
+		if(isset($this->value)) {
+					$result["value"]=$this->value;
+		}
 		return $result;
 	}
 
@@ -90,8 +92,9 @@ 
 	 * @return \Ajax\semantic\components\validation\Rule
 	 */
 	public static function integer($min=NULL,$max=NULL,$prompt=NULL){
-		if(\is_int($min) && \is_int($max))
-			return new Rule("integer[{$min}..{$max}]",$prompt);
+		if(\is_int($min) && \is_int($max)) {
+					return new Rule("integer[{$min}..{$max}]",$prompt);
+		}
 		return new Rule("integer",$prompt);
 	}
 

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

Braces +4 added lines, -3 removed lines

@@ -18,11 +18,12 @@
 		if(\is_array($value)){
 			$itemO=new HtmlFormInput(JArray::getDefaultValue($value, "id",""),JArray::getDefaultValue($value, "label",null),JArray::getDefaultValue($value, "type", "text"),JArray::getDefaultValue($value, "value",""),JArray::getDefaultValue($value, "placeholder",JArray::getDefaultValue($value, "label",null)));
 			return $itemO;
-		}elseif(\is_object($value)){
+		} elseif(\is_object($value)){
 			$itemO=new HtmlFormField("field-".$this->identifier, $value);
 			return $itemO;
-		}else
-			return new HtmlFormInput($value);
+		} else {
+					return new HtmlFormInput($value);
+		}
 	}
 
 	protected function createCondition($value){

Spacing +28 added lines, -28 removed lines

@@ -15,46 +15,46 @@ 
  * @property string $identifier
  */
 trait FieldsTrait {
-	abstract public function addFields($fields=NULL,$label=NULL);
+	abstract public function addFields($fields=NULL, $label=NULL);
 	abstract public function addItem($item);
 
-	protected function createItem($value){
-		if(\is_array($value)){
-			$itemO=new HtmlFormInput(JArray::getDefaultValue($value, "id",""),JArray::getDefaultValue($value, "label",null),JArray::getDefaultValue($value, "type", "text"),JArray::getDefaultValue($value, "value",""),JArray::getDefaultValue($value, "placeholder",JArray::getDefaultValue($value, "label",null)));
+	protected function createItem($value) {
+		if (\is_array($value)) {
+			$itemO=new HtmlFormInput(JArray::getDefaultValue($value, "id", ""), JArray::getDefaultValue($value, "label", null), JArray::getDefaultValue($value, "type", "text"), JArray::getDefaultValue($value, "value", ""), JArray::getDefaultValue($value, "placeholder", JArray::getDefaultValue($value, "label", null)));
 			return $itemO;
-		}elseif(\is_object($value)){
+		}elseif (\is_object($value)) {
 			$itemO=new HtmlFormField("field-".$this->identifier, $value);
 			return $itemO;
-		}else
+		} else
 			return new HtmlFormInput($value);
 	}
 
-	protected function createCondition($value){
+	protected function createCondition($value) {
 		return \is_object($value)===false || $value instanceof \Ajax\semantic\html\elements\HtmlInput;
 	}
 
-	public function addInputs($inputs,$fieldslabel=null){
+	public function addInputs($inputs, $fieldslabel=null) {
 		$fields=array();
-		foreach ($inputs as $input){
+		foreach ($inputs as $input) {
 			\extract($input);
-			$f=new HtmlFormInput("","");
+			$f=new HtmlFormInput("", "");
 			$f->fromArray($input);
 			$fields[]=$f;
 		}
-		return $this->addFields($fields,$fieldslabel);
+		return $this->addFields($fields, $fieldslabel);
 	}
 
-	public function addFieldRule($index,$type,$prompt=NULL,$value=NULL){
+	public function addFieldRule($index, $type, $prompt=NULL, $value=NULL) {
 		$field=$this->getItem($index);
-		if(isset($field)){
-			$field->addRule($type,$prompt,$value);
+		if (isset($field)) {
+			$field->addRule($type, $prompt, $value);
 		}
 		return $this;
 	}
 
-	public function addFieldRules($index,$rules){
+	public function addFieldRules($index, $rules) {
 		$field=$this->getItem($index);
-		if(isset($field)){
+		if (isset($field)) {
 			$field->addRules($rules);
 		}
 		return $this;
@@ -68,8 +68,8 @@ 
 	 * @param boolean $multiple
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addDropdown($identifier,$items=array(), $label=NULL,$value=NULL,$multiple=false){
-		return $this->addItem(new HtmlFormDropdown($identifier,$items,$label,$value,$multiple));
+	public function addDropdown($identifier, $items=array(), $label=NULL, $value=NULL, $multiple=false) {
+		return $this->addItem(new HtmlFormDropdown($identifier, $items, $label, $value, $multiple));
 	}
 
 	/**
@@ -80,23 +80,23 @@ 
 	 * @param string $placeholder
 	 * @return HtmlFormInput
 	 */
-	public function addInput($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL){
-		return $this->addItem(new HtmlFormInput($identifier,$label,$type,$value,$placeholder));
+	public function addInput($identifier, $label=NULL, $type="text", $value=NULL, $placeholder=NULL) {
+		return $this->addItem(new HtmlFormInput($identifier, $label, $type, $value, $placeholder));
 	}
 
-	public function addPassword($identifier, $label=NULL){
-		return $this->addItem(new HtmlFormInput($identifier,$label,"password","",""));
+	public function addPassword($identifier, $label=NULL) {
+		return $this->addItem(new HtmlFormInput($identifier, $label, "password", "", ""));
 	}
 
-	public function addButton($identifier,$value,$cssStyle=NULL,$onClick=NULL){
-		return $this->addItem(new HtmlButton($identifier,$value,$cssStyle,$onClick));
+	public function addButton($identifier, $value, $cssStyle=NULL, $onClick=NULL) {
+		return $this->addItem(new HtmlButton($identifier, $value, $cssStyle, $onClick));
 	}
 
-	public function addCheckbox($identifier, $label=NULL,$value=NULL,$type=NULL){
-		return $this->addItem(new HtmlFormCheckbox($identifier,$label,$value,$type));
+	public function addCheckbox($identifier, $label=NULL, $value=NULL, $type=NULL) {
+		return $this->addItem(new HtmlFormCheckbox($identifier, $label, $value, $type));
 	}
 
-	public function addRadio($identifier, $name,$label=NULL,$value=NULL){
-		return $this->addItem(new HtmlFormRadio($identifier,$name,$label,$value));
+	public function addRadio($identifier, $name, $label=NULL, $value=NULL) {
+		return $this->addItem(new HtmlFormRadio($identifier, $name, $label, $value));
 	}
 }
\ No newline at end of file

Ajax/semantic/html/modules/checkbox/AbstractCheckbox.php

Braces +7 added lines, -5 removed lines

@@ -13,14 +13,15 @@ 
 		$field=new \Ajax\common\html\html5\HtmlInput($identifier, $inputType, $value);
 		$field->setProperty("name", $name);
 		$this->setField($field);
-		if (isset($label))
-			$this->setLabel($label);
+		if (isset($label)) {
+					$this->setLabel($label);
+		}
 	}
 
 	public function setChecked($value=true){
 		if($value===true){
 			$this->getField()->setProperty("checked", "checked");
-		}else{
+		} else{
 			$this->getField()->removeProperty("checked");
 		}
 		return $this;
@@ -49,8 +50,9 @@ 
 	 * @return mixed
 	 */
 	public function getLabel() {
-		if (\array_key_exists("label", $this->content))
-			return $this->content["label"];
+		if (\array_key_exists("label", $this->content)) {
+					return $this->content["label"];
+		}
 	}
 
 	/**

Spacing +9 added lines, -9 removed lines

@@ -7,7 +7,7 @@ 
 use Ajax\JsUtils;
 
 abstract class AbstractCheckbox extends HtmlSemDoubleElement {
-	protected $_params=array ();
+	protected $_params=array();
 
 	public function __construct($identifier, $name=NULL, $label=NULL, $value=NULL, $inputType="checkbox", $type="checkbox") {
 		parent::__construct("ck-".$identifier, "div", "ui ".$type);
@@ -18,10 +18,10 @@ 
 			$this->setLabel($label);
 	}
 
-	public function setChecked($value=true){
-		if($value===true){
+	public function setChecked($value=true) {
+		if ($value===true) {
 			$this->getField()->setProperty("checked", "checked");
-		}else{
+		} else {
 			$this->getField()->removeProperty("checked");
 		}
 		return $this;
@@ -83,7 +83,7 @@ 
 	 * @return \Ajax\semantic\html\collections\form\AbstractHtmlFormRadioCheckbox
 	 */
 	public function attachEvent($selector, $action=NULL) {
-		if (isset($action)||\is_numeric($action)===true) {
+		if (isset($action) || \is_numeric($action)===true) {
 			$js='$("#%identifier%").checkbox("attach events", "'.$selector.'", "'.$action.'");';
 		} else {
 			$js='$("#%identifier%").checkbox("attach events", "'.$selector.'");';
@@ -99,7 +99,7 @@ 
 	 */
 	public function attachEvents($events=array()) {
 		if (\is_array($events)) {
-			foreach ( $events as $action => $selector ) {
+			foreach ($events as $action => $selector) {
 				$this->attachEvent($selector, $action);
 			}
 		}
@@ -110,16 +110,16 @@ 
 		return $this->addToProperty("class", "fitted");
 	}
 
-	public function setOnChecked($jsCode){
+	public function setOnChecked($jsCode) {
 		$this->_params["onChecked"]=$jsCode;
 	}
 
-	public function setOnUnchecked($jsCode){
+	public function setOnUnchecked($jsCode) {
 		$this->_params["onUnchecked"]=$jsCode;
 	}
 
 	public function run(JsUtils $js) {
-			$this->_bsComponent=$js->semantic()->checkbox("#" . $this->identifier, $this->_params);
+			$this->_bsComponent=$js->semantic()->checkbox("#".$this->identifier, $this->_params);
 			return parent::run($js);
 	}
 }
\ No newline at end of file

Ajax/semantic/html/elements/HtmlButton.php

Spacing +11 added lines, -11 removed lines

@@ -55,7 +55,7 @@ 
 	}
 
 	public function setFocusable($value=true) {
-		if ($value === true)
+		if ($value===true)
 			$this->setProperty("tabindex", "0");
 		else {
 			$this->removeProperty("tabindex");
@@ -65,14 +65,14 @@ 
 
 	public function setAnimated($content, $animation="") {
 		$this->setTagName("div");
-		$this->addToProperty("class", "animated " . $animation);
-		$visible=new HtmlSemDoubleElement("visible-" . $this->identifier, "div");
+		$this->addToProperty("class", "animated ".$animation);
+		$visible=new HtmlSemDoubleElement("visible-".$this->identifier, "div");
 		$visible->setClass("visible content");
 		$visible->setContent($this->content);
-		$hidden=new HtmlSemDoubleElement("hidden-" . $this->identifier, "div");
+		$hidden=new HtmlSemDoubleElement("hidden-".$this->identifier, "div");
 		$hidden->setClass("hidden content");
 		$hidden->setContent($content);
-		$this->content=array ($visible,$hidden );
+		$this->content=array($visible, $hidden);
 		return $hidden;
 	}
 
@@ -84,7 +84,7 @@ 
 	public function asIcon($icon) {
 		$iconO=$icon;
 		if (\is_string($icon)) {
-			$iconO=new HtmlIcon("icon-" . $this->identifier, $icon);
+			$iconO=new HtmlIcon("icon-".$this->identifier, $icon);
 		}
 		$this->addToProperty("class", "icon");
 		$this->content=$iconO;
@@ -106,9 +106,9 @@ 
 	public function addLabel($label, $before=false, $icon=NULL) {
 		$this->tagName="div";
 		$this->addToProperty("class", "labeled");
-		$this->content=new HtmlButton("button-" . $this->identifier, $this->content);
+		$this->content=new HtmlButton("button-".$this->identifier, $this->content);
 		$this->content->setTagName("div");
-		$label=new HtmlLabel("label-" . $this->identifier, $label, $icon,"a");
+		$label=new HtmlLabel("label-".$this->identifier, $label, $icon, "a");
 		$label->setBasic();
 		$this->addContent($label, $before);
 		return $label;
@@ -120,7 +120,7 @@ 
 	 */
 	public function fromArray($array) {
 		$array=parent::fromArray($array);
-		foreach ( $array as $key => $value ) {
+		foreach ($array as $key => $value) {
 			$this->setProperty($key, $value);
 		}
 		return $array;
@@ -175,7 +175,7 @@ 
 	}
 
 	public static function social($identifier, $social, $value=NULL) {
-		if ($value === NULL)
+		if ($value===NULL)
 			$value=\ucfirst($social);
 		$return=new HtmlButton($identifier, $value);
 		$return->addIcon($social);
@@ -195,7 +195,7 @@ 
 	}
 
 	public function asLink($href=NULL) {
-		$lnk=new HtmlLink("lnk-".$this->identifier,$href,$this->content);
+		$lnk=new HtmlLink("lnk-".$this->identifier, $href, $this->content);
 		$this->content=$lnk;
 		return $this;
 	}

Braces +6 added lines, -5 removed lines

@@ -55,9 +55,9 @@ 
 	}
 
 	public function setFocusable($value=true) {
-		if ($value === true)
-			$this->setProperty("tabindex", "0");
-		else {
+		if ($value === true) {
+					$this->setProperty("tabindex", "0");
+		} else {
 			$this->removeProperty("tabindex");
 		}
 		return $this;
@@ -175,8 +175,9 @@ 
 	}
 
 	public static function social($identifier, $social, $value=NULL) {
-		if ($value === NULL)
-			$value=\ucfirst($social);
+		if ($value === NULL) {
+					$value=\ucfirst($social);
+		}
 		$return=new HtmlButton($identifier, $value);
 		$return->addIcon($social);
 		return $return->addToPropertyCtrl("class", $social, Social::getConstants());

Ajax/common/traits/JqueryAjaxTrait.php

Braces +27 added lines, -20 removed lines

@@ -46,8 +46,9 @@ 
 		}
 		$retour.="$.".$method."(url,".$params.").done(function( data ) {\n";
 		$retour.=$this->_getOnAjaxDone($responseElement, $jsCallback)."});\n";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 			return $retour;
 	}
 
@@ -55,15 +56,17 @@ 
 		$url=$this->_correctAjaxUrl($url);
 		$retour="url='".$url."';\n";
 		$slash="/";
-		if(JString::endswith($url, "/")===true)
-			$slash="";
+		if(JString::endswith($url, "/")===true) {
+					$slash="";
+		}
 		if(JString::isNotNull($attr)){
-			if ($attr==="value")
-				$retour.="url=url+'".$slash."'+$(this).val();\n";
-			elseif ($attr==="html")
-			$retour.="url=url+'".$slash."'+$(this).html();\n";
-			elseif($attr!=null && $attr!=="")
-					$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
+			if ($attr==="value") {
+							$retour.="url=url+'".$slash."'+$(this).val();\n";
+			} elseif ($attr==="html") {
+						$retour.="url=url+'".$slash."'+$(this).html();\n";
+			} elseif($attr!=null && $attr!=="") {
+								$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
+			}
 		}
 		return $retour;
 	}
@@ -74,7 +77,7 @@ 
 			if(JString::startswith($responseElement, "\"-")===true){
 				$responseElement=\str_replace("\"-", "\"", $responseElement);
 				$retour="\t$({$responseElement}).replaceWith( data );\n";
-			}else{
+			} else{
 				$retour="\t$({$responseElement}).html( data );\n";
 			}
 		}
@@ -90,8 +93,9 @@ 
 	}
 
 	protected function _correctAjaxUrl($url) {
-		if ($url!=="/" && JString::endsWith($url, "/")===true)
-			$url=substr($url, 0, strlen($url)-1);
+		if ($url!=="/" && JString::endsWith($url, "/")===true) {
+					$url=substr($url, 0, strlen($url)-1);
+		}
 		if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
 			$url=$this->jsUtils->getUrl($url);
 		}
@@ -115,8 +119,9 @@ 
 				$retour.="\t".$jsCallback."\n".
 						"\t$(document).trigger('jsonReady',[data]);\n".
 						"});\n";
-				if ($immediatly)
-					$this->jquery_code_for_compile[]=$retour;
+				if ($immediatly) {
+									$this->jquery_code_for_compile[]=$retour;
+				}
 					return $retour;
 	}
 
@@ -155,7 +160,7 @@ 
 		if($context===null){
 			$appendTo="\t\tnewElm.appendTo($('".$maskSelector."').parent());\n";
 			$newElm = "$('#'+newId)";
-		}else{
+		} else{
 			$appendTo="\t\tnewElm.appendTo(".$context.");\n";
 			$newElm = $context.".find('#'+newId)";
 		}
@@ -165,8 +170,9 @@ 
 		$retour.="\t}\n"."\tfor(var key in value){\n"."\t\t\tvar html = $('<div />').append($(newElm).clone()).html();\n"."\t\t\tif(html.indexOf('[['+key+']]')>-1){\n"."\t\t\t\tcontent=$(html.split('[['+key+']]').join(value[key]));\n"."\t\t\t\t$(newElm).replaceWith(content);newElm=content;\n"."\t\t\t}\n"."\t\tvar sel='[data-id=\"'+key+'\"]';if($(sel,newElm).length){\n"."\t\t\tvar selElm=$(sel,newElm);\n"."\t\t\t if(selElm.is('[value]')) { selElm.attr('value',value[key]);selElm.val(value[key]);} else { selElm.html(value[key]); }\n"."\t\t}\n"."}\n"."\t$(newElm).show(true);"."\n"."\t$(newElm).removeClass('hide');"."});\n";
 		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
 		$retour.="\t".$jsCallback."\n"."});\n";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 			return $retour;
 	}
 	/**
@@ -207,8 +213,9 @@ 
 			}});\n";
 			$retour.="$('#".$form."').submit();\n";
 		}
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 			return $retour;
 	}
 

Spacing +37 added lines, -37 removed lines

@@ -15,7 +15,7 @@ 
 
 	protected $ajaxLoader='<span></span><span></span><span></span><span></span><span></span>';
 
-	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
+	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true);
 	protected function addLoading(&$retour, $responseElement) {
 		$loading_notifier='<div class="ajax-loader">';
 		if ($this->ajaxLoader=='') {
@@ -28,20 +28,20 @@ 
 		$retour.="\t\t$({$responseElement}).prepend('{$loading_notifier}');\n";
 	}
 
-	public function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
-		return $this->_ajax("get", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$immediatly);
+	public function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
+		return $this->_ajax("get", $url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $immediatly);
 	}
-	public function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
-		return $this->_ajax("post", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$immediatly);
+	public function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
+		return $this->_ajax("post", $url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $immediatly);
 	}
 
-	protected function _ajax($method,$url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
-		if(JString::isNull($params)){$params="{}";}
+	protected function _ajax($method, $url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
+		if (JString::isNull($params)) {$params="{}"; }
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
 		$retour=$this->_getAjaxUrl($url, $attr);
 		$responseElement=$this->_getResponseElement($responseElement);
 		$retour.="var self=this;\n";
-		if($hasLoader===true){
+		if ($hasLoader===true) {
 			$this->addLoading($retour, $responseElement);
 		}
 		$retour.="$.".$method."(url,".$params.").done(function( data ) {\n";
@@ -51,30 +51,30 @@ 
 			return $retour;
 	}
 
-	protected function _getAjaxUrl($url,$attr){
+	protected function _getAjaxUrl($url, $attr) {
 		$url=$this->_correctAjaxUrl($url);
 		$retour="url='".$url."';\n";
 		$slash="/";
-		if(JString::endswith($url, "/")===true)
+		if (JString::endswith($url, "/")===true)
 			$slash="";
-		if(JString::isNotNull($attr)){
+		if (JString::isNotNull($attr)) {
 			if ($attr==="value")
 				$retour.="url=url+'".$slash."'+$(this).val();\n";
 			elseif ($attr==="html")
 			$retour.="url=url+'".$slash."'+$(this).html();\n";
-			elseif($attr!=null && $attr!=="")
+			elseif ($attr!=null && $attr!=="")
 					$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
 		}
 		return $retour;
 	}
 
-	protected function _getOnAjaxDone($responseElement,$jsCallback){
+	protected function _getOnAjaxDone($responseElement, $jsCallback) {
 		$retour="";
 		if ($responseElement!=="") {
-			if(JString::startswith($responseElement, "\"-")===true){
+			if (JString::startswith($responseElement, "\"-")===true) {
 				$responseElement=\str_replace("\"-", "\"", $responseElement);
 				$retour="\t$({$responseElement}).replaceWith( data );\n";
-			}else{
+			} else {
 				$retour="\t$({$responseElement}).html( data );\n";
 			}
 		}
@@ -82,7 +82,7 @@ 
 		return $retour;
 	}
 
-	protected function _getResponseElement($responseElement){
+	protected function _getResponseElement($responseElement) {
 		if ($responseElement!=="") {
 			$responseElement=Javascript::prep_value($responseElement);
 		}
@@ -92,7 +92,7 @@ 
 	protected function _correctAjaxUrl($url) {
 		if ($url!=="/" && JString::endsWith($url, "/")===true)
 			$url=substr($url, 0, strlen($url)-1);
-		if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
+		if (strncmp($url, 'http://', 7)!=0 && strncmp($url, 'https://', 8)!=0) {
 			$url=$this->jsUtils->getUrl($url);
 		}
 		return $url;
@@ -106,7 +106,7 @@ 
 	 * @param string $jsCallback javascript code to execute after the request
 	 * @param boolean $immediatly
 	 */
-	public function _json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document",$immediatly=false) {
+	public function _json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document", $immediatly=false) {
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
 		$retour=$this->_getAjaxUrl($url, $attr);
 		$retour.="$.{$method}(url,".$params.").done(function( data ) {\n";
@@ -127,7 +127,7 @@ 
 	 * @param string $url the request address
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true)
 	 */
-	public function _jsonOn($event,$element, $url,$parameters=array()) {
+	public function _jsonOn($event, $element, $url, $parameters=array()) {
 		$preventDefault=true;
 		$stopPropagation=true;
 		$jsCallback=null;
@@ -137,7 +137,7 @@ 
 		$params="{}";
 		$immediatly=true;
 		extract($parameters);
-		return $this->_add_event($element, $this->_json($url,$method, $params,$jsCallback, $attr,$context), $event, $preventDefault, $stopPropagation,$immediatly);
+		return $this->_add_event($element, $this->_json($url, $method, $params, $jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 
 	/**
@@ -149,19 +149,19 @@ 
 	 * @param string $context jquery DOM element, array container.
 	 * @param boolean $immediatly
 	 */
-	public function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context=null,$immediatly=false) {
+	public function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context=null, $immediatly=false) {
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
 		$retour=$this->_getAjaxUrl($url, $attr);
-		if($context===null){
+		if ($context===null) {
 			$appendTo="\t\tnewElm.appendTo($('".$maskSelector."').parent());\n";
-			$newElm = "$('#'+newId)";
-		}else{
+			$newElm="$('#'+newId)";
+		} else {
 			$appendTo="\t\tnewElm.appendTo(".$context.");\n";
-			$newElm = $context.".find('#'+newId)";
+			$newElm=$context.".find('#'+newId)";
 		}
 		$retour.="var self = $(this);\n$.{$method}(url,".$params.").done(function( data ) {\n";
 		$retour.="\tdata=$.parseJSON(data);$.each(data, function(index, value) {\n"."\tvar created=false;var maskElm=$('".$maskSelector."').first();maskElm.hide();"."\tvar newId=(maskElm.attr('id') || 'mask')+'-'+index;"."\tvar newElm=".$newElm.";\n"."\tif(!newElm.length){\n"."\t\tnewElm=maskElm.clone();newElm.attr('id',newId);\n";
-		$retour.= $appendTo;
+		$retour.=$appendTo;
 		$retour.="\t}\n"."\tfor(var key in value){\n"."\t\t\tvar html = $('<div />').append($(newElm).clone()).html();\n"."\t\t\tif(html.indexOf('[['+key+']]')>-1){\n"."\t\t\t\tcontent=$(html.split('[['+key+']]').join(value[key]));\n"."\t\t\t\t$(newElm).replaceWith(content);newElm=content;\n"."\t\t\t}\n"."\t\tvar sel='[data-id=\"'+key+'\"]';if($(sel,newElm).length){\n"."\t\t\tvar selElm=$(sel,newElm);\n"."\t\t\t if(selElm.is('[value]')) { selElm.attr('value',value[key]);selElm.val(value[key]);} else { selElm.html(value[key]); }\n"."\t\t}\n"."}\n"."\t$(newElm).show(true);"."\n"."\t$(newElm).removeClass('hide');"."});\n";
 		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
 		$retour.="\t".$jsCallback."\n"."});\n";
@@ -176,26 +176,26 @@ 
 	 * @param string $url the request address
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get", "context"=>null)
 	 */
-	public function _jsonArrayOn($event,$element, $maskSelector,$url,$parameters=array()) {
+	public function _jsonArrayOn($event, $element, $maskSelector, $url, $parameters=array()) {
 		$preventDefault=true;
 		$stopPropagation=true;
 		$jsCallback=null;
 		$attr="id";
 		$method="get";
-		$context = null;
+		$context=null;
 		$params="{}";
 		$immediatly=true;
 		extract($parameters);
-		return $this->_add_event($element, $this->_jsonArray($maskSelector,$url,$method, $params,$jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation,$immediatly);
+		return $this->_add_event($element, $this->_jsonArray($maskSelector, $url, $method, $params, $jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 
-	public function _postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
+	public function _postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
 		$retour=$this->_getAjaxUrl($url, $attr);
 		$retour.="\nvar params=$('#".$form."').serialize();\n";
 		$responseElement=$this->_getResponseElement($responseElement);
 		$retour.="var self=this;\n";
-		if($hasLoader===true){
+		if ($hasLoader===true) {
 			$this->addLoading($retour, $responseElement);
 		}
 		$retour.="$.post(url,params).done(function( data ) {\n";
@@ -222,7 +222,7 @@ 
 	 * @param string $responseElement
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true)
 	 */
-	public function _getOn($event,$element, $url, $params="{}", $responseElement="", $parameters=array()) {
+	public function _getOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
 		$preventDefault=true;
 		$stopPropagation=true;
 		$jsCallback=null;
@@ -230,7 +230,7 @@ 
 		$hasLoader=true;
 		$immediatly=true;
 		extract($parameters);
-		return $this->_add_event($element, $this->_get($url, $params, $responseElement, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation,$immediatly);
+		return $this->_add_event($element, $this->_get($url, $params, $responseElement, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 
 	/**
@@ -243,7 +243,7 @@ 
 	 * @param string $responseElement
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true)
 	 */
-	public function _postOn($event,$element, $url, $params="{}", $responseElement="", $parameters=array()) {
+	public function _postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
 		$preventDefault=true;
 		$stopPropagation=true;
 		$jsCallback=null;
@@ -251,7 +251,7 @@ 
 		$hasLoader=true;
 		$immediatly=true;
 		extract($parameters);
-		return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation,$immediatly);
+		return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 
 	/**
@@ -264,7 +264,7 @@ 
 	 * @param string $responseElement
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true)
 	 */
-	public function _postFormOn($event,$element, $url, $form, $responseElement="", $parameters=array()) {
+	public function _postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) {
 		$preventDefault=true;
 		$stopPropagation=true;
 		$validation=false;
@@ -273,6 +273,6 @@ 
 		$hasLoader=true;
 		$immediatly=true;
 		extract($parameters);
-		return $this->_add_event($element, $this->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation,$immediatly);
+		return $this->_add_event($element, $this->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 }
\ No newline at end of file

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

Spacing +7 added lines, -7 removed lines

@@ -7,20 +7,20 @@
 
 use Ajax\semantic\html\elements\HtmlIcon;
 
-class HtmlPaginationMenu extends HtmlMenu{
+class HtmlPaginationMenu extends HtmlMenu {
 	private $_page;
-	public function __construct( $identifier, $items=array() ){
-		parent::__construct( $identifier,$items);
+	public function __construct($identifier, $items=array()) {
+		parent::__construct($identifier, $items);
 	}
 	/**
 	 * {@inheritDoc}
 	 * @see \Ajax\common\html\BaseHtml::compile()
 	 */
-	public function compile(JsUtils $js=NULL,&$view=NULL){
-		$this->insertItem(new HtmlIcon("", "left chevron"))->setProperty("data-page", \max([1,$this->_page-1]));
-		$this->addItem(new HtmlIcon("", "right chevron"))->setProperty("data-page", \min([\sizeof($this->content)-2,$this->_page+1]));
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
+		$this->insertItem(new HtmlIcon("", "left chevron"))->setProperty("data-page", \max([1, $this->_page-1]));
+		$this->addItem(new HtmlIcon("", "right chevron"))->setProperty("data-page", \min([\sizeof($this->content)-2, $this->_page+1]));
 		$this->asPagination();
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 
 	public function setActiveItem($index) {

Ajax/semantic/html/elements/HtmlInput.php

Spacing +7 added lines, -7 removed lines

@@ -10,13 +10,13 @@ 
 use Ajax\JsUtils;
 
 class HtmlInput extends HtmlSemDoubleElement {
-	use IconTrait,TextFieldsTrait,FieldTrait;
+	use IconTrait, TextFieldsTrait, FieldTrait;
 
 	public function __construct($identifier, $type="text", $value="", $placeholder="") {
-		parent::__construct("div-" . $identifier, "div", "ui input");
-		$this->content=[ "field" => new \Ajax\common\html\html5\HtmlInput($identifier, $type, $value, $placeholder) ];
-		$this->_states=[ State::DISABLED,State::FOCUS,State::ERROR ];
-		$this->_variations=[ Variation::TRANSPARENT ];
+		parent::__construct("div-".$identifier, "div", "ui input");
+		$this->content=["field" => new \Ajax\common\html\html5\HtmlInput($identifier, $type, $value, $placeholder)];
+		$this->_states=[State::DISABLED, State::FOCUS, State::ERROR];
+		$this->_variations=[Variation::TRANSPARENT];
 	}
 
 	public function getField() {
@@ -36,11 +36,11 @@ 
 
 	public function run(JsUtils $js) {
 		$result=parent::run($js);
-		$result->attach("#" . $this->getDataField()->getIdentifier());
+		$result->attach("#".$this->getDataField()->getIdentifier());
 		return $result;
 	}
 
-	public function setTransparent(){
+	public function setTransparent() {
 		return $this->addToProperty("class", "transparent");
 	}
 }
\ No newline at end of file