Completed
Push — master ( 238349...a91c54 )
by Jean-Christophe
03:22
created
Ajax/semantic/widgets/datatable/DataTableFieldAsTrait.php 1 patch
Braces   +12 added lines, -8 removed lines patch added patch discarded remove patch
@@ -62,15 +62,17 @@  discard block
 block discarded – undo
62 62
 	 */
63 63
 	private function getFieldButton($caption,$visibleHover=true){
64 64
 		$bt= new HtmlButton("",$caption);
65
-		if($visibleHover)
66
-			$this->_visibleOver($bt);
65
+		if($visibleHover) {
66
+					$this->_visibleOver($bt);
67
+		}
67 68
 		return $bt;
68 69
 	}
69 70
 
70 71
 	private function getFieldButtons($buttons,$visibleHover=true){
71 72
 		$bts=new HtmlButtonGroups("",$buttons);
72
-		if($visibleHover)
73
-			$this->_visibleOver($bts);
73
+		if($visibleHover) {
74
+					$this->_visibleOver($bts);
75
+		}
74 76
 		return $bts;
75 77
 	}
76 78
 
@@ -87,8 +89,9 @@  discard block
 block discarded – undo
87 89
 		return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle,$index,$attributes){
88 90
 			$button=new HtmlButton($id,$value,$cssStyle);
89 91
 			$button->postOnClick($url,"$(event.target).closest('tr').find(':input').serialize()",$responseElement,$attributes["ajax"]);
90
-			if(!isset($attributes["visibleHover"]) || $attributes["visibleHover"])
91
-				$this->_visibleOver($button);
92
+			if(!isset($attributes["visibleHover"]) || $attributes["visibleHover"]) {
93
+							$this->_visibleOver($button);
94
+			}
92 95
 				return $button;
93 96
 		}, $index,$attributes);
94 97
 	}
@@ -159,8 +162,9 @@  discard block
 block discarded – undo
159 162
 	private function getDefaultButton($icon,$class=null,$visibleHover=true){
160 163
 		$bt=$this->getFieldButton("",$visibleHover);
161 164
 		$bt->asIcon($icon);
162
-		if(isset($class))
163
-			$bt->addClass($class);
165
+		if(isset($class)) {
166
+					$bt->addClass($class);
167
+		}
164 168
 		return $bt;
165 169
 	}
166 170
 
Please login to merge, or discard this patch.
Ajax/semantic/html/elements/HtmlButton.php 1 patch
Braces   +17 added lines, -13 removed lines patch added patch discarded remove patch
@@ -55,9 +55,9 @@  discard block
 block discarded – undo
55 55
 	}
56 56
 
