Completed
Push — master ( 872df9...4bf172 )
by Jean-Christophe
04:11
created
Ajax/semantic/html/collections/form/HtmlFormInput.php 1 patch
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -9,8 +9,9 @@  discard block
 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
 	}
@@ -18,8 +19,9 @@  discard block
 block discarded – undo
18 19
 	public function getDataField(){
19 20
 		$field= $this->getField();
20 21
 		//TODO check getField
21
-		if($field instanceof HtmlInput)
22
-			$field=$field->getDataField();
22
+		if($field instanceof HtmlInput) {
23
+					$field=$field->getDataField();
24
+		}
23 25
 		return $field;
24 26
 	}
25 27
 }
26 28
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/HtmlFormTextarea.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -10,8 +10,9 @@
 block discarded – undo
10 10
 	use TextFieldsTrait;
11 11
 
12 12
 	public function __construct($identifier, $label=NULL,$value=NULL,$placeholder=NULL,$rows=NULL) {
13
-		if(!isset($placeholder))
14
-			$placeholder=$label;
13
+		if(!isset($placeholder)) {
14
+					$placeholder=$label;
15
+		}
15 16
 		parent::__construct("field-".$identifier, new HtmlTextarea($identifier,$value,$placeholder,$rows), $label);
16 17
 		$this->_identifier=$identifier;
17 18
 	}
Please login to merge, or discard this patch.
Ajax/semantic/html/base/traits/BaseTrait.php 1 patch
Braces   +27 added lines, -18 removed lines patch added patch discarded remove patch
@@ -47,8 +47,9 @@  discard block
 block discarded – undo
47 47
 
48 48
 	public function setVariations($variations) {
49 49
 		$this->setProperty("class", $this->_baseClass);
50
-		if (\is_string($variations))
51
-			$variations=\explode(" ", $variations);
50
+		if (\is_string($variations)) {
51
+					$variations=\explode(" ", $variations);
52
+		}
52 53
 		foreach ( $variations as $variation ) {
53 54
 			$this->addVariation($variation);
54 55
 		}
@@ -61,8 +62,9 @@  discard block
 block discarded – undo
61 62
 	}
62 63
 
63 64
 	public function addVariations($variations=array()) {
64
-		if (\is_string($variations))
65
-			$variations=\explode(" ", $variations);
65
+		if (\is_string($variations)) {
66
+					$variations=\explode(" ", $variations);
67
+		}
66 68
 		foreach ( $variations as $variation ) {
67 69
 			$this->addVariation($variation);
68 70
 		}
@@ -70,8 +72,9 @@  discard block
 block discarded – undo
70 72
 	}
71 73
 
72 74
 	public function addStates($states=array()) {
73
-		if (\is_string($states))
74
-			$states=\explode(" ", $states);
75
+		if (\is_string($states)) {
76
+					$states=\explode(" ", $states);
77
+		}
75 78
 		foreach ( $states as $state ) {
76 79
 			$this->addState($state);
77 80
 		}
@@ -80,8 +83,9 @@  discard block
 block discarded – undo
80 83
 
81 84
 	public function setStates($states) {
82 85
 		$this->setProperty("class", $this->_baseClass);
83
-		if (\is_string($states))
84
-			$states=\explode(" ", $states);
86
+		if (\is_string($states)) {
87
+					$states=\explode(" ", $states);
88
+		}
85 89
 		foreach ( $states as $state ) {
86 90
 			$this->addState($state);
87 91
 		}
@@ -113,8 +117,9 @@  discard block
 block discarded – undo
113 117
 	 * @return HtmlSemDoubleElement
114 118
 	 */
115 119
 	public function setDisabled($disable=true) {
116
-		if($disable)
117
-			$this->addToProperty("class", "disabled");
120
+		if($disable) {
121
+					$this->addToProperty("class", "disabled");
122
+		}
118 123
 		return $this;
119 124
 	}
120 125
 
@@ -148,14 +153,16 @@  discard block
 block discarded – undo
148 153
 	 * @return HtmlSemDoubleElement
149 154
 	 */
150 155
 	public function setActive($value=true){
151
-		if($value)
152
-			$this->addToProperty("class", "active");
156
+		if($value) {
157
+					$this->addToProperty("class", "active");
158
+		}
153 159
 		return $this;
154 160
 	}
155 161
 
156 162
 	public function setAttached($value=true){
157
-		if($value)
158
-			$this->addToPropertyCtrl("class", "attached", array ("attached" ));
163
+		if($value) {
164
+					$this->addToPropertyCtrl("class", "attached", array ("attached" ));
165
+		}
159 166
 		return $this;
160 167
 	}
161 168
 
@@ -191,10 +198,12 @@  discard block
 block discarded – undo
191 198
 			if(isset($array[$key])){
192 199
 				$p=JString::replaceAtFirstAndLast($array[$key], $before, "", $after, "");
193 200
 				$array[$key]=$before.$p.$value.$after;
194
-			}else
195
-				$array[$key]=$before.$value.$after;
196
-		}else
197
-			$array[$key]=$value;
201
+			} else {
202
+							$array[$key]=$before.$value.$after;
203
+			}
204
+		} else {
205
+					$array[$key]=$value;
206
+		}
198 207
 		return $this;
