Completed
Push — master ( 8b49e3...3c0bc3 )
by Jean-Christophe
03:22
created
Ajax/common/components/SimpleComponent.php 1 patch
Braces   +5 added lines, -4 removed lines patch added patch discarded remove patch
@@ -24,9 +24,9 @@  discard block
 block discarded – undo
24 24
 		foreach ( $this->events as $event => $jsCode ) {
25 25
 			if($event=="execute"){
26 26
 				$this->jquery_code_for_compile []=$jsCode;
27
-			}else if($event=="beforeExecute"){
27
+			} else if($event=="beforeExecute"){
28 28
 				\array_unshift($this->jquery_code_for_compile, $jsCode);
29
-			}else{
29
+			} else{
30 30
 				$selector=$this->attachTo;
31 31
 				if(isset($this->itemSelector)){
32 32
 					$selector.=" ".$this->itemSelector;
@@ -75,8 +75,9 @@  discard block
 block discarded – undo
75 75
 
76 76
 	protected function setParamCtrl($key, $value, $typeCtrl) {
77 77
 		if (is_array($typeCtrl)) {
78
-			if (array_search($value, $typeCtrl)===false)
79
-				throw new \Exception("La valeur passée a propriété `".$key."` pour le composant `".$this->uiName."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
78
+			if (array_search($value, $typeCtrl)===false) {
79
+							throw new \Exception("La valeur passée a propriété `".$key."` pour le composant `".$this->uiName."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
80
+			}
80 81
 		} else {
81 82
 			if (!$typeCtrl($value)) {
82 83
 				throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$key." au composant ".$this->uiName);
Please login to merge, or discard this patch.
Ajax/common/traits/JqueryAjaxTrait.php 1 patch
Braces   +27 added lines, -20 removed lines patch added patch discarded remove patch
@@ -46,8 +46,9 @@  discard block
 block discarded – undo
46 46
 		}
47 47
 		$retour.="$.".$method."(url,".$params.").done(function( data ) {\n";
48 48
 		$retour.=$this->_getOnAjaxDone($responseElement, $jsCallback)."});\n";
49
-		if ($immediatly)
50
-			$this->jquery_code_for_compile[]=$retour;
49
+		if ($immediatly) {
50
+					$this->jquery_code_for_compile[]=$retour;
51
+		}
51 52
 			return $retour;
52 53
 	}
53 54
 
@@ -55,15 +56,17 @@  discard block
 block discarded – undo
55 56
 		$url=$this->_correctAjaxUrl($url);
56 57
 		$retour="url='".$url."';\n";
57 58
 		$slash="/";
58
-		if(JString::endswith($url, "/")===true)
59
-			$slash="";
59
+		if(JString::endswith($url, "/")===true) {
60
+					$slash="";
61
+		}
60 62
 		if(JString::isNotNull($attr)){
61
-			if ($attr==="value")
62
-				$retour.="url=url+'".$slash."'+$(this).val();\n";
63
-			elseif ($attr==="html")
64
-			$retour.="url=url+'".$slash."'+$(this).html();\n";
65
-			elseif($attr!=null && $attr!=="")
66
-					$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
63
+			if ($attr==="value") {
64
+							$retour.="url=url+'".$slash."'+$(this).val();\n";
65
+			} elseif ($attr==="html") {
66
+						$retour.="url=url+'".$slash."'+$(this).html();\n";
67
+			} elseif($attr!=null && $attr!=="") {
68
+								$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
69
+			}
67 70
 		}
68 71
 		return $retour;
69 72
 	}
@@ -74,7 +77,7 @@  discard block
 block discarded – undo
74 77
 			if(JString::startswith($responseElement, "\"-")===true){
75 78
 				$responseElement=\str_replace("\"-", "\"", $responseElement);
76 79
 				$retour="\t$({$responseElement}).replaceWith( data );\n";
77
-			}else{
80
+			} else{
78 81
 				$retour="\t$({$responseElement}).html( data );\n";
79 82
 			}
80 83
 		}
@@ -90,8 +93,9 @@  discard block
 block discarded – undo
90 93
 	}
91 94
 
92 95
 	protected function _correctAjaxUrl($url) {
93
-		if ($url!=="/" && JString::endsWith($url, "/")===true)
94
-			$url=substr($url, 0, strlen($url)-1);
96
+		if ($url!=="/" && JString::endsWith($url, "/")===true) {
97
+					$url=substr($url, 0, strlen($url)-1);
98
+		}
95 99
 		if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
96 100
 			$url=$this->jsUtils->getUrl($url);
97 101
 		}
@@ -115,8 +119,9 @@  discard block
 block discarded – undo
115 119
 				$retour.="\t".$jsCallback."\n".
116 120
 						"\t$(document).trigger('jsonReady',[data]);\n".
117 121
 						"});\n";
118
-				if ($immediatly)
119
-					$this->jquery_code_for_compile[]=$retour;
122
+				if ($immediatly) {
123
+									$this->jquery_code_for_compile[]=$retour;
124
+				}
120 125
 					return $retour;
121 126
 	}
122 127
 
@@ -155,7 +160,7 @@  discard block
 block discarded – undo
155 160
 		if($context===null){
156 161
 			$appendTo="\t\tnewElm.appendTo($('".$maskSelector."').parent());\n";
157 162
 			$newElm = "$('#'+newId)";
158
-		}else{
163
+		} else{
159 164
 			$appendTo="\t\tnewElm.appendTo(".$context.");\n";
160 165
 			$newElm = $context.".find('#'+newId)";
161 166
 		}
@@ -165,8 +170,9 @@  discard block
 block discarded – undo
165 170
 		$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";
166 171
 		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
167 172
 		$retour.="\t".$jsCallback."\n"."});\n";
168
-		if ($immediatly)
169
-			$this->jquery_code_for_compile[]=$retour;
173
+		if ($immediatly) {
174
+					$this->jquery_code_for_compile[]=$retour;
175
+		}
170 176
 			return $retour;
171 177
 	}