57 57
 	public function setFocusable($value=true) {
58
-		if ($value === true)
59
-			$this->setProperty("tabindex", "0");
60
-		else {
58
+		if ($value === true) {
59
+					$this->setProperty("tabindex", "0");
60
+		} else {
61 61
 			$this->removeProperty("tabindex");
62 62
 		}
63 63
 		return $this;
@@ -105,8 +105,9 @@  discard block
 block discarded – undo
105 105
 	 */
106 106
 	public function addLabel($label, $before=false, $icon=NULL) {
107 107
 		$this->tagName="div";$prefix="";
108
-		if($before)
109
-			$prefix="left ";
108
+		if($before) {
109
+					$prefix="left ";
110
+		}
110 111
 		$this->addToProperty("class", $prefix."labeled");
111 112
 		$isIcon=(isset($this->content[0]) && $this->content[0] instanceof HtmlIcon);
112 113
 		$this->content=new HtmlButton("button-" . $this->identifier, $this->content);
@@ -143,12 +144,13 @@  discard block
 block discarded – undo
143 144
 	public function setColor($color){
144 145
 		if(\is_array($this->content)){
145 146
 			foreach ($this->content as $content){
146
-				if($content instanceof HtmlButton)
147
-					$content->setColor($color);
147
+				if($content instanceof HtmlButton) {
148
+									$content->setColor($color);
149
+				}
148 150
 			}
151
+		} else {
152
+					parent::setColor($color);
149 153
 		}
150
-		else
151
-			parent::setColor($color);
152 154
 		return $this;
153 155
 	}
154 156
 
@@ -201,8 +203,9 @@  discard block
 block discarded – undo
201 203
 	 * @return HtmlButton
202 204
 	 */
203 205
 	public static function social($identifier, $social, $value=NULL) {
204
-		if ($value === NULL)
205
-			$value=\ucfirst($social);
206
+		if ($value === NULL) {
207
+					$value=\ucfirst($social);
208
+		}
206 209
 		$return=new HtmlButton($identifier, $value);
207 210
 		$return->addIcon($social);
208 211
 		return $return->addToPropertyCtrl("class", $social, Social::getConstants());
@@ -255,8 +258,9 @@  discard block
 block discarded – undo
255 258
 	public static function dropdown($identifier,$value,$items=[],$asCombo=false,$icon=null){
256 259
 		$result=new HtmlButtonGroups($identifier,[$value]);
257 260
 		$result->addDropdown($items,$asCombo);
258
-		if(isset($icon))
259
-			$result->setIcon($icon);
261
+		if(isset($icon)) {
262
+					$result->setIcon($icon);
263
+		}
260 264
 		return $result;
261 265
 	}
262 266
 }
Please login to merge, or discard this patch.
Ajax/semantic/html/content/HtmlAbsractItem.php 1 patch
Braces   +10 added lines, -7 removed lines patch added patch discarded remove patch
@@ -24,8 +24,9 @@  discard block
 block discarded – undo
24 24
 	}
25 25
 
26 26
 	public function removeIcon(){
27
-		if(isset($this->content["icon"]))
28
-			unset($this->content["icon"]);
27
+		if(isset($this->content["icon"])) {
28
+					unset($this->content["icon"]);
29
+		}
29 30
 		return $this;
30 31
 	}
31 32
 
@@ -63,7 +64,7 @@  discard block
 block discarded – undo
63 64
 			$this->setTagName("div");
64 65
 			$this->removeProperty("href");
65 66
 			$this->addToPropertyCtrl("class", "active", array("active"));
66
-		}else{
67
+		} else{
67 68
 			$this->removePropertyValue("class", "active");
68 69
 		}
69 70
 		return $this;
@@ -71,8 +72,9 @@  discard block
 block discarded – undo
71 72
 
72 73
 	public function asLink($href=NULL,$part=NULL){
73 74
 		$this->setTagName("a");
74
-		if(isset($href))
75
-			$this->setProperty("href", $href);
75
+		if(isset($href)) {
76
+					$this->setProperty("href", $href);
77
+		}
76 78
 		return $this;
77 79
 	}
78 80
 
@@ -83,8 +85,9 @@  discard block
 block discarded – undo
83 85
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile()
84 86
 	 */
85 87
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
86
-		if(\is_array($this->content) && JArray::isAssociative($this->content))
87
-			$this->content=JArray::sortAssociative($this->content, [ "icon","image","content" ]);
88
+		if(\is_array($this->content) && JArray::isAssociative($this->content)) {
89
+					$this->content=JArray::sortAssociative($this->content, [ "icon","image","content" ]);
90
+		}
88 91
 		return parent::compile($js, $view);
89 92
 	}
90 93
 }
Please login to merge, or discard this patch.
Ajax/semantic/html/elements/HtmlStep.php 1 patch
Braces   +14 added lines, -11 removed lines patch added patch discarded remove patch
@@ -55,26 +55,29 @@
 block discarded – undo
55 55
 			for($i=$this->_startStep;$i<$count;$i++){
56 56
 				$step=$this->content[$i];
57 57
 				$step->removeStatus();
58
-				if($i<$activestep)
59
-					$step->setCompleted();
60
-				elseif ($i===$activestep)
61
-					$step->setActive();
62
-				else
63
-					$step->setDisabled();
58
+				if($i<$activestep) {
59
+									$step->setCompleted();
60
+				} elseif ($i===$activestep) {
61
+									$step->setActive();
62
+				} else {
63
+									$step->setDisabled();
64
+				}
64 65
 			}
65
-		}else{
66
+		} else{
66 67
 			foreach ($this->content as $step){
67 68
 				$step->removeStatus();
68 69
 			}
69
-			if($activestep<$count)
70
-				$this->content[$activestep]->setActive();
70
+			if($activestep<$count) {
71
+							$this->content[$activestep]->setActive();
72
+			}
71 73
 		}
72 74
 		return $this;
73 75
 	}
74 76
 
75 77
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
76
-		if(isset($this->_activeStep) && \is_numeric($this->_activeStep))
77
-			$this->defineActiveStep();
78
+		if(isset($this->_activeStep) && \is_numeric($this->_activeStep)) {
79
+					$this->defineActiveStep();
80
+		}
78 81
 		return parent::compile($js,$view);
79 82
 	}
80 83
 
Please login to merge, or discard this patch.
Ajax/semantic/html/content/HtmlListItem.php 1 patch
Braces   +6 added lines, -5 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
 				$icon=@$content[0];
