Completed
Push — master ( fb7dfb...db4c08 )
by Jean-Christophe
02:42
created
Ajax/bootstrap/components/Tabs.php 1 patch
Braces   +15 added lines, -10 removed lines patch added patch discarded remove patch
@@ -36,8 +36,9 @@  discard block
 block discarded – undo
36 36
 	}
37 37
 
38 38
 	public function getTab($index) {
39
-		if ($index>0&&$index<sizeof($this->tabs))
40
-			return $this->tabs [$index];
39
+		if ($index>0&&$index<sizeof($this->tabs)) {
40
+					return $this->tabs [$index];
41
+		}
41 42
 	}
42 43
 
43 44
 	public function show($index) {
@@ -53,8 +54,9 @@  discard block
 block discarded – undo
53 54
 	 */
54 55
 	public function onShow($index, $jsCode) {
55 56
 		$tab=$this->getTab($index);
56
-		if (isset($tab))
57
-			return $tab->onShow($jsCode);
57
+		if (isset($tab)) {
58
+					return $tab->onShow($jsCode);
59
+		}
58 60
 	}
59 61
 
60 62
 	/**
@@ -65,8 +67,9 @@  discard block
 block discarded – undo
65 67
 	 */
66 68
 	public function onShown($index, $jsCode) {
67 69
 		$tab=$this->getTab($index);
68
-		if (isset($tab))
69
-			return $tab->onShown($jsCode);
70
+		if (isset($tab)) {
71
+					return $tab->onShown($jsCode);
72
+		}
70 73
 	}
71 74
 
72 75
 	/**
@@ -77,8 +80,9 @@  discard block
 block discarded – undo
77 80
 	 */
78 81
 	public function onHide($index, $jsCode) {
79 82
 		$tab=$this->getTab($index);
80
-		if (isset($tab))
81
-			return $tab->onShow($jsCode);
83
+		if (isset($tab)) {
84
+					return $tab->onShow($jsCode);
85
+		}
82 86
 	}
83 87
 
84 88
 	/**
@@ -89,7 +93,8 @@  discard block
 block discarded – undo
89 93
 	 */
90 94
 	public function onHidden($index, $jsCode) {
91 95
 		$tab=$this->getTab($index);
92
-		if (isset($tab))
93
-			return $tab->onShow($jsCode);
96
+		if (isset($tab)) {
97
+					return $tab->onShow($jsCode);
98
+		}
94 99
 	}
95 100
 }
Please login to merge, or discard this patch.
Ajax/common/traits/JsUtilsAjaxTrait.php 1 patch
Braces   +32 added lines, -24 removed lines patch added patch discarded remove patch
@@ -29,8 +29,9 @@  discard block
 block discarded – undo
29 29
 		}
30 30
 		$retour.="$.".$method."(url,".$params.").done(function( data ) {\n";
31 31
 		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback)."});\n";
32
-		if ($immediatly)
33
-			$this->jquery_code_for_compile[]=$retour;
32
+		if ($immediatly) {
33
+					$this->jquery_code_for_compile[]=$retour;
34
+		}
34 35
 			return $retour;
35 36
 	}
36 37
 
@@ -40,15 +41,17 @@  discard block
 block discarded – undo
40 41
 		$url=$this->_correctAjaxUrl($url);
41 42
 		$retour="url='".$url."';";
42 43
 		$slash="/";
43
-		if(JString::endswith($url, "/")===true)
44
-			$slash="";
44
+		if(JString::endswith($url, "/")===true) {
45
+					$slash="";
46
+		}
45 47
 			if(JString::isNotNull($attr)){
46
-				if ($attr==="value")
47
-					$retour.="url=url+'".$slash."'+$(this).val();\n";
48
-				elseif ($attr==="html")
49
-					$retour.="url=url+'".$slash."'+$(this).html();\n";
50
-				elseif($attr!==null && $attr!=="")
51
-					$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
48
+				if ($attr==="value") {
49
+									$retour.="url=url+'".$slash."'+$(this).val();\n";
50
+				} elseif ($attr==="html") {
51
+									$retour.="url=url+'".$slash."'+$(this).html();\n";
52
+				} elseif($attr!==null && $attr!=="") {
53
+									$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
54
+				}
52 55
 			}