172 178
 	/**
@@ -207,8 +213,9 @@  discard block
 block discarded – undo
207 213
 			}});\n";
208 214
 			$retour.="$('#".$form."').submit();\n";
209 215
 		}
210
-		if ($immediatly)
211
-			$this->jquery_code_for_compile[]=$retour;
216
+		if ($immediatly) {
217
+					$this->jquery_code_for_compile[]=$retour;
218
+		}
212 219
 			return $retour;
213 220
 	}
214 221
 
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/menus/HtmlMenu.php 1 patch
Braces   +19 added lines, -15 removed lines patch added patch discarded remove patch
@@ -58,9 +58,9 @@  discard block
 block discarded – undo
58 58
 	}
59 59
 
60 60
 	private function afterInsert($item) {
61
-		if (!$item instanceof HtmlMenu && $item->propertyContains("class", "header")===false)
62
-			$item->addToPropertyCtrl("class", "item", array ("item" ));
63
-		else {
61
+		if (!$item instanceof HtmlMenu && $item->propertyContains("class", "header")===false) {
62
+					$item->addToPropertyCtrl("class", "item", array ("item" ));
63
+		} else {
64 64
 			$this->setSecondary();
65 65
 		}
66 66
 		return $item;
@@ -75,8 +75,9 @@  discard block
 block discarded – undo
75 75
 	public function addItem($item) {
76 76
 		$number=$item;
77 77
 		$item=parent::addItem($this->getItemToInsert($item));
78
-		if(\is_int($number))
79
-			$item->setProperty("data-page", $number);
78
+		if(\is_int($number)) {
79
+					$item->setProperty("data-page", $number);
80
+		}
80 81
 		return $this->afterInsert($item);
81 82
 	}
82 83
 
@@ -149,10 +150,11 @@  discard block
 block discarded – undo
149 150
 	}
150 151
 
151 152
 	public function setSecondary($value=true) {
152
-		if($value)
153
-			$this->addToProperty("class", "secondary");
154
-		else
155
-			$this->removePropertyValue("class", "secondary");
153
+		if($value) {
154
+					$this->addToProperty("class", "secondary");
155
+		} else {
156
+					$this->removePropertyValue("class", "secondary");
157
+		}
156 158
 		return $this;
157 159
 	}
158 160
 
@@ -172,8 +174,9 @@  discard block
 block discarded – undo
172 174
 		$this->apply(function (HtmlDoubleElement &$item) {
173 175
 			$item->setTagName("a");
174 176
 		});
175
-		if ($vertical === true)
176
-			$this->setVertical();
177
+		if ($vertical === true) {
178
+					$this->setVertical();
179
+		}
177 180
 		return $this->addToProperty("class", "tabular");
178 181
 	}
179 182
 
@@ -202,10 +205,11 @@  discard block
 block discarded – undo
202 205
 	 */