18 18
 				$title=@$content[1];
19 19
 				$desc=@$content[2];
20
-			}else{
20
+			} else{
21 21
 				$icon=@$content["icon"];
22 22
 				$image=@$content["image"];
23 23
 				$title=@$content["title"];
@@ -33,20 +33,21 @@  discard block
 block discarded – undo
33 33
 			}
34 34
 			if(isset($title)){
35 35
 				$this->setTitle($title,$desc);
36
-			}elseif (isset($header)){
36
+			} elseif (isset($header)){
37 37
 				$this->setTitle($header,$desc,"header");
38 38
 			}
39 39
 			if(isset($items)){
40 40
 				$this->addList($items);
41 41
 			}
42
-		}else{
42
+		} else{
43 43
 			$this->setContent($content);
44 44
 		}
45 45
 	}
46 46
 	public function addList($items=array(),$ordered=false) {
47 47
 		$list=new HtmlList("", $items);
48
-		if($ordered)
49
-			$list->setOrdered();
48
+		if($ordered) {
49
+					$list->setOrdered();
50
+		}
50 51
 		$list->setClass("list");
51 52
 		$this->content["list"]=$list;
52 53
 		return $list;
Please login to merge, or discard this patch.
Ajax/semantic/html/elements/HtmlList.php 1 patch
Braces   +10 added lines, -7 removed lines patch added patch discarded remove patch
@@ -50,8 +50,9 @@  discard block
 block discarded – undo
50 50
 
51 51
 	protected function getItemToAdd($item){
52 52
 		$itemO=parent::getItemToAdd($item);
53
-		if($itemO instanceof AbstractCheckbox)
54
-			$itemO->addClass("item");
53
+		if($itemO instanceof AbstractCheckbox) {
54
+					$itemO->addClass("item");
55
+		}
55 56
 		return $itemO;
56 57
 	}
57 58
 
@@ -106,14 +107,15 @@  discard block
 block discarded – undo
106 107
 		if (isset($masterItem)) {
107 108
 			if(\is_array($masterItem)){
108 109
 				$masterO=new HtmlFormCheckbox("master-" . $identifier, @$masterItem[0],@$masterItem[1]);
109
-				if(isset($name))
110
-					$masterO->setName($name);
110
+				if(isset($name)) {
111
+									$masterO->setName($name);
112
+				}
111 113
 				if(isset($masterItem[1])){
112 114
 					if(\array_search($masterItem[1], $values)!==false){
113 115
 						$masterO->getDataField()->setProperty("checked", "");
114 116
 					}
115 117
 				}
116
-			}else{
118
+			} else{
117 119
 				$masterO=new HtmlFormCheckbox("master-" . $identifier, $masterItem);
118 120
 			}
119 121
 			if($notAllChecked){
@@ -130,8 +132,9 @@  discard block
 block discarded – undo
130 132
 			if (\array_search($val, $values) !== false) {
131 133
 				$itemO->getDataField()->setProperty("checked", "");
132 134
 			}
133
-			if(isset($name))
134
-				$itemO->setName($name);
135
+			if(isset($name)) {
136
+							$itemO->setName($name);
137
+			}
135 138
 			$itemO->setClass("item");
136 139
 			$fields[]=$itemO;
137 140
 		}
Please login to merge, or discard this patch.
Ajax/common/traits/JsUtilsAjaxTrait.php 1 patch
Braces   +35 added lines, -26 removed lines patch added patch discarded remove patch
@@ -28,8 +28,9 @@  discard block
 block discarded – undo
28 28
 		}
29 29
 		$retour.="$.".$method."(url,".self::_correctParams($params).").done(function( data ) {\n";
30 30
 		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback)."});\n";
31
-		if ($immediatly)
32
-			$this->jquery_code_for_compile[]=$retour;
31
+		if ($immediatly) {
32
+					$this->jquery_code_for_compile[]=$retour;
33
+		}
33 34
 		return $retour;
34 35
 	}
35 36
 
@@ -39,15 +40,17 @@  discard block
 block discarded – undo
39 40
 		$url=$this->_correctAjaxUrl($url);
40 41
 		$retour="url='".$url."';";
41 42
 		$slash="/";