53 56
 			return $retour;
54 57
 	}
@@ -58,13 +61,14 @@  discard block
 block discarded – undo
58 61
 		if ($responseElement!=="") {
59 62
 			if(isset($ajaxTransition)){
60 63
 				$call=$this->setAjaxDataCall($ajaxTransition);
61
-			}elseif(isset($this->ajaxTransition)){
64
+			} elseif(isset($this->ajaxTransition)){
62 65
 				$call=$this->ajaxTransition;
63 66
 			}
64
-			if(\is_callable($call))
65
-				$retour="\t".$call($responseElement,$jqueryDone).";\n";
66
-				else
67
-					$retour="\t$({$responseElement}).{$jqueryDone}( data );\n";
67
+			if(\is_callable($call)) {
68
+							$retour="\t".$call($responseElement,$jqueryDone).";\n";
69
+			} else {
70
+									$retour="\t$({$responseElement}).{$jqueryDone}( data );\n";
71
+				}
68 72
 		}
69 73
 		$retour.="\t".$jsCallback."\n";
70 74
 		return $retour;
@@ -78,8 +82,9 @@  discard block
 block discarded – undo
78 82
 	}
79 83
 
80 84
 	protected function _correctAjaxUrl($url) {
81
-		if ($url!=="/" && JString::endsWith($url, "/")===true)
82
-			$url=substr($url, 0, strlen($url)-1);
85
+		if ($url!=="/" && JString::endsWith($url, "/")===true) {
86
+					$url=substr($url, 0, strlen($url)-1);
87
+		}
83 88
 			if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
84 89
 				$url=$this->getUrl($url);
85 90
 			}
@@ -159,8 +164,9 @@  discard block
 block discarded – undo
159 164
 				$retour.="\t".$jsCallback."\n".
160 165
 						"\t$(document).trigger('jsonReady',[data]);\n".
161 166
 						"});\n";
162
-				if ($immediatly)
163
-					$this->jquery_code_for_compile[]=$retour;
167
+				if ($immediatly) {
168
+									$this->jquery_code_for_compile[]=$retour;
169
+				}
164 170
 		return $retour;
165 171
 	}
166 172
 
@@ -225,7 +231,7 @@  discard block
 block discarded – undo
225 231
 		if($context===null){
226 232
 			$parent="$('".$maskSelector."').parent()";
227 233
 			$newElm = "$('#'+newId)";
228
-		}else{
234
+		} else{
229 235
 			$parent=$context;
230 236
 			$newElm = $context.".find('#'+newId)";
231 237
 		}
@@ -238,8 +244,9 @@  discard block
 block discarded – undo
238 244
 		$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";
239 245
 		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
240 246
 		$retour.="\t".$jsCallback."\n"."});\n";
241
-		if ($immediatly)
242
-			$this->jquery_code_for_compile[]=$retour;
247
+		if ($immediatly) {
248
+					$this->jquery_code_for_compile[]=$retour;
249
+		}
243 250
 		return $retour;
244 251
 	}
245 252
 
@@ -430,8 +437,9 @@  discard block
 block discarded – undo
430 437
 			}});\n";
431 438
 			$retour.="$('#".$form."').submit();\n";
432 439
 		}
433
-		if ($immediatly)
434
-			$this->jquery_code_for_compile[]=$retour;
440
+		if ($immediatly) {
441
+					$this->jquery_code_for_compile[]=$retour;
442
+		}
435 443
 		return $retour;
436 444
 	}
437 445
 
Please login to merge, or discard this patch.
Ajax/common/traits/JsUtilsActionsTrait.php 1 patch
Braces   +36 added lines, -24 removed lines patch added patch discarded remove patch
@@ -28,8 +28,9 @@  discard block
 block discarded – undo
28 28
 			$callback=", function(){\n{$callback}\n}";
29 29
 		}
30 30
 		$str="$({$element}).{$action}({$speed}{$callback});";