199 208
 	}
200 209
 }
201 210
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/common/traits/JqueryAjaxTrait.php 1 patch
Braces   +32 added lines, -24 removed lines patch added patch discarded remove patch
@@ -48,8 +48,9 @@  discard block
 block discarded – undo
48 48
 		}
49 49
 		$retour.="$.".$method."(url,".$params.").done(function( data ) {\n";
50 50
 		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback)."});\n";
51
-		if ($immediatly)
52
-			$this->jquery_code_for_compile[]=$retour;
51
+		if ($immediatly) {
52
+					$this->jquery_code_for_compile[]=$retour;
53
+		}
53 54
 		return $retour;
54 55
 	}
55 56
 
@@ -67,15 +68,17 @@  discard block
 block discarded – undo
67 68
 		$url=$this->_correctAjaxUrl($url);
68 69
 		$retour="url='".$url."';";
69 70
 		$slash="/";
70
-		if(JString::endswith($url, "/")===true)
71
-			$slash="";
71
+		if(JString::endswith($url, "/")===true) {
72
+					$slash="";
73
+		}
72 74
 		if(JString::isNotNull($attr)){
73
-			if ($attr==="value")
74
-				$retour.="url=url+'".$slash."'+$(this).val();\n";
75
-			elseif ($attr==="html")
76
-			$retour.="url=url+'".$slash."'+$(this).html();\n";
77
-			elseif($attr!=null && $attr!=="")
78
-					$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
75
+			if ($attr==="value") {
76
+							$retour.="url=url+'".$slash."'+$(this).val();\n";
77
+			} elseif ($attr==="html") {
78
+						$retour.="url=url+'".$slash."'+$(this).html();\n";
79
+			} elseif($attr!=null && $attr!=="") {
80
+								$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
81
+			}
79 82
 		}
80 83
 		return $retour;
81 84
 	}
@@ -85,13 +88,14 @@  discard block
 block discarded – undo
85 88
 		if ($responseElement!=="") {
86 89
 			if(isset($ajaxTransition)){
87 90
 				$call=$this->setAjaxDataCall($ajaxTransition);
88
-			}elseif(isset($this->ajaxTransition)){
91
+			} elseif(isset($this->ajaxTransition)){
89 92
 				$call=$this->ajaxTransition;
90 93
 			}
91
-			if(\is_callable($call))
92
-				$retour="\t".$call($responseElement,$jqueryDone).";\n";
93
-			else
94
-				$retour="\t$({$responseElement}).{$jqueryDone}( data );\n";
94
+			if(\is_callable($call)) {
95
+							$retour="\t".$call($responseElement,$jqueryDone).";\n";
96
+			} else {
97
+							$retour="\t$({$responseElement}).{$jqueryDone}( data );\n";
98
+			}
95 99
 		}
96 100
 		$retour.="\t".$jsCallback."\n";
97 101
 		return $retour;
@@ -105,8 +109,9 @@  discard block
 block discarded – undo
105 109
 	}
106 110
 
107 111
 	protected function _correctAjaxUrl($url) {
108
-		if ($url!=="/" && JString::endsWith($url, "/")===true)
109
-			$url=substr($url, 0, strlen($url)-1);
112
+		if ($url!=="/" && JString::endsWith($url, "/")===true) {
113
+					$url=substr($url, 0, strlen($url)-1);
114
+		}
110 115
 		if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
111 116
 			$url=$this->jsUtils->getUrl($url);
112 117
 		}
@@ -130,8 +135,9 @@  discard block
 block discarded – undo
130 135
 				$retour.="\t".$jsCallback."\n".
131 136
 						"\t$(document).trigger('jsonReady',[data]);\n".
132 137
 						"});\n";
133
-				if ($immediatly)
134
-					$this->jquery_code_for_compile[]=$retour;
138
+				if ($immediatly) {
139
+									$this->jquery_code_for_compile[]=$retour;
140
+				}
135 141
 					return $retour;
136 142
 	}
137 143
 
