Passed
Push — master ( 9a9b82...74dc3c )
by Jean-Christophe
02:28
created
Ajax/common/traits/JsUtilsAjaxTrait.php 2 patches
Spacing   +119 added lines, -119 removed lines patch added patch discarded remove patch
@@ -17,11 +17,11 @@  discard block
 block discarded – undo
17 17
 	protected $ajaxLoader="<div class=\"ui active centered inline text loader\">Loading</div>";
18 18
 
19 19
 	abstract public function getUrl($url);
20
-	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
21
-	abstract public function interval($jsCode,$time,$globalName=null,$immediatly=true);
20
+	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true);
21
+	abstract public function interval($jsCode, $time, $globalName=null, $immediatly=true);
22 22
 
23
-	protected function _ajax($method,$url,$responseElement="",$parameters=[]) {
24
-		if(isset($this->params["ajax"])){
23
+	protected function _ajax($method, $url, $responseElement="", $parameters=[]) {
24
+		if (isset($this->params["ajax"])) {
25 25
 			extract($this->params["ajax"]);
26 26
 		}
27 27
 		extract($parameters);
@@ -31,111 +31,111 @@  discard block
 block discarded – undo
31 31
 		$originalSelector=$responseElement;
32 32
 		$responseElement=$this->_getResponseElement($responseElement);
33 33
 		$retour.="var self=this;\n";
34
-		$before=isset($before)?$before:"";
34
+		$before=isset($before) ? $before : "";
35 35
 		$retour.=$before;
36
-		if($hasLoader===true && JString::isNotNull($responseElement)){
37
-			$this->addLoading($retour, $responseElement,$ajaxLoader);
38
-		}elseif($hasLoader==="internal"){
36
+		if ($hasLoader===true && JString::isNotNull($responseElement)) {
37
+			$this->addLoading($retour, $responseElement, $ajaxLoader);
38
+		}elseif ($hasLoader==="internal") {
39 39
 			$retour.="\n$(this).addClass('loading');";
40 40
 		}
41
-		$ajaxParameters=["url"=>"url","method"=>"'".\strtoupper($method)."'"];
41
+		$ajaxParameters=["url"=>"url", "method"=>"'".\strtoupper($method)."'"];
42 42
 		
43
-		$ajaxParameters["async"]=($async?"true":"false");
43
+		$ajaxParameters["async"]=($async ? "true" : "false");
44 44
 		
45
-		if(isset($params)){
45
+		if (isset($params)) {
46 46
 			$ajaxParameters["data"]=self::_correctParams($params);
47 47
 		}
48
-		if(isset($headers)){
48
+		if (isset($headers)) {
49 49
 			$ajaxParameters["headers"]=$headers;
50 50
 		}
51 51
 		$this->createAjaxParameters($ajaxParameters, $parameters);
52 52
 		$retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data, textStatus, jqXHR ) {\n";
53
-		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback,$hasLoader,($historize?$originalSelector:null))."});\n";
54
-		$retour=$this->_addJsCondition($jsCondition,$retour);
53
+		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader, ($historize ? $originalSelector : null))."});\n";
54
+		$retour=$this->_addJsCondition($jsCondition, $retour);
55 55
 		if ($immediatly)
56 56
 			$this->jquery_code_for_compile[]=$retour;
57 57
 		return $retour;
58 58
 	}
59 59
 
60
-	protected function createAjaxParameters(&$original,$parameters){
61
-		$validParameters=["dataType"=>"'%value%'","beforeSend"=>"function(jqXHR,settings){%value%}","complete"=>"function(jqXHR){%value%}"];
62
-		foreach ($validParameters as $param=>$mask){
63
-			if(isset($parameters[$param])){
60
+	protected function createAjaxParameters(&$original, $parameters) {
61
+		$validParameters=["dataType"=>"'%value%'", "beforeSend"=>"function(jqXHR,settings){%value%}", "complete"=>"function(jqXHR){%value%}"];
62
+		foreach ($validParameters as $param=>$mask) {
63
+			if (isset($parameters[$param])) {
64 64
 				$original[$param]=\str_replace("%value%", $parameters[$param], $mask);
65 65
 			}
66 66
 		}
67 67
 	}
68 68
 
69
-	protected function implodeAjaxParameters($ajaxParameters){
70
-		$s = ''; foreach ($ajaxParameters as $k=>$v) { if ($s !== '') { $s .= ','; } $s .= "'{$k}':{$v}"; }
69
+	protected function implodeAjaxParameters($ajaxParameters) {
70
+		$s=''; foreach ($ajaxParameters as $k=>$v) { if ($s!=='') { $s.=','; } $s.="'{$k}':{$v}"; }
71 71
 		return $s;
72 72
 	}
73 73
 
74
-	protected function _addJsCondition($jsCondition,$jsSource){
75
-		if(isset($jsCondition)){
74
+	protected function _addJsCondition($jsCondition, $jsSource) {
75
+		if (isset($jsCondition)) {
76 76
 			return "if(".$jsCondition."){\n".$jsSource."\n}";
77 77
 		}
78 78
 		return $jsSource;
79 79
 	}
80 80
 
81 81
 
82
-	protected function _getAjaxUrl($url,$attr){
82
+	protected function _getAjaxUrl($url, $attr) {
83 83
 		$url=$this->_correctAjaxUrl($url);
84 84
 		$retour="url='".$url."';";
85 85
 		$slash="/";
86
-		if(JString::endswith($url, "/")===true){
86
+		if (JString::endswith($url, "/")===true) {
87 87
 			$slash="";
88 88
 		}
89
-		if(JString::isNotNull($attr)){
90
-			if ($attr==="value"){
89
+		if (JString::isNotNull($attr)) {
90
+			if ($attr==="value") {
91 91
 				$retour.="url=url+'".$slash."'+$(this).val();\n";
92
-			}elseif ($attr==="html"){
92
+			}elseif ($attr==="html") {
93 93
 				$retour.="url=url+'".$slash."'+$(this).html();\n";
94
-			}elseif(\substr($attr, 0,3)==="js:"){
94
+			}elseif (\substr($attr, 0, 3)==="js:") {
95 95
 				$retour.="url=url+'".$slash."'+".\substr($attr, 3).";\n";
96
-			}elseif($attr!==null && $attr!=="")
96
+			}elseif ($attr!==null && $attr!=="")
97 97
 				$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
98 98
 		}
99 99
 		return $retour;
100 100
 	}
101 101
 	
102
-	protected function onPopstate(){
102
+	protected function onPopstate() {
103 103
 		return "window.onpopstate = function(e){if(e.state){var target=e.state.jqueryDone;$(e.state.selector)[target](e.state.html);}};";
104 104
 	}
105 105
 	
106
-	protected function autoActiveLinks($previousURL="window.location.href"){
107
-		$result= "\nfunction getHref(url) { return \$('a').filter(function(){return \$(this).prop('href') == url; });}";
106
+	protected function autoActiveLinks($previousURL="window.location.href") {
107
+		$result="\nfunction getHref(url) { return \$('a').filter(function(){return \$(this).prop('href') == url; });}";
108 108
 		$result.="\nvar myurl={$previousURL};if(window._previousURL) getHref(window._previousURL).removeClass('active');getHref(myurl).addClass('active');window._previousURL=myurl;";
109 109
 		return $result;
110 110
 	}
111 111
 
112
-	protected function _getOnAjaxDone($responseElement,$jqueryDone,$ajaxTransition,$jsCallback,$hasLoader=false,$history=null){
113
-		$retour="";$call=null;
112
+	protected function _getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader=false, $history=null) {
113
+		$retour=""; $call=null;
114 114
 		if (JString::isNotNull($responseElement)) {
115
-			if(isset($ajaxTransition)){
115
+			if (isset($ajaxTransition)) {
116 116
 				$call=$this->setAjaxDataCall($ajaxTransition);
117
-			}elseif(isset($this->ajaxTransition)){
117
+			}elseif (isset($this->ajaxTransition)) {
118 118
 				$call=$this->ajaxTransition;
119 119
 			}
120
-			if(\is_callable($call))
121
-				$retour="\t".$call($responseElement,$jqueryDone).";\n";
120
+			if (\is_callable($call))
121
+				$retour="\t".$call($responseElement, $jqueryDone).";\n";
122 122
 			else
123 123
 				$retour="\t{$responseElement}.{$jqueryDone}( data );\n";
124 124
 		}
125
-		if(isset($history)){
126
-			if($this->params["autoActiveLinks"]){
125
+		if (isset($history)) {
126
+			if ($this->params["autoActiveLinks"]) {
127 127
 				$retour.=$this->autoActiveLinks("url");
128 128
 			}
129 129
 			$retour.="\nwindow.history.pushState({'html':data,'selector':".Javascript::prep_value($history).",'jqueryDone':'{$jqueryDone}'},'', url);";
130 130
 		}
131
-		if($hasLoader==="internal"){
131
+		if ($hasLoader==="internal") {
132 132
 			$retour.="\n$(self).removeClass('loading');";
133 133
 		}
134 134
 		$retour.="\t".$jsCallback."\n";
135 135
 		return $retour;
136 136
 	}
137 137
 
138
-	protected function _getResponseElement($responseElement){
138
+	protected function _getResponseElement($responseElement) {
139 139
 		if (JString::isNotNull($responseElement)) {
140 140
 			$responseElement=Javascript::prep_jquery_selector($responseElement);
141 141
 		}
@@ -145,33 +145,33 @@  discard block
 block discarded – undo
145 145
 	protected function _correctAjaxUrl($url) {
146 146
 		if ($url!=="/" && JString::endsWith($url, "/")===true)
147 147
 			$url=substr($url, 0, strlen($url)-1);
148
-			if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
148
+			if (strncmp($url, 'http://', 7)!=0 && strncmp($url, 'https://', 8)!=0) {
149 149
 				$url=$this->getUrl($url);
150 150
 			}
151 151
 			return $url;
152 152
 	}
153 153
 
154
-	public static function _correctParams($params){
155
-		if(JString::isNull($params)){
154
+	public static function _correctParams($params) {
155
+		if (JString::isNull($params)) {
156 156
 			return "";
157 157
 		}
158
-		if(\preg_match("@^\{.*?\}$@", $params)){
158
+		if (\preg_match("@^\{.*?\}$@", $params)) {
159 159
 			return '$.param('.$params.')';
160 160
 		}
161 161
 		return $params;
162 162
 	}
163 163
 
164
-	public static function _implodeParams($parameters){
164
+	public static function _implodeParams($parameters) {
165 165
 		$allParameters=[];
166
-		foreach ($parameters as $params){
167
-			if(isset($params))
166
+		foreach ($parameters as $params) {
167
+			if (isset($params))
168 168
 				$allParameters[]=self::_correctParams($params);
169 169
 		}
170 170
 		return \implode("+'&'+", $allParameters);
171 171
 	}
172 172
 
173
-	protected function addLoading(&$retour, $responseElement,$ajaxLoader=null) {
174
-		if(!isset($ajaxLoader)){
173
+	protected function addLoading(&$retour, $responseElement, $ajaxLoader=null) {
174
+		if (!isset($ajaxLoader)) {
175 175
 			$ajaxLoader=$this->ajaxLoader;
176 176
 		}
177 177
 		$loading_notifier='<div class="ajax-loader">'.$ajaxLoader.'</div>';
@@ -179,19 +179,19 @@  discard block
 block discarded – undo
179 179
 		$retour.="\t\t{$responseElement}.prepend('{$loading_notifier}');\n";
180 180
 	}
181 181
 
182
-	protected function setAjaxDataCall($params){
182
+	protected function setAjaxDataCall($params) {
183 183
 		$result=null;
184
-		if(!\is_callable($params)){
185
-			$result=function ($responseElement,$jqueryDone="html") use($params){
186
-				return AjaxTransition::{$params}($responseElement,$jqueryDone);
184
+		if (!\is_callable($params)) {
185
+			$result=function($responseElement, $jqueryDone="html") use($params){
186
+				return AjaxTransition::{$params}($responseElement, $jqueryDone);
187 187
 			};
188 188
 		}
189 189
 		return $result;
190 190
 	}
191 191
 
192
-	protected function setDefaultParameters(&$parameters,$default){
193
-		foreach ($default as $k=>$v){
194
-			if(!isset($parameters[$k]))
192
+	protected function setDefaultParameters(&$parameters, $default) {
193
+		foreach ($default as $k=>$v) {
194
+			if (!isset($parameters[$k]))
195 195
 				$parameters[$k]=$v;
196 196
 		}
197 197
 	}
@@ -205,8 +205,8 @@  discard block
 block discarded – undo
205 205
 	 * @param string $url The url of the request
206 206
 	 * @param string $responseElement selector of the HTML element displaying the answer
207 207
 	 */
208
-	private function _get($url, $responseElement="",$parameters=[]) {
209
-		return $this->_ajax("get", $url,$responseElement,$parameters);
208
+	private function _get($url, $responseElement="", $parameters=[]) {
209
+		return $this->_ajax("get", $url, $responseElement, $parameters);
210 210
 	}
211 211
 
212 212
 	/**
@@ -215,9 +215,9 @@  discard block
 block discarded – undo
215 215
 	 * @param string $responseElement selector of the HTML element displaying the answer
216 216
 	 * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false)
217 217
 	 */
218
-	public function get($url, $responseElement="",$parameters=[]) {
218
+	public function get($url, $responseElement="", $parameters=[]) {
219 219
 		$parameters["immediatly"]=true;
220
-		return $this->_get($url,$responseElement,$parameters);
220
+		return $this->_get($url, $responseElement, $parameters);
221 221
 	}
222 222
 
223 223
 	/**
@@ -227,9 +227,9 @@  discard block
 block discarded – undo
227 227
 	 * @param string $responseElement selector of the HTML element displaying the answer
228 228
 	 * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false)
229 229
 	 */
230
-	public function ajax($method,$url, $responseElement="", $parameters=[]) {
230
+	public function ajax($method, $url, $responseElement="", $parameters=[]) {
231 231
 		$parameters["immediatly"]=true;
232
-		return $this->_ajax($method,$url,$responseElement,$parameters);
232
+		return $this->_ajax($method, $url, $responseElement, $parameters);
233 233
 	}
234 234
 	
235 235
 	/**
@@ -242,8 +242,8 @@  discard block
 block discarded – undo
242 242
 	 * @param array $parameters  The ajax parameters, default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false) 
243 243
 	 * @return string
244 244
 	 */
245
-	public function ajaxInterval($method,$url, $interval,$globalName=null,$responseElement="", $parameters=[]){
246
-		return $this->interval($this->ajaxDeferred($method, $url,$responseElement,$parameters), $interval,$globalName);
245
+	public function ajaxInterval($method, $url, $interval, $globalName=null, $responseElement="", $parameters=[]) {
246
+		return $this->interval($this->ajaxDeferred($method, $url, $responseElement, $parameters), $interval, $globalName);
247 247
 	}
248 248
 
249 249
 	/**
@@ -253,9 +253,9 @@  discard block
 block discarded – undo
253 253
 	 * @param string $responseElement selector of the HTML element displaying the answer
254 254
 	 * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false)
255 255
 	 */
256
-	public function ajaxDeferred($method,$url, $responseElement="", $parameters=[]) {
256
+	public function ajaxDeferred($method, $url, $responseElement="", $parameters=[]) {
257 257
 		$parameters["immediatly"]=false;
258
-		return $this->_ajax($method,$url,$responseElement,$parameters);
258
+		return $this->_ajax($method, $url, $responseElement, $parameters);
259 259
 	}
260 260
 
261 261
 	/**
@@ -264,8 +264,8 @@  discard block
 block discarded – undo
264 264
 	 * @param string $method Method used
265 265
 	 * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>"document","jsCondition"=>NULL,"headers"=>null,"immediatly"=>false)
266 266
 	 */
267
-	private function _json($url, $method="get",$parameters=[]) {
268
-		$parameters=\array_merge($parameters,["hasLoader"=>false]);
267
+	private function _json($url, $method="get", $parameters=[]) {
268
+		$parameters=\array_merge($parameters, ["hasLoader"=>false]);
269 269
 		$jsCallback=isset($parameters['jsCallback']) ? $parameters['jsCallback'] : "";
270 270
 		$context=isset($parameters['context']) ? $parameters['context'] : "document";
271 271
 		$retour="\tdata=($.isPlainObject(data))?data:JSON.parse(data);\t".$jsCallback.";"
@@ -273,7 +273,7 @@  discard block
 block discarded – undo
273 273
 				."if($('#'+key,".$context.").length){ if($('#'+key,".$context.").is('[value]')) { $('#'+key,".$context.").val(data[key]);} else { $('#'+key,".$context.").html(data[key]); }}};\n";
274 274
 				$retour.="\t$(document).trigger('jsonReady',[data]);\n";
275 275
 		$parameters["jsCallback"]=$retour;
276
-		return $this->_ajax($method, $url,null,$parameters);
276
+		return $this->_ajax($method, $url, null, $parameters);
277 277
 	}
278 278
 	
279 279
 	/**
@@ -283,7 +283,7 @@  discard block
 block discarded – undo
283 283
 	 * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>"document","jsCondition"=>NULL,"headers"=>null,"immediatly"=>false)
284 284
 	 */
285 285
 	public function json($url, $method="get", $parameters=[]) {
286
-		return $this->_json($url,$method,$parameters);
286
+		return $this->_json($url, $method, $parameters);
287 287
 	}
288 288
 
289 289
 	/**
@@ -294,9 +294,9 @@  discard block
 block discarded – undo
294 294
 	 * @param string $method default get
295 295
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true)
296 296
 	 */
297
-	public function jsonOn($event,$element, $url,$method="get",$parameters=array()) {
298
-		$this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]);
299
-		return $this->_add_event($element, $this->jsonDeferred($url,$method, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]);
297
+	public function jsonOn($event, $element, $url, $method="get", $parameters=array()) {
298
+		$this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]);
299
+		return $this->_add_event($element, $this->jsonDeferred($url, $method, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]);
300 300
 	}
301 301
 
302 302
 	/**
@@ -307,7 +307,7 @@  discard block
 block discarded – undo
307 307
 	 */
308 308
 	public function jsonDeferred($url, $method="get", $parameters=[]) {
309 309
 		$parameters["immediatly"]=false;
310
-		return $this->_json($url,$method,$parameters);
310
+		return $this->_json($url, $method, $parameters);
311 311
 	}
312 312
 
313 313
 	/**
@@ -318,27 +318,27 @@  discard block
 block discarded – undo
318 318
 	 * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"rowClass"=>"_json")
319 319
 	 */
320 320
 	private function _jsonArray($maskSelector, $url, $method="get", $parameters=[]) {
321
-		$parameters=\array_merge($parameters,["hasLoader"=>false]);
321
+		$parameters=\array_merge($parameters, ["hasLoader"=>false]);
322 322
 		$rowClass=isset($parameters['rowClass']) ? $parameters['rowClass'] : "_json";
323 323
 		$jsCallback=isset($parameters['jsCallback']) ? $parameters['jsCallback'] : "";
324 324
 		$context=isset($parameters['context']) ? $parameters['context'] : null;
325
-		if($context===null){
325
+		if ($context===null) {
326 326
 			$parent="$('".$maskSelector."').parent()";
327
-			$newElm = "$('#'+newId)";
328
-		}else{
327
+			$newElm="$('#'+newId)";
328
+		} else {
329 329
 			$parent=$context;
330
-			$newElm = $context.".find('#'+newId)";
330
+			$newElm=$context.".find('#'+newId)";
331 331
 		}
332 332
 		$appendTo="\t\tnewElm.appendTo(".$parent.");\n";
333 333
 		$retour=$parent.".find('.{$rowClass}').remove();";
334 334
 		$retour.="\tdata=($.isPlainObject(data)||$.isArray(data))?data:JSON.parse(data);\n$.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();
335 335
 		newElm.attr('id',newId);\n;newElm.addClass('{$rowClass}').removeClass('_jsonArrayModel');\nnewElm.find('[id]').each(function(){ var newId=$(this).attr('id')+'-'+index;$(this).attr('id',newId).removeClass('_jsonArrayChecked');});\n";
336
-		$retour.= $appendTo;
336
+		$retour.=$appendTo;
337 337
 		$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";
338 338
 		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
339 339
 		$retour.="\t".$jsCallback;
340 340
 		$parameters["jsCallback"]=$retour;
341
-		return $this->_ajax($method, $url,null,$parameters);
341
+		return $this->_ajax($method, $url, null, $parameters);
342 342
 	}
343 343
 
344 344
 	/**
@@ -349,7 +349,7 @@  discard block
 block discarded – undo
349 349
 	 * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"rowClass"=>"_json")
350 350
 	 */
351 351
 	public function jsonArray($maskSelector, $url, $method="get", $parameters=[]) {
352
-		return $this->_jsonArray($maskSelector, $url,$method,$parameters);
352
+		return $this->_jsonArray($maskSelector, $url, $method, $parameters);
353 353
 	}
354 354
 
355 355
 	/**
@@ -372,9 +372,9 @@  discard block
 block discarded – undo
372 372
 	 * @param string $method Method used, default : get
373 373
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","rowClass"=>"_json","immediatly"=>true)
374 374
 	 */
375
-	public function jsonArrayOn($event,$element,$maskSelector, $url,$method="get",$parameters=array()) {
376
-		$this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]);
377
-		return $this->_add_event($element, $this->jsonArrayDeferred($maskSelector,$url,$method, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]);
375
+	public function jsonArrayOn($event, $element, $maskSelector, $url, $method="get", $parameters=array()) {
376
+		$this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]);
377
+		return $this->_add_event($element, $this->jsonArrayDeferred($maskSelector, $url, $method, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]);
378 378
 	}
379 379
 
380 380
 	/**
@@ -386,7 +386,7 @@  discard block
 block discarded – undo
386 386
 	 */
387 387
 	public function getDeferred($url, $responseElement="", $parameters=[]) {
388 388
 		$parameters["immediatly"]=false;
389
-		return $this->_get($url, $responseElement,$parameters);
389
+		return $this->_get($url, $responseElement, $parameters);
390 390
 	}
391 391
 
392 392
 	/**
@@ -399,8 +399,8 @@  discard block
 block discarded – undo
399 399
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>null,"headers"=>null,"historize"=>false)
400 400
 	 */
401 401
 	public function getOn($event, $element, $url, $responseElement="", $parameters=array()) {
402
-		$this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]);
403
-		return $this->_add_event($element, $this->getDeferred($url,$responseElement,$parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]);
402
+		$this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]);
403
+		return $this->_add_event($element, $this->getDeferred($url, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]);
404 404
 	}
405 405
 
406 406
 	/**
@@ -413,8 +413,8 @@  discard block
 block discarded – undo
413 413
 	 * @param array $parameters default : array("method"=>"get","preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>false)
414 414
 	 */
415 415
 	public function ajaxOn($event, $element, $url, $responseElement="", $parameters=array()) {
416
-		$this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true,"method"=>"get"]);
417
-		return $this->_add_event($element, $this->ajaxDeferred($parameters["method"],$url,$responseElement,$parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]);
416
+		$this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true, "method"=>"get"]);
417
+		return $this->_add_event($element, $this->ajaxDeferred($parameters["method"], $url, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]);
418 418
 	}
419 419
 
420 420
 	/**
@@ -448,15 +448,15 @@  discard block
 block discarded – undo
448 448
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"href","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>true)
449 449
 	 * @return $this
450 450
 	 */
451
-	public function getHref($element,$responseElement="",$parameters=array()){
451
+	public function getHref($element, $responseElement="", $parameters=array()) {
452 452
 		$parameters["attr"]="href";
453
-		if(JString::isNull($responseElement)){
453
+		if (JString::isNull($responseElement)) {
454 454
 			$responseElement='%$(self).attr("data-target")%';
455 455
 		}
456
-		if(!isset($parameters["historize"])){
456
+		if (!isset($parameters["historize"])) {
457 457
 			$parameters["historize"]=true;
458 458
 		}
459
-		return $this->getOnClick($element, "",$responseElement,$parameters);
459
+		return $this->getOnClick($element, "", $responseElement, $parameters);
460 460
 	}
461 461
 	
462 462
 	/**
@@ -466,20 +466,20 @@  discard block
 block discarded – undo
466 466
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"href","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>false)
467 467
 	 * @return $this
468 468
 	 */
469
-	public function postHref($element,$responseElement="",$parameters=array()){
469
+	public function postHref($element, $responseElement="", $parameters=array()) {
470 470
 		$parameters["attr"]="href";
471
-		if(JString::isNull($responseElement)){
471
+		if (JString::isNull($responseElement)) {
472 472
 			$responseElement='%$(this).attr("data-target")%';
473 473
 		}
474
-		if(!isset($parameters["historize"])){
474
+		if (!isset($parameters["historize"])) {
475 475
 			$parameters["historize"]=true;
476 476
 		}
477
-		return $this->postOnClick($element, "","{}",$responseElement,$parameters);
477
+		return $this->postOnClick($element, "", "{}", $responseElement, $parameters);
478 478
 	}
479 479
 
480
-	private function _post($url, $params="{}",$responseElement="", $parameters=[]) {
480
+	private function _post($url, $params="{}", $responseElement="", $parameters=[]) {
481 481
 		$parameters["params"]=$params;
482
-		return $this->_ajax("POST", $url,$responseElement,$parameters);
482
+		return $this->_ajax("POST", $url, $responseElement, $parameters);
483 483
 	}
484 484
 
485 485
 	/**
@@ -489,8 +489,8 @@  discard block
 block discarded – undo
489 489
 	 * @param string $params JSON parameters
490 490
 	 * @param array $parameters default : array("jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false)
491 491
 	 */
492
-	public function post($url, $params="{}",$responseElement="", $parameters=[]) {
493
-		return $this->_post($url, $params,$responseElement, $parameters);
492
+	public function post($url, $params="{}", $responseElement="", $parameters=[]) {
493
+		return $this->_post($url, $params, $responseElement, $parameters);
494 494
 	}
495 495
 
496 496
 	/**
@@ -501,7 +501,7 @@  discard block
 block discarded – undo
501 501
 	 * @param string $responseElement selector of the HTML element displaying the answer
502 502
 	 * @param array $parameters default : array("jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false)
503 503
 	 */
504
-	public function postDeferred($url, $params="{}",$responseElement="", $parameters=[]) {
504
+	public function postDeferred($url, $params="{}", $responseElement="", $parameters=[]) {
505 505
 		$parameters["immediatly"]=false;
506 506
 		return $this->_post($url, $params, $responseElement, $parameters);
507 507
 	}
@@ -517,8 +517,8 @@  discard block
 block discarded – undo
517 517
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false)
518 518
 	 */
519 519
 	public function postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
520
-		$this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]);
521
-		return $this->_add_event($element, $this->postDeferred($url, $params, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]);
520
+		$this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]);
521
+		return $this->_add_event($element, $this->postDeferred($url, $params, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]);
522 522
 	}
523 523
 
524 524
 	/**
@@ -535,33 +535,33 @@  discard block
 block discarded – undo
535 535
 	}
536 536
 
537 537
 	private function _postForm($url, $form, $responseElement, $parameters=[]) {
538
-		if(isset($this->params["ajax"])){
538
+		if (isset($this->params["ajax"])) {
539 539
 			extract($this->params["ajax"]);
540 540
 		}
541
-		$params="{}";$validation=false;
541
+		$params="{}"; $validation=false;
542 542
 		\extract($parameters);
543
-		$async=($async)?"true":"false";
543
+		$async=($async) ? "true" : "false";
544 544
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
545 545
 		$retour=$this->_getAjaxUrl($url, $attr);
546 546
 		$retour.="\n$('#".$form."').trigger('ajaxSubmit');";
547 547
 		$retour.="\nvar params=$('#".$form."').serialize();\n";
548
-		if(isset($params)){
548
+		if (isset($params)) {
549 549
 			$retour.="params+='&'+".self::_correctParams($params).";\n";
550 550
 		}
551 551
 		$responseElement=$this->_getResponseElement($responseElement);
552 552
 		$retour.="var self=this;\n";
553
-		if($hasLoader===true){
554
-			$this->addLoading($retour, $responseElement,$ajaxLoader);
555
-		}elseif($hasLoader==="internal"){
553
+		if ($hasLoader===true) {
554
+			$this->addLoading($retour, $responseElement, $ajaxLoader);
555
+		}elseif ($hasLoader==="internal") {
556 556
 			$retour.="\n$(this).addClass('loading');";
557 557
 		}
558
-		$ajaxParameters=["url"=>"url","method"=>"'POST'","data"=>"params","async"=>$async];
559
-		if(isset($headers)){
558
+		$ajaxParameters=["url"=>"url", "method"=>"'POST'", "data"=>"params", "async"=>$async];
559
+		if (isset($headers)) {
560 560
 			$ajaxParameters["headers"]=$headers;
561 561
 		}
562 562
 		$this->createAjaxParameters($ajaxParameters, $parameters);
563 563
 		$retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data ) {\n";
564
-		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback,$hasLoader)."});\n";
564
+		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader)."});\n";
565 565
 
566 566
 		if ($validation) {
567 567
 			$retour="$('#".$form."').validate({submitHandler: function(form) {
@@ -611,8 +611,8 @@  discard block
 block discarded – undo
611 611
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>null,"headers"=>null,"historize"=>false)
612 612
 	 */
613 613
 	public function postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) {
614
-		$this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]);
615
-		return $this->_add_event($element, $this->postFormDeferred($url, $form, $responseElement,$parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]);
614
+		$this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]);
615
+		return $this->_add_event($element, $this->postFormDeferred($url, $form, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]);
616 616
 	}
617 617
 
618 618
 	/**
Please login to merge, or discard this patch.
Braces   +29 added lines, -22 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 		$retour.=$before;
36 36
 		if($hasLoader===true && JString::isNotNull($responseElement)){
37 37
 			$this->addLoading($retour, $responseElement,$ajaxLoader);
38
-		}elseif($hasLoader==="internal"){
38
+		} elseif($hasLoader==="internal"){
39 39
 			$retour.="\n$(this).addClass('loading');";
40 40
 		}
41 41
 		$ajaxParameters=["url"=>"url","method"=>"'".\strtoupper($method)."'"];
@@ -52,8 +52,9 @@  discard block
 block discarded – undo
52 52
 		$retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data, textStatus, jqXHR ) {\n";
53 53
 		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback,$hasLoader,($historize?$originalSelector:null))."});\n";
54 54
 		$retour=$this->_addJsCondition($jsCondition,$retour);
55
-		if ($immediatly)
56
-			$this->jquery_code_for_compile[]=$retour;
55
+		if ($immediatly) {
56
+					$this->jquery_code_for_compile[]=$retour;
57
+		}
57 58
 		return $retour;
58 59
 	}
59 60
 
@@ -89,12 +90,13 @@  discard block
 block discarded – undo
89 90
 		if(JString::isNotNull($attr)){
90 91
 			if ($attr==="value"){
91 92
 				$retour.="url=url+'".$slash."'+$(this).val();\n";
92
-			}elseif ($attr==="html"){
93
+			} elseif ($attr==="html"){
93 94
 				$retour.="url=url+'".$slash."'+$(this).html();\n";
94
-			}elseif(\substr($attr, 0,3)==="js:"){
95
+			} elseif(\substr($attr, 0,3)==="js:"){
95 96
 				$retour.="url=url+'".$slash."'+".\substr($attr, 3).";\n";
96
-			}elseif($attr!==null && $attr!=="")
97
-				$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
97
+			} elseif($attr!==null && $attr!=="") {
98
+							$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
99
+			}
98 100
 		}
99 101
 		return $retour;
100 102
 	}
@@ -114,13 +116,14 @@  discard block
 block discarded – undo
114 116
 		if (JString::isNotNull($responseElement)) {
115 117
 			if(isset($ajaxTransition)){
116 118
 				$call=$this->setAjaxDataCall($ajaxTransition);
117
-			}elseif(isset($this->ajaxTransition)){
119
+			} elseif(isset($this->ajaxTransition)){
118 120
 				$call=$this->ajaxTransition;
119 121
 			}
120
-			if(\is_callable($call))
121
-				$retour="\t".$call($responseElement,$jqueryDone).";\n";
122
-			else
123
-				$retour="\t{$responseElement}.{$jqueryDone}( data );\n";
122
+			if(\is_callable($call)) {
123
+							$retour="\t".$call($responseElement,$jqueryDone).";\n";
124
+			} else {
125
+							$retour="\t{$responseElement}.{$jqueryDone}( data );\n";
126
+			}
124 127
 		}
125 128
 		if(isset($history)){
126 129
 			if($this->params["autoActiveLinks"]){
@@ -143,8 +146,9 @@  discard block
 block discarded – undo
143 146
 	}
144 147
 
145 148
 	protected function _correctAjaxUrl($url) {
146
-		if ($url!=="/" && JString::endsWith($url, "/")===true)
147
-			$url=substr($url, 0, strlen($url)-1);
149
+		if ($url!=="/" && JString::endsWith($url, "/")===true) {
150
+					$url=substr($url, 0, strlen($url)-1);
151
+		}
148 152
 			if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
149 153
 				$url=$this->getUrl($url);
150 154
 			}
@@ -164,8 +168,9 @@  discard block
 block discarded – undo
164 168
 	public static function _implodeParams($parameters){
165 169
 		$allParameters=[];
166 170
 		foreach ($parameters as $params){
167
-			if(isset($params))
168
-				$allParameters[]=self::_correctParams($params);
171
+			if(isset($params)) {
172
+							$allParameters[]=self::_correctParams($params);
173
+			}
169 174
 		}
170 175
 		return \implode("+'&'+", $allParameters);
171 176
 	}
@@ -191,8 +196,9 @@  discard block
 block discarded – undo
191 196
 
192 197
 	protected function setDefaultParameters(&$parameters,$default){
193 198
 		foreach ($default as $k=>$v){
194
-			if(!isset($parameters[$k]))
195
-				$parameters[$k]=$v;
199
+			if(!isset($parameters[$k])) {
200
+							$parameters[$k]=$v;
201
+			}
196 202
 		}
197 203
 	}
198 204
 
@@ -325,7 +331,7 @@  discard block
 block discarded – undo
325 331
 		if($context===null){
326 332
 			$parent="$('".$maskSelector."').parent()";
327 333
 			$newElm = "$('#'+newId)";
328
-		}else{
334
+		} else{
329 335
 			$parent=$context;
330 336
 			$newElm = $context.".find('#'+newId)";
331 337
 		}
@@ -552,7 +558,7 @@  discard block
 block discarded – undo
552 558
 		$retour.="var self=this;\n";
553 559
 		if($hasLoader===true){
554 560
 			$this->addLoading($retour, $responseElement,$ajaxLoader);
555
-		}elseif($hasLoader==="internal"){
561
+		} elseif($hasLoader==="internal"){
556 562
 			$retour.="\n$(this).addClass('loading');";
557 563
 		}
558 564
 		$ajaxParameters=["url"=>"url","method"=>"'POST'","data"=>"params","async"=>$async];
@@ -570,8 +576,9 @@  discard block
 block discarded – undo
570 576
 			$retour.="$('#".$form."').submit();\n";
571 577
 		}
572 578
 		$retour=$this->_addJsCondition($jsCondition, $retour);
573
-		if ($immediatly)
574
-			$this->jquery_code_for_compile[]=$retour;
579
+		if ($immediatly) {
580
+					$this->jquery_code_for_compile[]=$retour;
581
+		}
575 582
 		return $retour;
576 583
 	}
577 584
 
Please login to merge, or discard this patch.
Ajax/common/html/HtmlDoubleElement.php 2 patches
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -30,15 +30,15 @@  discard block
 block discarded – undo
30 30
 		return $this->content;
31 31
 	}
32 32
 
33
-	public function addContent($content,$before=false) {
33
+	public function addContent($content, $before=false) {
34 34
 		if (!\is_array($this->content)) {
35
-			if(isset($this->content))
36
-				$this->content=array ($this->content);
35
+			if (isset($this->content))
36
+				$this->content=array($this->content);
37 37
 			else
38 38
 				$this->content=array();
39 39
 		}
40
-		if($before)
41
-			array_unshift($this->content,$content);
40
+		if ($before)
41
+			array_unshift($this->content, $content);
42 42
 		else
43 43
 			$this->content []=$content;
44 44
 		return $this;
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 		if ($this->content instanceof HtmlDoubleElement) {
54 54
 			$this->content->run($js);
55 55
 		} else if (\is_array($this->content)) {
56
-			foreach ( $this->content as $itemContent ) {
56
+			foreach ($this->content as $itemContent) {
57 57
 				if ($itemContent instanceof HtmlDoubleElement) {
58 58
 					$itemContent->run($js);
59 59
 				}
@@ -70,19 +70,19 @@  discard block
 block discarded – undo
70 70
 		return $this;
71 71
 	}
72 72
 
73
-	public function getContentInstances($class){
74
-		return $this->_getContentInstances($class,$this->content);
73
+	public function getContentInstances($class) {
74
+		return $this->_getContentInstances($class, $this->content);
75 75
 	}
76 76
 
77
-	protected function _getContentInstances($class,$content){
77
+	protected function _getContentInstances($class, $content) {
78 78
 		$instances=[];
79
-		if($content instanceof $class){
79
+		if ($content instanceof $class) {
80 80
 			$instances[]=$content;
81
-		}elseif($content instanceof HtmlDoubleElement){
82
-			$instances=\array_merge($instances,$content->getContentInstances($class));
83
-		}elseif (\is_array($content)){
84
-			foreach ($content as $element){
85
-				$instances=\array_merge($instances,$this->_getContentInstances($class, $element));
81
+		}elseif ($content instanceof HtmlDoubleElement) {
82
+			$instances=\array_merge($instances, $content->getContentInstances($class));
83
+		}elseif (\is_array($content)) {
84
+			foreach ($content as $element) {
85
+				$instances=\array_merge($instances, $this->_getContentInstances($class, $element));
86 86
 			}
87 87
 		}
88 88
 		return $instances;
@@ -92,36 +92,36 @@  discard block
 block discarded – undo
92 92
 	 * Transforms the element into a link
93 93
 	 * @return HtmlDoubleElement
94 94
 	 */
95
-	public function asLink($href=NULL,$target=NULL) {
95
+	public function asLink($href=NULL, $target=NULL) {
96 96
 		if (isset($href))
97 97
 			$this->setProperty("href", $href);
98
-		if(isset($target))
98
+		if (isset($target))
99 99
 			$this->setProperty("target", $target);
100 100
 		return $this->setTagName("a");
101 101
 	}
102 102
 	
103
-	public function getTextContent(){
104
-		if(is_array($this->content)){
103
+	public function getTextContent() {
104
+		if (is_array($this->content)) {
105 105
 			return strip_tags(implode("", $this->content));
106 106
 		}
107 107
 		return strip_tags($this->content);
108 108
 	}
109 109
 	
110
-	public function asEditable(HtmlFormField $field,$asForm=false,$setValueProperty="val()"){
110
+	public function asEditable(HtmlFormField $field, $asForm=false, $setValueProperty="val()") {
111 111
 		$idF=$field->getIdentifier();
112 112
 		$idE=$idF;
113
-		if($asForm){
113
+		if ($asForm) {
114 114
 			$frm=new HtmlForm("frm-".$field->getIdentifier());
115 115
 			$frm->setProperty("onsubmit", "return false;");
116 116
 			$fields=$frm->addFields();
117 117
 			$idE=$frm->getIdentifier();
118 118
 			$fields->addItem($field);
119
-			$fields->addButtonIcon("bt-okay", "check","green mini","\$('#".$idE."').trigger('validate',{value: $('#'+idF+' input').val()});");
120
-			$fields->addButtonIcon("bt-cancel", "close","mini","\$('#".$idE."').trigger('endEdit');");
119
+			$fields->addButtonIcon("bt-okay", "check", "green mini", "\$('#".$idE."').trigger('validate',{value: $('#'+idF+' input').val()});");
120
+			$fields->addButtonIcon("bt-cancel", "close", "mini", "\$('#".$idE."').trigger('endEdit');");
121 121
 			$this->_editableContent=$frm;
122 122
 			$keypress="";
123 123
 			$focusOut="";
124
-		}else{
124
+		} else {
125 125
 			$focusOut="if(e.relatedTarget==null)elm.trigger('endEdit');";
126 126
 			$this->_editableContent=$field;
127 127
 			$keypress="$('#".$idF."').keyup(function(e){if(e.which == 13) {\$('#".$idE."').trigger('validate',{value: $('#'+idF+' input').val()});}if(e.keyCode===27) {\$('#".$idE."').trigger('endEdit');}});";
@@ -134,11 +134,11 @@  discard block
 block discarded – undo
134 134
 	 * {@inheritDoc}
135 135
 	 * @see \Ajax\common\html\BaseHtml::compile_once()
136 136
 	 */
137
-	protected function compile_once(\Ajax\JsUtils $js = NULL, &$view = NULL) {
138
-		if(!$this->_compiled && isset($this->_editableContent)){
139
-			$this->wrap("",$this->_editableContent);
137
+	protected function compile_once(\Ajax\JsUtils $js=NULL, &$view=NULL) {
138
+		if (!$this->_compiled && isset($this->_editableContent)) {
139
+			$this->wrap("", $this->_editableContent);
140 140
 		}
141
-		parent::compile_once($js,$view);
141
+		parent::compile_once($js, $view);
142 142
 		
143 143
 	}
144 144
 
Please login to merge, or discard this patch.
Braces   +19 added lines, -15 removed lines patch added patch discarded remove patch
@@ -32,15 +32,17 @@  discard block
 block discarded – undo
32 32
 
33 33
 	public function addContent($content,$before=false) {
34 34
 		if (!\is_array($this->content)) {
35
-			if(isset($this->content))
36
-				$this->content=array ($this->content);
37
-			else
38
-				$this->content=array();
35
+			if(isset($this->content)) {
36
+							$this->content=array ($this->content);
37
+			} else {
38
+							$this->content=array();
39
+			}
40
+		}
41
+		if($before) {
42
+					array_unshift($this->content,$content);
43
+		} else {
44
+					$this->content []=$content;
39 45
 		}
40
-		if($before)
41
-			array_unshift($this->content,$content);
42
-		else
43
-			$this->content []=$content;
44 46
 		return $this;
45 47
 	}
46 48
 
@@ -78,9 +80,9 @@  discard block
 block discarded – undo
78 80
 		$instances=[];
79 81
 		if($content instanceof $class){
80 82
 			$instances[]=$content;
81
-		}elseif($content instanceof HtmlDoubleElement){
83
+		} elseif($content instanceof HtmlDoubleElement){
82 84
 			$instances=\array_merge($instances,$content->getContentInstances($class));
83
-		}elseif (\is_array($content)){
85
+		} elseif (\is_array($content)){
84 86
 			foreach ($content as $element){
85 87
 				$instances=\array_merge($instances,$this->_getContentInstances($class, $element));
86 88
 			}
@@ -93,10 +95,12 @@  discard block
 block discarded – undo
93 95
 	 * @return HtmlDoubleElement
94 96
 	 */
95 97
 	public function asLink($href=NULL,$target=NULL) {
96
-		if (isset($href))
97
-			$this->setProperty("href", $href);
98
-		if(isset($target))
99
-			$this->setProperty("target", $target);
98
+		if (isset($href)) {
99
+					$this->setProperty("href", $href);
100
+		}
101
+		if(isset($target)) {
102
+					$this->setProperty("target", $target);
103
+		}
100 104
 		return $this->setTagName("a");
101 105
 	}
102 106
 	
@@ -121,7 +125,7 @@  discard block
 block discarded – undo
121 125
 			$this->_editableContent=$frm;
122 126
 			$keypress="";
123 127
 			$focusOut="";
124
-		}else{
128
+		} else{
125 129
 			$focusOut="if(e.relatedTarget==null)elm.trigger('endEdit');";
126 130
 			$this->_editableContent=$field;
127 131
 			$keypress="$('#".$idF."').keyup(function(e){if(e.which == 13) {\$('#".$idE."').trigger('validate',{value: $('#'+idF+' input').val()});}if(e.keyCode===27) {\$('#".$idE."').trigger('endEdit');}});";
Please login to merge, or discard this patch.
Ajax/common/html/traits/BaseHooksTrait.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
 	 * @param string $hookKey
10 10
 	 * @return boolean
11 11
 	 */
12
-	public function hookExists($hookKey){
12
+	public function hookExists($hookKey) {
13 13
 		return isset($this->_hooks[$hookKey]);
14 14
 	}
15 15
 	
@@ -17,8 +17,8 @@  discard block
 block discarded – undo
17 17
 	 * @param string $hookKey
18 18
 	 * @return callable|NULL
19 19
 	 */
20
-	public function getHook($hookKey){
21
-		if(isset($this->_hooks[$hookKey])){
20
+	public function getHook($hookKey) {
21
+		if (isset($this->_hooks[$hookKey])) {
22 22
 			return $this->_hooks[$hookKey];
23 23
 		}
24 24
 		return null;
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 	 * @param String $hookKey
30 30
 	 * @param callable $callable
31 31
 	 */
32
-	public function addHook($hookKey,$callable){
32
+	public function addHook($hookKey, $callable) {
33 33
 		$this->_hooks[$hookKey]=$callable;
34 34
 	}
35 35
 	
@@ -39,9 +39,9 @@  discard block
 block discarded – undo
39 39
 	 * @param mixed|null $variable
40 40
 	 * @return void|mixed
41 41
 	 */
42
-	public function execHook($hookKey,...$variables){
43
-		if(($hook=$this->getHook($hookKey))!=null){
44
-			return call_user_func_array($hook,$variables);
42
+	public function execHook($hookKey, ...$variables) {
43
+		if (($hook=$this->getHook($hookKey))!=null) {
44
+			return call_user_func_array($hook, $variables);
45 45
 		}
46 46
 		return;
47 47
 	}
Please login to merge, or discard this patch.
Ajax/common/html/HtmlContentOnly.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -2,8 +2,8 @@
 block discarded – undo
2 2
 
3 3
 namespace Ajax\common\html;
4 4
 
5
-class HtmlContentOnly extends HtmlDoubleElement{
6
-	public function __construct($content,$identifier=""){
5
+class HtmlContentOnly extends HtmlDoubleElement {
6
+	public function __construct($content, $identifier="") {
7 7
 		parent::__construct($identifier);
8 8
 		$this->_template='%wrapContentBefore%%content%%wrapContentAfter%';
9 9
 		$this->setContent($content);
Please login to merge, or discard this patch.
Ajax/semantic/widgets/datatable/DataTable.php 1 patch
Spacing   +145 added lines, -145 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
  *
26 26
  */
27 27
 class DataTable extends Widget {
28
-	use TableTrait,DataTableFieldAsTrait,HasCheckboxesTrait,BaseTrait;
28
+	use TableTrait, DataTableFieldAsTrait, HasCheckboxesTrait, BaseTrait;
29 29
 	protected $_searchField;
30 30
 	protected $_urls;
31 31
 	protected $_pagination;
@@ -44,41 +44,41 @@  discard block
 block discarded – undo
44 44
 	protected $_colWidths;
45 45
 
46 46
 
47
-	public function __construct($identifier,$model,$modelInstance=NULL) {
48
-		parent::__construct($identifier, $model,$modelInstance);
49
-		$this->_init(new InstanceViewer($identifier), "table", new HtmlTable($identifier, 0,0), false);
47
+	public function __construct($identifier, $model, $modelInstance=NULL) {
48
+		parent::__construct($identifier, $model, $modelInstance);
49
+		$this->_init(new InstanceViewer($identifier), "table", new HtmlTable($identifier, 0, 0), false);
50 50
 		$this->_urls=[];
51
-		$this->_emptyMessage=new HtmlMessage("","nothing to display");
51
+		$this->_emptyMessage=new HtmlMessage("", "nothing to display");
52 52
 		$this->_emptyMessage->setIcon("info circle");
53 53
 	}
54 54
 
55
-	public function run(JsUtils $js){
55
+	public function run(JsUtils $js) {
56 56
 		$offset=$js->scriptCount();
57
-		if($this->_hasCheckboxes && isset($js)){
57
+		if ($this->_hasCheckboxes && isset($js)) {
58 58
 			$this->_runCheckboxes($js);
59 59
 		}
60
-		if($this->_visibleHover){
61
-			$js->execOn("mouseover", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'visible');",["preventDefault"=>false,"stopPropagation"=>true]);
62
-			$js->execOn("mouseout", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'hidden');",["preventDefault"=>false,"stopPropagation"=>true]);
60
+		if ($this->_visibleHover) {
61
+			$js->execOn("mouseover", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'visible');", ["preventDefault"=>false, "stopPropagation"=>true]);
62
+			$js->execOn("mouseout", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'hidden');", ["preventDefault"=>false, "stopPropagation"=>true]);
63 63
 		}
64
-		if(\is_array($this->_deleteBehavior))
65
-			$this->_generateBehavior("delete",$this->_deleteBehavior, $js);
66
-		if(\is_array($this->_editBehavior))
67
-			$this->_generateBehavior("edit",$this->_editBehavior,$js);
68
-		if(\is_array($this->_displayBehavior)){
69
-			$this->_generateBehavior("display",$this->_displayBehavior,$js);
64
+		if (\is_array($this->_deleteBehavior))
65
+			$this->_generateBehavior("delete", $this->_deleteBehavior, $js);
66
+		if (\is_array($this->_editBehavior))
67
+			$this->_generateBehavior("edit", $this->_editBehavior, $js);
68
+		if (\is_array($this->_displayBehavior)) {
69
+			$this->_generateBehavior("display", $this->_displayBehavior, $js);
70 70
 		}
71 71
 		parent::run($js);
72
-		if(isset($this->_pagination))
73
-			$this->_associatePaginationBehavior($js,$offset);
74
-		$this->_associateSearchFieldBehavior($js,$offset);
72
+		if (isset($this->_pagination))
73
+			$this->_associatePaginationBehavior($js, $offset);
74
+		$this->_associateSearchFieldBehavior($js, $offset);
75 75
 			
76 76
 	}
77 77
 
78
-	protected function _generateBehavior($op,$params,JsUtils $js){
79
-		if(isset($this->_urls[$op])){
80
-			$params=\array_merge($params,["attr"=>"data-ajax"]);
81
-			$js->ajaxOnClick("#".$this->identifier." ._".$op, $this->_urls[$op],$this->getTargetSelector($op),$params);
78
+	protected function _generateBehavior($op, $params, JsUtils $js) {
79
+		if (isset($this->_urls[$op])) {
80
+			$params=\array_merge($params, ["attr"=>"data-ajax"]);
81
+			$js->ajaxOnClick("#".$this->identifier." ._".$op, $this->_urls[$op], $this->getTargetSelector($op), $params);
82 82
 		}
83 83
 	}
84 84
 
@@ -90,34 +90,34 @@  discard block
 block discarded – undo
90 90
 		return $this->content["table"];
91 91
 	}
92 92
 	
93
-	public function refreshTR(){
93
+	public function refreshTR() {
94 94
 		$this->getTable()->refreshTR();
95 95
 		return $this;
96 96
 	}
97 97
 	
98
-	public function refreshTD($fieldName,$jquery,$view){
98
+	public function refreshTD($fieldName, $jquery, $view) {
99 99
 		$index=$this->_getIndex($fieldName);
100
-		$this->compile($jquery,$view);
101
-		return $this->refreshTR()->getTable()->getCell(0,$index);
100
+		$this->compile($jquery, $view);
101
+		return $this->refreshTR()->getTable()->getCell(0, $index);
102 102
 	}
103 103
 	
104 104
 
105 105
 
106
-	public function compile(JsUtils $js=NULL,&$view=NULL){
107
-		if(!$this->_generated){
108
-			if(isset($this->_buttonsColumn)){
106
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
107
+		if (!$this->_generated) {
108
+			if (isset($this->_buttonsColumn)) {
109 109
 				$this->_instanceViewer->sortColumnContent($this->_buttonsColumn, $this->_buttons);
110 110
 			}
111 111
 			$this->_instanceViewer->setInstance($this->_model);
112 112
 			$captions=$this->_instanceViewer->getCaptions();
113 113
 			$table=$this->content["table"];
114
-			if($this->_hasCheckboxes){
114
+			if ($this->_hasCheckboxes) {
115 115
 				$this->_generateMainCheckbox($captions);
116 116
 			}
117 117
 			$table->setRowCount(0, \sizeof($captions));
118
-			$this->_generateHeader($table,$captions);
118
+			$this->_generateHeader($table, $captions);
119 119
 
120
-			if(isset($this->_compileParts))
120
+			if (isset($this->_compileParts))
121 121
 				$table->setCompileParts($this->_compileParts);
122 122
 
123 123
 			$this->_generateContent($table);
@@ -125,158 +125,158 @@  discard block
 block discarded – undo
125 125
 			$this->compileExtraElements($table, $captions);
126 126
 			$this->_compileSearchFieldBehavior($js);
127 127
 
128
-			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"table",PositionInTable::AFTERTABLE]);
128
+			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "table", PositionInTable::AFTERTABLE]);
129 129
 			$this->_compileForm();
130 130
 			$this->_applyStyleAttributes($table);
131 131
 			$this->_generated=true;
132 132
 		}
133
-		return parent::compile($js,$view);
133
+		return parent::compile($js, $view);
134 134
 	}
135 135
 
136
-	protected function compileExtraElements($table,$captions){
136
+	protected function compileExtraElements($table, $captions) {
137 137
 
138
-		if($this->_hasCheckboxes && $table->hasPart("thead")){
138
+		if ($this->_hasCheckboxes && $table->hasPart("thead")) {
139 139
 			$table->getHeader()->getCell(0, 0)->addClass("no-sort");
140 140
 		}
141 141
 
142
-		if(isset($this->_toolbar)){
142
+		if (isset($this->_toolbar)) {
143 143
 			$this->_setToolbarPosition($table, $captions);
144 144
 		}
145
-		if(isset($this->_pagination) && $this->_pagination->getVisible()){
145
+		if (isset($this->_pagination) && $this->_pagination->getVisible()) {
146 146
 			$this->_generatePagination($table);
147 147
 		}
148 148
 	}
149 149
 
150
-	protected function _applyStyleAttributes($table){
151
-		if(isset($this->_hiddenColumns))
150
+	protected function _applyStyleAttributes($table) {
151
+		if (isset($this->_hiddenColumns))
152 152
 			$this->_hideColumns();
153
-			if(isset($this->_colWidths)){
154
-				foreach ($this->_colWidths as $colIndex=>$width){
155
-					$table->setColWidth($colIndex,$width);
153
+			if (isset($this->_colWidths)) {
154
+				foreach ($this->_colWidths as $colIndex=>$width) {
155
+					$table->setColWidth($colIndex, $width);
156 156
 				}
157 157
 			}
158 158
 	}
159 159
 
160
-	protected function _hideColumns(){
161
-		foreach ($this->_hiddenColumns as $colIndex){
160
+	protected function _hideColumns() {
161
+		foreach ($this->_hiddenColumns as $colIndex) {
162 162
 			$this->_self->hideColumn($colIndex);
163 163
 		}
164 164
 		return $this;
165 165
 	}
166 166
 
167
-	protected function _generateHeader(HtmlTable $table,$captions){
167
+	protected function _generateHeader(HtmlTable $table, $captions) {
168 168
 		$table->setHeaderValues($captions);
169
-		if(isset($this->_sortable)){
169
+		if (isset($this->_sortable)) {
170 170
 			$table->setSortable($this->_sortable);
171 171
 		}
172 172
 	}
173 173
 
174 174
 
175 175
 
176
-	protected function _generateContent($table){
176
+	protected function _generateContent($table) {
177 177
 		$objects=$this->_modelInstance;
178
-		if(isset($this->_pagination)){
178
+		if (isset($this->_pagination)) {
179 179
 			$objects=$this->_pagination->getObjects($this->_modelInstance);
180 180
 		}
181 181
 			InstanceViewer::setIndex(0);
182 182
 			$fields=$this->_instanceViewer->getSimpleProperties();
183 183
 			$groupByFields=$this->_instanceViewer->getGroupByFields();
184
-			if(!is_array($groupByFields)){
185
-				$table->fromDatabaseObjects($objects, function($instance) use($table,$fields){
186
-					return $this->_generateRow($instance, $fields,$table);
184
+			if (!is_array($groupByFields)) {
185
+				$table->fromDatabaseObjects($objects, function($instance) use($table, $fields){
186
+					return $this->_generateRow($instance, $fields, $table);
187 187
 				});
188
-			}else{
188
+			} else {
189 189
 				$activeValues=array_combine($groupByFields, array_fill(0, sizeof($groupByFields), null));
190 190
 				$uuids=[];
191
-				$table->fromDatabaseObjects($objects, function($instance) use($table,$fields,&$activeValues,$groupByFields,&$uuids){
191
+				$table->fromDatabaseObjects($objects, function($instance) use($table, $fields, &$activeValues, $groupByFields, &$uuids){
192 192
 					$this->_instanceViewer->setInstance($instance);
193
-					foreach ($groupByFields as $index=>$gbField){
194
-						$this->_generateGroupByRow($index, $gbField, $table,$fields,$activeValues, $uuids);
193
+					foreach ($groupByFields as $index=>$gbField) {
194
+						$this->_generateGroupByRow($index, $gbField, $table, $fields, $activeValues, $uuids);
195 195
 					}
196
-					return $this->_generateRow($instance, $fields,$table,null,$uuids);
196
+					return $this->_generateRow($instance, $fields, $table, null, $uuids);
197 197
 				});
198 198
 			}
199
-		if($table->getRowCount()==0){
199
+		if ($table->getRowCount()==0) {
200 200
 			$result=$table->addRow();
201 201
 			$result->mergeRow();
202 202
 			$result->setValues([$this->_emptyMessage]);
203 203
 		}
204 204
 	}
205 205
 	
206
-	protected function _generateGroupByRow($index,$gbField,$table,$fields,&$activeValues,&$uuids){
206
+	protected function _generateGroupByRow($index, $gbField, $table, $fields, &$activeValues, &$uuids) {
207 207
 		$newValue=$this->_instanceViewer->getValue($gbField);
208
-		if($this->getElementContent($activeValues[$gbField])!==$this->getElementContent($newValue)){
209
-			if($index==0){
208
+		if ($this->getElementContent($activeValues[$gbField])!==$this->getElementContent($newValue)) {
209
+			if ($index==0) {
210 210
 				$uuids=[];
211 211
 			}
212 212
 			$uuid=uniqid("grp");
213 213
 			$uuids[$gbField]=$uuid;
214 214
 			$id=$this->_instanceViewer->getIdentifier();
215
-			$result=$table->addMergeRow(sizeof($fields)+1,$newValue);
215
+			$result=$table->addMergeRow(sizeof($fields)+1, $newValue);
216 216
 			$result->setIdentifier($this->identifier."-tr-gb-".$id);
217
-			$result->setProperty("data-ajax",$id);
218
-			$result->setProperty("data-group",$uuid);
219
-			$result->addToProperty("class",$this->_rowClass);
217
+			$result->setProperty("data-ajax", $id);
218
+			$result->setProperty("data-group", $uuid);
219
+			$result->addToProperty("class", $this->_rowClass);
220 220
 			$activeValues[$gbField]=$newValue;
221 221
 		}
222 222
 	}
223 223
 	
224
-	private function getElementContent($elm){
225
-		if($elm instanceof HtmlDoubleElement){
224
+	private function getElementContent($elm) {
225
+		if ($elm instanceof HtmlDoubleElement) {
226 226
 			return $elm->getTextContent();
227 227
 		}
228 228
 		return $elm;
229 229
 	}
230 230
 	
231
-	public function getFieldValue($index){
231
+	public function getFieldValue($index) {
232 232
 		$index=$this->_getIndex($index);
233
-		if(is_numeric($index)){
234
-			$values= $this->_instanceViewer->getValues();
235
-			if(isset($values[$index])){
233
+		if (is_numeric($index)) {
234
+			$values=$this->_instanceViewer->getValues();
235
+			if (isset($values[$index])) {
236 236
 				return $values[$index];
237 237
 			}
238 238
 		}
239 239
 		return null;
240 240
 	}
241 241
 
242
-	protected function _generateRow($instance,$fields,&$table,$checkedClass=null,$uuids=null){
242
+	protected function _generateRow($instance, $fields, &$table, $checkedClass=null, $uuids=null) {
243 243
 		$this->_instanceViewer->setInstance($instance);
244 244
 		InstanceViewer::$index++;
245
-		$values= $this->_instanceViewer->getValues();
245
+		$values=$this->_instanceViewer->getValues();
246 246
 		$id=$this->_instanceViewer->getIdentifier();
247 247
 		$dataAjax=$id;
248 248
 		$id=$this->cleanIdentifier($id);
249
-		if($this->_hasCheckboxes){
250
-			$ck=new HtmlCheckbox("ck-".$this->identifier."-".$id,"");
249
+		if ($this->_hasCheckboxes) {
250
+			$ck=new HtmlCheckbox("ck-".$this->identifier."-".$id, "");
251 251
 			$checked=false;
252
-			if(isset($this->_checkedCallback)){
252
+			if (isset($this->_checkedCallback)) {
253 253
 				$func=$this->_checkedCallback;
254 254
 				$checked=$func($instance);
255 255
 			}
256 256
 			$ck->setChecked($checked);
257 257
 			$ck->setOnChange("event.stopPropagation();");
258 258
 			$field=$ck->getField();
259
-			$field->setProperty("value",$dataAjax);
259
+			$field->setProperty("value", $dataAjax);
260 260
 			$field->setProperty("name", "selection[]");
261
-			if(isset($checkedClass))
261
+			if (isset($checkedClass))
262 262
 				$field->setClass($checkedClass);
263 263
 			\array_unshift($values, $ck);
264 264
 		}
265 265
 		$result=$table->newRow();
266 266
 		$result->setIdentifier($this->identifier."-tr-".$id);
267
-		$result->setProperty("data-ajax",$dataAjax);
267
+		$result->setProperty("data-ajax", $dataAjax);
268 268
 		$result->setValues($values);
269
-		$result->addToProperty("class",$this->_rowClass);
269
+		$result->addToProperty("class", $this->_rowClass);
270 270
 		$result->setPropertyValues("data-field", $fields);
271
-		if(isset($uuids)){
272
-			$result->setProperty("data-child",implode(" ", $uuids));
271
+		if (isset($uuids)) {
272
+			$result->setProperty("data-child", implode(" ", $uuids));
273 273
 		}
274 274
 		return $result;
275 275
 	}
276 276
 
277
-	protected function _generatePagination($table){
278
-		if(isset($this->_toolbar)){
279
-			if($this->_toolbarPosition==PositionInTable::FOOTER)
277
+	protected function _generatePagination($table) {
278
+		if (isset($this->_toolbar)) {
279
+			if ($this->_toolbarPosition==PositionInTable::FOOTER)
280 280
 				$this->_toolbar->setFloated("left");
281 281
 		}
282 282
 		$footer=$table->getFooter();
@@ -284,51 +284,51 @@  discard block
 block discarded – undo
284 284
 		$footer->addValues($this->_pagination->generateMenu($this->identifier));
285 285
 	}
286 286
 
287
-	protected function _associatePaginationBehavior(JsUtils $js=NULL,$offset=null){
288
-		if(isset($this->_urls["refresh"])){
287
+	protected function _associatePaginationBehavior(JsUtils $js=NULL, $offset=null) {
288
+		if (isset($this->_urls["refresh"])) {
289 289
 			$menu=$this->_pagination->getMenu();
290
-			if(isset($menu) && isset($js)){
291
-				$js->postOnClick("#".$menu->getIdentifier()." .item",$this->_urls["refresh"],"{'p':$(this).attr('data-page'),'_model':'".JString::doubleBackSlashes($this->_model)."'}",$this->getRefreshSelector(),["preventDefault"=>false,"jqueryDone"=>"replaceWith","hasLoader"=>false,"jsCallback"=>'$("#'.$this->identifier.'").trigger("pageChange");$("#'.$this->identifier.'").trigger("activeRowChange");']);
290
+			if (isset($menu) && isset($js)) {
291
+				$js->postOnClick("#".$menu->getIdentifier()." .item", $this->_urls["refresh"], "{'p':$(this).attr('data-page'),'_model':'".JString::doubleBackSlashes($this->_model)."'}", $this->getRefreshSelector(), ["preventDefault"=>false, "jqueryDone"=>"replaceWith", "hasLoader"=>false, "jsCallback"=>'$("#'.$this->identifier.'").trigger("pageChange");$("#'.$this->identifier.'").trigger("activeRowChange");']);
292 292
 				$page=URequest::post("p");
293
-				if(isset($page)){
293
+				if (isset($page)) {
294 294
 					$js->execAtLast('$("#'.$this->getIdentifier().' .pagination").children("a.item").removeClass("active");$("#'.$this->getIdentifier().' .pagination").children("a.item[data-page='.$page.']:not(.no-active)").addClass("active");');
295 295
 				}				
296 296
 			}
297 297
 		}
298 298
 	}
299 299
 	
300
-	protected function _compileSearchFieldBehavior(JsUtils $js=NULL){
301
-		if(isset($this->_searchField) && isset($js) && isset($this->_urls["refresh"])){
302
-			$this->_searchField->postOn("change", $this->_urls["refresh"],"{'s':$(self).val(),'_model':'".JString::doubleBackSlashes($this->_model)."'}","#".$this->identifier." tbody",["preventDefault"=>false,"jqueryDone"=>"replaceWith","hasLoader"=>"internal","jsCallback"=>'$("#'.$this->identifier.'").trigger("searchTerminate",[$(self).val()]);']);
300
+	protected function _compileSearchFieldBehavior(JsUtils $js=NULL) {
301
+		if (isset($this->_searchField) && isset($js) && isset($this->_urls["refresh"])) {
302
+			$this->_searchField->postOn("change", $this->_urls["refresh"], "{'s':$(self).val(),'_model':'".JString::doubleBackSlashes($this->_model)."'}", "#".$this->identifier." tbody", ["preventDefault"=>false, "jqueryDone"=>"replaceWith", "hasLoader"=>"internal", "jsCallback"=>'$("#'.$this->identifier.'").trigger("searchTerminate",[$(self).val()]);']);
303 303
 		}
304 304
 	}
305
-	protected function _associateSearchFieldBehavior(JsUtils $js=NULL,$offset=null){
305
+	protected function _associateSearchFieldBehavior(JsUtils $js=NULL, $offset=null) {
306 306
 		
307 307
 	}
308 308
 
309
-	protected function _getFieldName($index){
309
+	protected function _getFieldName($index) {
310 310
 		$fieldName=parent::_getFieldName($index);
311
-		if(\is_object($fieldName))
311
+		if (\is_object($fieldName))
312 312
 			$fieldName="field-".$index;
313 313
 		return $fieldName."[]";
314 314
 	}
315 315
 
316
-	protected function _getFieldCaption($index){
316
+	protected function _getFieldCaption($index) {
317 317
 		return null;
318 318
 	}
319 319
 
320
-	protected function _setToolbarPosition($table,$captions=NULL){
321
-		switch ($this->_toolbarPosition){
320
+	protected function _setToolbarPosition($table, $captions=NULL) {
321
+		switch ($this->_toolbarPosition) {
322 322
 			case PositionInTable::BEFORETABLE:
323 323
 			case PositionInTable::AFTERTABLE:
324
-				if(isset($this->_compileParts)===false){
324
+				if (isset($this->_compileParts)===false) {
325 325
 					$this->content[$this->_toolbarPosition]=$this->_toolbar;
326 326
 				}
327 327
 				break;
328 328
 			case PositionInTable::HEADER:
329 329
 			case PositionInTable::FOOTER:
330 330
 			case PositionInTable::BODY:
331
-				$this->addToolbarRow($this->_toolbarPosition,$table, $captions);
331
+				$this->addToolbarRow($this->_toolbarPosition, $table, $captions);
332 332
 				break;
333 333
 		}
334 334
 	}
@@ -340,16 +340,16 @@  discard block
 block discarded – undo
340 340
 	 * @param callable $callback function called after the field compilation
341 341
 	 * @return DataTable
342 342
 	 */
343
-	public function afterCompile($index,$callback){
344
-		$this->_instanceViewer->afterCompile($index,$callback);
343
+	public function afterCompile($index, $callback) {
344
+		$this->_instanceViewer->afterCompile($index, $callback);
345 345
 		return $this;
346 346
 	}
347 347
 
348
-	private function addToolbarRow($part,$table,$captions){
348
+	private function addToolbarRow($part, $table, $captions) {
349 349
 		$hasPart=$table->hasPart($part);
350
-		if($hasPart){
350
+		if ($hasPart) {
351 351
 			$row=$table->getPart($part)->addRow(\sizeof($captions));
352
-		}else{
352
+		} else {
353 353
 			$row=$table->getPart($part)->getRow(0);
354 354
 		}
355 355
 		$row->mergeCol();
@@ -361,7 +361,7 @@  discard block
 block discarded – undo
361 361
 	 * @see Widget::getHtmlComponent()
362 362
 	 * @return HtmlTable
363 363
 	 */
364
-	public function getHtmlComponent(){
364
+	public function getHtmlComponent() {
365 365
 		return $this->content["table"];
366 366
 	}
367 367
 
@@ -376,13 +376,13 @@  discard block
 block discarded – undo
376 376
 	 * @return DataTable
377 377
 	 */
378 378
 	public function setUrls($urls) {
379
-		if(\is_array($urls)){
380
-			$this->_urls["refresh"]=JArray::getValue($urls, "refresh",0);
381
-			$this->_urls["edit"]=JArray::getValue($urls, "edit",1);
382
-			$this->_urls["delete"]=JArray::getValue($urls, "delete",2);
383
-			$this->_urls["display"]=JArray::getValue($urls, "display",3);
384
-		}else{
385
-			$this->_urls=["refresh"=>$urls,"edit"=>$urls,"delete"=>$urls,"display"=>$urls];
379
+		if (\is_array($urls)) {
380
+			$this->_urls["refresh"]=JArray::getValue($urls, "refresh", 0);
381
+			$this->_urls["edit"]=JArray::getValue($urls, "edit", 1);
382
+			$this->_urls["delete"]=JArray::getValue($urls, "delete", 2);
383
+			$this->_urls["display"]=JArray::getValue($urls, "display", 3);
384
+		} else {
385
+			$this->_urls=["refresh"=>$urls, "edit"=>$urls, "delete"=>$urls, "display"=>$urls];
386 386
 		}
387 387
 		return $this;
388 388
 	}
@@ -395,8 +395,8 @@  discard block
 block discarded – undo
395 395
 	 * @param number $pages_visibles The number of visible pages in the Pagination component
396 396
 	 * @return DataTable
397 397
 	 */
398
-	public function paginate($page,$total_rowcount,$items_per_page=10,$pages_visibles=null){
399
-		$this->_pagination=new Pagination($items_per_page,$pages_visibles,$page,$total_rowcount);
398
+	public function paginate($page, $total_rowcount, $items_per_page=10, $pages_visibles=null) {
399
+		$this->_pagination=new Pagination($items_per_page, $pages_visibles, $page, $total_rowcount);
400 400
 		return $this;
401 401
 	}
402 402
 
@@ -407,8 +407,8 @@  discard block
 block discarded – undo
407 407
 	 * @param number $pages_visibles The number of visible pages in the Pagination component
408 408
 	 * @return DataTable
409 409
 	 */
410
-	public function autoPaginate($page=1,$items_per_page=10,$pages_visibles=4){
411
-		$this->_pagination=new Pagination($items_per_page,$pages_visibles,$page);
410
+	public function autoPaginate($page=1, $items_per_page=10, $pages_visibles=4) {
411
+		$this->_pagination=new Pagination($items_per_page, $pages_visibles, $page);
412 412
 		return $this;
413 413
 	}
414 414
 
@@ -418,7 +418,7 @@  discard block
 block discarded – undo
418 418
 	 * @param array $compileParts
419 419
 	 * @return DataTable
420 420
 	 */
421
-	public function refresh($compileParts=["tbody"]){
421
+	public function refresh($compileParts=["tbody"]) {
422 422
 		$this->_compileParts=$compileParts;
423 423
 		return $this;
424 424
 	}
@@ -429,14 +429,14 @@  discard block
 block discarded – undo
429 429
 	 * @param string $position
430 430
 	 * @return \Ajax\common\html\HtmlDoubleElement
431 431
 	 */
432
-	public function addSearchInToolbar($position=Direction::RIGHT){
432
+	public function addSearchInToolbar($position=Direction::RIGHT) {
433 433
 		return $this->addInToolbar($this->getSearchField())->setPosition($position);
434 434
 	}
435 435
 
436
-	public function getSearchField(){
437
-		if(isset($this->_searchField)===false){
438
-			$this->_searchField=new HtmlInput("search-".$this->identifier,"search","","Search...");
439
-			$this->_searchField->addIcon("search",Direction::RIGHT);
436
+	public function getSearchField() {
437
+		if (isset($this->_searchField)===false) {
438
+			$this->_searchField=new HtmlInput("search-".$this->identifier, "search", "", "Search...");
439
+			$this->_searchField->addIcon("search", Direction::RIGHT);
440 440
 		}
441 441
 		return $this->_searchField;
442 442
 	}
@@ -456,7 +456,7 @@  discard block
 block discarded – undo
456 456
 	 * Returns a form corresponding to the Datatable
457 457
 	 * @return \Ajax\semantic\html\collections\form\HtmlForm
458 458
 	 */
459
-	public function asForm(){
459
+	public function asForm() {
460 460
 		return $this->getForm();
461 461
 	}
462 462
 
@@ -464,7 +464,7 @@  discard block
 block discarded – undo
464 464
 
465 465
 	protected function getTargetSelector($op) {
466 466
 		$result=$this->_targetSelector;
467
-		if(!isset($result[$op]))
467
+		if (!isset($result[$op]))
468 468
 			$result="#".$this->identifier;
469 469
 		return $result[$op];
470 470
 	}
@@ -475,15 +475,15 @@  discard block
 block discarded – undo
475 475
 	 * @return DataTable
476 476
 	 */
477 477
 	public function setTargetSelector($_targetSelector) {
478
-		if(!\is_array($_targetSelector)){
479
-			$_targetSelector=["edit"=>$_targetSelector,"delete"=>$_targetSelector];
478
+		if (!\is_array($_targetSelector)) {
479
+			$_targetSelector=["edit"=>$_targetSelector, "delete"=>$_targetSelector];
480 480
 		}
481 481
 		$this->_targetSelector=$_targetSelector;
482 482
 		return $this;
483 483
 	}
484 484
 
485 485
 	public function getRefreshSelector() {
486
-		if(isset($this->_refreshSelector))
486
+		if (isset($this->_refreshSelector))
487 487
 			return $this->_refreshSelector;
488 488
 		return "#".$this->identifier." tbody";
489 489
 	}
@@ -501,9 +501,9 @@  discard block
 block discarded – undo
501 501
 	 * {@inheritDoc}
502 502
 	 * @see \Ajax\common\Widget::show()
503 503
 	 */
504
-	public function show($modelInstance){
505
-		if(\is_array($modelInstance)){
506
-			if(isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0]))
504
+	public function show($modelInstance) {
505
+		if (\is_array($modelInstance)) {
506
+			if (isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0]))
507 507
 				$modelInstance=\json_decode(\json_encode($modelInstance), FALSE);
508 508
 		}
509 509
 		$this->_modelInstance=$modelInstance;
@@ -538,37 +538,37 @@  discard block
 block discarded – undo
538 538
 		return $this;
539 539
 	}
540 540
 
541
-	public function setActiveRowSelector($class="active",$event="click",$multiple=false){
542
-		$this->_self->setActiveRowSelector($class,$event,$multiple);
541
+	public function setActiveRowSelector($class="active", $event="click", $multiple=false) {
542
+		$this->_self->setActiveRowSelector($class, $event, $multiple);
543 543
 		return $this;
544 544
 	}
545 545
 
546
-	public function hideColumn($colIndex){
547
-		if(!\is_array($this->_hiddenColumns))
546
+	public function hideColumn($colIndex) {
547
+		if (!\is_array($this->_hiddenColumns))
548 548
 			$this->_hiddenColumns=[];
549 549
 		$this->_hiddenColumns[]=$colIndex;
550 550
 		return $this;
551 551
 	}
552 552
 
553
-	public function setColWidth($colIndex,$width){
553
+	public function setColWidth($colIndex, $width) {
554 554
 		$this->_colWidths[$colIndex]=$width;
555 555
 		return $this;
556 556
 	}
557 557
 	public function setColWidths($_colWidths) {
558
-		$this->_colWidths = $_colWidths;
558
+		$this->_colWidths=$_colWidths;
559 559
 		return $this;
560 560
 	}
561 561
 
562
-	public function setColAlignment($colIndex,$alignment){
563
-		$this->content["table"]->setColAlignment($colIndex,$alignment);
562
+	public function setColAlignment($colIndex, $alignment) {
563
+		$this->content["table"]->setColAlignment($colIndex, $alignment);
564 564
 		return $this;
565 565
 	}
566 566
 	
567
-	public function trigger($event,$params="[]"){
568
-		return $this->getHtmlComponent()->trigger($event,$params);
567
+	public function trigger($event, $params="[]") {
568
+		return $this->getHtmlComponent()->trigger($event, $params);
569 569
 	}
570 570
 	
571
-	public function onActiveRowChange($jsCode){
571
+	public function onActiveRowChange($jsCode) {
572 572
 		$this->getHtmlComponent()->onActiveRowChange($jsCode);
573 573
 		return $this;
574 574
 	}
@@ -596,7 +596,7 @@  discard block
 block discarded – undo
596 596
 	 * @param mixed $_displayBehavior
597 597
 	 */
598 598
 	public function setDisplayBehavior($_displayBehavior) {
599
-		$this->_displayBehavior = $_displayBehavior;
599
+		$this->_displayBehavior=$_displayBehavior;
600 600
 	}
601 601
 	/**
602 602
 	 * @return mixed
Please login to merge, or discard this patch.
Ajax/semantic/widgets/dataelement/DataElement.php 1 patch
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -22,72 +22,72 @@  discard block
 block discarded – undo
22 22
 	protected $_colWidths;
23 23
 
24 24
 	public function __construct($identifier, $modelInstance=NULL) {
25
-		parent::__construct($identifier, null,$modelInstance);
26
-		$this->_init(new DeInstanceViewer($identifier), "table", new HtmlTable($identifier, 0,2), false);
25
+		parent::__construct($identifier, null, $modelInstance);
26
+		$this->_init(new DeInstanceViewer($identifier), "table", new HtmlTable($identifier, 0, 2), false);
27 27
 		$this->content["table"]->setDefinition()->addClass("_element");
28 28
 	}
29 29
 
30
-	public function compile(JsUtils $js=NULL,&$view=NULL){
31
-		if(!$this->_generated){
30
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
31
+		if (!$this->_generated) {
32 32
 			$this->_instanceViewer->setInstance($this->_modelInstance);
33 33
 
34 34
 			$table=$this->content["table"];
35 35
 			$this->_generateContent($table);
36 36
 
37
-			if(isset($this->_toolbar)){
37
+			if (isset($this->_toolbar)) {
38 38
 				$this->_setToolbarPosition($table);
39 39
 			}
40
-			if(isset($this->_colWidths)){
40
+			if (isset($this->_colWidths)) {
41 41
 				$this->_applyStyleAttributes($table);
42 42
 			}
43
-			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"table",PositionInTable::AFTERTABLE]);
43
+			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "table", PositionInTable::AFTERTABLE]);
44 44
 			$this->_compileForm();
45 45
 			$this->_generated=true;
46 46
 		}
47
-		return parent::compile($js,$view);
47
+		return parent::compile($js, $view);
48 48
 	}
49 49
 
50 50
 	/**
51 51
 	 * @param HtmlTable $table
52 52
 	 */
53
-	protected function _generateContent($table){
54
-		$values= $this->_instanceViewer->getValues();
53
+	protected function _generateContent($table) {
54
+		$values=$this->_instanceViewer->getValues();
55 55
 		$captions=$this->_instanceViewer->getCaptions();
56 56
 		$fields=$this->_instanceViewer->getVisibleProperties();
57 57
 		$count=$this->_instanceViewer->count();
58 58
 		$this->setProperty("data-ajax", $this->_instanceViewer->getIdentifier());
59
-		for($i=0;$i<$count;$i++){
60
-			$row=$table->addRow([$captions[$i],$values[$i]]);
59
+		for ($i=0; $i<$count; $i++) {
60
+			$row=$table->addRow([$captions[$i], $values[$i]]);
61 61
 			$row->getItem(1)->setProperty("data-field", $fields[$i]);
62 62
 		}
63 63
 	}
64 64
 	
65
-	public function getFieldValue($index){
66
-		if(is_string($index)){
65
+	public function getFieldValue($index) {
66
+		if (is_string($index)) {
67 67
 			$fields=$this->_instanceViewer->getVisibleProperties();
68 68
 			$index=array_search($index, $fields);
69 69
 		}
70
-		if(is_numeric($index)){
71
-			$values= $this->_instanceViewer->getValues();
72
-			if(isset($values[$index])){
70
+		if (is_numeric($index)) {
71
+			$values=$this->_instanceViewer->getValues();
72
+			if (isset($values[$index])) {
73 73
 				return $values[$index];
74 74
 			}
75 75
 		}
76 76
 		return null;
77 77
 	}
78 78
 
79
-	protected function _applyStyleAttributes(HtmlTable $table){
79
+	protected function _applyStyleAttributes(HtmlTable $table) {
80 80
 		$table->setColWidths($this->_colWidths);
81 81
 	}
82
-	protected function _getFieldName($index){
82
+	protected function _getFieldName($index) {
83 83
 		return $this->_instanceViewer->getFieldName($index);
84 84
 	}
85 85
 
86
-	protected function _getFieldCaption($index){
86
+	protected function _getFieldCaption($index) {
87 87
 		return null;
88 88
 	}
89 89
 
90
-	protected function _getFieldIdentifier($prefix,$name=""){
90
+	protected function _getFieldIdentifier($prefix, $name="") {
91 91
 		return $this->identifier."-{$prefix}-".$name;
92 92
 	}
93 93
 
@@ -119,11 +119,11 @@  discard block
 block discarded – undo
119 119
 		return $this;
120 120
 	}
121 121
 
122
-	public function asForm(){
122
+	public function asForm() {
123 123
 		return $this->getForm();
124 124
 	}
125 125
 
126
-	public function setColCaptionWidth($width){
126
+	public function setColCaptionWidth($width) {
127 127
 		$this->_colWidths[0]=$width;
128 128
 		return $this;
129 129
 	}
@@ -133,13 +133,13 @@  discard block
 block discarded – undo
133 133
 		return $this;
134 134
 	}
135 135
 
136
-	public function setColWidths($widths){
136
+	public function setColWidths($widths) {
137 137
 		$this->_colWidths=$widths;
138 138
 		return $this;
139 139
 	}
140 140
 	
141
-	public function run(JsUtils $js){
142
-		if(JString::isNotNull($this->_identifier))
141
+	public function run(JsUtils $js) {
142
+		if (JString::isNotNull($this->_identifier))
143 143
 			$js->execOn("click", "#".$this->_identifier." .ui.toggle", 'var active=$(this).hasClass("active");$(this).children("i").toggleClass("up",active).toggleClass("down",!active);var nextTd=$(this).closest("td").next("td");nextTd.children(":not(.toggle-caption)").toggle(active);nextTd.children(".toggle-caption").toggle(!active);$(this).trigger({type:"toggled",active: active,caption: nextTd.children(".toggle-caption")});');
144 144
 		parent::run($js);
145 145
 	}
Please login to merge, or discard this patch.
Ajax/semantic/widgets/dataform/DataForm.php 2 patches
Spacing   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -21,36 +21,36 @@  discard block
 block discarded – undo
21 21
 	use BaseTrait;
22 22
 
23 23
 	public function __construct($identifier, $modelInstance=NULL) {
24
-		parent::__construct($identifier, null,$modelInstance);
24
+		parent::__construct($identifier, null, $modelInstance);
25 25
 		$this->_form=new HtmlForm($identifier);
26 26
 		$this->_init(new FormInstanceViewer($identifier), "form", $this->_form, true);
27 27
 	}
28 28
 
29
-	protected function _getFieldIdentifier($prefix,$name=""){
29
+	protected function _getFieldIdentifier($prefix, $name="") {
30 30
 		return $this->identifier."-{$name}-".$this->_instanceViewer->getIdentifier();
31 31
 	}
32 32
 
33
-	public function compile(JsUtils $js=NULL,&$view=NULL){
34
-		if(!$this->_generated){
33
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
34
+		if (!$this->_generated) {
35 35
 			$this->_instanceViewer->setInstance($this->_modelInstance);
36 36
 
37 37
 			$form=$this->content["form"];
38 38
 			$this->_generateContent($form);
39 39
 
40
-			if(isset($this->_toolbar)){
40
+			if (isset($this->_toolbar)) {
41 41
 				$this->_setToolbarPosition($form);
42 42
 			}
43
-			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"form",PositionInTable::AFTERTABLE]);
43
+			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "form", PositionInTable::AFTERTABLE]);
44 44
 			$this->_generated=true;
45 45
 		}
46
-		return parent::compile($js,$view);
46
+		return parent::compile($js, $view);
47 47
 	}
48 48
 
49 49
 	/**
50 50
 	 * @param HtmlForm $form
51 51
 	 */
52
-	protected function _generateContent($form){
53
-		$values= $this->_instanceViewer->getValues();
52
+	protected function _generateContent($form) {
53
+		$values=$this->_instanceViewer->getValues();
54 54
 		$count=$this->_instanceViewer->count();
55 55
 		$separators=$this->_instanceViewer->getSeparators();
56 56
 		$headers=$this->_instanceViewer->getHeaders();
@@ -58,41 +58,41 @@  discard block
 block discarded – undo
58 58
 		\sort($separators);
59 59
 		$size=\sizeof($separators);
60 60
 		$nb=0;
61
-		if($size===1){
61
+		if ($size===1) {
62 62
 			$i=-1;
63
-			foreach ($values as $v){
64
-				$this->_generateFields($form, [$v], $headers, $i, $wrappers,$nb++);
63
+			foreach ($values as $v) {
64
+				$this->_generateFields($form, [$v], $headers, $i, $wrappers, $nb++);
65 65
 				$i++;
66 66
 			}
67
-		}else{
67
+		} else {
68 68
 			$separators[]=$count;
69
-			for($i=0;$i<$size;$i++){
70
-				$fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]);
71
-				$this->_generateFields($form, $fields, $headers, $separators[$i], $wrappers,$nb++);
69
+			for ($i=0; $i<$size; $i++) {
70
+				$fields=\array_slice($values, $separators[$i]+1, $separators[$i+1]-$separators[$i]);
71
+				$this->_generateFields($form, $fields, $headers, $separators[$i], $wrappers, $nb++);
72 72
 			}
73 73
 		}
74
-		if($this->_hasRules && !$this->getForm()->hasValidationParams()){
74
+		if ($this->_hasRules && !$this->getForm()->hasValidationParams()) {
75 75
 				$this->setValidationParams(["inline"=>true]);
76 76
 		}
77 77
 	}
78 78
 
79
-	protected function _generateFields($form,$values,$headers,$sepFirst,$wrappers,$nb){
79
+	protected function _generateFields($form, $values, $headers, $sepFirst, $wrappers, $nb) {
80 80
 		$wrapper=null;
81
-		if(isset($headers[$sepFirst+1]))
82
-			$form->addHeader($headers[$sepFirst+1],4,true);
83
-		if(isset($wrappers[$sepFirst+1])){
81
+		if (isset($headers[$sepFirst+1]))
82
+			$form->addHeader($headers[$sepFirst+1], 4, true);
83
+		if (isset($wrappers[$sepFirst+1])) {
84 84
 			$wrapper=$wrappers[$sepFirst+1];
85 85
 		}
86
-		if(\sizeof($values)===1){
86
+		if (\sizeof($values)===1) {
87 87
 			$added=$form->addField($values[0]);
88
-		}elseif(\sizeof($values)>1){
88
+		}elseif (\sizeof($values)>1) {
89 89
 			$added=$form->addFields($values);
90
-		}else
90
+		} else
91 91
 			return;
92
-		if(isset($wrapper)){
93
-			$added->wrap($wrapper[0],$wrapper[1]);
92
+		if (isset($wrapper)) {
93
+			$added->wrap($wrapper[0], $wrapper[1]);
94 94
 		}
95
-		$this->execHook("onGenerateFields",$added,$nb);
95
+		$this->execHook("onGenerateFields", $added, $nb);
96 96
 	}
97 97
 	
98 98
 	/**
@@ -100,18 +100,18 @@  discard block
 block discarded – undo
100 100
 	 * the generated field is the first parameter
101 101
 	 * @param callable $callback the fonction to call when a field is generated
102 102
 	 */
103
-	public function onGenerateField($callback){
104
-		$this->addHook("onGenerateFields",$callback);
103
+	public function onGenerateField($callback) {
104
+		$this->addHook("onGenerateFields", $callback);
105 105
 	}
106 106
 
107 107
 	/**
108 108
 	 * @return HtmlForm
109 109
 	 */
110
-	public function getForm(){
110
+	public function getForm() {
111 111
 		return $this->content["form"];
112 112
 	}
113 113
 
114
-	public function addSeparatorAfter($fieldNum){
114
+	public function addSeparatorAfter($fieldNum) {
115 115
 		$fieldNum=$this->_getIndex($fieldNum);
116 116
 		$this->_instanceViewer->addSeparatorAfter($fieldNum);
117 117
 		return $this;
@@ -126,12 +126,12 @@  discard block
 block discarded – undo
126 126
 		return $this;
127 127
 	}
128 128
 
129
-	public function fieldAsReset($index,$cssStyle=NULL,$attributes=NULL){
130
-		return $this->_fieldAs(function($id,$name,$value) use ($cssStyle){
131
-			$button=new HtmlButton($id,$value,$cssStyle);
129
+	public function fieldAsReset($index, $cssStyle=NULL, $attributes=NULL) {
130
+		return $this->_fieldAs(function($id, $name, $value) use ($cssStyle){
131
+			$button=new HtmlButton($id, $value, $cssStyle);
132 132
 			$button->setProperty("type", "reset");
133 133
 			return $button;
134
-		}, $index,$attributes);
134
+		}, $index, $attributes);
135 135
 	}
136 136
 
137 137
 	/**
@@ -150,19 +150,19 @@  discard block
 block discarded – undo
150 150
 		$this->content[$this->_toolbarPosition]=$this->_toolbar;
151 151
 	}
152 152
 
153
-	public function addDividerBefore($index,$title){
153
+	public function addDividerBefore($index, $title) {
154 154
 		$index=$this->_getIndex($index);
155 155
 		$this->_instanceViewer->addHeaderDividerBefore($index, $title);
156 156
 		return $this;
157 157
 	}
158 158
 
159
-	public function addWrapper($index,$contentBefore,$contentAfter=null){
159
+	public function addWrapper($index, $contentBefore, $contentAfter=null) {
160 160
 		$index=$this->_getIndex($index);
161
-		$this->_instanceViewer->addWrapper($index, $contentBefore,$contentAfter);
161
+		$this->_instanceViewer->addWrapper($index, $contentBefore, $contentAfter);
162 162
 		return $this;
163 163
 	}
164 164
 
165
-	public function run(JsUtils $js){
165
+	public function run(JsUtils $js) {
166 166
 		parent::run($js);
167 167
 	}
168 168
 }
Please login to merge, or discard this patch.
Braces   +8 added lines, -6 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 				$this->_generateFields($form, [$v], $headers, $i, $wrappers,$nb++);
65 65
 				$i++;
66 66
 			}
67
-		}else{
67
+		} else{
68 68
 			$separators[]=$count;
69 69
 			for($i=0;$i<$size;$i++){
70 70
 				$fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]);
@@ -78,17 +78,19 @@  discard block
 block discarded – undo
78 78
 
79 79
 	protected function _generateFields($form,$values,$headers,$sepFirst,$wrappers,$nb){
80 80
 		$wrapper=null;
81
-		if(isset($headers[$sepFirst+1]))
82
-			$form->addHeader($headers[$sepFirst+1],4,true);
81
+		if(isset($headers[$sepFirst+1])) {
82
+					$form->addHeader($headers[$sepFirst+1],4,true);
83
+		}
83 84
 		if(isset($wrappers[$sepFirst+1])){
84 85
 			$wrapper=$wrappers[$sepFirst+1];
85 86
 		}
86 87
 		if(\sizeof($values)===1){
87 88
 			$added=$form->addField($values[0]);
88
-		}elseif(\sizeof($values)>1){
89
+		} elseif(\sizeof($values)>1){
89 90
 			$added=$form->addFields($values);
90
-		}else
91
-			return;
91
+		} else {
92
+					return;
93
+		}
92 94
 		if(isset($wrapper)){
93 95
 			$added->wrap($wrapper[0],$wrapper[1]);
94 96
 		}
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/table/HtmlTable.php 1 patch
Spacing   +49 added lines, -49 removed lines patch added patch discarded remove patch
@@ -31,10 +31,10 @@  discard block
 block discarded – undo
31 31
 
32 32
 	public function __construct($identifier, $rowCount, $colCount) {
33 33
 		parent::__construct($identifier, "table", "ui table");
34
-		$this->content=array ();
34
+		$this->content=array();
35 35
 		$this->setRowCount($rowCount, $colCount);
36
-		$this->_variations=[ Variation::CELLED,Variation::PADDED,Variation::COMPACT ];
37
-		$this->_compileParts=["thead","tbody","tfoot"];
36
+		$this->_variations=[Variation::CELLED, Variation::PADDED, Variation::COMPACT];
37
+		$this->_compileParts=["thead", "tbody", "tfoot"];
38 38
 		$this->_afterCompileEvents=[];
39 39
 	}
40 40
 
@@ -44,17 +44,17 @@  discard block
 block discarded – undo
44 44
 	 * @return HtmlTableContent
45 45
 	 */
46 46
 	public function getPart($key) {
47
-		if (\array_key_exists($key, $this->content) === false) {
47
+		if (\array_key_exists($key, $this->content)===false) {
48 48
 			$this->content[$key]=new HtmlTableContent("", $key);
49
-			if ($key !== "tbody") {
49
+			if ($key!=="tbody") {
50 50
 				$this->content[$key]->setRowCount(1, $this->_colCount);
51 51
 			}
52 52
 		}
53 53
 		return $this->content[$key];
54 54
 	}
55 55
 
56
-	protected function _getFirstPart(){
57
-		if(isset($this->content["thead"])){
56
+	protected function _getFirstPart() {
57
+		if (isset($this->content["thead"])) {
58 58
 			return $this->content["thead"];
59 59
 		}
60 60
 		return $this->content["tbody"];
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 	 * @return boolean
100 100
 	 */
101 101
 	public function hasPart($key) {
102
-		return \array_key_exists($key, $this->content) === true;
102
+		return \array_key_exists($key, $this->content)===true;
103 103
 	}
104 104
 
105 105
 	/**
@@ -259,8 +259,8 @@  discard block
 block discarded – undo
259 259
 		return $this->colAlign($colIndex, "colLeftFromRight");
260 260
 	}
261 261
 
262
-	public function setColAlignment($colIndex,$alignment){
263
-		switch ($alignment){
262
+	public function setColAlignment($colIndex, $alignment) {
263
+		switch ($alignment) {
264 264
 			case TextAlignment::LEFT:
265 265
 				$function="colLeft";
266 266
 				break;
@@ -280,8 +280,8 @@  discard block
 block discarded – undo
280 280
 		return $this;
281 281
 	}
282 282
 	
283
-	public function setColAlignmentFromRight($colIndex,$alignment){
284
-		switch ($alignment){
283
+	public function setColAlignmentFromRight($colIndex, $alignment) {
284
+		switch ($alignment) {
285 285
 			case TextAlignment::LEFT:
286 286
 				$function="colLeftFromRight";
287 287
 				break;
@@ -303,7 +303,7 @@  discard block
 block discarded – undo
303 303
 
304 304
 	private function colAlign($colIndex, $function) {
305 305
 		if (\is_array($colIndex)) {
306
-			foreach ( $colIndex as $cIndex ) {
306
+			foreach ($colIndex as $cIndex) {
307 307
 				$this->colAlign($cIndex, $function);
308 308
 			}
309 309
 		} else {
@@ -364,7 +364,7 @@  discard block
 block discarded – undo
364 364
 	 * @see HtmlSemDoubleElement::compile()
365 365
 	 */
366 366
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
367
-		if(\sizeof($this->_compileParts)<3){
367
+		if (\sizeof($this->_compileParts)<3) {
368 368
 			$this->_template="%content%";
369 369
 			$this->refresh($js);
370 370
 		}
@@ -373,9 +373,9 @@  discard block
 block discarded – undo
373 373
 	}
374 374
 
375 375
 	protected function compile_once(JsUtils $js=NULL, &$view=NULL) {
376
-		parent::compile_once($js,$view);
376
+		parent::compile_once($js, $view);
377 377
 		if ($this->propertyContains("class", "sortable")) {
378
-			$this->addEvent("execute", "$('#" . $this->identifier . "').tablesort().data('tablesort').sort($('th.default-sort'));");
378
+			$this->addEvent("execute", "$('#".$this->identifier."').tablesort().data('tablesort').sort($('th.default-sort'));");
379 379
 		}
380 380
 	}
381 381
 
@@ -388,13 +388,13 @@  discard block
 block discarded – undo
388 388
 	public function fromDatabaseObject($object, $function) {
389 389
 		$result=$function($object);
390 390
 		if (\is_array($result)) {
391
-			$result= $this->addRow($function($object));
391
+			$result=$this->addRow($function($object));
392 392
 		} else {
393
-			$result= $this->getBody()->_addRow($result);
393
+			$result=$this->getBody()->_addRow($result);
394 394
 		}
395
-		if(isset($this->_afterCompileEvents["onNewRow"])){
396
-			if(\is_callable($this->_afterCompileEvents["onNewRow"]))
397
-				$this->_afterCompileEvents["onNewRow"]($result,$object);
395
+		if (isset($this->_afterCompileEvents["onNewRow"])) {
396
+			if (\is_callable($this->_afterCompileEvents["onNewRow"]))
397
+				$this->_afterCompileEvents["onNewRow"]($result, $object);
398 398
 		}
399 399
 		return $result;
400 400
 	}
@@ -409,26 +409,26 @@  discard block
 block discarded – undo
409 409
 		return $this;
410 410
 	}
411 411
 	
412
-	public function refreshTR(){
412
+	public function refreshTR() {
413 413
 		$this->setCompileParts();
414 414
 		$this->getPart("tbody")->refreshTR();
415 415
 	}
416 416
 
417
-	public function refresh($js){
417
+	public function refresh($js) {
418 418
 		$this->_footer=$this->getFooter();
419
-		if(isset($js)){
420
-			$js->exec('$("#'.$this->identifier.' tfoot").replaceWith("'.\addslashes($this->_footer).'");',true);
419
+		if (isset($js)) {
420
+			$js->exec('$("#'.$this->identifier.' tfoot").replaceWith("'.\addslashes($this->_footer).'");', true);
421 421
 		}
422 422
 	}
423 423
 
424
-	public function run(JsUtils $js){
425
-		if(!$this->_runned){
426
-			if(isset($this->_activeRowSelector)){
424
+	public function run(JsUtils $js) {
425
+		if (!$this->_runned) {
426
+			if (isset($this->_activeRowSelector)) {
427 427
 				$this->_activeRowSelector->run();
428 428
 			}
429 429
 		}
430
-		$result= parent::run($js);
431
-		if(isset($this->_footer))
430
+		$result=parent::run($js);
431
+		if (isset($this->_footer))
432 432
 			$this->_footer->run($js);
433 433
 		$this->_runned=true;
434 434
 		return $result;
@@ -452,47 +452,47 @@  discard block
 block discarded – undo
452 452
 	 * @param boolean $multiple
453 453
 	 * @return HtmlTable
454 454
 	 */
455
-	public function setActiveRowSelector($class="active",$event="click",$multiple=false){
456
-		$this->_activeRowSelector=new ActiveRow($this,$class,$event,$multiple);
455
+	public function setActiveRowSelector($class="active", $event="click", $multiple=false) {
456
+		$this->_activeRowSelector=new ActiveRow($this, $class, $event, $multiple);
457 457
 		return $this;
458 458
 	}
459 459
 
460
-	public function hideColumn($colIndex){
461
-		if(isset($this->content["thead"])){
460
+	public function hideColumn($colIndex) {
461
+		if (isset($this->content["thead"])) {
462 462
 			$this->content["thead"]->hideColumn($colIndex);
463 463
 		}
464 464
 		$this->content["tbody"]->hideColumn($colIndex);
465
-		if(isset($this->content["tfoot"])){
465
+		if (isset($this->content["tfoot"])) {
466 466
 			$this->content["tfoot"]->hideColumn($colIndex);
467 467
 		}
468 468
 		return $this;
469 469
 	}
470 470
 
471
-	public function setColWidth($colIndex,$width){
471
+	public function setColWidth($colIndex, $width) {
472 472
 		$part=$this->_getFirstPart();
473
-		if($part!==null && $part->count()>0)
473
+		if ($part!==null && $part->count()>0)
474 474
 			$part->getCell(0, $colIndex)->setWidth($width);
475 475
 		return $this;
476 476
 	}
477 477
 
478
-	public function setColWidths($widths){
478
+	public function setColWidths($widths) {
479 479
 		$part=$this->_getFirstPart();
480
-		if($part!==null && $part->count()>0){
480
+		if ($part!==null && $part->count()>0) {
481 481
 			$count=$part->getColCount();
482
-			if(!\is_array($widths)){
482
+			if (!\is_array($widths)) {
483 483
 				$widths=\array_fill(0, $count, $widths);
484 484
 			}
485
-			$max=\min(\sizeof($widths),$count);
486
-			for($i=0;$i<$max;$i++){
485
+			$max=\min(\sizeof($widths), $count);
486
+			for ($i=0; $i<$max; $i++) {
487 487
 				$part->getCell(0, $i)->setWidth($widths[$i]);
488 488
 			}
489 489
 		}
490 490
 		return $this;
491 491
 	}
492 492
 
493
-	public function mergeIdentiqualValues($colIndex,$function="strip_tags"){
493
+	public function mergeIdentiqualValues($colIndex, $function="strip_tags") {
494 494
 		$body=$this->getBody();
495
-		$body->mergeIdentiqualValues($colIndex,$function);
495
+		$body->mergeIdentiqualValues($colIndex, $function);
496 496
 		return $this;
497 497
 	}
498 498
 	/**
@@ -506,16 +506,16 @@  discard block
 block discarded – undo
506 506
 	 * @param mixed $_innerScript
507 507
 	 */
508 508
 	public function setInnerScript($_innerScript) {
509
-		$this->_innerScript = $_innerScript;
509
+		$this->_innerScript=$_innerScript;
510 510
 	}
511 511
 	
512
-	public function onActiveRowChange($jsCode){
513
-		$this->on("activeRowChange",$jsCode);
512
+	public function onActiveRowChange($jsCode) {
513
+		$this->on("activeRowChange", $jsCode);
514 514
 		return $this;
515 515
 	}
516 516
 	
517
-	public function addMergeRow($colCount,$value=null){
518
-		return $this->getBody()->addMergeRow($colCount,$value);
517
+	public function addMergeRow($colCount, $value=null) {
518
+		return $this->getBody()->addMergeRow($colCount, $value);
519 519
 	}
520 520
 
521 521
 }
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/table/traits/TableTrait.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -8,12 +8,12 @@  discard block
 block discarded – undo
8 8
  * @author jc
9 9
  * @property HtmlTable $_self
10 10
  */
11
-trait TableTrait{
11
+trait TableTrait {
12 12
 
13 13
 	abstract public function addEvent($event, $jsCode, $stopPropagation=false, $preventDefault=false);
14 14
 	abstract public function getOn($event, $url, $responseElement="", $parameters=array());
15 15
 	
16
-	protected function addToPropertyTable($property,$value){
16
+	protected function addToPropertyTable($property, $value) {
17 17
 		return $this->_self->addToProperty($property, $value);
18 18
 	}
19 19
 
@@ -24,15 +24,15 @@  discard block
 block discarded – undo
24 24
 	public function setBasic($very=false) {
25 25
 		$table=$this->_self;
26 26
 		if ($very)
27
-			$table->addToPropertyCtrl("class", "very", array ("very" ));
28
-		return $table->addToPropertyCtrl("class", "basic", array ("basic" ));
27
+			$table->addToPropertyCtrl("class", "very", array("very"));
28
+		return $table->addToPropertyCtrl("class", "basic", array("basic"));
29 29
 	}
30 30
 
31 31
 	public function setCompact($very=false) {
32 32
 		$table=$this->_self;
33 33
 		if ($very)
34
-			$table->addToPropertyCtrl("class", "very", array ("very" ));
35
-		return $table->addToPropertyCtrl("class", "compact", array ("compact" ));
34
+			$table->addToPropertyCtrl("class", "very", array("very"));
35
+		return $table->addToPropertyCtrl("class", "compact", array("compact"));
36 36
 	}
37 37
 
38 38
 	public function setCollapsing() {
@@ -71,41 +71,41 @@  discard block
 block discarded – undo
71 71
 		return $this->addToPropertyTable("class", "striped");
72 72
 	}
73 73
 
74
-	public function onRowClick($jsCode, $stopPropagation=false, $preventDefault=false){
75
-		return $this->onRow("click", $jsCode,$stopPropagation,$preventDefault);
74
+	public function onRowClick($jsCode, $stopPropagation=false, $preventDefault=false) {
75
+		return $this->onRow("click", $jsCode, $stopPropagation, $preventDefault);
76 76
 	}
77 77
 
78
-	public function onRow($event,$jsCode, $stopPropagation=false, $preventDefault=false){
79
-		return $this->_self->addEvent($event."{{tbody tr}}",$jsCode,$stopPropagation,$preventDefault);
78
+	public function onRow($event, $jsCode, $stopPropagation=false, $preventDefault=false) {
79
+		return $this->_self->addEvent($event."{{tbody tr}}", $jsCode, $stopPropagation, $preventDefault);
80 80
 	}
81 81
 
82
-	public function getOnRow($event, $url, $responseElement="", $parameters=array()){
83
-		$parameters=\array_merge($parameters,["stopPropagation"=>false,"preventDefault"=>false,"jsCondition"=>'!$(this).closest("tr").hasClass("active")']);
82
+	public function getOnRow($event, $url, $responseElement="", $parameters=array()) {
83
+		$parameters=\array_merge($parameters, ["stopPropagation"=>false, "preventDefault"=>false, "jsCondition"=>'!$(this).closest("tr").hasClass("active")']);
84 84
 		$selector="tbody tr";
85
-		if(isset($parameters["selector"])){
85
+		if (isset($parameters["selector"])) {
86 86
 			$selector=$parameters["selector"];
87 87
 		}
88
-		return $this->_self->getOn($event."{{".$selector."}}", $url,$responseElement,$parameters);
88
+		return $this->_self->getOn($event."{{".$selector."}}", $url, $responseElement, $parameters);
89 89
 	}
90 90
 	
91
-	public function onPageChange($jsCode){
91
+	public function onPageChange($jsCode) {
92 92
 		$this->_self->_addEvent("pageChange", $jsCode);
93 93
 		return $this;
94 94
 	}
95 95
 	
96
-	public function onSearchTerminate($jsCode){
96
+	public function onSearchTerminate($jsCode) {
97 97
 		$this->_self->_addEvent("searchTerminate", $jsCode);
98 98
 		return $this;
99 99
 	}
100 100
 	
101
-	public function getEventsScript(){
101
+	public function getEventsScript() {
102 102
 		return $this->_self->getBsComponent()->getScript();
103 103
 	}
104 104
 	
105 105
 	public function addEventsOnRun(JsUtils $js=NULL) {
106 106
 		$script=parent::addEventsOnRun($js);
107 107
 		$innerScript=$this->_self->getInnerScript();
108
-		if(!isset($innerScript)){
108
+		if (!isset($innerScript)) {
109 109
 			$this->_self->setInnerScript($script);
110 110
 		}
111 111
 		return $script;
Please login to merge, or discard this patch.