31
-		if ($immediatly)
32
-			$this->jquery_code_for_compile[]=$str;
31
+		if ($immediatly) {
32
+					$this->jquery_code_for_compile[]=$str;
33
+		}
33 34
 			return $str;
34 35
 	}
35 36
 	/**
@@ -61,10 +62,12 @@  discard block
 block discarded – undo
61 62
 		if (isset($param)) {
62 63
 			$param=Javascript::prep_value($param);
63 64
 			$str="$({$element}).{$jQueryCall}({$param});";
64
-		} else
65
-			$str="$({$element}).{$jQueryCall}();";
66
-		if ($immediatly)
67
-			$this->jquery_code_for_compile[]=$str;
65
+		} else {
66
+					$str="$({$element}).{$jQueryCall}();";
67
+		}
68
+		if ($immediatly) {
69
+					$this->jquery_code_for_compile[]=$str;
70
+		}
68 71
 		return $str;
69 72
 	}
70 73
 
@@ -80,8 +83,9 @@  discard block
 block discarded – undo
80 83
 		$to=Javascript::prep_element($to);
81 84
 		$element=Javascript::prep_element($element);
82 85
 		$str="$({$to}).{$jQueryCall}({$element});";
83
-		if ($immediatly)
84
-			$this->jquery_code_for_compile[]=$str;
86
+		if ($immediatly) {
87
+					$this->jquery_code_for_compile[]=$str;
88
+		}
85 89
 		return $str;
86 90
 	}
87 91
 	/**
@@ -130,10 +134,12 @@  discard block
 block discarded – undo
130 134
 		if (isset($value)) {
131 135
 			$value=Javascript::prep_value($value);
132 136
 			$str="$({$element}).attr(\"$attributeName\",{$value});";
133
-		} else
134
-			$str="$({$element}).attr(\"$attributeName\");";
135
-		if ($immediatly)
136
-			$this->jquery_code_for_compile[]=$str;
137
+		} else {
138
+					$str="$({$element}).attr(\"$attributeName\");";
139
+		}
140
+		if ($immediatly) {
141
+					$this->jquery_code_for_compile[]=$str;
142
+		}
137 143
 		return $str;
138 144
 	}
139 145
 
@@ -189,8 +195,9 @@  discard block
 block discarded – undo
189 195
 
190 196
 		$str="$({$element}).animate({\n$animations\n\t\t}".$speed.$extra.");";
191 197
 
192
-		if ($immediatly)
193
-			$this->jquery_code_for_compile[]=$str;
198
+		if ($immediatly) {
199
+					$this->jquery_code_for_compile[]=$str;
200
+		}
194 201
 		return $str;
195 202
 	}
196 203
 
@@ -340,8 +347,9 @@  discard block
 block discarded – undo
340 347
 		$element=Javascript::prep_element($element);
341 348
 		$str="$({$element}).trigger(\"$event\");";
342 349
 
343
-		if ($immediatly)
344
-			$this->jquery_code_for_compile[]=$str;
350
+		if ($immediatly) {
351
+					$this->jquery_code_for_compile[]=$str;
352
+		}
345 353
 		return $str;
346 354
 	}
347 355
 
@@ -403,8 +411,9 @@  discard block
 block discarded – undo
403 411
 			$str.="else{".$jsCodeIfFalse."}";
404 412
 		}
405 413
 
406
-		if ($immediatly)
407
-			$this->jquery_code_for_compile[]=$str;
414
+		if ($immediatly) {
415
+					$this->jquery_code_for_compile[]=$str;
416
+		}
408 417
 		return $str;
409 418
 	}
410 419
 
@@ -420,11 +429,13 @@  discard block
 block discarded – undo
420 429
 	private function _doJQuery($element, $jqueryCall, $param="", $jsCallback="", $immediatly=false) {
421 430
 		$param=Javascript::prep_value($param);
422 431
 		$callback="";
423
-		if ($jsCallback!="")
424
-			$callback=", function(event){\n{$jsCallback}\n}";
432
+		if ($jsCallback!="") {
433
+					$callback=", function(event){\n{$jsCallback}\n}";
434
+		}
425 435
 			$script="$(".Javascript::prep_element($element).").".$jqueryCall."(".$param.$callback.");\n";
426
-			if ($immediatly)
427
-				$this->jquery_code_for_compile[]=$script;
436
+			if ($immediatly) {
437
+							$this->jquery_code_for_compile[]=$script;
438
+			}
428 439
 				return $script;
429 440
 	}
430 441
 
@@ -495,8 +506,9 @@  discard block
 block discarded – undo
495 506
 	 */