@@ -170,7 +176,7 @@  discard block
 block discarded – undo
170 176
 		if($context===null){
171 177
 			$parent="$('".$maskSelector."').parent()";
172 178
 			$newElm = "$('#'+newId)";
173
-		}else{
179
+		} else{
174 180
 			$parent=$context;
175 181
 			$newElm = $context.".find('#'+newId)";
176 182
 		}
@@ -183,8 +189,9 @@  discard block
 block discarded – undo
183 189
 		$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";
184 190
 		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
185 191
 		$retour.="\t".$jsCallback."\n"."});\n";
186
-		if ($immediatly)
187
-			$this->jquery_code_for_compile[]=$retour;
192
+		if ($immediatly) {
193
+					$this->jquery_code_for_compile[]=$retour;
194
+		}
188 195
 			return $retour;
189 196
 	}
190 197
 	/**
@@ -225,8 +232,9 @@  discard block
 block discarded – undo
225 232
 			}});\n";
226 233
 			$retour.="$('#".$form."').submit();\n";
227 234
 		}
228
-		if ($immediatly)
229
-			$this->jquery_code_for_compile[]=$retour;
235
+		if ($immediatly) {
236
+					$this->jquery_code_for_compile[]=$retour;
237
+		}
230 238
 			return $retour;
231 239
 	}
232 240
 
Please login to merge, or discard this patch.
Ajax/Jquery.php 1 patch
Braces   +26 added lines, -17 removed lines patch added patch discarded remove patch
@@ -54,8 +54,9 @@  discard block
 block discarded – undo
54 54
 				$this->params[$key]=$params[$key];
55 55
 		}
56 56
 		$this->jsUtils=$jsUtils;
57
-		if(isset($params["ajaxTransition"]))
58
-			$this->ajaxTransition=$this->setAjaxDataCall($params["ajaxTransition"]);
57
+		if(isset($params["ajaxTransition"])) {
58
+					$this->ajaxTransition=$this->setAjaxDataCall($params["ajaxTransition"]);
59
+		}
59 60
 	}
60 61
 
61 62
 	/**
@@ -138,10 +139,12 @@  discard block
 block discarded – undo
138 139
 		if (isset($param)) {
139 140
 			$param=Javascript::prep_value($param);
140 141
 			$str="$({$element}).{$jQueryCall}({$param});";
141
-		} else
142
-			$str="$({$element}).{$jQueryCall}();";
143
-			if ($immediatly)
144
-				$this->jquery_code_for_compile[]=$str;
142
+		} else {
143
+					$str="$({$element}).{$jQueryCall}();";
144
+		}
145
+			if ($immediatly) {
146
+							$this->jquery_code_for_compile[]=$str;
147
+			}
145 148
 			return $str;
146 149
 	}
147 150
 	/**
@@ -156,8 +159,9 @@  discard block
 block discarded – undo
156 159
 		$to=Javascript::prep_element($to);
157 160
 		$element=Javascript::prep_element($element);
158 161
 		$str="$({$to}).{$jQueryCall}({$element});";
159
-		if ($immediatly)
160
-			$this->jquery_code_for_compile[]=$str;
162
+		if ($immediatly) {
163
+					$this->jquery_code_for_compile[]=$str;
164
+		}
161 165
 			return $str;
162 166
 	}
163 167
 
@@ -213,12 +217,14 @@  discard block
 block discarded – undo
213 217
 		if ($stopPropagation===true) {
214 218
 			$js=Javascript::$stopPropagation.$js;
215 219
 		}
216
-		if (array_search($event, $this->jquery_events)===false)
217
-			$event="\n\t$(".Javascript::prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n";
218
-		else
219
-			$event="\n\t$(".Javascript::prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n";
220
-		if($immediatly)
221
-			$this->jquery_code_for_compile[]=$event;
220
+		if (array_search($event, $this->jquery_events)===false) {
221
+					$event="\n\t$(".Javascript::prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n";
222
+		} else {
223
+					$event="\n\t$(".Javascript::prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n";
224
+		}
225
+		if($immediatly) {
226
+					$this->jquery_code_for_compile[]=$event;
227
+		}
222 228
 		return $event;
223 229
 	}
224 230
 
@@ -261,8 +267,9 @@  discard block
 block discarded – undo
261 267
 
262 268
 	public function getScript($offset=0){
263 269
 		$code=$this->jquery_code_for_compile;
264
-		if($offset>0)
265
-			$code=\array_slice($code, $offset);
270
+		if($offset>0) {
271
+					$code=\array_slice($code, $offset);
272
+		}
266 273
 		return implode('', $code);
267 274
 	}
268 275
 
@@ -314,7 +321,9 @@  discard block
 block discarded – undo
314 321
 	}
315 322
 
316 323
 	private function minify($input) {
317
-	if(trim($input) === "") return $input;
324
+	if(trim($input) === "") {
325
+		return $input;
326
+	}
318 327
 	return preg_replace(
319 328
 			array(
320 329
 					// Remove comment(s)
Please login to merge, or discard this patch.
Ajax/semantic/widgets/datatable/HasCheckboxesTrait.php 1 patch
Braces   +9 added lines, -6 removed lines patch added patch discarded remove patch
@@ -50,8 +50,9 @@  discard block
 block discarded – undo
50 50
 			if(isset($this->_checkedClass)){
51 51
 				$checkedMessageCall.="$(this).closest('tr').toggleClass('".$this->_checkedClass."',$(this).prop('checked'));";
52 52
 			}
53
-			if(isset($js))
54
-				$js->exec($this->_getCheckedMessageFunction(),true);
53
+			if(isset($js)) {
54
+							$js->exec($this->_getCheckedMessageFunction(),true);
55
+			}
55 56
 		}
56 57
 		return $checkedMessageCall;
57 58
 	}
@@ -59,8 +60,9 @@  discard block
 block discarded – undo
59 60
 	protected function _generateMainCheckbox(&$captions){
60 61
 		$ck=new HtmlCheckbox("main-ck-".$this->identifier,"");
61 62
 		$checkedMessageCall="";
62
-		if($this->_hasCheckedMessage)
63
-			$checkedMessageCall="$('#{$this->identifier}').trigger('updateChecked');";
63
+		if($this->_hasCheckedMessage) {
64
+					$checkedMessageCall="$('#{$this->identifier}').trigger('updateChecked');";
65
+		}
64 66
 
65 67
 			$ck->setOnChecked($this->_setAllChecked("true").$checkedMessageCall);
66 68
 			$ck->setOnUnchecked($this->_setAllChecked("false").$checkedMessageCall);
@@ -108,8 +110,9 @@  discard block
 block discarded – undo
108 110
 	 * @param callable $callback
109 111
 	 */