203 206
 	public function fromDatabaseObject($object, $function) {
204 207
 		$return=$function($object);
205
-		if (\is_array($return))
206
-			$this->addItems($return);
207
-		else
208
-			$this->addItem($return);
208
+		if (\is_array($return)) {
209
+					$this->addItems($return);
210
+		} else {
211
+					$this->addItem($return);
212
+		}
209 213
 	}
210 214
 
211 215
 	/**
Please login to merge, or discard this patch.
Ajax/semantic/html/base/traits/MenuItemTrait.php 1 patch
Braces   +14 added lines, -10 removed lines patch added patch discarded remove patch
@@ -11,14 +11,15 @@  discard block
 block discarded – undo
11 11
 	public function setContent($content){
12 12
 		if($content==="-"){
13 13
 			$this->asDivider();
14
-		}elseif($content==="-search-"){
14
+		} elseif($content==="-search-"){
15 15
 			$values=\explode(",",$content,-1);
16 16
 			$this->asSearchInput(JArray::getDefaultValue($values, 0, "Search..."),JArray::getDefaultValue($values, 1, "search"));
17
-		}elseif(JString::startswith($content, "-")){
17
+		} elseif(JString::startswith($content, "-")){
18 18
 			$content=\ltrim($content,"-");
19 19
 			$this->asHeader($content);
20
-		}else
21
-			parent::setContent($content);
20
+		} else {
21
+					parent::setContent($content);
22
+		}
22 23
 		return $this;
23 24
 	}
24 25
 
@@ -30,11 +31,13 @@  discard block
 block discarded – undo
30 31
 	public function asSearchInput($placeholder=NULL,$icon=NULL){
31 32
 		$this->setClass("ui icon search input");
32 33
 		$input=new HtmlInput("search-".$this->identifier);
33
-		if(isset($placeholder))
34
-			$input->setProperty("placeholder", $placeholder);
34
+		if(isset($placeholder)) {
35
+					$input->setProperty("placeholder", $placeholder);
36
+		}
35 37
 			$this->content=$input;
36
-			if(isset($icon))
37
-				$this->addIcon($icon);
38
+			if(isset($icon)) {
39
+							$this->addIcon($icon);
40
+			}
38 41
 				return $this;
39 42
 	}
40 43
 
@@ -57,8 +60,9 @@  discard block
 block discarded – undo
57 60
 		$this->setClass("header");
58 61
 		$this->tagName="div";
59 62
 		$this->content=$caption;
60
-		if(isset($icon))
61
-			$this->addIcon($icon,Direction::LEFT);
63
+		if(isset($icon)) {
64
+					$this->addIcon($icon,Direction::LEFT);
65
+		}
62 66
 			return $this;
63 67
 	}
64 68
 
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/HtmlFormFields.php 1 patch
Braces   +18 added lines, -12 removed lines patch added patch discarded remove patch
@@ -29,12 +29,14 @@  discard block
 block discarded – undo
29 29
 				if (\is_string($end)) {
30 30
 					$label=$end;
31 31
 					\array_pop($fields);
32
-				} else
33
-					$label=NULL;
32
+				} else {
33
+									$label=NULL;
34
+				}
34 35
 			}
35 36
 		}
36
-		if (isset($label))
37
-			$this->setLabel($label);
37
+		if (isset($label)) {
38
+					$this->setLabel($label);
39
+		}
38 40
 		foreach ( $fields as $field ) {
39 41
 			$this->addItem($field);
40 42
 		}
@@ -57,8 +59,9 @@  discard block
 block discarded – undo
57 59
 
58 60
 	public function addItem($item) {
59 61
 		$item=parent::addItem($item);
60
-		if($item instanceof HtmlFormField)
61
-			$item->setContainer($this);
62
+		if($item instanceof HtmlFormField) {
63
+					$item->setContainer($this);
64
+		}
62 65
 		return $item;
63 66
 	}
64 67
 
@@ -66,8 +69,9 @@  discard block
 block discarded – undo
66 69
 		if ($this->_equalWidth) {
67 70
 			$count=$this->count();
68 71
 			$this->addToProperty("class", Wide::getConstants()["W".$count]." fields");
69
-		} else
70
-			$this->addToProperty("class", "fields");
72
+		} else {
73
+					$this->addToProperty("class", "fields");
74
+		}
71 75
 		return parent::compile($js, $view);
72 76
 	}
73 77
 
@@ -108,8 +112,9 @@  discard block
 block discarded – undo
108 112
 			$fields[]=$itemO;
109 113
 		}
110 114
 		$radios=new HtmlFormFields("fields-".$name, $fields);
111
-		if (isset($label))
112
-			$radios->setLabel($label)->setProperty("for", $name);
115
+		if (isset($label)) {
116
+					$radios->setLabel($label)->setProperty("for", $name);
117
+		}
113 118
 		return $radios;
114 119
 	}
115 120
 
@@ -124,8 +129,9 @@  discard block
 block discarded – undo
124 129
 			$fields[]=$itemO;
125 130
 		}
126 131
 		$radios=new HtmlFormFields("fields-".$name, $fields);
127
-		if (isset($label))
128
-			$radios->setLabel($label)->setProperty("for", $name);
132
+		if (isset($label)) {
133
+					$radios->setLabel($label)->setProperty("for", $name);
134
+		}
129 135
 		return $radios;
130 136
 	}
131 137
 
Please login to merge, or discard this patch.
Ajax/semantic/widgets/dataform/FormInstanceViewer.php 1 patch
Braces   +5 added lines, -4 removed lines patch added patch discarded remove patch
@@ -34,17 +34,18 @@
 block discarded – undo
34 34
 		$property=$this->getProperty($index);
35 35
 		if($property instanceof \ReflectionProperty){
36 36
 			$result=$property->getName();
37
-		}elseif(\is_callable($property)){
37
+		} elseif(\is_callable($property)){
38 38
 			$result=$this->visibleProperties[$index];
39
-		}else{
39
+		} else{
40 40
 			$result=\strtolower($this->getCaption($index));
41 41
 		}
42 42
 		return $result;
43 43
 	}
44 44
 
45 45
 	public function addSeparatorAfter($fieldNum){
46
-		if(\array_search($fieldNum, $this->separators)===false)
47
-			$this->separators[]=$fieldNum;
46
+		if(\array_search($fieldNum, $this->separators)===false) {
47
+					$this->separators[]=$fieldNum;
48
+		}
48 49
 			return $this;
49 50
 	}
50 51
 
Please login to merge, or discard this patch.
Ajax/semantic/widgets/dataform/DataForm.php 1 patch
Braces   +4 added lines, -3 removed lines patch added patch discarded remove patch
@@ -51,14 +51,15 @@
 block discarded – undo
51 51
 			foreach ($values as $v){
52 52
 				$form->addField($v);
53 53
 			}
54
-		}else{
54
+		} else{
55 55
 			$separators[]=$count;
56 56
 			for($i=0;$i<$size-1;$i++){
57 57
 				$fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]);
58 58
 				if(\sizeof($fields)===1){
59 59
 					$form->addField($fields[0]);
60
-				}else
61
-					$form->addFields($fields);
60
+				} else {
61
+									$form->addFields($fields);
62
+				}
62 63
 			}
63 64
 		}
64 65
 	}
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/HtmlFormInput.php 1 patch
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -9,16 +9,18 @@
 block discarded – undo
9 9
 	use TextFieldsTrait;
10 10
 
11 11
 	public function __construct($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL) {
12
-		if(!isset($placeholder) && $type==="text")
13
-			$placeholder=$label;
12
+		if(!isset($placeholder) && $type==="text") {
13
+					$placeholder=$label;
14
+		}
14 15
 		parent::__construct("field-".$identifier, new HtmlInput($identifier,$type,$value,$placeholder), $label);
15 16
 	}
16 17
 
17 18
 	public function getDataField(){
18 19
 		$field= $this->getField();
19 20
 		//TODO check getField
20
-		if($field instanceof HtmlInput)
21
-			$field=$field->getDataField();
21
+		if($field instanceof HtmlInput) {
22
+					$field=$field->getDataField();
23
+		}
22 24
 		return $field;
23 25
 	}
24 26
 }
25 27
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/traits/TextFieldsTrait.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -17,8 +17,9 @@
 block discarded – undo
17 17
 	}
18 18
 
19 19
 	public function setInputType($type){
20
-		if($type==="hidden")
21
-			$this->addToProperty("style","display:none;");
20
+		if($type==="hidden") {
21
+					$this->addToProperty("style","display:none;");
22
+		}
22 23
 		$this->getDataField()->setInputType($type);
23 24
 		return $this;
24 25
 	}
Please login to merge, or discard this patch.