496 507
 	public function exec($js, $immediatly=false) {
497 508
 		$script=$js."\n";
498
-		if ($immediatly)
499
-			$this->jquery_code_for_compile[]=$script;
509
+		if ($immediatly) {
510
+					$this->jquery_code_for_compile[]=$script;
511
+		}
500 512
 		return $script;
501 513
 	}
502 514
 
Please login to merge, or discard this patch.
Ajax/common/components/SimpleComponent.php 1 patch
Braces   +11 added lines, -8 removed lines patch added patch discarded remove patch
@@ -26,9 +26,9 @@  discard block
 block discarded – undo
26 26
 			$itemSelector=JString::getValueBetween($event);
27 27
 			if($event=="execute"){
28 28
 				$this->jquery_code_for_compile []=$jsCode;
29
-			}else if($event=="beforeExecute"){
29
+			} else if($event=="beforeExecute"){
30 30
 				\array_unshift($this->jquery_code_for_compile, $jsCode);
31
-			}else{
31
+			} else{
32 32
 				$selector=$this->_createSelector($itemSelector, $this->attachTo);
33 33
 				$this->jquery_code_for_compile []="$( \"".$selector."\" ).on(\"".$event."\" , function( event, data ) {".$jsCode."});";
34 34
 			}
@@ -36,10 +36,12 @@  discard block
 block discarded – undo
36 36
 	}
37 37
 
38 38
 	protected function _createSelector($itemSelector,$selector){
39
-		if(!isset($itemSelector))
40
-			$itemSelector=$this->itemSelector;
41
-		if(isset($itemSelector) && $itemSelector!=="")
42
-			$selector.=" ".$itemSelector;
39
+		if(!isset($itemSelector)) {
40
+					$itemSelector=$this->itemSelector;
41
+		}
42
+		if(isset($itemSelector) && $itemSelector!=="") {
43
+					$selector.=" ".$itemSelector;
44
+		}
43 45
 		return $selector;
44 46
 	}
45 47
 
@@ -82,8 +84,9 @@  discard block
 block discarded – undo
82 84
 