42
-		if(JString::endswith($url, "/")===true)
43
-			$slash="";
43
+		if(JString::endswith($url, "/")===true) {
44
+					$slash="";
45
+		}
44 46
 			if(JString::isNotNull($attr)){
45
-				if ($attr==="value")
46
-					$retour.="url=url+'".$slash."'+$(this).val();\n";
47
-				elseif ($attr==="html")
48
-					$retour.="url=url+'".$slash."'+$(this).html();\n";
49
-				elseif($attr!==null && $attr!=="")
50
-					$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
47
+				if ($attr==="value") {
48
+									$retour.="url=url+'".$slash."'+$(this).val();\n";
49
+				} elseif ($attr==="html") {
50
+									$retour.="url=url+'".$slash."'+$(this).html();\n";
51
+				} elseif($attr!==null && $attr!=="") {
52
+									$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
53
+				}
51 54
 			}
52 55
 			return $retour;
53 56
 	}
@@ -57,13 +60,14 @@  discard block
 block discarded – undo
57 60
 		if ($responseElement!=="") {
58 61
 			if(isset($ajaxTransition)){
59 62
 				$call=$this->setAjaxDataCall($ajaxTransition);
60
-			}elseif(isset($this->ajaxTransition)){
63
+			} elseif(isset($this->ajaxTransition)){
61 64
 				$call=$this->ajaxTransition;
62 65
 			}
63
-			if(\is_callable($call))
64
-				$retour="\t".$call($responseElement,$jqueryDone).";\n";
65
-				else
66
-					$retour="\t$({$responseElement}).{$jqueryDone}( data );\n";
66
+			if(\is_callable($call)) {
67
+							$retour="\t".$call($responseElement,$jqueryDone).";\n";
68
+			} else {
69
+									$retour="\t$({$responseElement}).{$jqueryDone}( data );\n";
70
+				}
67 71
 		}
68 72
 		$retour.="\t".$jsCallback."\n";
69 73
 		return $retour;
@@ -77,8 +81,9 @@  discard block
 block discarded – undo
77 81
 	}
78 82
 
79 83
 	protected function _correctAjaxUrl($url) {
80
-		if ($url!=="/" && JString::endsWith($url, "/")===true)
81
-			$url=substr($url, 0, strlen($url)-1);
84
+		if ($url!=="/" && JString::endsWith($url, "/")===true) {
85
+					$url=substr($url, 0, strlen($url)-1);
86
+		}
82 87
 			if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
83 88
 				$url=$this->getUrl($url);
84 89
 			}
@@ -98,8 +103,9 @@  discard block
 block discarded – undo
98 103
 	public static function _implodeParams($parameters){
99 104
 		$allParameters=[];
100 105
 		foreach ($parameters as $params){
101
-			if(isset($params))
102
-				$allParameters[]=self::_correctParams($params);
106
+			if(isset($params)) {
107
+							$allParameters[]=self::_correctParams($params);
108
+			}
103 109
 		}
104 110
 		return \implode("+'&'+", $allParameters);
105 111
 	}
@@ -193,8 +199,9 @@  discard block
 block discarded – undo
193 199
 				$retour.="\t".$jsCallback."\n".
194 200
 						"\t$(document).trigger('jsonReady',[data]);\n".
195 201
 						"});\n";
196
-				if ($immediatly)
197
-					$this->jquery_code_for_compile[]=$retour;
202
+				if ($immediatly) {
203
+									$this->jquery_code_for_compile[]=$retour;
204
+				}
198 205
 		return $retour;
199 206
 	}
200 207
 
@@ -259,7 +266,7 @@  discard block
 block discarded – undo
259 266
 		if($context===null){
260 267
 			$parent="$('".$maskSelector."').parent()";
261 268
 			$newElm = "$('#'+newId)";
262
-		}else{
269
+		} else{
263 270
 			$parent=$context;
264 271
 			$newElm = $context.".find('#'+newId)";
265 272
 		}
@@ -272,8 +279,9 @@  discard block
 block discarded – undo
272 279
 		$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";
273 280
 		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
274 281
 		$retour.="\t".$jsCallback."\n"."});\n";
275
-		if ($immediatly)
276
-			$this->jquery_code_for_compile[]=$retour;
282
+		if ($immediatly) {
283
+					$this->jquery_code_for_compile[]=$retour;
284
+		}
277 285
 		return $retour;
278 286
 	}
279 287
 
@@ -503,8 +511,9 @@  discard block
 block discarded – undo
503 511
 			}});\n";
504 512
 			$retour.="$('#".$form."').submit();\n";
505 513
 		}
506
-		if ($immediatly)
507
-			$this->jquery_code_for_compile[]=$retour;
514
+		if ($immediatly) {
515
+					$this->jquery_code_for_compile[]=$retour;
516
+		}
508 517
 		return $retour;
509 518
 	}
510 519
 
Please login to merge, or discard this patch.