110 112
 	public function addCountCheckedInToolbar(array $checkedMessage=null,$callback=null){
111
-		if(isset($checkedMessage))
112
-			$this->_checkedMessage=$checkedMessage;
113
+		if(isset($checkedMessage)) {
114
+					$this->_checkedMessage=$checkedMessage;
115
+		}
113 116
 			$checkedMessage=$this->getCheckedMessage();
114 117
 			$this->_hasCheckboxes=true;
115 118
 			$this->_hasCheckedMessage=true;
Please login to merge, or discard this patch.
Ajax/semantic/widgets/datatable/Pagination.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -89,8 +89,9 @@
 block discarded – undo
89 89
 	}
90 90
 
91 91
 	public function setPagesVisibles($pages_visibles) {
92
-		if(!isset($pages_visibles))
93
-			$pages_visibles=(int)ceil($this->row_count / $this->items_per_page)+1;
92
+		if(!isset($pages_visibles)) {
93
+					$pages_visibles=(int)ceil($this->row_count / $this->items_per_page)+1;
94
+		}
94 95
 		$this->pages_visibles=$pages_visibles;
95 96
 		return $this;
96 97
 	}
Please login to merge, or discard this patch.
Ajax/semantic/widgets/datatable/JsonDataTable.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -48,8 +48,9 @@
 block discarded – undo
48 48
 			$('#pagination-{$id} ._firstPage').attr('data-page',Math.max(1,page-1));
49 49
 			var lastPage=$('#pagination-{$id} ._lastPage');lastPage.attr('data-page',Math.min(lastPage.attr('data-max'),page+1));";
50 50
 		}
51
-		if(isset($this->_urls["refresh"]))
52
-			$this->jsonArrayOnClick($menu, $this->_urls["refresh"],"post","{'p':$(this).attr('data-page')}",$callback);
51
+		if(isset($this->_urls["refresh"])) {
52
+					$this->jsonArrayOnClick($menu, $this->_urls["refresh"],"post","{'p':$(this).attr('data-page')}",$callback);
53
+		}
53 54
 	}
54 55
 
55 56
 	/**
Please login to merge, or discard this patch.
Ajax/service/JReflection.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
 					if($class->getProperty($property)!==null){
22 22
 						\call_user_func_array([$object,$name],[$value]);
23 23
 					}
24
-				}catch(\Exception $e){
24
+				} catch(\Exception $e){
25 25
 					//Nothing to do
26 26
 				}
27 27
 			}
Please login to merge, or discard this patch.