83 85
 	protected function setParamCtrl($key, $value, $typeCtrl) {
84 86
 		if (\is_array($typeCtrl)) {
85
-			if (array_search($value, $typeCtrl)===false)
86
-				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)."}");
87
+			if (array_search($value, $typeCtrl)===false) {
88
+							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)."}");
89
+			}
87 90
 		} else {
88 91
 			if (!$typeCtrl($value)) {
89 92
 				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/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
 		$this->_identifier=$identifier;
16 17
 	}
17 18
 
18 19
 	public function getDataField(){
19 20
 		$field= $this->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
 }
Please login to merge, or discard this patch.
Ajax/semantic/html/modules/HtmlSearch.php 1 patch
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -22,10 +22,12 @@
 block discarded – undo
22 22
 
23 23
 	private function createField($placeholder=NULL, $icon=NULL) {
24 24
 		$field=new HtmlInput($this->identifier);
25
-		if (isset($placeholder))
26
-			$field->setPlaceholder($placeholder);
27
-		if (isset($icon))
28
-			$field->addIcon($icon, Direction::RIGHT);
25
+		if (isset($placeholder)) {
26
+					$field->setPlaceholder($placeholder);
27
+		}
28
+		if (isset($icon)) {
29
+					$field->addIcon($icon, Direction::RIGHT);
30
+		}
29 31
 		$field->getDataField()->setClass("prompt");
30 32
 		$this->content["field"]=$field;
31 33
 		return $field;
Please login to merge, or discard this patch.
Ajax/semantic/html/base/traits/BaseTrait.php 1 patch
Braces   +28 added lines, -20 removed lines patch added patch discarded remove patch
@@ -48,8 +48,9 @@  discard block
 block discarded – undo
48 48
 
49 49
 	public function setVariations($variations) {
50 50
 		$this->_self->setProperty("class", $this->_self->getBaseClass());
51
-		if (\is_string($variations))
52
-			$variations=\explode(" ", $variations);
51
+		if (\is_string($variations)) {
52
+					$variations=\explode(" ", $variations);
53
+		}
53 54
 		foreach ( $variations as $variation ) {
54 55
 			$this->_self->addVariation($variation);
55 56
 		}
@@ -62,8 +63,9 @@  discard block
 block discarded – undo
62 63
 	}
63 64
 
64 65
 	public function addVariations($variations=array()) {
65
-		if (\is_string($variations))
66
-			$variations=\explode(" ", $variations);
66
+		if (\is_string($variations)) {
67
+					$variations=\explode(" ", $variations);
68
+		}
67 69
 		foreach ( $variations as $variation ) {
68 70
 			$this->_self->addVariation($variation);
69 71
 		}
@@ -71,8 +73,9 @@  discard block
 block discarded – undo
71 73
 	}
72 74
 
73 75
 	public function addStates($states=array()) {
74
-		if (\is_string($states))
75
-			$states=\explode(" ", $states);
76
+		if (\is_string($states)) {
77
+					$states=\explode(" ", $states);
78
+		}
76 79
 		foreach ( $states as $state ) {
77 80
 			$this->_self->addState($state);
78 81
 		}
@@ -81,8 +84,9 @@  discard block
 block discarded – undo
81 84
 
82 85
 	public function setStates($states) {
83 86
 		$this->_self->setProperty("class", $this->_self->getBaseClass());
84
-		if (\is_string($states))
85
-			$states=\explode(" ", $states);
87
+		if (\is_string($states)) {
88
+					$states=\explode(" ", $states);
89
+		}
86 90
 		foreach ( $states as $state ) {
87 91
 			$this->_self->addState($state);
88 92
 		}
@@ -114,8 +118,9 @@  discard block
 block discarded – undo
114 118
 	 * @return HtmlSemDoubleElement
115 119
 	 */
116 120
 	public function setDisabled($disable=true) {
117
-		if($disable)
118
-			$this->_self->addToProperty("class", "disabled");
121
+		if($disable) {
122
+					$this->_self->addToProperty("class", "disabled");
123
+		}
119 124
 		return $this;
120 125
 	}
121 126
 
@@ -149,14 +154,16 @@  discard block
 block discarded – undo
149 154
 	 * @return HtmlSemDoubleElement
150 155
 	 */
151 156
 	public function setActive($value=true){
152
-		if($value)
153
-			$this->_self->addToProperty("class", "active");
157
+		if($value) {
158
+					$this->_self->addToProperty("class", "active");
159
+		}
154 160
 		return $this;
155 161
 	}
156 162
 
157 163
 	public function setAttached($value=true){
158
-		if($value)
159
-			$this->_self->addToPropertyCtrl("class", "attached", array ("attached" ));
164
+		if($value) {
165
+					$this->_self->addToPropertyCtrl("class", "attached", array ("attached" ));
166
+		}
160 167
 		return $this;
161 168
 	}
162 169
 
@@ -166,9 +173,9 @@  discard block
 block discarded – undo
166 173
 	public function setInverted($recursive=true) {
167 174
 		if($recursive===true){
168 175
 			$content=$this->_self->getContent();
169
-			if($content instanceof HtmlSemDoubleElement)
170
-				$content->setInverted($recursive);
171
-			elseif(\is_array($content) || $content instanceof \Traversable){
176
+			if($content instanceof HtmlSemDoubleElement) {
177
+							$content->setInverted($recursive);
178
+			} elseif(\is_array($content) || $content instanceof \Traversable){
172 179
 				foreach ($content as $elm){
173 180
 					if($elm instanceof  HtmlSemDoubleElement){
174 181
 						$elm->setInverted($recursive);
@@ -204,9 +211,10 @@  discard block
 block discarded – undo
204 211
 			if(isset($array[$key])){
205 212
 				$p=JString::replaceAtFirstAndLast($array[$key], $before, "", $after, "");
206 213
 				$array[$key]=$before.$p.$value.$after;
207
-			}else
208
-				$array[$key]=$before.$value.$after;
209
-		}else{
214
+			} else {
215
+							$array[$key]=$before.$value.$after;
216
+			}
217
+		} else{
210 218
 			$array[$key]=$value;
211 219
 		}
212 220
 		return $this;
Please login to merge, or discard this patch.
Ajax/common/traits/JsUtilsInternalTrait.php 1 patch
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -16,8 +16,9 @@  discard block
 block discarded – undo
16 16
 	 */
17 17
 	protected function _compileLibrary(BaseGui $library=NULL, &$view=NULL){
18 18
 		if ($library!=NULL) {
19
-			if(isset($view))
20
-				$library->compileHtml($this, $view);
19
+			if(isset($view)) {
20
+							$library->compileHtml($this, $view);
21
+			}
21 22
 			if ($library->isAutoCompile()) {
22 23
 				$library->compile(true);
23 24
 			}
@@ -37,7 +38,9 @@  discard block
 block discarded – undo
37 38
 	}
38 39
 
39 40
 	protected function minify($input) {
40
-		if(trim($input) === "") return $input;
41
+		if(trim($input) === "") {
42
+			return $input;
43
+		}
41 44
 		return preg_replace(
42 45
 				array(
43 46
 						// Remove comment(s)
Please login to merge, or discard this patch.
Ajax/semantic/html/elements/HtmlButton.php 1 patch
Braces   +14 added lines, -11 removed lines patch added patch discarded remove patch
@@ -56,9 +56,9 @@  discard block
 block discarded – undo
56 56
 	}
57 57
 
58 58
 	public function setFocusable($value=true) {
59
-		if ($value === true)
60
-			$this->setProperty("tabindex", "0");
61
-		else {
59
+		if ($value === true) {
60
+					$this->setProperty("tabindex", "0");
61
+		} else {
62 62
 			$this->removeProperty("tabindex");
63 63
 		}
64 64
 		return $this;
@@ -106,8 +106,9 @@  discard block
 block discarded – undo
106 106
 	 */
107 107
 	public function addLabel($label, $before=false, $icon=NULL) {
108 108
 		$this->tagName="div";$prefix="";
109
-		if($before)
110
-			$prefix="left ";
109
+		if($before) {
110
+					$prefix="left ";
111
+		}
111 112
 		$this->addToProperty("class", $prefix."labeled");
112 113
 		$isIcon=(isset($this->content[0]) && $this->content[0] instanceof HtmlIcon);
113 114
 		$this->content=new HtmlButton("button-" . $this->identifier, $this->content);
@@ -144,12 +145,13 @@  discard block
 block discarded – undo
144 145
 	public function setColor($color){
145 146
 		if(\is_array($this->content)){
146 147
 			foreach ($this->content as $content){
147
-				if($content instanceof HtmlButton)
148
-					$content->setColor($color);
148
+				if($content instanceof HtmlButton) {
149
+									$content->setColor($color);
150
+				}
149 151
 			}
152
+		} else {
153
+					parent::setColor($color);
150 154
 		}
151
-		else
152
-			parent::setColor($color);
153 155
 		return $this;
154 156
 	}
155 157
 
@@ -202,8 +204,9 @@  discard block
 block discarded – undo
202 204
 	 * @return HtmlButton
203 205
 	 */
204 206
 	public static function social($identifier, $social, $value=NULL) {
205
-		if ($value === NULL)
206
-			$value=\ucfirst($social);
207
+		if ($value === NULL) {
208
+					$value=\ucfirst($social);
209
+		}
207 210
 		$return=new HtmlButton($identifier, $value);
208 211
 		$return->addIcon($social);
209 212
 		return $return->addToPropertyCtrl("class", $social, Social::getConstants());
Please login to merge, or discard this patch.