Passed
Push — master ( ac12b8...337a26 )
by Jean-Christophe
02:24
created
Ajax/common/traits/JsUtilsAjaxTrait.php 1 patch
Spacing   +284 added lines, -284 removed lines patch added patch discarded remove patch
@@ -14,215 +14,215 @@  discard block
 block discarded – undo
14 14
  */
15 15
 trait JsUtilsAjaxTrait {
16 16
 	protected $ajaxTransition;
17
-	protected $ajaxLoader = "<div class=\"ui active centered inline text loader\">Loading</div>";
17
+	protected $ajaxLoader="<div class=\"ui active centered inline text loader\">Loading</div>";
18 18
 	abstract public function getUrl($url);
19
-	abstract public function _add_event($element, $js, $event, $preventDefault = false, $stopPropagation = false, $immediatly = true, $listenerOn=false);
20
-	abstract public function interval($jsCode, $time, $globalName = null, $immediatly = true);
21
-
22
-	protected function _ajax($method, $url, $responseElement = '', $parameters = [ ]) {
23
-		if (isset ( $this->params ['ajax'] )) {
24
-			extract ( $this->params ['ajax'] );
25
-		}
26
-		extract ( $parameters );
27
-
28
-		$jsCallback = isset ( $jsCallback ) ? $jsCallback : '';
29
-		$retour = $this->_getAjaxUrl ( $url, $attr );
30
-		$originalSelector = $responseElement;
31
-		$responseElement = $this->_getResponseElement ( $responseElement );
32
-		$retour .= "var self=this;\n";
33
-		$before = isset ( $before ) ? $before : "";
34
-		$retour .= $before;
35
-		if ($hasLoader === true && JString::isNotNull ( $responseElement )) {
36
-			$this->addLoading ( $retour, $responseElement, $ajaxLoader );
37
-		} elseif ($hasLoader === 'response') {
38
-			$this->addResponseLoading ( $retour, $responseElement, $ajaxLoader );
39
-		} elseif ($hasLoader === 'internal') {
40
-			$retour .= "\n$(this).addClass('loading');";
41
-		}
42
-		$ajaxParameters = [ 
19
+	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true, $listenerOn=false);
20
+	abstract public function interval($jsCode, $time, $globalName=null, $immediatly=true);
21
+
22
+	protected function _ajax($method, $url, $responseElement='', $parameters=[]) {
23
+		if (isset ($this->params ['ajax'])) {
24
+			extract($this->params ['ajax']);
25
+		}
26
+		extract($parameters);
27
+
28
+		$jsCallback=isset ($jsCallback) ? $jsCallback : '';
29
+		$retour=$this->_getAjaxUrl($url, $attr);
30
+		$originalSelector=$responseElement;
31
+		$responseElement=$this->_getResponseElement($responseElement);
32
+		$retour.="var self=this;\n";
33
+		$before=isset ($before) ? $before : "";
34
+		$retour.=$before;
35
+		if ($hasLoader===true && JString::isNotNull($responseElement)) {
36
+			$this->addLoading($retour, $responseElement, $ajaxLoader);
37
+		} elseif ($hasLoader==='response') {
38
+			$this->addResponseLoading($retour, $responseElement, $ajaxLoader);
39
+		} elseif ($hasLoader==='internal') {
40
+			$retour.="\n$(this).addClass('loading');";
41
+		}
42
+		$ajaxParameters=[ 
43 43
 				"url" => "url",
44
-				"method" => "'" . \strtoupper ( $method ) . "'"
44
+				"method" => "'".\strtoupper($method)."'"
45 45
 		];
46 46
 
47
-		$ajaxParameters ["async"] = ($async ? "true" : "false");
47
+		$ajaxParameters ["async"]=($async ? "true" : "false");
48 48
 
49
-		if (isset ( $params )) {
50
-			$ajaxParameters ["data"] = self::_correctParams ( $params, $parameters );
49
+		if (isset ($params)) {
50
+			$ajaxParameters ["data"]=self::_correctParams($params, $parameters);
51 51
 		}
52
-		if (isset ( $headers )) {
53
-			$ajaxParameters ["headers"] = $headers;
52
+		if (isset ($headers)) {
53
+			$ajaxParameters ["headers"]=$headers;
54 54
 		}
55 55
 		if ($csrf) {
56
-			$csrf=(is_string($csrf))?$csrf:'csrf-token';
57
-			$parameters ["beforeSend"] = "jqXHR.setRequestHeader('{$csrf}', $('meta[name=\"{$csrf}\"]').attr('content'));";
56
+			$csrf=(is_string($csrf)) ? $csrf : 'csrf-token';
57
+			$parameters ["beforeSend"]="jqXHR.setRequestHeader('{$csrf}', $('meta[name=\"{$csrf}\"]').attr('content'));";
58 58
 		}
59
-		if (isset ( $partial )) {
60
-			$ajaxParameters ["xhr"] = "xhrProvider";
61
-			$retour .= "var xhr = $.ajaxSettings.xhr();function xhrProvider() {return xhr;};xhr.onreadystatechange = function (e) { if (3==e.target.readyState){let response=e.target.responseText;" . $partial . ";}; };";
59
+		if (isset ($partial)) {
60
+			$ajaxParameters ["xhr"]="xhrProvider";
61
+			$retour.="var xhr = $.ajaxSettings.xhr();function xhrProvider() {return xhr;};xhr.onreadystatechange = function (e) { if (3==e.target.readyState){let response=e.target.responseText;".$partial.";}; };";
62 62
 		}
63
-		$this->createAjaxParameters ( $ajaxParameters, $parameters );
64
-		$retour .= "$.ajax({" . $this->implodeAjaxParameters ( $ajaxParameters ) . "}).done(function( data, textStatus, jqXHR ) {\n";
65
-		$retour .= $this->_getOnAjaxDone ( $responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader, ($historize ? $originalSelector : null) ) . "});\n";
63
+		$this->createAjaxParameters($ajaxParameters, $parameters);
64
+		$retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data, textStatus, jqXHR ) {\n";
65
+		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader, ($historize ? $originalSelector : null))."});\n";
66 66
 
67
-		$retour = $this->_addJsCondition ( $jsCondition, $retour );
67
+		$retour=$this->_addJsCondition($jsCondition, $retour);
68 68
 		if ($immediatly)
69
-			$this->jquery_code_for_compile [] = $retour;
69
+			$this->jquery_code_for_compile []=$retour;
70 70
 		return $retour;
71 71
 	}
72 72
 	protected function createAjaxParameters(&$original, $parameters) {
73
-		$validParameters = [ 
73
+		$validParameters=[ 
74 74
 				"contentType" => "%value%",
75 75
 				"dataType" => "'%value%'",
76 76
 				"beforeSend" => "function(jqXHR,settings){%value%}",
77 77
 				"complete" => "function(jqXHR){%value%}",
78 78
 				"processData" => "%value%"
79 79
 		];
80
-		foreach ( $validParameters as $param => $mask ) {
81
-			if (isset ( $parameters [$param] )) {
82
-				$original [$param] = \str_replace ( "%value%", $parameters [$param], $mask );
80
+		foreach ($validParameters as $param => $mask) {
81
+			if (isset ($parameters [$param])) {
82
+				$original [$param]=\str_replace("%value%", $parameters [$param], $mask);
83 83
 			}
84 84
 		}
85 85
 	}
86 86
 	protected function implodeAjaxParameters($ajaxParameters) {
87
-		$s = '';
88
-		foreach ( $ajaxParameters as $k => $v ) {
89
-			if ($s !== '') {
90
-				$s .= ',';
87
+		$s='';
88
+		foreach ($ajaxParameters as $k => $v) {
89
+			if ($s!=='') {
90
+				$s.=',';
91 91
 			}
92
-			if (is_array ( $v )) {
93
-				$s .= "'{$k}':{" . self::implodeAjaxParameters ( $v ) . "}";
92
+			if (is_array($v)) {
93
+				$s.="'{$k}':{".self::implodeAjaxParameters($v)."}";
94 94
 			} else {
95
-				$s .= "'{$k}':{$v}";
95
+				$s.="'{$k}':{$v}";
96 96
 			}
97 97
 		}
98 98
 		return $s;
99 99
 	}
100 100
 	protected function _addJsCondition($jsCondition, $jsSource) {
101
-		if (isset ( $jsCondition )) {
102
-			return "if(" . $jsCondition . "){\n" . $jsSource . "\n}";
101
+		if (isset ($jsCondition)) {
102
+			return "if(".$jsCondition."){\n".$jsSource."\n}";
103 103
 		}
104 104
 		return $jsSource;
105 105
 	}
106 106
 	protected function _getAjaxUrl($url, $attr) {
107
-		$url = $this->_correctAjaxUrl ( $url );
108
-		$retour = "url='" . $url . "';";
109
-		$slash = "/";
110
-		if (JString::endswith ( $url, "/" ) === true) {
111
-			$slash = "";
112
-		}
113
-		if (JString::isNotNull ( $attr )) {
114
-			if ($attr === "value") {
115
-				$retour .= "url=url+'" . $slash . "'+$(this).val();\n";
116
-			} elseif ($attr === "html") {
117
-				$retour .= "url=url+'" . $slash . "'+$(this).html();\n";
118
-			} elseif (\substr ( $attr, 0, 3 ) === "js:") {
119
-				$retour .= "url=url+'" . $slash . "'+" . \substr ( $attr, 3 ) . ";\n";
120
-			} elseif ($attr !== null && $attr !== "")
121
-				$retour .= "url=url+'" . $slash . "'+($(this).attr('" . $attr . "')||'');\n";
107
+		$url=$this->_correctAjaxUrl($url);
108
+		$retour="url='".$url."';";
109
+		$slash="/";
110
+		if (JString::endswith($url, "/")===true) {
111
+			$slash="";
112
+		}
113
+		if (JString::isNotNull($attr)) {
114
+			if ($attr==="value") {
115
+				$retour.="url=url+'".$slash."'+$(this).val();\n";
116
+			} elseif ($attr==="html") {
117
+				$retour.="url=url+'".$slash."'+$(this).html();\n";
118
+			} elseif (\substr($attr, 0, 3)==="js:") {
119
+				$retour.="url=url+'".$slash."'+".\substr($attr, 3).";\n";
120
+			} elseif ($attr!==null && $attr!=="")
121
+				$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
122 122
 		}
123 123
 		return $retour;
124 124
 	}
125 125
 	protected function onPopstate() {
126 126
 		return "window.onpopstate = function(e){if(e.state){var target=e.state.jqueryDone;$(e.state.selector)[target](e.state.html);}};";
127 127
 	}
128
-	protected function autoActiveLinks($previousURL = "window.location.href") {
129
-		$result = "\nfunction getHref(url) { return \$('a').filter(function(){return \$(this).prop('href') == url; });}";
130
-		$result .= "\nvar myurl={$previousURL};if(window._previousURL) getHref(window._previousURL).removeClass('active');getHref(myurl).addClass('active');window._previousURL=myurl;";
128
+	protected function autoActiveLinks($previousURL="window.location.href") {
129
+		$result="\nfunction getHref(url) { return \$('a').filter(function(){return \$(this).prop('href') == url; });}";
130
+		$result.="\nvar myurl={$previousURL};if(window._previousURL) getHref(window._previousURL).removeClass('active');getHref(myurl).addClass('active');window._previousURL=myurl;";
131 131
 		return $result;
132 132
 	}
133
-	protected function _getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader = false, $history = null) {
134
-		$retour = "";
135
-		$call = null;
136
-		if (JString::isNotNull ( $responseElement )) {
137
-			if (isset ( $ajaxTransition )) {
138
-				$call = $this->setAjaxDataCall ( $ajaxTransition );
139
-			} elseif (isset ( $this->ajaxTransition )) {
140
-				$call = $this->ajaxTransition;
133
+	protected function _getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader=false, $history=null) {
134
+		$retour="";
135
+		$call=null;
136
+		if (JString::isNotNull($responseElement)) {
137
+			if (isset ($ajaxTransition)) {
138
+				$call=$this->setAjaxDataCall($ajaxTransition);
139
+			} elseif (isset ($this->ajaxTransition)) {
140
+				$call=$this->ajaxTransition;
141 141
 			}
142
-			if (\is_callable ( $call ))
143
-				$retour = "\t" . $call ( $responseElement, $jqueryDone ) . ";\n";
142
+			if (\is_callable($call))
143
+				$retour="\t".$call($responseElement, $jqueryDone).";\n";
144 144
 			else
145
-				$retour = "\t{$responseElement}.{$jqueryDone}( data );\n";
145
+				$retour="\t{$responseElement}.{$jqueryDone}( data );\n";
146 146
 		}
147
-		if (isset ( $history )) {
147
+		if (isset ($history)) {
148 148
 			if ($this->params ["autoActiveLinks"]) {
149
-				$retour .= $this->autoActiveLinks ( "url" );
149
+				$retour.=$this->autoActiveLinks("url");
150 150
 			}
151
-			$retour .= "\nwindow.history.pushState({'html':data,'selector':" . Javascript::prep_value ( $history ) . ",'jqueryDone':'{$jqueryDone}'},'', url);";
151
+			$retour.="\nwindow.history.pushState({'html':data,'selector':".Javascript::prep_value($history).",'jqueryDone':'{$jqueryDone}'},'', url);";
152 152
 		}
153
-		if ($hasLoader === 'internal') {
154
-			$retour .= "\n$(self).removeClass('loading');";
153
+		if ($hasLoader==='internal') {
154
+			$retour.="\n$(self).removeClass('loading');";
155 155
 		}
156
-		$retour .= "\t" . $jsCallback . "\n";
156
+		$retour.="\t".$jsCallback."\n";
157 157
 		return $retour;
158 158
 	}
159 159
 	protected function _getResponseElement($responseElement) {
160
-		if (JString::isNotNull ( $responseElement )) {
161
-			$responseElement = Javascript::prep_jquery_selector ( $responseElement );
160
+		if (JString::isNotNull($responseElement)) {
161
+			$responseElement=Javascript::prep_jquery_selector($responseElement);
162 162
 		}
163 163
 		return $responseElement;
164 164
 	}
165 165
 	protected function _correctAjaxUrl($url) {
166
-		if ($url !== "/" && JString::endsWith ( $url, "/" ) === true)
167
-			$url = substr ( $url, 0, strlen ( $url ) - 1 );
168
-		if (strncmp ( $url, 'http://', 7 ) != 0 && strncmp ( $url, 'https://', 8 ) != 0) {
169
-			$url = $this->getUrl ( $url );
166
+		if ($url!=="/" && JString::endsWith($url, "/")===true)
167
+			$url=substr($url, 0, strlen($url)-1);
168
+		if (strncmp($url, 'http://', 7)!=0 && strncmp($url, 'https://', 8)!=0) {
169
+			$url=$this->getUrl($url);
170 170
 		}
171 171
 		return $url;
172 172
 	}
173
-	public static function _correctParams($params, $ajaxParameters = [ ]) {
174
-		if (JString::isNull ( $params )) {
173
+	public static function _correctParams($params, $ajaxParameters=[]) {
174
+		if (JString::isNull($params)) {
175 175
 			return "";
176 176
 		}
177
-		if (\preg_match ( "@^\{.*?\}$@", $params )) {
178
-			if (! isset ( $ajaxParameters ['contentType'] ) || ! JString::contains ( $ajaxParameters ['contentType'], 'json' )) {
179
-				return '$.param(' . $params . ')';
177
+		if (\preg_match("@^\{.*?\}$@", $params)) {
178
+			if (!isset ($ajaxParameters ['contentType']) || !JString::contains($ajaxParameters ['contentType'], 'json')) {
179
+				return '$.param('.$params.')';
180 180
 			} else {
181
-				return 'JSON.stringify(' . $params . ')';
181
+				return 'JSON.stringify('.$params.')';
182 182
 			}
183 183
 		}
184 184
 		return $params;
185 185
 	}
186 186
 	public static function _implodeParams($parameters) {
187
-		$allParameters = [ ];
188
-		foreach ( $parameters as $params ) {
189
-			if (isset ( $params ))
190
-				$allParameters [] = self::_correctParams ( $params );
187
+		$allParameters=[];
188
+		foreach ($parameters as $params) {
189
+			if (isset ($params))
190
+				$allParameters []=self::_correctParams($params);
191 191
 		}
192
-		return \implode ( "+'&'+", $allParameters );
192
+		return \implode("+'&'+", $allParameters);
193 193
 	}
194
-	protected function addLoading(&$retour, $responseElement, $ajaxLoader = null) {
195
-		if (! isset ( $ajaxLoader )) {
196
-			$ajaxLoader = $this->ajaxLoader;
194
+	protected function addLoading(&$retour, $responseElement, $ajaxLoader=null) {
195
+		if (!isset ($ajaxLoader)) {
196
+			$ajaxLoader=$this->ajaxLoader;
197 197
 		}
198
-		$loading_notifier = '<div class="ajax-loader ui active inverted dimmer">' . $ajaxLoader . '</div>';
199
-		$retour .= "\t\t{$responseElement}.append('{$loading_notifier}');\n";
198
+		$loading_notifier='<div class="ajax-loader ui active inverted dimmer">'.$ajaxLoader.'</div>';
199
+		$retour.="\t\t{$responseElement}.append('{$loading_notifier}');\n";
200 200
 	}
201
-	protected function addResponseLoading(&$retour, $responseElement, $ajaxLoader = null) {
202
-		if (! isset ( $ajaxLoader )) {
203
-			$ajaxLoader = $this->ajaxLoader;
201
+	protected function addResponseLoading(&$retour, $responseElement, $ajaxLoader=null) {
202
+		if (!isset ($ajaxLoader)) {
203
+			$ajaxLoader=$this->ajaxLoader;
204 204
 		}
205
-		$loading_notifier = '<div class="ajax-loader">' . $ajaxLoader . '</div>';
206
-		$retour .= "{$responseElement}.empty();\n";
207
-		$retour .= "\t\t{$responseElement}.prepend('{$loading_notifier}');\n";
205
+		$loading_notifier='<div class="ajax-loader">'.$ajaxLoader.'</div>';
206
+		$retour.="{$responseElement}.empty();\n";
207
+		$retour.="\t\t{$responseElement}.prepend('{$loading_notifier}');\n";
208 208
 	}
209 209
 	protected function setAjaxDataCall($params) {
210
-		$result = null;
211
-		if (! \is_callable ( $params )) {
212
-			$result = function ($responseElement, $jqueryDone = 'html') use ($params) {
213
-				return AjaxTransition::{$params} ( $responseElement, $jqueryDone );
210
+		$result=null;
211
+		if (!\is_callable($params)) {
212
+			$result=function($responseElement, $jqueryDone='html') use ($params) {
213
+				return AjaxTransition::{$params} ($responseElement, $jqueryDone);
214 214
 			};
215 215
 		}
216 216
 		return $result;
217 217
 	}
218 218
 	protected function setDefaultParameters(&$parameters, $default) {
219
-		foreach ( $default as $k => $v ) {
220
-			if (! isset ( $parameters [$k] ))
221
-				$parameters [$k] = $v;
219
+		foreach ($default as $k => $v) {
220
+			if (!isset ($parameters [$k]))
221
+				$parameters [$k]=$v;
222 222
 		}
223 223
 	}
224 224
 	public function setAjaxLoader($loader) {
225
-		$this->ajaxLoader = $loader;
225
+		$this->ajaxLoader=$loader;
226 226
 	}
227 227
 
228 228
 	/**
@@ -233,8 +233,8 @@  discard block
 block discarded – undo
233 233
 	 * @param string $responseElement
234 234
 	 *        	selector of the HTML element displaying the answer
235 235
 	 */
236
-	private function _get($url, $responseElement = '', $parameters = [ ]) {
237
-		return $this->_ajax ( 'get', $url, $responseElement, $parameters );
236
+	private function _get($url, $responseElement='', $parameters=[]) {
237
+		return $this->_ajax('get', $url, $responseElement, $parameters);
238 238
 	}
239 239
 
240 240
 	/**
@@ -247,9 +247,9 @@  discard block
 block discarded – undo
247 247
 	 * @param array $parameters
248 248
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null)
249 249
 	 */
250
-	public function get($url, $responseElement = '', $parameters = [ ]) {
251
-		$parameters ['immediatly'] = true;
252
-		return $this->_get ( $url, $responseElement, $parameters );
250
+	public function get($url, $responseElement='', $parameters=[]) {
251
+		$parameters ['immediatly']=true;
252
+		return $this->_get($url, $responseElement, $parameters);
253 253
 	}
254 254
 
255 255
 	/**
@@ -264,9 +264,9 @@  discard block
 block discarded – undo
264 264
 	 * @param array $parameters
265 265
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null)
266 266
 	 */
267
-	public function ajax($method, $url, $responseElement = '', $parameters = [ ]) {
268
-		$parameters ['immediatly'] = true;
269
-		return $this->_ajax ( $method, $url, $responseElement, $parameters );
267
+	public function ajax($method, $url, $responseElement='', $parameters=[]) {
268
+		$parameters ['immediatly']=true;
269
+		return $this->_ajax($method, $url, $responseElement, $parameters);
270 270
 	}
271 271
 
272 272
 	/**
@@ -287,8 +287,8 @@  discard block
 block discarded – undo
287 287
 	 *        	$immediatly
288 288
 	 * @return string
289 289
 	 */
290
-	public function ajaxInterval($method, $url, $interval, $globalName = null, $responseElement = '', $parameters = [ ], $immediatly = true) {
291
-		return $this->interval ( $this->ajaxDeferred ( $method, $url, $responseElement, $parameters ), $interval, $globalName, $immediatly );
290
+	public function ajaxInterval($method, $url, $interval, $globalName=null, $responseElement='', $parameters=[], $immediatly=true) {
291
+		return $this->interval($this->ajaxDeferred($method, $url, $responseElement, $parameters), $interval, $globalName, $immediatly);
292 292
 	}
293 293
 
294 294
 	/**
@@ -303,9 +303,9 @@  discard block
 block discarded – undo
303 303
 	 * @param array $parameters
304 304
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null)
305 305
 	 */
306
-	public function ajaxDeferred($method, $url, $responseElement = '', $parameters = [ ]) {
307
-		$parameters ['immediatly'] = false;
308
-		return $this->_ajax ( $method, $url, $responseElement, $parameters );
306
+	public function ajaxDeferred($method, $url, $responseElement='', $parameters=[]) {
307
+		$parameters ['immediatly']=false;
308
+		return $this->_ajax($method, $url, $responseElement, $parameters);
309 309
 	}
310 310
 
311 311
 	/**
@@ -318,16 +318,16 @@  discard block
 block discarded – undo
318 318
 	 * @param array $parameters
319 319
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>"document","jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"before"=>null)
320 320
 	 */
321
-	private function _json($url, $method = "get", $parameters = [ ]) {
322
-		$parameters = \array_merge ( $parameters, [ 
321
+	private function _json($url, $method="get", $parameters=[]) {
322
+		$parameters=\array_merge($parameters, [ 
323 323
 				"hasLoader" => false
324
-		] );
325
-		$jsCallback = isset ( $parameters ['jsCallback'] ) ? $parameters ['jsCallback'] : "";
326
-		$context = isset ( $parameters ['context'] ) ? $parameters ['context'] : "document";
327
-		$retour = "\tdata=($.isPlainObject(data))?data:JSON.parse(data);\t" . $jsCallback . ";" . "\n\tfor(var key in data){" . "if($('#'+key," . $context . ").length){ if($('#'+key," . $context . ").is('[value]')) { $('#'+key," . $context . ").val(data[key]);} else { $('#'+key," . $context . ").html(data[key]); }}};\n";
328
-		$retour .= "\t$(document).trigger('jsonReady',[data]);\n";
329
-		$parameters ["jsCallback"] = $retour;
330
-		return $this->_ajax ( $method, $url, null, $parameters );
324
+		]);
325
+		$jsCallback=isset ($parameters ['jsCallback']) ? $parameters ['jsCallback'] : "";
326
+		$context=isset ($parameters ['context']) ? $parameters ['context'] : "document";
327
+		$retour="\tdata=($.isPlainObject(data))?data:JSON.parse(data);\t".$jsCallback.";"."\n\tfor(var key in data){"."if($('#'+key,".$context.").length){ if($('#'+key,".$context.").is('[value]')) { $('#'+key,".$context.").val(data[key]);} else { $('#'+key,".$context.").html(data[key]); }}};\n";
328
+		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
329
+		$parameters ["jsCallback"]=$retour;
330
+		return $this->_ajax($method, $url, null, $parameters);
331 331
 	}
332 332
 
333 333
 	/**
@@ -340,8 +340,8 @@  discard block
 block discarded – undo
340 340
 	 * @param array $parameters
341 341
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>"document","jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"before"=>null)
342 342
 	 */
343
-	public function json($url, $method = "get", $parameters = [ ]) {
344
-		return $this->_json ( $url, $method, $parameters );
343
+	public function json($url, $method="get", $parameters=[]) {
344
+		return $this->_json($url, $method, $parameters);
345 345
 	}
346 346
 
347 347
 	/**
@@ -356,14 +356,14 @@  discard block
 block discarded – undo
356 356
 	 * @param array $parameters
357 357
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true,"before"=>null,"listenerOn"=>false)
358 358
 	 */
359
-	public function jsonOn($event, $element, $url, $method = 'get', $parameters = array ()) {
360
-		$this->setDefaultParameters ( $parameters, [ 
359
+	public function jsonOn($event, $element, $url, $method='get', $parameters=array()) {
360
+		$this->setDefaultParameters($parameters, [ 
361 361
 				'preventDefault' => true,
362 362
 				'stopPropagation' => true,
363 363
 				'immediatly' => true,
364 364
 				'listenerOn'=>false
365
-		] );
366
-		return $this->_add_event ( $element, $this->jsonDeferred ( $url, $method, $parameters ), $event, $parameters ["preventDefault"], $parameters ["stopPropagation"], $parameters ["immediatly"] ,$parameters['listenerOn']);
365
+		]);
366
+		return $this->_add_event($element, $this->jsonDeferred($url, $method, $parameters), $event, $parameters ["preventDefault"], $parameters ["stopPropagation"], $parameters ["immediatly"], $parameters['listenerOn']);
367 367
 	}
368 368
 
369 369
 	/**
@@ -376,9 +376,9 @@  discard block
 block discarded – undo
376 376
 	 * @param array $parameters
377 377
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>"document","jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"before"=>null)
378 378
 	 */
379
-	public function jsonDeferred($url, $method = 'get', $parameters = [ ]) {
380
-		$parameters ['immediatly'] = false;
381
-		return $this->_json ( $url, $method, $parameters );
379
+	public function jsonDeferred($url, $method='get', $parameters=[]) {
380
+		$parameters ['immediatly']=false;
381
+		return $this->_json($url, $method, $parameters);
382 382
 	}
383 383
 
384 384
 	/**
@@ -392,30 +392,30 @@  discard block
 block discarded – undo
392 392
 	 * @param array $parameters
393 393
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"rowClass"=>"_json","before"=>null)
394 394
 	 */
395
-	private function _jsonArray($maskSelector, $url, $method = 'get', $parameters = [ ]) {
396
-		$parameters = \array_merge ( $parameters, [ 
395
+	private function _jsonArray($maskSelector, $url, $method='get', $parameters=[]) {
396
+		$parameters=\array_merge($parameters, [ 
397 397
 				"hasLoader" => false
398
-		] );
399
-		$rowClass = isset ( $parameters ['rowClass'] ) ? $parameters ['rowClass'] : "_json";
400
-		$jsCallback = isset ( $parameters ['jsCallback'] ) ? $parameters ['jsCallback'] : "";
401
-		$context = isset ( $parameters ['context'] ) ? $parameters ['context'] : null;
402
-		if ($context === null) {
403
-			$parent = "$('" . $maskSelector . "').parent()";
404
-			$newElm = "$('#'+newId)";
398
+		]);
399
+		$rowClass=isset ($parameters ['rowClass']) ? $parameters ['rowClass'] : "_json";
400
+		$jsCallback=isset ($parameters ['jsCallback']) ? $parameters ['jsCallback'] : "";
401
+		$context=isset ($parameters ['context']) ? $parameters ['context'] : null;
402
+		if ($context===null) {
403
+			$parent="$('".$maskSelector."').parent()";
404
+			$newElm="$('#'+newId)";
405 405
 		} else {
406
-			$parent = $context;
407
-			$newElm = $context . ".find('#'+newId)";
406
+			$parent=$context;
407
+			$newElm=$context.".find('#'+newId)";
408 408
 		}
409
-		$appendTo = "\t\tnewElm.appendTo(" . $parent . ");\n";
410
-		$retour = $parent . ".find('.{$rowClass}').remove();";
411
-		$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();
409
+		$appendTo="\t\tnewElm.appendTo(".$parent.");\n";
410
+		$retour=$parent.".find('.{$rowClass}').remove();";
411
+		$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();
412 412
 		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";
413
-		$retour .= $appendTo;
414
-		$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";
415
-		$retour .= "\t$(document).trigger('jsonReady',[data]);\n";
416
-		$retour .= "\t" . $jsCallback;
417
-		$parameters ["jsCallback"] = $retour;
418
-		return $this->_ajax ( $method, $url, null, $parameters );
413
+		$retour.=$appendTo;
414
+		$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";
415
+		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
416
+		$retour.="\t".$jsCallback;
417
+		$parameters ["jsCallback"]=$retour;
418
+		return $this->_ajax($method, $url, null, $parameters);
419 419
 	}
420 420
 
421 421
 	/**
@@ -429,8 +429,8 @@  discard block
 block discarded – undo
429 429
 	 * @param array $parameters
430 430
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"rowClass"=>"_json","before"=>null)
431 431
 	 */
432
-	public function jsonArray($maskSelector, $url, $method = 'get', $parameters = [ ]) {
433
-		return $this->_jsonArray ( $maskSelector, $url, $method, $parameters );
432
+	public function jsonArray($maskSelector, $url, $method='get', $parameters=[]) {
433
+		return $this->_jsonArray($maskSelector, $url, $method, $parameters);
434 434
 	}
435 435
 
436 436
 	/**
@@ -444,9 +444,9 @@  discard block
 block discarded – undo
444 444
 	 * @param array $parameters
445 445
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"rowClass"=>"_json","before"=>null)
446 446
 	 */
447
-	public function jsonArrayDeferred($maskSelector, $url, $method = 'get', $parameters = [ ]) {
448
-		$parameters ['immediatly'] = false;
449
-		return $this->jsonArray ( $maskSelector, $url, $method, $parameters );
447
+	public function jsonArrayDeferred($maskSelector, $url, $method='get', $parameters=[]) {
448
+		$parameters ['immediatly']=false;
449
+		return $this->jsonArray($maskSelector, $url, $method, $parameters);
450 450
 	}
451 451
 
452 452
 	/**
@@ -461,14 +461,14 @@  discard block
 block discarded – undo
461 461
 	 * @param array $parameters
462 462
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","rowClass"=>"_json","immediatly"=>true,"before"=>null,"listenerOn"=>false)
463 463
 	 */
464
-	public function jsonArrayOn($event, $element, $maskSelector, $url, $method = 'get', $parameters = array ()) {
465
-		$this->setDefaultParameters ( $parameters, [ 
464
+	public function jsonArrayOn($event, $element, $maskSelector, $url, $method='get', $parameters=array()) {
465
+		$this->setDefaultParameters($parameters, [ 
466 466
 				'preventDefault' => true,
467 467
 				'stopPropagation' => true,
468 468
 				'immediatly' => true,
469 469
 				'listenerOn'=>false
470
-		] );
471
-		return $this->_add_event ( $element, $this->jsonArrayDeferred ( $maskSelector, $url, $method, $parameters ), $event, $parameters ["preventDefault"], $parameters ["stopPropagation"], $parameters ["immediatly"] ,$parameters['listenerOn']);
470
+		]);
471
+		return $this->_add_event($element, $this->jsonArrayDeferred($maskSelector, $url, $method, $parameters), $event, $parameters ["preventDefault"], $parameters ["stopPropagation"], $parameters ["immediatly"], $parameters['listenerOn']);
472 472
 	}
473 473
 
474 474
 	/**
@@ -482,9 +482,9 @@  discard block
 block discarded – undo
482 482
 	 * @param array $parameters
483 483
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null)
484 484
 	 */
485
-	public function getDeferred($url, $responseElement = "", $parameters = [ ]) {
486
-		$parameters ['immediatly'] = false;
487
-		return $this->_get ( $url, $responseElement, $parameters );
485
+	public function getDeferred($url, $responseElement="", $parameters=[]) {
486
+		$parameters ['immediatly']=false;
487
+		return $this->_get($url, $responseElement, $parameters);
488 488
 	}
489 489
 
490 490
 	/**
@@ -502,9 +502,9 @@  discard block
 block discarded – undo
502 502
 	 * @param array $parameters
503 503
 	 *        	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,"before"=>null,"listenerOn"=>false)
504 504
 	 */
505
-	public function getOn($event, $element, $url, $responseElement = "", $parameters = array ()) {
505
+	public function getOn($event, $element, $url, $responseElement="", $parameters=array()) {
506 506
 		$parameters['method']='get';
507
-		return $this->ajaxOn($event, $element, $url,$responseElement,$parameters);
507
+		return $this->ajaxOn($event, $element, $url, $responseElement, $parameters);
508 508
 	}
509 509
 
510 510
 	/**
@@ -522,15 +522,15 @@  discard block
 block discarded – undo
522 522
 	 * @param array $parameters
523 523
 	 *        	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,"before"=>null,"listenerOn"=>false)
524 524
 	 */
525
-	public function ajaxOn($event, $element, $url, $responseElement = '', $parameters = array ()) {
526
-		$this->setDefaultParameters ( $parameters, [ 
525
+	public function ajaxOn($event, $element, $url, $responseElement='', $parameters=array()) {
526
+		$this->setDefaultParameters($parameters, [ 
527 527
 				'preventDefault' => true,
528 528
 				'stopPropagation' => true,
529 529
 				'immediatly' => true,
530 530
 				'method' => 'get',
531 531
 				'listenerOn'=>false
532
-		] );
533
-		return $this->_add_event ( $element, $this->ajaxDeferred ( $parameters ['method'], $url, $responseElement, $parameters ), $event, $parameters ["preventDefault"], $parameters ["stopPropagation"], $parameters ["immediatly"],$parameters['listenerOn'] );
532
+		]);
533
+		return $this->_add_event($element, $this->ajaxDeferred($parameters ['method'], $url, $responseElement, $parameters), $event, $parameters ["preventDefault"], $parameters ["stopPropagation"], $parameters ["immediatly"], $parameters['listenerOn']);
534 534
 	}
535 535
 
536 536
 	/**
@@ -546,8 +546,8 @@  discard block
 block discarded – undo
546 546
 	 * @param array $parameters
547 547
 	 *        	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,"before"=>null,"listenerOn"=>false)
548 548
 	 */
549
-	public function ajaxOnClick($element, $url, $responseElement = '', $parameters = array ()) {
550
-		return $this->ajaxOn ( 'click', $element, $url, $responseElement, $parameters );
549
+	public function ajaxOnClick($element, $url, $responseElement='', $parameters=array()) {
550
+		return $this->ajaxOn('click', $element, $url, $responseElement, $parameters);
551 551
 	}
552 552
 
553 553
 	/**
@@ -563,8 +563,8 @@  discard block
 block discarded – undo
563 563
 	 * @param array $parameters
564 564
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null,"listenerOn"=>false)
565 565
 	 */
566
-	public function getOnClick($element, $url, $responseElement = '', $parameters = array ()) {
567
-		return $this->getOn ( 'click', $element, $url, $responseElement, $parameters );
566
+	public function getOnClick($element, $url, $responseElement='', $parameters=array()) {
567
+		return $this->getOn('click', $element, $url, $responseElement, $parameters);
568 568
 	}
569 569
 
570 570
 	/**
@@ -578,17 +578,17 @@  discard block
 block discarded – undo
578 578
 	 *        	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,"before"=>null)
579 579
 	 * @return $this
580 580
 	 */
581
-	public function getHref($element, $responseElement = "", $parameters = array ()) {
582
-		$parameters ['attr'] = 'href';
583
-		if (JString::isNull ( $responseElement )) {
584
-			$responseElement = '%$(self).attr("data-target")%';
581
+	public function getHref($element, $responseElement="", $parameters=array()) {
582
+		$parameters ['attr']='href';
583
+		if (JString::isNull($responseElement)) {
584
+			$responseElement='%$(self).attr("data-target")%';
585 585
 		} else {
586
-			$responseElement = '%$(self).attr("data-target") || "' . $responseElement . '"%';
586
+			$responseElement='%$(self).attr("data-target") || "'.$responseElement.'"%';
587 587
 		}
588
-		if (! isset ( $parameters ['historize'] )) {
589
-			$parameters ['historize'] = true;
588
+		if (!isset ($parameters ['historize'])) {
589
+			$parameters ['historize']=true;
590 590
 		}
591
-		return $this->getOnClick ( $element, "", $responseElement, $parameters );
591
+		return $this->getOnClick($element, "", $responseElement, $parameters);
592 592
 	}
593 593
 
594 594
 	/**
@@ -602,21 +602,21 @@  discard block
 block discarded – undo
602 602
 	 *        	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,"before"=>null)
603 603
 	 * @return $this
604 604
 	 */
605
-	public function postHref($element, $responseElement = "", $parameters = array ()) {
606
-		$parameters ['attr'] = 'href';
607
-		if (JString::isNull ( $responseElement )) {
608
-			$responseElement = '%$(this).attr("data-target")%';
605
+	public function postHref($element, $responseElement="", $parameters=array()) {
606
+		$parameters ['attr']='href';
607
+		if (JString::isNull($responseElement)) {
608
+			$responseElement='%$(this).attr("data-target")%';
609 609
 		} else {
610
-			$responseElement = '%$(self).attr("data-target") || "' . $responseElement . '"%';
610
+			$responseElement='%$(self).attr("data-target") || "'.$responseElement.'"%';
611 611
 		}
612
-		if (! isset ( $parameters ['historize'] )) {
613
-			$parameters ['historize'] = true;
612
+		if (!isset ($parameters ['historize'])) {
613
+			$parameters ['historize']=true;
614 614
 		}
615
-		return $this->postOnClick ( $element, '', '{}', $responseElement, $parameters );
615
+		return $this->postOnClick($element, '', '{}', $responseElement, $parameters);
616 616
 	}
617
-	private function _post($url, $params = '{}', $responseElement = '', $parameters = [ ]) {
618
-		$parameters ['params'] = $params;
619
-		return $this->_ajax ( 'POST', $url, $responseElement, $parameters );
617
+	private function _post($url, $params='{}', $responseElement='', $parameters=[]) {
618
+		$parameters ['params']=$params;
619
+		return $this->_ajax('POST', $url, $responseElement, $parameters);
620 620
 	}
621 621
 
622 622
 	/**
@@ -631,9 +631,9 @@  discard block
 block discarded – undo
631 631
 	 * @param array $parameters
632 632
 	 *        	default : array("jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null)
633 633
 	 */
634
-	public function post($url, $params = "{}", $responseElement = "", $parameters = [ ]) {
635
-		$parameters ['immediatly'] = true;
636
-		return $this->_post ( $url, $params, $responseElement, $parameters );
634
+	public function post($url, $params="{}", $responseElement="", $parameters=[]) {
635
+		$parameters ['immediatly']=true;
636
+		return $this->_post($url, $params, $responseElement, $parameters);
637 637
 	}
638 638
 
639 639
 	/**
@@ -649,9 +649,9 @@  discard block
 block discarded – undo
649 649
 	 * @param array $parameters
650 650
 	 *        	default : array("jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null)
651 651
 	 */
652
-	public function postDeferred($url, $params = "{}", $responseElement = "", $parameters = [ ]) {
653
-		$parameters ['immediatly'] = false;
654
-		return $this->_post ( $url, $params, $responseElement, $parameters );
652
+	public function postDeferred($url, $params="{}", $responseElement="", $parameters=[]) {
653
+		$parameters ['immediatly']=false;
654
+		return $this->_post($url, $params, $responseElement, $parameters);
655 655
 	}
656 656
 
657 657
 	/**
@@ -669,10 +669,10 @@  discard block
 block discarded – undo
669 669
 	 * @param array $parameters
670 670
 	 *        	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,"before"=>null,"listenerOn"=>false)
671 671
 	 */
672
-	public function postOn($event, $element, $url, $params = "{}", $responseElement = "", $parameters = array ()) {
672
+	public function postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
673 673
 		$parameters['method']='post';
674
-		$parameters ['params'] = $params;
675
-		return $this->ajaxOn($event, $element, $url,$responseElement,$parameters);
674
+		$parameters ['params']=$params;
675
+		return $this->ajaxOn($event, $element, $url, $responseElement, $parameters);
676 676
 	}
677 677
 
678 678
 	/**
@@ -689,65 +689,65 @@  discard block
 block discarded – undo
689 689
 	 * @param array $parameters
690 690
 	 *        	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,"before"=>null,"before"=>null,"listenerOn"=>false)
691 691
 	 */
692
-	public function postOnClick($element, $url, $params = '{}', $responseElement = '', $parameters = array ()) {
693
-		return $this->postOn ( 'click', $element, $url, $params, $responseElement, $parameters );
694
-	}
695
-	private function _postForm($url, $form, $responseElement, $parameters = [ ]) {
696
-		if (isset ( $this->params ['ajax'] )) {
697
-			extract ( $this->params ['ajax'] );
698
-		}
699
-		$params = '{}';
700
-		$validation = false;
701
-		\extract ( $parameters );
702
-		$async = ($async) ? 'true' : 'false';
703
-		$jsCallback = isset ( $jsCallback ) ? $jsCallback : "";
704
-		$retour = $this->_getAjaxUrl ( $url, $attr );
705
-		$retour .= "\n$('#" . $form . "').trigger('ajaxSubmit');";
706
-		if (! isset ( $contentType ) || $contentType != 'false') {
707
-			$retour .= "\nvar params=$('#" . $form . "').serialize();\n";
708
-			if (isset ( $params )) {
709
-				$retour .= "params+='&'+" . self::_correctParams ( $params ) . ";\n";
692
+	public function postOnClick($element, $url, $params='{}', $responseElement='', $parameters=array()) {
693
+		return $this->postOn('click', $element, $url, $params, $responseElement, $parameters);
694
+	}
695
+	private function _postForm($url, $form, $responseElement, $parameters=[]) {
696
+		if (isset ($this->params ['ajax'])) {
697
+			extract($this->params ['ajax']);
698
+		}
699
+		$params='{}';
700
+		$validation=false;
701
+		\extract($parameters);
702
+		$async=($async) ? 'true' : 'false';
703
+		$jsCallback=isset ($jsCallback) ? $jsCallback : "";
704
+		$retour=$this->_getAjaxUrl($url, $attr);
705
+		$retour.="\n$('#".$form."').trigger('ajaxSubmit');";
706
+		if (!isset ($contentType) || $contentType!='false') {
707
+			$retour.="\nvar params=$('#".$form."').serialize();\n";
708
+			if (isset ($params)) {
709
+				$retour.="params+='&'+".self::_correctParams($params).";\n";
710 710
 			}
711 711
 		} else {
712
-			$retour .= "\nvar params=new FormData($('#" . $form . "')[0]);\n";
713
-		}
714
-		$responseElement = $this->_getResponseElement ( $responseElement );
715
-		$retour .= "var self=this;\n";
716
-		$before = isset ( $before ) ? $before : "";
717
-		$retour .= $before;
718
-		if ($hasLoader === true) {
719
-			$this->addLoading ( $retour, $responseElement, $ajaxLoader );
720
-		} elseif ($hasLoader === 'response') {
721
-			$this->addResponseLoading ( $retour, $responseElement, $ajaxLoader );
722
-		} elseif ($hasLoader === 'internal') {
723
-			$retour .= "\n$(this).addClass('loading');";
724
-		}
725
-		$ajaxParameters = [ 
712
+			$retour.="\nvar params=new FormData($('#".$form."')[0]);\n";
713
+		}
714
+		$responseElement=$this->_getResponseElement($responseElement);
715
+		$retour.="var self=this;\n";
716
+		$before=isset ($before) ? $before : "";
717
+		$retour.=$before;
718
+		if ($hasLoader===true) {
719
+			$this->addLoading($retour, $responseElement, $ajaxLoader);
720
+		} elseif ($hasLoader==='response') {
721
+			$this->addResponseLoading($retour, $responseElement, $ajaxLoader);
722
+		} elseif ($hasLoader==='internal') {
723
+			$retour.="\n$(this).addClass('loading');";
724
+		}
725
+		$ajaxParameters=[ 
726 726
 				"url" => "url",
727 727
 				"method" => "'POST'",
728 728
 				"data" => "params",
729 729
 				"async" => $async
730 730
 		];
731
-		if (isset ( $headers )) {
732
-			$ajaxParameters ["headers"] = $headers;
731
+		if (isset ($headers)) {
732
+			$ajaxParameters ["headers"]=$headers;
733 733
 		}
734
-		if (isset ( $partial )) {
735
-			$ajaxParameters ["xhr"] = "xhrProvider";
736
-			$retour .= "var xhr = $.ajaxSettings.xhr();function xhrProvider() {return xhr;};xhr.onreadystatechange = function (e) { if (3==e.target.readyState){let response=e.target.responseText;" . $partial . ";}; };";
734
+		if (isset ($partial)) {
735
+			$ajaxParameters ["xhr"]="xhrProvider";
736
+			$retour.="var xhr = $.ajaxSettings.xhr();function xhrProvider() {return xhr;};xhr.onreadystatechange = function (e) { if (3==e.target.readyState){let response=e.target.responseText;".$partial.";}; };";
737 737
 		}
738
-		$this->createAjaxParameters ( $ajaxParameters, $parameters );
739
-		$retour .= "$.ajax({" . $this->implodeAjaxParameters ( $ajaxParameters ) . "}).done(function( data ) {\n";
740
-		$retour .= $this->_getOnAjaxDone ( $responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader ) . "});\n";
738
+		$this->createAjaxParameters($ajaxParameters, $parameters);
739
+		$retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data ) {\n";
740
+		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader)."});\n";
741 741
 
742 742
 		if ($validation) {
743
-			$retour = "$('#" . $form . "').validate({submitHandler: function(form) {
744
-			" . $retour . "
743
+			$retour="$('#".$form."').validate({submitHandler: function(form) {
744
+			" . $retour."
745 745
 			}});\n";
746
-			$retour .= "$('#" . $form . "').submit();\n";
746
+			$retour.="$('#".$form."').submit();\n";
747 747
 		}
748
-		$retour = $this->_addJsCondition ( $jsCondition, $retour );
748
+		$retour=$this->_addJsCondition($jsCondition, $retour);
749 749
 		if ($immediatly)
750
-			$this->jquery_code_for_compile [] = $retour;
750
+			$this->jquery_code_for_compile []=$retour;
751 751
 		return $retour;
752 752
 	}
753 753
 
@@ -763,9 +763,9 @@  discard block
 block discarded – undo
763 763
 	 * @param array $parameters
764 764
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null)
765 765
 	 */
766
-	public function postForm($url, $form, $responseElement, $parameters = [ ]) {
767
-		$parameters ['immediatly'] = true;
768
-		return $this->_postForm ( $url, $form, $responseElement, $parameters );
766
+	public function postForm($url, $form, $responseElement, $parameters=[]) {
767
+		$parameters ['immediatly']=true;
768
+		return $this->_postForm($url, $form, $responseElement, $parameters);
769 769
 	}
770 770
 
771 771
 	/**
@@ -781,9 +781,9 @@  discard block
 block discarded – undo
781 781
 	 * @param array $parameters
782 782
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null)
783 783
 	 */
784
-	public function postFormDeferred($url, $form, $responseElement, $parameters = [ ]) {
785
-		$parameters ['immediatly'] = false;
786
-		return $this->_postForm ( $url, $form, $responseElement, $parameters );
784
+	public function postFormDeferred($url, $form, $responseElement, $parameters=[]) {
785
+		$parameters ['immediatly']=false;
786
+		return $this->_postForm($url, $form, $responseElement, $parameters);
787 787
 	}
788 788
 
789 789
 	/**
@@ -799,14 +799,14 @@  discard block
 block discarded – undo
799 799
 	 * @param array $parameters
800 800
 	 *        	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,"before"=>null,"listenerOn"=>false)
801 801
 	 */
802
-	public function postFormOn($event, $element, $url, $form, $responseElement = "", $parameters = array ()) {
803
-		$this->setDefaultParameters ( $parameters, [ 
802
+	public function postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) {
803
+		$this->setDefaultParameters($parameters, [ 
804 804
 				'preventDefault' => true,
805 805
 				'stopPropagation' => true,
806 806
 				'immediatly' => true,
807 807
 				'listenerOn'=>false
808
-		] );
809
-		return $this->_add_event ( $element, $this->postFormDeferred ( $url, $form, $responseElement, $parameters ), $event, $parameters ["preventDefault"], $parameters ["stopPropagation"], $parameters ["immediatly"] ,$parameters['listenerOn']);
808
+		]);
809
+		return $this->_add_event($element, $this->postFormDeferred($url, $form, $responseElement, $parameters), $event, $parameters ["preventDefault"], $parameters ["stopPropagation"], $parameters ["immediatly"], $parameters['listenerOn']);
810 810
 	}
811 811
 
812 812
 	/**
@@ -821,11 +821,11 @@  discard block
 block discarded – undo
821 821
 	 * @param array $parameters
822 822
 	 *        	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,"before"=>null,"listenerOn"=>false)
823 823
 	 */
824
-	public function postFormOnClick($element, $url, $form, $responseElement = "", $parameters = array ()) {
825
-		return $this->postFormOn ( "click", $element, $url, $form, $responseElement, $parameters );
824
+	public function postFormOnClick($element, $url, $form, $responseElement="", $parameters=array()) {
825
+		return $this->postFormOn("click", $element, $url, $form, $responseElement, $parameters);
826 826
 	}
827 827
 	
828
-	public function addCsrf($name='csrf-token'){
828
+	public function addCsrf($name='csrf-token') {
829 829
 		return "
830 830
 		$.ajaxSetup({
831 831
 			beforeSend: function(xhr, settings) {
Please login to merge, or discard this patch.
Ajax/semantic/widgets/base/InstanceViewer.php 1 patch
Spacing   +109 added lines, -109 removed lines patch added patch discarded remove patch
@@ -29,17 +29,17 @@  discard block
 block discarded – undo
29 29
 
30 30
 	protected $groupByFields;
31 31
 
32
-	public static $index = 0;
32
+	public static $index=0;
33 33
 
34
-	public function __construct($identifier, $instance = NULL, $captions = NULL) {
35
-		$this->widgetIdentifier = $identifier;
36
-		$this->values = [];
37
-		$this->afterCompile = [];
34
+	public function __construct($identifier, $instance=NULL, $captions=NULL) {
35
+		$this->widgetIdentifier=$identifier;
36
+		$this->values=[];
37
+		$this->afterCompile=[];
38 38
 		if (isset($instance))
39 39
 			$this->setInstance($instance);
40 40
 		$this->setCaptions($captions);
41
-		$this->captionCallback = NULL;
42
-		$this->defaultValueFunction = function ($name, $value) {
41
+		$this->captionCallback=NULL;
42
+		$this->defaultValueFunction=function($name, $value) {
43 43
 			return $value;
44 44
 		};
45 45
 	}
@@ -66,47 +66,47 @@  discard block
 block discarded – undo
66 66
 	}
67 67
 
68 68
 	public function getValues() {
69
-		$values = [];
70
-		$index = 0;
71
-		$count = $this->count();
72
-		$hasGroupby = is_array($this->groupByFields);
73
-		if (! $hasGroupby) {
74
-			while ($index < $count) {
75
-				$values[] = $this->getValue($index ++);
69
+		$values=[];
70
+		$index=0;
71
+		$count=$this->count();
72
+		$hasGroupby=is_array($this->groupByFields);
73
+		if (!$hasGroupby) {
74
+			while ($index<$count) {
75
+				$values[]=$this->getValue($index++);
76 76
 			}
77 77
 		} else {
78
-			while ($index < $count) {
79
-				if (array_search($index, $this->groupByFields) === false) {
80
-					$values[] = $this->getValue($index);
78
+			while ($index<$count) {
79
+				if (array_search($index, $this->groupByFields)===false) {
80
+					$values[]=$this->getValue($index);
81 81
 				}
82
-				$index ++;
82
+				$index++;
83 83
 			}
84 84
 		}
85 85
 		return $values;
86 86
 	}
87 87
 
88
-	public function getIdentifier($index = NULL) {
89
-		if (! isset($index))
90
-			$index = self::$index;
91
-		$value = $index;
88
+	public function getIdentifier($index=NULL) {
89
+		if (!isset($index))
90
+			$index=self::$index;
91
+		$value=$index;
92 92
 		if (isset($this->values["identifier"])) {
93 93
 			if (\is_string($this->values["identifier"]))
94
-				$value = JReflection::callMethod($this->instance, $this->values["identifier"], []);
94
+				$value=JReflection::callMethod($this->instance, $this->values["identifier"], []);
95 95
 			else
96
-				$value = $this->values["identifier"]($index, $this->instance);
96
+				$value=$this->values["identifier"]($index, $this->instance);
97 97
 		}
98 98
 		return $value;
99 99
 	}
100 100
 
101 101
 	public function getValue($index) {
102
-		$property = $this->properties[$index];
102
+		$property=$this->properties[$index];
103 103
 		return $this->_getValue($property, $index);
104 104
 	}
105 105
 
106 106
 	protected function _beforeAddProperty($index, &$field) {}
107 107
 
108 108
 	protected function _getDefaultValue($name, $value, $index) {
109
-		$func = $this->defaultValueFunction;
109
+		$func=$this->defaultValueFunction;
110 110
 		return $func($name, $value, $index, $this->instance);
111 111
 	}
112 112
 
@@ -116,27 +116,27 @@  discard block
 block discarded – undo
116 116
 	}
117 117
 
118 118
 	protected function _getValue($property, $index) {
119
-		$value = null;
120
-		$propertyName = $property;
119
+		$value=null;
120
+		$propertyName=$property;
121 121
 		if ($property instanceof \ReflectionProperty) {
122
-			$value = $this->_getPropertyValue($property);
123
-			$propertyName = $property->getName();
124
-		} elseif (\is_callable($property) && \array_search($property, ['system','date']) === false){
125
-			try{
126
-				$value = $property($this->instance);
127
-			}catch(\Error $e){}
122
+			$value=$this->_getPropertyValue($property);
123
+			$propertyName=$property->getName();
124
+		} elseif (\is_callable($property) && \array_search($property, ['system', 'date'])===false) {
125
+			try {
126
+				$value=$property($this->instance);
127
+			}catch (\Error $e) {}
128 128
 		}
129 129
 		elseif (\is_array($property)) {
130
-			$values = \array_map(function ($v) use ($index) {
130
+			$values=\array_map(function($v) use ($index) {
131 131
 				return $this->_getValue($v, $index);
132 132
 			}, $property);
133
-			$value = \implode('', $values);
133
+			$value=\implode('', $values);
134 134
 		} elseif (\is_string($property)) {
135
-			$value = '';
135
+			$value='';
136 136
 			if (isset($this->instance->{$property})) {
137
-				$value = $this->instance->{$property};
138
-			} elseif (\method_exists($this->instance, $getter = JReflection::getterName($property))) {
139
-				$value = JReflection::callMethod($this->instance, $getter, []);
137
+				$value=$this->instance->{$property};
138
+			} elseif (\method_exists($this->instance, $getter=JReflection::getterName($property))) {
139
+				$value=JReflection::callMethod($this->instance, $getter, []);
140 140
 			}
141 141
 		}
142 142
 
@@ -145,9 +145,9 @@  discard block
 block discarded – undo
145 145
 
146 146
 	protected function _postGetValue($index, $propertyName, $value) {
147 147
 		if (isset($this->values[$index])) {
148
-			$value = $this->values[$index]($value, $this->instance, $index, self::$index);
148
+			$value=$this->values[$index]($value, $this->instance, $index, self::$index);
149 149
 		} else {
150
-			$value = $this->_getDefaultValue($propertyName, $value, $index);
150
+			$value=$this->_getDefaultValue($propertyName, $value, $index);
151 151
 		}
152 152
 		if (isset($this->afterCompile[$index])) {
153 153
 			if (\is_callable($this->afterCompile[$index])) {
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
 		return $value;
158 158
 	}
159 159
 
160
-	public function insertField($index, $field, $key = null) {
160
+	public function insertField($index, $field, $key=null) {
161 161
 		if (isset($key)) {
162 162
 			array_splice($this->visibleProperties, $index, 0, [
163 163
 				$key => $field
@@ -171,29 +171,29 @@  discard block
 block discarded – undo
171 171
 	public function sortColumnContent($index, $array) {
172 172
 		if (isset($this->visibleProperties[$index])) {
173 173
 			if (is_array($this->visibleProperties[$index])) {
174
-				$this->visibleProperties[$index] = JArray::sortAssociative($this->visibleProperties[$index], $array);
174
+				$this->visibleProperties[$index]=JArray::sortAssociative($this->visibleProperties[$index], $array);
175 175
 			}
176 176
 		}
177 177
 		return $this;
178 178
 	}
179 179
 
180
-	public function insertInField($index, $field, $key = null) {
181
-		$vb = $this->visibleProperties;
180
+	public function insertInField($index, $field, $key=null) {
181
+		$vb=$this->visibleProperties;
182 182
 		if (isset($vb[$index])) {
183 183
 			if (isset($key)) {
184 184
 				if (\is_array($vb[$index])) {
185
-					$this->visibleProperties[$index][$key] = $field;
185
+					$this->visibleProperties[$index][$key]=$field;
186 186
 				} else {
187
-					$this->visibleProperties[$index] = [
187
+					$this->visibleProperties[$index]=[
188 188
 						$vb[$index],
189 189
 						$key => $field
190 190
 					];
191 191
 				}
192 192
 			} else {
193 193
 				if (\is_array($vb[$index])) {
194
-					$this->visibleProperties[$index][] = $field;
194
+					$this->visibleProperties[$index][]=$field;
195 195
 				} else {
196
-					$this->visibleProperties[$index] = [
196
+					$this->visibleProperties[$index]=[
197 197
 						$vb[$index],
198 198
 						$field
199 199
 					];
@@ -205,19 +205,19 @@  discard block
 block discarded – undo
205 205
 		return $this;
206 206
 	}
207 207
 
208
-	public function addField($field, $key = null) {
208
+	public function addField($field, $key=null) {
209 209
 		if (isset($key)) {
210
-			$this->visibleProperties[] = [
210
+			$this->visibleProperties[]=[
211 211
 				$key => $field
212 212
 			];
213 213
 		} else {
214
-			$this->visibleProperties[] = $field;
214
+			$this->visibleProperties[]=$field;
215 215
 		}
216 216
 		return $this;
217 217
 	}
218 218
 
219 219
 	public function addFields($fields) {
220
-		$this->visibleProperties = \array_merge($this->visibleProperties, $fields);
220
+		$this->visibleProperties=\array_merge($this->visibleProperties, $fields);
221 221
 		return $this;
222 222
 	}
223 223
 
@@ -234,30 +234,30 @@  discard block
 block discarded – undo
234 234
 	}
235 235
 
236 236
 	public function getFieldName($index) {
237
-		$property = $this->getProperty($index);
237
+		$property=$this->getProperty($index);
238 238
 		if ($property instanceof \ReflectionProperty) {
239
-			$result = $property->getName();
239
+			$result=$property->getName();
240 240
 		} elseif (\is_callable($property)) {
241
-			$result = $this->visibleProperties[$index];
241
+			$result=$this->visibleProperties[$index];
242 242
 		} else {
243
-			$result = $property;
243
+			$result=$property;
244 244
 		}
245 245
 		return $result;
246 246
 	}
247 247
 
248 248
 	protected function showableProperty(\ReflectionProperty $rProperty) {
249
-		return JString::startswith($rProperty->getName(), "_") === false;
249
+		return JString::startswith($rProperty->getName(), "_")===false;
250 250
 	}
251 251
 
252 252
 	public function setInstance($instance) {
253 253
 		if (\is_string($instance)) {
254
-			$instance = new $instance();
254
+			$instance=new $instance();
255 255
 		}
256
-		$this->instance = $instance;
257
-		$this->properties = [];
258
-		$this->reflect = new \ReflectionClass($instance);
259
-		if (JArray::count($this->visibleProperties) === 0) {
260
-			$this->properties = $this->getDefaultProperties();
256
+		$this->instance=$instance;
257
+		$this->properties=[];
258
+		$this->reflect=new \ReflectionClass($instance);
259
+		if (JArray::count($this->visibleProperties)===0) {
260
+			$this->properties=$this->getDefaultProperties();
261 261
 		} else {
262 262
 			foreach ($this->visibleProperties as $property) {
263 263
 				$this->setInstanceProperty($property);
@@ -268,56 +268,56 @@  discard block
 block discarded – undo
268 268
 
269 269
 	private function setInstanceProperty($property) {
270 270
 		if (\is_callable($property)) {
271
-			$this->properties[] = $property;
271
+			$this->properties[]=$property;
272 272
 		} elseif (\is_string($property)) {
273 273
 			try {
274 274
 				$this->_beforeAddProperty(\sizeof($this->properties), $property);
275
-				$rProperty = $this->reflect->getProperty($property);
276
-				$this->properties[] = $rProperty;
277
-			} catch (\Exception $e) {
275
+				$rProperty=$this->reflect->getProperty($property);
276
+				$this->properties[]=$rProperty;
277
+			}catch (\Exception $e) {
278 278
 				$this->_beforeAddProperty(\sizeof($this->properties), $property);
279
-				$this->properties[] = $property;
279
+				$this->properties[]=$property;
280 280
 			}
281 281
 		} elseif (\is_int($property)) {
282
-			$props = $this->getDefaultProperties();
282
+			$props=$this->getDefaultProperties();
283 283
 			if (isset($props[$property]))
284
-				$this->properties[] = $props[$property];
284
+				$this->properties[]=$props[$property];
285 285
 			else
286
-				$this->properties[] = $property;
286
+				$this->properties[]=$property;
287 287
 		} else {
288
-			$this->properties[] = $property;
288
+			$this->properties[]=$property;
289 289
 		}
290 290
 	}
291 291
 
292 292
 	protected function getDefaultProperties() {
293
-		$result = [];
294
-		$properties = $this->reflect->getProperties();
293
+		$result=[];
294
+		$properties=$this->reflect->getProperties();
295 295
 		foreach ($properties as $property) {
296
-			$showable = $this->showableProperty($property);
297
-			if ($showable !== false) {
298
-				$result[] = $property;
296
+			$showable=$this->showableProperty($property);
297
+			if ($showable!==false) {
298
+				$result[]=$property;
299 299
 			}
300 300
 		}
301 301
 		return $result;
302 302
 	}
303 303
 
304 304
 	public function setVisibleProperties($visibleProperties) {
305
-		$this->visibleProperties = $visibleProperties;
305
+		$this->visibleProperties=$visibleProperties;
306 306
 		return $this;
307 307
 	}
308 308
 
309 309
 	public function setValueFunction($index, $callback) {
310
-		$this->values[$index] = $callback;
310
+		$this->values[$index]=$callback;
311 311
 		return $this;
312 312
 	}
313 313
 
314 314
 	public function setIdentifierFunction($callback) {
315
-		$this->values["identifier"] = $callback;
315
+		$this->values["identifier"]=$callback;
316 316
 		return $this;
317 317
 	}
318 318
 
319 319
 	public static function setIndex($index) {
320
-		self::$index = $index;
320
+		self::$index=$index;
321 321
 	}
322 322
 
323 323
 	public function getProperties() {
@@ -337,43 +337,43 @@  discard block
 block discarded – undo
337 337
 	}
338 338
 
339 339
 	public function getCaptions() {
340
-		$hasGroupby = is_array($this->groupByFields);
341
-		$count = $this->count();
342
-		$moreAdded = false;
340
+		$hasGroupby=is_array($this->groupByFields);
341
+		$count=$this->count();
342
+		$moreAdded=false;
343 343
 		if (isset($this->captions)) {
344
-			$captions = \array_values($this->captions);
345
-			$gbSize = $hasGroupby ? sizeof($this->groupByFields) : 0;
346
-			$captionsSize = \sizeof($captions);
347
-			for ($i = $captionsSize; $i < $count - $gbSize; $i ++) {
348
-				$captions[] = "";
349
-				$moreAdded = true;
344
+			$captions=\array_values($this->captions);
345
+			$gbSize=$hasGroupby ? sizeof($this->groupByFields) : 0;
346
+			$captionsSize=\sizeof($captions);
347
+			for ($i=$captionsSize; $i<$count-$gbSize; $i++) {
348
+				$captions[]="";
349
+				$moreAdded=true;
350 350
 			}
351 351
 		} else {
352
-			$captions = [];
353
-			$index = 0;
354
-			while ($index < $count) {
355
-				$captions[] = $this->getCaption($index ++);
352
+			$captions=[];
353
+			$index=0;
354
+			while ($index<$count) {
355
+				$captions[]=$this->getCaption($index++);
356 356
 			}
357 357
 		}
358
-		if ($hasGroupby && sizeof($captions) >= $count && ! $moreAdded) {
359
-			$captions = JArray::removeByKeys($captions, $this->groupByFields);
358
+		if ($hasGroupby && sizeof($captions)>=$count && !$moreAdded) {
359
+			$captions=JArray::removeByKeys($captions, $this->groupByFields);
360 360
 		}
361 361
 		if (isset($this->captionCallback) && \is_callable($this->captionCallback)) {
362
-			$callback = $this->captionCallback;
362
+			$callback=$this->captionCallback;
363 363
 			$callback($captions, $this->instance);
364 364
 		}
365 365
 		return $captions;
366 366
 	}
367 367
 
368 368
 	public function setCaption($index, $caption) {
369
-		if (isset($this->captions) === false)
370
-			$this->captions = [];
371
-		$this->captions[$index] = $caption;
369
+		if (isset($this->captions)===false)
370
+			$this->captions=[];
371
+		$this->captions[$index]=$caption;
372 372
 		return $this;
373 373
 	}
374 374
 
375 375
 	public function setCaptions($captions) {
376
-		$this->captions = $captions;
376
+		$this->captions=$captions;
377 377
 		return $this;
378 378
 	}
379 379
 
@@ -388,7 +388,7 @@  discard block
 block discarded – undo
388 388
 	 * @return InstanceViewer
389 389
 	 */
390 390
 	public function afterCompile($index, $callback) {
391
-		$this->afterCompile[$index] = $callback;
391
+		$this->afterCompile[$index]=$callback;
392 392
 		return $this;
393 393
 	}
394 394
 
@@ -400,7 +400,7 @@  discard block
 block discarded – undo
400 400
 	 * @return \Ajax\semantic\widgets\base\InstanceViewer
401 401
 	 */
402 402
 	public function setCaptionCallback($captionCallback) {
403
-		$this->captionCallback = $captionCallback;
403
+		$this->captionCallback=$captionCallback;
404 404
 		return $this;
405 405
 	}
406 406
 
@@ -412,7 +412,7 @@  discard block
 block discarded – undo
412 412
 	 * @return \Ajax\semantic\widgets\base\InstanceViewer
413 413
 	 */
414 414
 	public function setDefaultValueFunction($defaultValueFunction) {
415
-		$this->defaultValueFunction = $defaultValueFunction;
415
+		$this->defaultValueFunction=$defaultValueFunction;
416 416
 		return $this;
417 417
 	}
418 418
 
@@ -421,8 +421,8 @@  discard block
 block discarded – undo
421 421
 	}
422 422
 
423 423
 	public function getSimpleProperties() {
424
-		return array_filter($this->visibleProperties, function ($item) {
425
-			return ! (is_array($item) || is_object($item));
424
+		return array_filter($this->visibleProperties, function($item) {
425
+			return !(is_array($item) || is_object($item));
426 426
 		});
427 427
 	}
428 428
 
@@ -447,7 +447,7 @@  discard block
 block discarded – undo
447 447
 	 * @param mixed $groupByFields
448 448
 	 */
449 449
 	public function setGroupByFields($groupByFields) {
450
-		$this->groupByFields = $groupByFields;
450
+		$this->groupByFields=$groupByFields;
451 451
 	}
452 452
 
453 453
 	public function getGroupByFieldsCount() {
Please login to merge, or discard this patch.
Ajax/semantic/html/modules/HtmlTab.php 1 patch
Spacing   +45 added lines, -45 removed lines patch added patch discarded remove patch
@@ -18,19 +18,19 @@  discard block
 block discarded – undo
18 18
  */
19 19
 class HtmlTab extends HtmlSemCollection {
20 20
 
21
-	protected $params = [];
21
+	protected $params=[];
22 22
 
23
-	protected $_activated = false;
23
+	protected $_activated=false;
24 24
 
25
-	public function __construct($identifier, $tabs = array()) {
25
+	public function __construct($identifier, $tabs=array()) {
26 26
 		parent::__construct($identifier, "div", "");
27
-		$menu = new HtmlMenu("menu" . $this->identifier);
27
+		$menu=new HtmlMenu("menu".$this->identifier);
28 28
 		$menu->asTab(false)->setAttachment(NULL, Side::TOP);
29
-		$this->content["menu"] = $menu;
29
+		$this->content["menu"]=$menu;
30 30
 		$this->addItems($tabs);
31 31
 	}
32 32
 	
33
-	public function getMenu(){
33
+	public function getMenu() {
34 34
 		return $this->content['menu'];
35 35
 	}
36 36
 
@@ -41,18 +41,18 @@  discard block
 block discarded – undo
41 41
 	 * @return HtmlSegment
42 42
 	 */
43 43
 	protected function createItem($value) {
44
-		$count = $this->count();
45
-		$title = $value;
46
-		$content = NULL;
44
+		$count=$this->count();
45
+		$title=$value;
46
+		$content=NULL;
47 47
 		if (\is_array($value)) {
48
-			$title = @$value[0];
49
-			$content = @$value[1];
48
+			$title=@$value[0];
49
+			$content=@$value[1];
50 50
 		}
51
-		$menuItem = $this->content["menu"]->addItem($title);
51
+		$menuItem=$this->content["menu"]->addItem($title);
52 52
 		$menuItem->addToProperty("data-tab", $menuItem->getIdentifier());
53 53
 		$menuItem->removeProperty("href");
54
-		$result = $this->createSegment($count, $content, $menuItem->getIdentifier());
55
-		$result->menuTab = $menuItem;
54
+		$result=$this->createSegment($count, $content, $menuItem->getIdentifier());
55
+		$result->menuTab=$menuItem;
56 56
 		return $result;
57 57
 	}
58 58
 
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
65 65
 	 */
66 66
 	private function createSegment($count, $content, $datatab) {
67
-		$segment = new HtmlSegment("item-" . $this->identifier . "-" . $count, $content);
67
+		$segment=new HtmlSegment("item-".$this->identifier."-".$count, $content);
68 68
 		$segment->setAttachment(NULL, Side::BOTTOM)
69 69
 			->addToProperty("class", "tab")
70 70
 			->addToProperty("data-tab", $datatab);
@@ -81,10 +81,10 @@  discard block
 block discarded – undo
81 81
 	 * @return \Ajax\semantic\html\modules\HtmlTab
82 82
 	 */
83 83
 	public function setTabContent($index, $content) {
84
-		$menu = $this->content["menu"];
85
-		if ($index < $menu->count()) {
86
-			if (isset($this->content[$index]) === false) {
87
-				$this->content[$index] = $this->createSegment($index, $content, $menu->getItem($index)
84
+		$menu=$this->content["menu"];
85
+		if ($index<$menu->count()) {
86
+			if (isset($this->content[$index])===false) {
87
+				$this->content[$index]=$this->createSegment($index, $content, $menu->getItem($index)
88 88
 					->getIdentifier());
89 89
 			} else
90 90
 				$this->content[$index]->setContent($content);
@@ -99,8 +99,8 @@  discard block
 block discarded – undo
99 99
 	 * @return \Ajax\semantic\html\modules\HtmlTab
100 100
 	 */
101 101
 	public function setTabsContent($contents) {
102
-		$size = \sizeof($contents);
103
-		for ($i = 0; $i < $size; $i ++) {
102
+		$size=\sizeof($contents);
103
+		for ($i=0; $i<$size; $i++) {
104 104
 			$this->setTabContent($i, $contents[$i]);
105 105
 		}
106 106
 		return $this;
@@ -113,11 +113,11 @@  discard block
 block discarded – undo
113 113
 	 * @return \Ajax\semantic\html\modules\HtmlTab
114 114
 	 */
115 115
 	public function activate($index) {
116
-		$item = $this->content["menu"]->getItem($index);
117
-		if ($item != null) {
116
+		$item=$this->content["menu"]->getItem($index);
117
+		if ($item!=null) {
118 118
 			$item->setActive(true);
119 119
 			$this->content[$index]->setActive(true);
120
-			$this->_activated = true;
120
+			$this->_activated=true;
121 121
 		}
122 122
 		return $this;
123 123
 	}
@@ -151,9 +151,9 @@  discard block
 block discarded – undo
151 151
 	 * @param array $params
152 152
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
153 153
 	 */
154
-	public function forwardTab($index, JsUtils $js, $title, $initialController, $controller, $action, $params = array()) {
154
+	public function forwardTab($index, JsUtils $js, $title, $initialController, $controller, $action, $params=array()) {
155 155
 		if (\array_key_exists($index, $this->content)) {
156
-			$this->content[$index] = $js->forward($initialController, $controller, $action, $params);
156
+			$this->content[$index]=$js->forward($initialController, $controller, $action, $params);
157 157
 			return $this->content[$index];
158 158
 		}
159 159
 
@@ -174,9 +174,9 @@  discard block
 block discarded – undo
174 174
 	 *        	The parameters to pass to the view
175 175
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
176 176
 	 */
177
-	public function renderViewTab($index, JsUtils $js, $title, $initialController, $viewName, $params = array()) {
177
+	public function renderViewTab($index, JsUtils $js, $title, $initialController, $viewName, $params=array()) {
178 178
 		if (\array_key_exists($index, $this->content)) {
179
-			$this->content[$index] = $js->renderContent($initialController, $viewName, $params);
179
+			$this->content[$index]=$js->renderContent($initialController, $viewName, $params);
180 180
 			return $this->content[$index];
181 181
 		}
182 182
 		return $this->addAndRenderViewTab($js, $title, $initialController, $viewName, $params);
@@ -196,10 +196,10 @@  discard block
 block discarded – undo
196 196
 	 * @param array $params
197 197
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
198 198
 	 */
199
-	public function addAndForwardTab(JsUtils $js, $title, $initialController, $controller, $action, $params = array()) {
199
+	public function addAndForwardTab(JsUtils $js, $title, $initialController, $controller, $action, $params=array()) {
200 200
 		\ob_start();
201 201
 		$js->forward($initialController, $controller, $action, $params);
202
-		$content = \ob_get_clean();
202
+		$content=\ob_get_clean();
203 203
 		return $this->addTab($title, $content);
204 204
 	}
205 205
 
@@ -215,11 +215,11 @@  discard block
 block discarded – undo
215 215
 	 *        	The parameters to pass to the view
216 216
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
217 217
 	 */
218
-	public function addAndRenderViewTab(JsUtils $js, $title, $initialController, $viewName, $params = array()) {
218
+	public function addAndRenderViewTab(JsUtils $js, $title, $initialController, $viewName, $params=array()) {
219 219
 		return $this->addTab($title, $js->renderContent($initialController, $viewName, $params));
220 220
 	}
221 221
 
222
-	public function setPointing($value = Direction::NONE) {
222
+	public function setPointing($value=Direction::NONE) {
223 223
 		return $this->content["menu"]->setPointing($value);
224 224
 	}
225 225
 
@@ -254,25 +254,25 @@  discard block
 block discarded – undo
254 254
 	 * @return \Ajax\semantic\html\modules\HtmlTab
255 255
 	 */
256 256
 	public function setMenu($menu) {
257
-		$contentSize = \sizeof($this->content);
258
-		for ($i = 0; $i < $contentSize; $i ++) {
259
-			if ($menu->getItem($i) !== NULL) {
257
+		$contentSize=\sizeof($this->content);
258
+		for ($i=0; $i<$contentSize; $i++) {
259
+			if ($menu->getItem($i)!==NULL) {
260 260
 				if (isset($this->content[$i])) {
261 261
 					$menu->getItem($i)->addToProperty("data-tab", $this->content[$i]->getProperty("data-tab"));
262 262
 				}
263 263
 			}
264 264
 		}
265
-		$menuSize = $menu->count();
266
-		for ($i = 0; $i < $menuSize; $i ++) {
265
+		$menuSize=$menu->count();
266
+		for ($i=0; $i<$menuSize; $i++) {
267 267
 			$menu->getItem($i)->removeProperty("href");
268
-			if (isset($this->content[$i]) === false) {
269
-				$this->content[$i] = $this->createSegment($i, "New content", $menu->getItem($i)
268
+			if (isset($this->content[$i])===false) {
269
+				$this->content[$i]=$this->createSegment($i, "New content", $menu->getItem($i)
270 270
 					->getIdentifier());
271 271
 			}
272 272
 			$menu->getItem($i)->addToProperty("data-tab", $this->content[$i]->getProperty("data-tab"));
273 273
 		}
274 274
 
275
-		$this->content["menu"] = $menu;
275
+		$this->content["menu"]=$menu;
276 276
 		return $this;
277 277
 	}
278 278
 
@@ -281,19 +281,19 @@  discard block
 block discarded – undo
281 281
 	 * @see BaseHtml::run()
282 282
 	 */
283 283
 	public function run(JsUtils $js) {
284
-		if (isset($this->_bsComponent) === false)
285
-			$this->_bsComponent = $js->semantic()->tab("#" . $this->identifier . " .item", $this->params);
284
+		if (isset($this->_bsComponent)===false)
285
+			$this->_bsComponent=$js->semantic()->tab("#".$this->identifier." .item", $this->params);
286 286
 		$this->addEventsOnRun($js);
287 287
 		return $this->_bsComponent;
288 288
 	}
289 289
 
290
-	public function compile(JsUtils $js = NULL, &$view = NULL) {
291
-		if (! $this->_activated && $this->content["menu"]->count() > 0 && \sizeof($this->content) > 1)
290
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
291
+		if (!$this->_activated && $this->content["menu"]->count()>0 && \sizeof($this->content)>1)
292 292
 			$this->activate(0);
293 293
 		return parent::compile($js, $view);
294 294
 	}
295 295
 	
296
-	public function setInverted($recursive=true){
296
+	public function setInverted($recursive=true) {
297 297
 		parent::setInverted($recursive);
298 298
 		$this->content['menu']->addClass('inverted');
299 299
 	}
Please login to merge, or discard this patch.
Ajax/common/Widget.php 1 patch
Spacing   +75 added lines, -75 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
 use Ajax\common\html\traits\BaseHooksTrait;
21 21
 
22 22
 abstract class Widget extends HtmlDoubleElement {
23
-	use FieldAsTrait,FormTrait,BaseHooksTrait;
23
+	use FieldAsTrait, FormTrait, BaseHooksTrait;
24 24
 
25 25
 	/**
26 26
 	 *
@@ -66,24 +66,24 @@  discard block
 block discarded – undo
66 66
 
67 67
 	protected $_hasRules;
68 68
 
69
-	public function __construct($identifier, $model, $modelInstance = NULL) {
69
+	public function __construct($identifier, $model, $modelInstance=NULL) {
70 70
 		parent::__construct($identifier);
71
-		$this->_template = "%wrapContentBefore%%content%%wrapContentAfter%";
71
+		$this->_template="%wrapContentBefore%%content%%wrapContentAfter%";
72 72
 		$this->setModel($model);
73 73
 		if (isset($modelInstance)) {
74 74
 			$this->show($modelInstance);
75 75
 		}
76
-		$this->_generated = false;
76
+		$this->_generated=false;
77 77
 	}
78 78
 
79 79
 	protected function _init($instanceViewer, $contentKey, $content, $edition) {
80
-		$this->_instanceViewer = $instanceViewer;
81
-		$this->content = [
80
+		$this->_instanceViewer=$instanceViewer;
81
+		$this->content=[
82 82
 			$contentKey => $content
83 83
 		];
84
-		$this->_self = $content;
85
-		$this->_toolbarPosition = PositionInTable::BEFORETABLE;
86
-		$this->_edition = $edition;
84
+		$this->_self=$content;
85
+		$this->_toolbarPosition=PositionInTable::BEFORETABLE;
86
+		$this->_edition=$edition;
87 87
 	}
88 88
 
89 89
 	/**
@@ -92,16 +92,16 @@  discard block
 block discarded – undo
92 92
 	 * @return int|string|boolean
93 93
 	 */
94 94
 	protected function _getIndex($fieldName) {
95
-		$index = $fieldName;
95
+		$index=$fieldName;
96 96
 		if (\is_string($fieldName)) {
97
-			$fields = $this->_instanceViewer->getVisibleProperties();
98
-			$index = \array_search($fieldName, $fields);
97
+			$fields=$this->_instanceViewer->getVisibleProperties();
98
+			$index=\array_search($fieldName, $fields);
99 99
 		}
100 100
 		return $index;
101 101
 	}
102 102
 
103
-	protected function _getFieldIdentifier($prefix, $name = "") {
104
-		return $this->identifier . "-{$prefix}-" . $this->_instanceViewer->getIdentifier();
103
+	protected function _getFieldIdentifier($prefix, $name="") {
104
+		return $this->identifier."-{$prefix}-".$this->_instanceViewer->getIdentifier();
105 105
 	}
106 106
 
107 107
 	protected function _getFieldName($index) {
@@ -112,13 +112,13 @@  discard block
 block discarded – undo
112 112
 		return $this->_instanceViewer->getCaption($index);
113 113
 	}
114 114
 
115
-	abstract protected function _setToolbarPosition($table, $captions = NULL);
115
+	abstract protected function _setToolbarPosition($table, $captions=NULL);
116 116
 
117 117
 	public function show($modelInstance) {
118 118
 		if (\is_array($modelInstance)) {
119
-			$modelInstance = \json_decode(\json_encode($modelInstance), FALSE);
119
+			$modelInstance=\json_decode(\json_encode($modelInstance), FALSE);
120 120
 		}
121
-		$this->_modelInstance = $modelInstance;
121
+		$this->_modelInstance=$modelInstance;
122 122
 	}
123 123
 
124 124
 	public function getModel() {
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
 	}
127 127
 
128 128
 	public function setModel($_model) {
129
-		$this->_model = $_model;
129
+		$this->_model=$_model;
130 130
 		return $this;
131 131
 	}
132 132
 
@@ -135,13 +135,13 @@  discard block
 block discarded – undo
135 135
 	}
136 136
 
137 137
 	public function setInstanceViewer($_instanceViewer) {
138
-		$this->_instanceViewer = $_instanceViewer;
138
+		$this->_instanceViewer=$_instanceViewer;
139 139
 		return $this;
140 140
 	}
141 141
 
142 142
 	abstract public function getHtmlComponent();
143 143
 
144
-	public function setAttached($value = true) {
144
+	public function setAttached($value=true) {
145 145
 		return $this->getHtmlComponent()->setAttached($value);
146 146
 	}
147 147
 
@@ -156,8 +156,8 @@  discard block
 block discarded – undo
156 156
 	 * @return Widget
157 157
 	 */
158 158
 	public function afterCompile($index, $callback) {
159
-		$index = $this->_getIndex($index);
160
-		if ($index !== false) {
159
+		$index=$this->_getIndex($index);
160
+		if ($index!==false) {
161 161
 			$this->_instanceViewer->afterCompile($index, $callback);
162 162
 		}
163 163
 		return $this;
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
 		return $this;
183 183
 	}
184 184
 
185
-	public function addField($field, $key = null) {
185
+	public function addField($field, $key=null) {
186 186
 		$this->_instanceViewer->addField($field, $key);
187 187
 		return $this;
188 188
 	}
@@ -196,10 +196,10 @@  discard block
 block discarded – undo
196 196
 		return $this->_instanceViewer->visiblePropertiesCount();
197 197
 	}
198 198
 
199
-	public function addMessage($attributes = NULL, $fieldName = "message") {
199
+	public function addMessage($attributes=NULL, $fieldName="message") {
200 200
 		$this->_instanceViewer->addField($fieldName);
201
-		$count = $this->_instanceViewer->visiblePropertiesCount();
202
-		return $this->fieldAsMessage($count - 1, $attributes);
201
+		$count=$this->_instanceViewer->visiblePropertiesCount();
202
+		return $this->fieldAsMessage($count-1, $attributes);
203 203
 	}
204 204
 
205 205
 	public function addErrorMessage() {
@@ -208,15 +208,15 @@  discard block
 block discarded – undo
208 208
 		], "message");
209 209
 	}
210 210
 
211
-	public function insertField($index, $field, $key = null) {
212
-		$index = $this->_getIndex($index);
211
+	public function insertField($index, $field, $key=null) {
212
+		$index=$this->_getIndex($index);
213 213
 		$this->_instanceViewer->insertField($index, $field, $key);
214 214
 		return $this;
215 215
 	}
216 216
 
217
-	public function insertInField($index, $field, $key = null) {
218
-		$index = $this->_getIndex($index);
219
-		if ($index !== false) {
217
+	public function insertInField($index, $field, $key=null) {
218
+		$index=$this->_getIndex($index);
219
+		if ($index!==false) {
220 220
 			$this->_instanceViewer->insertInField($index, $field, $key);
221 221
 		}
222 222
 		return $this;
@@ -232,8 +232,8 @@  discard block
 block discarded – undo
232 232
 	 * @return Widget
233 233
 	 */
234 234
 	public function setValueFunction($index, $callback) {
235
-		$index = $this->_getIndex($index);
236
-		if ($index !== false) {
235
+		$index=$this->_getIndex($index);
236
+		if ($index!==false) {
237 237
 			$this->_instanceViewer->setValueFunction($index, $callback);
238 238
 		}
239 239
 		return $this;
@@ -249,8 +249,8 @@  discard block
 block discarded – undo
249 249
 	 * @return \Ajax\semantic\html\collections\menus\HtmlMenu
250 250
 	 */
251 251
 	public function getToolbar() {
252
-		if (isset($this->_toolbar) === false) {
253
-			$this->_toolbar = new HtmlMenu("toolbar-" . $this->identifier);
252
+		if (isset($this->_toolbar)===false) {
253
+			$this->_toolbar=new HtmlMenu("toolbar-".$this->identifier);
254 254
 		}
255 255
 		return $this->_toolbar;
256 256
 	}
@@ -263,11 +263,11 @@  discard block
 block discarded – undo
263 263
 	 *        	function to call on $element
264 264
 	 * @return \Ajax\common\html\HtmlDoubleElement
265 265
 	 */
266
-	public function addInToolbar($element, $callback = NULL) {
267
-		$tb = $this->getToolbar();
266
+	public function addInToolbar($element, $callback=NULL) {
267
+		$tb=$this->getToolbar();
268 268
 		if ($element instanceof BaseWidget) {
269
-			if ($element->getIdentifier() === "") {
270
-				$element->setIdentifier("tb-item-" . $this->identifier . "-" . $tb->count());
269
+			if ($element->getIdentifier()==="") {
270
+				$element->setIdentifier("tb-item-".$this->identifier."-".$tb->count());
271 271
 			}
272 272
 		}
273 273
 		if (isset($callback)) {
@@ -286,8 +286,8 @@  discard block
 block discarded – undo
286 286
 	 *        	function($element)
287 287
 	 * @return \Ajax\common\html\HtmlDoubleElement
288 288
 	 */
289
-	public function addItemInToolbar($caption, $icon = NULL, $callback = NULL) {
290
-		$result = $this->addInToolbar($caption, $callback);
289
+	public function addItemInToolbar($caption, $icon=NULL, $callback=NULL) {
290
+		$result=$this->addInToolbar($caption, $callback);
291 291
 		if (isset($icon) && method_exists($result, "addIcon"))
292 292
 			$result->addIcon($icon);
293 293
 		return $result;
@@ -300,7 +300,7 @@  discard block
 block discarded – undo
300 300
 	 *        	function($element)
301 301
 	 * @return \Ajax\common\Widget
302 302
 	 */
303
-	public function addItemsInToolbar(array $items, $callback = NULL) {
303
+	public function addItemsInToolbar(array $items, $callback=NULL) {
304 304
 		if (JArray::isAssociative($items)) {
305 305
 			foreach ($items as $icon => $item) {
306 306
 				$this->addItemInToolbar($item, $icon, $callback);
@@ -321,10 +321,10 @@  discard block
 block discarded – undo
321 321
 	 *        	function($element)
322 322
 	 * @return \Ajax\common\html\HtmlDoubleElement
323 323
 	 */
324
-	public function addDropdownInToolbar($value, $items, $callback = NULL) {
325
-		$dd = $value;
324
+	public function addDropdownInToolbar($value, $items, $callback=NULL) {
325
+		$dd=$value;
326 326
 		if (\is_string($value)) {
327
-			$dd = new HtmlDropdown("dropdown-" . $this->identifier . "-" . $value, $value, $items);
327
+			$dd=new HtmlDropdown("dropdown-".$this->identifier."-".$value, $value, $items);
328 328
 		}
329 329
 		return $this->addInToolbar($dd, $callback);
330 330
 	}
@@ -337,8 +337,8 @@  discard block
 block discarded – undo
337 337
 	 *        	function($element)
338 338
 	 * @return \Ajax\common\html\HtmlDoubleElement
339 339
 	 */
340
-	public function addButtonInToolbar($caption, $cssStyle = null, $callback = NULL) {
341
-		$bt = new HtmlButton("bt-" . $caption, $caption, $cssStyle);
340
+	public function addButtonInToolbar($caption, $cssStyle=null, $callback=NULL) {
341
+		$bt=new HtmlButton("bt-".$caption, $caption, $cssStyle);
342 342
 		return $this->addInToolbar($bt, $callback);
343 343
 	}
344 344
 
@@ -350,8 +350,8 @@  discard block
 block discarded – undo
350 350
 	 *        	function($element)
351 351
 	 * @return \Ajax\common\html\HtmlDoubleElement
352 352
 	 */
353
-	public function addButtonsInToolbar(array $captions, $asIcon = false, $callback = NULL) {
354
-		$bts = new HtmlButtonGroups("", $captions, $asIcon);
353
+	public function addButtonsInToolbar(array $captions, $asIcon=false, $callback=NULL) {
354
+		$bts=new HtmlButtonGroups("", $captions, $asIcon);
355 355
 		return $this->addInToolbar($bts, $callback);
356 356
 	}
357 357
 
@@ -363,14 +363,14 @@  discard block
 block discarded – undo
363 363
 	 * @param boolean $labeled
364 364
 	 * @return \Ajax\common\html\HtmlDoubleElement
365 365
 	 */
366
-	public function addLabelledIconButtonInToolbar($caption, $icon, $before = true, $labeled = false) {
367
-		$bt = new HtmlButton("", $caption);
366
+	public function addLabelledIconButtonInToolbar($caption, $icon, $before=true, $labeled=false) {
367
+		$bt=new HtmlButton("", $caption);
368 368
 		$bt->addIcon($icon, $before, $labeled);
369 369
 		return $this->addInToolbar($bt);
370 370
 	}
371 371
 
372
-	public function addSubmitInToolbar($identifier, $value, $cssStyle = NULL, $url = NULL, $responseElement = NULL, $parameters = NULL) {
373
-		$button = new HtmlButton($identifier, $value, $cssStyle);
372
+	public function addSubmitInToolbar($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $parameters=NULL) {
373
+		$button=new HtmlButton($identifier, $value, $cssStyle);
374 374
 		$this->_buttonAsSubmit($button, "click", $url, $responseElement, $parameters);
375 375
 		return $this->addInToolbar($button);
376 376
 	}
@@ -393,8 +393,8 @@  discard block
 block discarded – undo
393 393
 	 * @param boolean $_edition
394 394
 	 * @return \Ajax\common\Widget
395 395
 	 */
396
-	public function setEdition($_edition = true) {
397
-		$this->_edition = $_edition;
396
+	public function setEdition($_edition=true) {
397
+		$this->_edition=$_edition;
398 398
 		return $this;
399 399
 	}
400 400
 
@@ -423,8 +423,8 @@  discard block
 block discarded – undo
423 423
 	 * @param string|boolean $disable
424 424
 	 * @return string
425 425
 	 */
426
-	public function jsDisabled($disable = true) {
427
-		return "$('#" . $this->identifier . " .ui.input,#" . $this->identifier . " .ui.dropdown,#" . $this->identifier . " .ui.checkbox').toggleClass('disabled'," . $disable . ");";
426
+	public function jsDisabled($disable=true) {
427
+		return "$('#".$this->identifier." .ui.input,#".$this->identifier." .ui.dropdown,#".$this->identifier." .ui.checkbox').toggleClass('disabled',".$disable.");";
428 428
 	}
429 429
 
430 430
 	/**
@@ -434,8 +434,8 @@  discard block
 block discarded – undo
434 434
 	 *        	function($element)
435 435
 	 * @return \Ajax\common\html\HtmlDoubleElement
436 436
 	 */
437
-	public function addEditButtonInToolbar($caption, $callback = NULL) {
438
-		$bt = new HtmlButton($this->identifier . "-editBtn", $caption);
437
+	public function addEditButtonInToolbar($caption, $callback=NULL) {
438
+		$bt=new HtmlButton($this->identifier."-editBtn", $caption);
439 439
 		$bt->setToggle();
440 440
 		$bt->setActive($this->_edition);
441 441
 		$bt->onClick($this->jsDisabled(Javascript::prep_value("!$(event.target).hasClass('active')")));
@@ -443,18 +443,18 @@  discard block
 block discarded – undo
443 443
 	}
444 444
 
445 445
 	public function setToolbar(HtmlMenu $_toolbar) {
446
-		$this->_toolbar = $_toolbar;
446
+		$this->_toolbar=$_toolbar;
447 447
 		return $this;
448 448
 	}
449 449
 
450 450
 	public function setToolbarPosition($_toolbarPosition) {
451
-		$this->_toolbarPosition = $_toolbarPosition;
451
+		$this->_toolbarPosition=$_toolbarPosition;
452 452
 		return $this;
453 453
 	}
454 454
 
455 455
 	public function getForm() {
456
-		if (! isset($this->_form)) {
457
-			$this->_form = new HtmlForm("frm-" . $this->identifier);
456
+		if (!isset($this->_form)) {
457
+			$this->_form=new HtmlForm("frm-".$this->identifier);
458 458
 			$this->setEdition(true);
459 459
 		}
460 460
 		return $this->_form;
@@ -468,7 +468,7 @@  discard block
 block discarded – undo
468 468
 	}
469 469
 
470 470
 	protected function runForm(JsUtils $js) {
471
-		$fields = $this->getContentInstances(HtmlFormField::class);
471
+		$fields=$this->getContentInstances(HtmlFormField::class);
472 472
 		foreach ($fields as $field) {
473 473
 			$this->_form->addField($field);
474 474
 		}
@@ -477,10 +477,10 @@  discard block
 block discarded – undo
477 477
 
478 478
 	protected function _compileForm() {
479 479
 		if (isset($this->_form)) {
480
-			$noValidate = "";
481
-			if (\sizeof($this->_form->getValidationParams()) > 0)
482
-				$noValidate = "novalidate";
483
-				$this->wrapContent("<form class='".$this->_form->getProperty('class')."' id='frm-" . $this->identifier . "' name='frm-" . $this->identifier . "' " . $noValidate . ">", "</form>");
480
+			$noValidate="";
481
+			if (\sizeof($this->_form->getValidationParams())>0)
482
+				$noValidate="novalidate";
483
+				$this->wrapContent("<form class='".$this->_form->getProperty('class')."' id='frm-".$this->identifier."' name='frm-".$this->identifier."' ".$noValidate.">", "</form>");
484 484
 		}
485 485
 	}
486 486
 
@@ -502,21 +502,21 @@  discard block
 block discarded – undo
502 502
 	}
503 503
 
504 504
 	public function swapFields($index1, $index2) {
505
-		$index1 = $this->_getIndex($index1);
506
-		$index2 = $this->_getIndex($index2);
505
+		$index1=$this->_getIndex($index1);
506
+		$index2=$this->_getIndex($index2);
507 507
 		return $this->_instanceViewer->swapFields($index1, $index2);
508 508
 	}
509 509
 
510 510
 	public function removeField($index) {
511
-		$index = $this->_getIndex($index);
512
-		if ($index !== false) {
511
+		$index=$this->_getIndex($index);
512
+		if ($index!==false) {
513 513
 			$this->_instanceViewer->removeField($index);
514 514
 		}
515 515
 		return $this;
516 516
 	}
517 517
 
518
-	public function asModal($header = null) {
519
-		$modal = new HtmlModal("modal-" . $this->identifier, $header);
518
+	public function asModal($header=null) {
519
+		$modal=new HtmlModal("modal-".$this->identifier, $header);
520 520
 		$modal->setContent($this);
521 521
 		if (isset($this->_form)) {
522 522
 			$this->_form->onSuccess($modal->jsHide());
@@ -524,7 +524,7 @@  discard block
 block discarded – undo
524 524
 		return $modal;
525 525
 	}
526 526
 
527
-	public function addToProperty($name, $value, $separator = " ") {
527
+	public function addToProperty($name, $value, $separator=" ") {
528 528
 		return $this->getHtmlComponent()->addToProperty($name, $value, $separator);
529 529
 	}
530 530
 
Please login to merge, or discard this patch.
Ajax/semantic/html/modules/HtmlModal.php 1 patch
Spacing   +51 added lines, -51 removed lines patch added patch discarded remove patch
@@ -15,36 +15,36 @@  discard block
 block discarded – undo
15 15
 	protected $_paramParts=array();
16 16
 
17 17
 	public function __construct($identifier, $header="", $content="", $actions=null) {
18
-		parent::__construct($identifier, "div","ui modal");
19
-		if(isset($header)){
18
+		parent::__construct($identifier, "div", "ui modal");
19
+		if (isset($header)) {
20 20
 			$this->setHeader($header);
21 21
 		}
22
-		if(isset($content)){
22
+		if (isset($content)) {
23 23
 			$this->setContent($content);
24 24
 		}
25
-		if(isset($actions)){
25
+		if (isset($actions)) {
26 26
 			$this->setActions($actions);
27 27
 		}
28 28
 	}
29 29
 
30 30
 	public function setHeader($value) {
31
-		$this->content["header"]=new HtmlSemDoubleElement("header-" . $this->identifier, "a", "header", $value);
31
+		$this->content["header"]=new HtmlSemDoubleElement("header-".$this->identifier, "a", "header", $value);
32 32
 		return $this;
33 33
 	}
34 34
 
35 35
 	public function setContent($value) {
36
-		$this->content["content"]=new HtmlSemDoubleElement("content-" . $this->identifier, "div", "content", $value);
36
+		$this->content["content"]=new HtmlSemDoubleElement("content-".$this->identifier, "div", "content", $value);
37 37
 		return $this;
38 38
 	}
39 39
 
40 40
 	public function setActions($actions) {
41
-		$this->content["actions"]=new HtmlSemDoubleElement("content-" . $this->identifier, "div", "actions");
42
-		if(\is_array($actions)){
43
-			foreach ($actions as $action){
41
+		$this->content["actions"]=new HtmlSemDoubleElement("content-".$this->identifier, "div", "actions");
42
+		if (\is_array($actions)) {
43
+			foreach ($actions as $action) {
44 44
 				$this->addAction($action);
45 45
 			}
46 46
 		}
47
-		else{
47
+		else {
48 48
 			$this->addAction($actions);
49 49
 		}
50 50
 		return $this;
@@ -54,17 +54,17 @@  discard block
 block discarded – undo
54 54
 	 * @param string|BaseHtml $action
55 55
 	 * @return HtmlButton
56 56
 	 */
57
-	public function addAction($action){
58
-		if(!$action instanceof BaseHtml){
57
+	public function addAction($action) {
58
+		if (!$action instanceof BaseHtml) {
59 59
 			$class="";
60
-			if(\array_search($action, ["Okay","Yes","Validate"])!==false){
60
+			if (\array_search($action, ["Okay", "Yes", "Validate"])!==false) {
61 61
 				$class="approve";
62 62
 			}
63
-			if(\array_search($action, ["Close","Cancel","No"])!==false){
63
+			if (\array_search($action, ["Close", "Cancel", "No"])!==false) {
64 64
 				$class="cancel";
65 65
 			}
66
-			$action=new HtmlButton("action-".$this->identifier."-".JArray::count($this->content["actions"]->getContent()),$action);
67
-			if($class!=="")
66
+			$action=new HtmlButton("action-".$this->identifier."-".JArray::count($this->content["actions"]->getContent()), $action);
67
+			if ($class!=="")
68 68
 				$action->addToProperty("class", $class);
69 69
 		}
70 70
 		return $this->addElementInPart($action, "actions");
@@ -74,66 +74,66 @@  discard block
 block discarded – undo
74 74
 	 * @param int $index
75 75
 	 * @return HtmlButton
76 76
 	 */
77
-	public function getAction($index){
77
+	public function getAction($index) {
78 78
 		return $this->content["actions"]->getContent()[$index];
79 79
 	}
80 80
 
81
-	public function addContent($content,$before=false){
82
-		$this->content["content"]->addContent($content,$before);
81
+	public function addContent($content, $before=false) {
82
+		$this->content["content"]->addContent($content, $before);
83 83
 		return $this;
84 84
 	}
85 85
 
86
-	public function addImageContent($image,$description=NULL){
86
+	public function addImageContent($image, $description=NULL) {
87 87
 		$content=$this->content["content"];
88
-		if(isset($description)){
89
-			$description=new HtmlSemDoubleElement("description-".$this->identifier,"div","description",$description);
90
-			$content->addContent($description,true);
88
+		if (isset($description)) {
89
+			$description=new HtmlSemDoubleElement("description-".$this->identifier, "div", "description", $description);
90
+			$content->addContent($description, true);
91 91
 		}
92
-		if($image!==""){
93
-			$img=new HtmlImage("image-".$this->identifier,$image,"","medium");
94
-			$content->addContent($img,true);
95
-			$content->addToProperty("class","image");
92
+		if ($image!=="") {
93
+			$img=new HtmlImage("image-".$this->identifier, $image, "", "medium");
94
+			$content->addContent($img, true);
95
+			$content->addToProperty("class", "image");
96 96
 		}
97 97
 		return $this;
98 98
 	}
99 99
 
100
-	public function addIconContent($icon,$description=NULL){
100
+	public function addIconContent($icon, $description=NULL) {
101 101
 		$content=$this->content["content"];
102
-		if(isset($description)){
103
-			$description=new HtmlSemDoubleElement("description-".$this->identifier,"div","description",$description);
104
-			$content->addContent($description,true);
102
+		if (isset($description)) {
103
+			$description=new HtmlSemDoubleElement("description-".$this->identifier, "div", "description", $description);
104
+			$content->addContent($description, true);
105 105
 		}
106
-		if($icon!==""){
107
-			$img=new HtmlIcon("image-".$this->identifier,$icon);
108
-			$content->addContent($img,true);
109
-			$content->addToProperty("class","image");
106
+		if ($icon!=="") {
107
+			$img=new HtmlIcon("image-".$this->identifier, $icon);
108
+			$content->addContent($img, true);
109
+			$content->addToProperty("class", "image");
110 110
 		}
111 111
 		return $this;
112 112
 	}
113 113
 
114
-	private function addElementInPart($element,$part) {
114
+	private function addElementInPart($element, $part) {
115 115
 		$this->content[$part]->addContent($element);
116 116
 		return $element;
117 117
 	}
118 118
 
119
-	public function showDimmer($value){
120
-		$value=$value?"show":"hide";
119
+	public function showDimmer($value) {
120
+		$value=$value ? "show" : "hide";
121 121
 		$this->_paramParts[]=["'".$value." dimmer'"];
122 122
 		return $this;
123 123
 	}
124 124
 
125
-	public function setInverted($recursive=true){
125
+	public function setInverted($recursive=true) {
126 126
 		$this->_params["inverted"]=true;
127 127
 		return $this;
128 128
 	}
129 129
 
130
-	public function setBasic(){
130
+	public function setBasic() {
131 131
 		return $this->addToProperty("class", "basic");
132 132
 	}
133 133
 
134 134
 
135
-	public function setTransition($value){
136
-		$this->_paramParts[]=["'setting'","'transition'","'".$value."'"];
135
+	public function setTransition($value) {
136
+		$this->_paramParts[]=["'setting'", "'transition'", "'".$value."'"];
137 137
 	}
138 138
 
139 139
 	/**
@@ -143,8 +143,8 @@  discard block
 block discarded – undo
143 143
 	 * @param string $viewName
144 144
 	 * @param array $params The parameters to pass to the view
145 145
 	 */
146
-	public function renderView(JsUtils $js,$initialController,$viewName, $params=array()) {
147
-		return $this->setContent($js->renderContent($initialController, $viewName,$params));
146
+	public function renderView(JsUtils $js, $initialController, $viewName, $params=array()) {
147
+		return $this->setContent($js->renderContent($initialController, $viewName, $params));
148 148
 	}
149 149
 
150 150
 	/**
@@ -155,8 +155,8 @@  discard block
 block discarded – undo
155 155
 	 * @param string $actionName the action name
156 156
 	 * @param array $params
157 157
 	 */
158
-	public function forward(JsUtils $js,$initialControllerInstance,$controllerName,$actionName,$params=NULL){
159
-		return $this->setContent($js->forward($initialControllerInstance, $controllerName, $actionName,$params));
158
+	public function forward(JsUtils $js, $initialControllerInstance, $controllerName, $actionName, $params=NULL) {
159
+		return $this->setContent($js->forward($initialControllerInstance, $controllerName, $actionName, $params));
160 160
 	}
161 161
 
162 162
 	/**
@@ -166,8 +166,8 @@  discard block
 block discarded – undo
166 166
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile()
167 167
 	 */
168 168
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
169
-		$this->content=JArray::sortAssociative($this->content, ["header","content","actions" ]);
170
-		if(isset($this->_params["inverted"]) && $this->_params["inverted"]){
169
+		$this->content=JArray::sortAssociative($this->content, ["header", "content", "actions"]);
170
+		if (isset($this->_params["inverted"]) && $this->_params["inverted"]) {
171 171
 			parent::setInverted(true);
172 172
 		}
173 173
 		return parent::compile($js, $view);
@@ -177,8 +177,8 @@  discard block
 block discarded – undo
177 177
 	 * @see BaseHtml::run()
178 178
 	 */
179 179
 	public function run(JsUtils $js) {
180
-		if(isset($this->_bsComponent)===false)
181
-			$this->_bsComponent=$js->semantic()->modal("#".$this->identifier,$this->_params,$this->_paramParts);
180
+		if (isset($this->_bsComponent)===false)
181
+			$this->_bsComponent=$js->semantic()->modal("#".$this->identifier, $this->_params, $this->_paramParts);
182 182
 		$this->addEventsOnRun($js);
183 183
 		return $this->_bsComponent;
184 184
 	}
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
191 191
 		return $this->jsDo("hide");
192 192
 	}
193 193
 
194
-	public function onHidden($js){
194
+	public function onHidden($js) {
195 195
 		$this->_params["onHidden"]=$js;
196 196
 	}
197 197
 }
Please login to merge, or discard this patch.
Ajax/semantic/widgets/datatable/DataTable.php 1 patch
Spacing   +116 added lines, -116 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
 
30 30
 	protected $_searchField;
31 31
 
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 
42 42
 	protected $_displayBehavior;
43 43
 
44
-	protected $_visibleHover = false;
44
+	protected $_visibleHover=false;
45 45
 
46 46
 	protected $_targetSelector;
47 47
 
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
 
52 52
 	protected $_json;
53 53
 
54
-	protected $_rowClass = "_element";
54
+	protected $_rowClass="_element";
55 55
 
56 56
 	protected $_sortable;
57 57
 
@@ -61,26 +61,26 @@  discard block
 block discarded – undo
61 61
 	
62 62
 	protected $_paginationToolbar;
63 63
 
64
-	public function __construct($identifier, $model, $modelInstance = NULL) {
64
+	public function __construct($identifier, $model, $modelInstance=NULL) {
65 65
 		parent::__construct($identifier, $model, $modelInstance);
66 66
 		$this->_init(new InstanceViewer($identifier), "table", new HtmlTable($identifier, 0, 0), false);
67
-		$this->_urls = [];
68
-		$this->_emptyMessage = new HtmlMessage("", "nothing to display");
67
+		$this->_urls=[];
68
+		$this->_emptyMessage=new HtmlMessage("", "nothing to display");
69 69
 		$this->_emptyMessage->setIcon("info circle");
70 70
 	}
71 71
 
72 72
 	public function run(JsUtils $js) {
73
-		if ($this->_runned !== true) {
74
-			$offset = $js->scriptCount();
73
+		if ($this->_runned!==true) {
74
+			$offset=$js->scriptCount();
75 75
 			if ($this->_hasCheckboxes && isset($js)) {
76 76
 				$this->_runCheckboxes($js);
77 77
 			}
78 78
 			if ($this->_visibleHover) {
79
-				$js->execOn("mouseover", "#" . $this->identifier . " tr", "$(event.currentTarget).closest('tr').find('.visibleover').css('visibility', 'visible');", [
79
+				$js->execOn("mouseover", "#".$this->identifier." tr", "$(event.currentTarget).closest('tr').find('.visibleover').css('visibility', 'visible');", [
80 80
 					"preventDefault" => false,
81 81
 					"stopPropagation" => true
82 82
 				]);
83
-				$js->execOn("mouseout", "#" . $this->identifier . " tr", "$(event.currentTarget).closest('tr').find('.visibleover').css('visibility', 'hidden');$(event.currentTarget).trigger('visibleoverOut');", [
83
+				$js->execOn("mouseout", "#".$this->identifier." tr", "$(event.currentTarget).closest('tr').find('.visibleover').css('visibility', 'hidden');$(event.currentTarget).trigger('visibleoverOut');", [
84 84
 					"preventDefault" => false,
85 85
 					"stopPropagation" => true
86 86
 				]);
@@ -96,16 +96,16 @@  discard block
 block discarded – undo
96 96
 			if (isset($this->_pagination))
97 97
 				$this->_associatePaginationBehavior($js, $offset);
98 98
 			$this->_associateSearchFieldBehavior($js, $offset);
99
-			$this->_runned = true;
99
+			$this->_runned=true;
100 100
 		}
101 101
 	}
102 102
 
103 103
 	protected function _generateBehavior($op, $params, JsUtils $js) {
104 104
 		if (isset($this->_urls[$op])) {
105
-			$params = \array_merge($params, [
105
+			$params=\array_merge($params, [
106 106
 				"attr" => "data-ajax"
107 107
 			]);
108
-			$js->ajaxOnClick("#" . $this->identifier . " ._" . $op, $this->_urls[$op], $this->getTargetSelector($op), $params);
108
+			$js->ajaxOnClick("#".$this->identifier." ._".$op, $this->_urls[$op], $this->getTargetSelector($op), $params);
109 109
 		}
110 110
 	}
111 111
 
@@ -124,21 +124,21 @@  discard block
 block discarded – undo
124 124
 	}
125 125
 
126 126
 	public function refreshTD($fieldName, $jquery, $view) {
127
-		$index = $this->_getIndex($fieldName);
127
+		$index=$this->_getIndex($fieldName);
128 128
 		$this->compile($jquery, $view);
129 129
 		return $this->refreshTR()
130 130
 			->getTable()
131 131
 			->getCell(0, $index);
132 132
 	}
133 133
 
134
-	public function compile(JsUtils $js = NULL, &$view = NULL) {
135
-		if (! $this->_generated) {
134
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
135
+		if (!$this->_generated) {
136 136
 			if (isset($this->_buttonsColumn)) {
137 137
 				$this->_instanceViewer->sortColumnContent($this->_buttonsColumn, $this->_buttons);
138 138
 			}
139 139
 			$this->_instanceViewer->setInstance($this->_model);
140
-			$captions = $this->_instanceViewer->getCaptions();
141
-			$table = $this->content["table"];
140
+			$captions=$this->_instanceViewer->getCaptions();
141
+			$table=$this->content["table"];
142 142
 			if ($this->_hasCheckboxes) {
143 143
 				$this->_generateMainCheckbox($captions);
144 144
 			}
@@ -153,14 +153,14 @@  discard block
 block discarded – undo
153 153
 			$this->compileExtraElements($table, $captions);
154 154
 			$this->_compileSearchFieldBehavior($js);
155 155
 
156
-			$this->content = JArray::sortAssociative($this->content, [
156
+			$this->content=JArray::sortAssociative($this->content, [
157 157
 				PositionInTable::BEFORETABLE,
158 158
 				"table",
159 159
 				PositionInTable::AFTERTABLE
160 160
 			]);
161 161
 			$this->_compileForm();
162 162
 			$this->_applyStyleAttributes($table);
163
-			$this->_generated = true;
163
+			$this->_generated=true;
164 164
 		}
165 165
 		return parent::compile($js, $view);
166 166
 	}
@@ -205,21 +205,21 @@  discard block
 block discarded – undo
205 205
 	}
206 206
 
207 207
 	protected function _generateContent($table) {
208
-		$objects = $this->_modelInstance;
208
+		$objects=$this->_modelInstance;
209 209
 		if (isset($this->_pagination)) {
210
-			$objects = $this->_pagination->getObjects($this->_modelInstance);
210
+			$objects=$this->_pagination->getObjects($this->_modelInstance);
211 211
 		}
212 212
 		InstanceViewer::setIndex(0);
213
-		$fields = $this->_instanceViewer->getSimpleProperties();
214
-		$groupByFields = $this->_instanceViewer->getGroupByFields();
215
-		if (! is_array($groupByFields)) {
216
-			$table->fromDatabaseObjects($objects, function ($instance) use ($table, $fields) {
213
+		$fields=$this->_instanceViewer->getSimpleProperties();
214
+		$groupByFields=$this->_instanceViewer->getGroupByFields();
215
+		if (!is_array($groupByFields)) {
216
+			$table->fromDatabaseObjects($objects, function($instance) use ($table, $fields) {
217 217
 				return $this->_generateRow($instance, $fields, $table);
218 218
 			});
219 219
 		} else {
220
-			$activeValues = array_combine($groupByFields, array_fill(0, sizeof($groupByFields), null));
221
-			$uuids = [];
222
-			$table->fromDatabaseObjects($objects, function ($instance) use ($table, $fields, &$activeValues, $groupByFields, &$uuids) {
220
+			$activeValues=array_combine($groupByFields, array_fill(0, sizeof($groupByFields), null));
221
+			$uuids=[];
222
+			$table->fromDatabaseObjects($objects, function($instance) use ($table, $fields, &$activeValues, $groupByFields, &$uuids) {
223 223
 				$this->_instanceViewer->setInstance($instance);
224 224
 				foreach ($groupByFields as $index => $gbField) {
225 225
 					$this->_generateGroupByRow($index, $gbField, $table, $fields, $activeValues, $uuids);
@@ -227,8 +227,8 @@  discard block
 block discarded – undo
227 227
 				return $this->_generateRow($instance, $fields, $table, null, $uuids);
228 228
 			});
229 229
 		}
230
-		if ($table->getRowCount() == 0) {
231
-			$result = $table->addRow();
230
+		if ($table->getRowCount()==0) {
231
+			$result=$table->addRow();
232 232
 			$result->mergeRow();
233 233
 			$result->setValues([
234 234
 				$this->_emptyMessage
@@ -237,20 +237,20 @@  discard block
 block discarded – undo
237 237
 	}
238 238
 
239 239
 	protected function _generateGroupByRow($index, $gbField, $table, $fields, &$activeValues, &$uuids) {
240
-		$newValue = $this->_instanceViewer->getValue($gbField);
241
-		if ($this->getElementContent($activeValues[$gbField]) !== $this->getElementContent($newValue)) {
242
-			if ($index == 0) {
243
-				$uuids = [];
240
+		$newValue=$this->_instanceViewer->getValue($gbField);
241
+		if ($this->getElementContent($activeValues[$gbField])!==$this->getElementContent($newValue)) {
242
+			if ($index==0) {
243
+				$uuids=[];
244 244
 			}
245
-			$uuid = uniqid("grp");
246
-			$uuids[$gbField] = $uuid;
247
-			$id = $this->_instanceViewer->getIdentifier();
248
-			$result = $table->addMergeRow(sizeof($fields) + 1, $newValue);
249
-			$result->setIdentifier($this->identifier . "-tr-gb-" . $id);
245
+			$uuid=uniqid("grp");
246
+			$uuids[$gbField]=$uuid;
247
+			$id=$this->_instanceViewer->getIdentifier();
248
+			$result=$table->addMergeRow(sizeof($fields)+1, $newValue);
249
+			$result->setIdentifier($this->identifier."-tr-gb-".$id);
250 250
 			$result->setProperty("data-ajax", $id);
251 251
 			$result->setProperty("data-group", $uuid);
252 252
 			$result->addToProperty("class", $this->_rowClass);
253
-			$activeValues[$gbField] = $newValue;
253
+			$activeValues[$gbField]=$newValue;
254 254
 		}
255 255
 	}
256 256
 
@@ -262,9 +262,9 @@  discard block
 block discarded – undo
262 262
 	}
263 263
 
264 264
 	public function getFieldValue($index) {
265
-		$index = $this->_getIndex($index);
265
+		$index=$this->_getIndex($index);
266 266
 		if (is_numeric($index)) {
267
-			$values = $this->_instanceViewer->getValues();
267
+			$values=$this->_instanceViewer->getValues();
268 268
 			if (isset($values[$index])) {
269 269
 				return $values[$index];
270 270
 			}
@@ -272,31 +272,31 @@  discard block
 block discarded – undo
272 272
 		return null;
273 273
 	}
274 274
 
275
-	protected function _generateRow($instance, $fields, &$table, $checkedClass = null, $uuids = null) {
275
+	protected function _generateRow($instance, $fields, &$table, $checkedClass=null, $uuids=null) {
276 276
 		$this->_instanceViewer->setInstance($instance);
277
-		InstanceViewer::$index ++;
278
-		$values = $this->_instanceViewer->getValues();
279
-		$id = $this->_instanceViewer->getIdentifier();
280
-		$dataAjax = $id;
281
-		$id = $this->cleanIdentifier($id);
277
+		InstanceViewer::$index++;
278
+		$values=$this->_instanceViewer->getValues();
279
+		$id=$this->_instanceViewer->getIdentifier();
280
+		$dataAjax=$id;
281
+		$id=$this->cleanIdentifier($id);
282 282
 		if ($this->_hasCheckboxes) {
283
-			$ck = new HtmlCheckbox("ck-" . $this->identifier . "-" . $id, "");
284
-			$checked = false;
283
+			$ck=new HtmlCheckbox("ck-".$this->identifier."-".$id, "");
284
+			$checked=false;
285 285
 			if (isset($this->_checkedCallback)) {
286
-				$func = $this->_checkedCallback;
287
-				$checked = $func($instance);
286
+				$func=$this->_checkedCallback;
287
+				$checked=$func($instance);
288 288
 			}
289 289
 			$ck->setChecked($checked);
290 290
 			// $ck->setOnChange("event.stopPropagation();");
291
-			$field = $ck->getField();
291
+			$field=$ck->getField();
292 292
 			$field->setProperty("value", $dataAjax);
293 293
 			$field->setProperty("name", "selection[]");
294 294
 			if (isset($checkedClass))
295 295
 				$field->setClass($checkedClass);
296 296
 			\array_unshift($values, $ck);
297 297
 		}
298
-		$result = $table->newRow();
299
-		$result->setIdentifier($this->identifier . "-tr-" . $id);
298
+		$result=$table->newRow();
299
+		$result->setIdentifier($this->identifier."-tr-".$id);
300 300
 		$result->setProperty("data-ajax", $dataAjax);
301 301
 		$result->setValues($values);
302 302
 		$result->addToProperty("class", $this->_rowClass);
@@ -309,63 +309,63 @@  discard block
 block discarded – undo
309 309
 
310 310
 	protected function _generatePagination($table) {
311 311
 		if (isset($this->_toolbar)) {
312
-			if ($this->_toolbarPosition == PositionInTable::FOOTER)
312
+			if ($this->_toolbarPosition==PositionInTable::FOOTER)
313 313
 				$this->_toolbar->setFloated("left");
314 314
 		}
315
-		$footer = $table->getFooter();
315
+		$footer=$table->getFooter();
316 316
 		$footer->mergeCol();
317 317
 		$this->_paginationToolbar=$this->_pagination->generateMenu($this->identifier);
318 318
 		$footer->addValues($this->_paginationToolbar);
319 319
 	}
320 320
 
321
-	protected function _associatePaginationBehavior(JsUtils $js = NULL, $offset = null) {
321
+	protected function _associatePaginationBehavior(JsUtils $js=NULL, $offset=null) {
322 322
 		if (isset($this->_urls["refresh"])) {
323
-			$menu = $this->_pagination->getMenu();
323
+			$menu=$this->_pagination->getMenu();
324 324
 			if (isset($menu) && isset($js)) {
325
-				$js->postOnClick("#" . $menu->getIdentifier() . " .item", $this->_urls["refresh"], "{'p':$(this).attr('data-page'),'_model':'" . JString::doubleBackSlashes($this->_model) . "'}", $this->getRefreshSelector(), [
325
+				$js->postOnClick("#".$menu->getIdentifier()." .item", $this->_urls["refresh"], "{'p':$(this).attr('data-page'),'_model':'".JString::doubleBackSlashes($this->_model)."'}", $this->getRefreshSelector(), [
326 326
 					"preventDefault" => false,
327 327
 					"jqueryDone" => "replaceWith",
328 328
 					"hasLoader" => false,
329
-					"jsCallback" => '$("#' . $this->identifier . '").trigger("pageChange");$("#' . $this->identifier . '").trigger("activeRowChange");'
329
+					"jsCallback" => '$("#'.$this->identifier.'").trigger("pageChange");$("#'.$this->identifier.'").trigger("activeRowChange");'
330 330
 				]);
331
-				$page = $_POST["p"] ?? null;
331
+				$page=$_POST["p"] ?? null;
332 332
 				if (isset($page)) {
333
-					$js->execAtLast('$("#' . $this->getIdentifier() . ' .pagination").children("a.item").removeClass("active");$("#' . $this->getIdentifier() . ' .pagination").children("a.item[data-page=' . $page . ']:not(.no-active)").addClass("active");');
333
+					$js->execAtLast('$("#'.$this->getIdentifier().' .pagination").children("a.item").removeClass("active");$("#'.$this->getIdentifier().' .pagination").children("a.item[data-page='.$page.']:not(.no-active)").addClass("active");');
334 334
 				}
335 335
 			}
336 336
 		}
337 337
 	}
338 338
 
339
-	protected function _compileSearchFieldBehavior(JsUtils $js = NULL) {
339
+	protected function _compileSearchFieldBehavior(JsUtils $js=NULL) {
340 340
 		if (isset($this->_searchField) && isset($js) && isset($this->_urls["refresh"])) {
341
-			$this->_searchField->postOn("change", $this->_urls["refresh"], "{'s':$(self).val(),'_model':'" . JString::doubleBackSlashes($this->_model) . "'}", "#" . $this->identifier . " tbody", [
341
+			$this->_searchField->postOn("change", $this->_urls["refresh"], "{'s':$(self).val(),'_model':'".JString::doubleBackSlashes($this->_model)."'}", "#".$this->identifier." tbody", [
342 342
 				"preventDefault" => false,
343 343
 				"jqueryDone" => "replaceWith",
344 344
 				"hasLoader" => "internal",
345
-				"jsCallback" => '$("#' . $this->identifier . '").trigger("searchTerminate",[$(self).val()]);'
345
+				"jsCallback" => '$("#'.$this->identifier.'").trigger("searchTerminate",[$(self).val()]);'
346 346
 			]);
347 347
 		}
348 348
 	}
349 349
 
350
-	protected function _associateSearchFieldBehavior(JsUtils $js = NULL, $offset = null) {}
350
+	protected function _associateSearchFieldBehavior(JsUtils $js=NULL, $offset=null) {}
351 351
 
352 352
 	protected function _getFieldName($index) {
353
-		$fieldName = parent::_getFieldName($index);
353
+		$fieldName=parent::_getFieldName($index);
354 354
 		if (\is_object($fieldName))
355
-			$fieldName = "field-" . $index;
356
-		return $fieldName . "[]";
355
+			$fieldName="field-".$index;
356
+		return $fieldName."[]";
357 357
 	}
358 358
 
359 359
 	protected function _getFieldCaption($index) {
360 360
 		return null;
361 361
 	}
362 362
 
363
-	protected function _setToolbarPosition($table, $captions = NULL) {
363
+	protected function _setToolbarPosition($table, $captions=NULL) {
364 364
 		switch ($this->_toolbarPosition) {
365 365
 			case PositionInTable::BEFORETABLE:
366 366
 			case PositionInTable::AFTERTABLE:
367
-				if (isset($this->_compileParts) === false) {
368
-					$this->content[$this->_toolbarPosition] = $this->_toolbar;
367
+				if (isset($this->_compileParts)===false) {
368
+					$this->content[$this->_toolbarPosition]=$this->_toolbar;
369 369
 				}
370 370
 				break;
371 371
 			case PositionInTable::HEADER:
@@ -392,11 +392,11 @@  discard block
 block discarded – undo
392 392
 	}
393 393
 
394 394
 	private function addToolbarRow($part, $table, $captions) {
395
-		$hasPart = $table->hasPart($part);
395
+		$hasPart=$table->hasPart($part);
396 396
 		if ($hasPart) {
397
-			$row = $table->getPart($part)->addRow(\sizeof($captions));
397
+			$row=$table->getPart($part)->addRow(\sizeof($captions));
398 398
 		} else {
399
-			$row = $table->getPart($part)->getRow(0);
399
+			$row=$table->getPart($part)->getRow(0);
400 400
 		}
401 401
 		$row->mergeCol();
402 402
 		$row->setValues([
@@ -428,12 +428,12 @@  discard block
 block discarded – undo
428 428
 	 */
429 429
 	public function setUrls($urls) {
430 430
 		if (\is_array($urls)) {
431
-			$this->_urls["refresh"] = JArray::getValue($urls, "refresh", 0);
432
-			$this->_urls["edit"] = JArray::getValue($urls, "edit", 1);
433
-			$this->_urls["delete"] = JArray::getValue($urls, "delete", 2);
434
-			$this->_urls["display"] = JArray::getValue($urls, "display", 3);
431
+			$this->_urls["refresh"]=JArray::getValue($urls, "refresh", 0);
432
+			$this->_urls["edit"]=JArray::getValue($urls, "edit", 1);
433
+			$this->_urls["delete"]=JArray::getValue($urls, "delete", 2);
434
+			$this->_urls["display"]=JArray::getValue($urls, "display", 3);
435 435
 		} else {
436
-			$this->_urls = [
436
+			$this->_urls=[
437 437
 				"refresh" => $urls,
438 438
 				"edit" => $urls,
439 439
 				"delete" => $urls,
@@ -456,8 +456,8 @@  discard block
 block discarded – undo
456 456
 	 *        	The number of visible pages in the Pagination component
457 457
 	 * @return DataTable
458 458
 	 */
459
-	public function paginate($page, $total_rowcount, $items_per_page = 10, $pages_visibles = null) {
460
-		$this->_pagination = new Pagination($items_per_page, $pages_visibles, $page, $total_rowcount);
459
+	public function paginate($page, $total_rowcount, $items_per_page=10, $pages_visibles=null) {
460
+		$this->_pagination=new Pagination($items_per_page, $pages_visibles, $page, $total_rowcount);
461 461
 		return $this;
462 462
 	}
463 463
 
@@ -472,8 +472,8 @@  discard block
 block discarded – undo
472 472
 	 *        	The number of visible pages in the Pagination component
473 473
 	 * @return DataTable
474 474
 	 */
475
-	public function autoPaginate($page = 1, $items_per_page = 10, $pages_visibles = 4) {
476
-		$this->_pagination = new Pagination($items_per_page, $pages_visibles, $page);
475
+	public function autoPaginate($page=1, $items_per_page=10, $pages_visibles=4) {
476
+		$this->_pagination=new Pagination($items_per_page, $pages_visibles, $page);
477 477
 		return $this;
478 478
 	}
479 479
 
@@ -482,8 +482,8 @@  discard block
 block discarded – undo
482 482
 	 * @param array $compileParts
483 483
 	 * @return DataTable
484 484
 	 */
485
-	public function refresh($compileParts = ['tbody']) {
486
-		$this->_compileParts = $compileParts;
485
+	public function refresh($compileParts=['tbody']) {
486
+		$this->_compileParts=$compileParts;
487 487
 		return $this;
488 488
 	}
489 489
 
@@ -493,14 +493,14 @@  discard block
 block discarded – undo
493 493
 	 * @param string $position
494 494
 	 * @return \Ajax\common\html\HtmlDoubleElement
495 495
 	 */
496
-	public function addSearchInToolbar($position = Direction::RIGHT) {
496
+	public function addSearchInToolbar($position=Direction::RIGHT) {
497 497
 		return $this->addInToolbar($this->getSearchField())
498 498
 			->setPosition($position);
499 499
 	}
500 500
 
501 501
 	public function getSearchField() {
502
-		if (isset($this->_searchField) === false) {
503
-			$this->_searchField = new HtmlInput("search-" . $this->identifier, "search", "", "Search...");
502
+		if (isset($this->_searchField)===false) {
503
+			$this->_searchField=new HtmlInput("search-".$this->identifier, "search", "", "Search...");
504 504
 			$this->_searchField->addIcon("search", Direction::RIGHT);
505 505
 		}
506 506
 		return $this->_searchField;
@@ -528,9 +528,9 @@  discard block
 block discarded – undo
528 528
 	}
529 529
 
530 530
 	protected function getTargetSelector($op) {
531
-		$result = $this->_targetSelector;
532
-		if (! isset($result[$op]))
533
-			$result = "#" . $this->identifier;
531
+		$result=$this->_targetSelector;
532
+		if (!isset($result[$op]))
533
+			$result="#".$this->identifier;
534 534
 		return $result[$op];
535 535
 	}
536 536
 
@@ -542,20 +542,20 @@  discard block
 block discarded – undo
542 542
 	 * @return DataTable
543 543
 	 */
544 544
 	public function setTargetSelector($_targetSelector) {
545
-		if (! \is_array($_targetSelector)) {
546
-			$_targetSelector = [
545
+		if (!\is_array($_targetSelector)) {
546
+			$_targetSelector=[
547 547
 				"edit" => $_targetSelector,
548 548
 				"delete" => $_targetSelector
549 549
 			];
550 550
 		}
551
-		$this->_targetSelector = $_targetSelector;
551
+		$this->_targetSelector=$_targetSelector;
552 552
 		return $this;
553 553
 	}
554 554
 
555 555
 	public function getRefreshSelector() {
556 556
 		if (isset($this->_refreshSelector))
557 557
 			return $this->_refreshSelector;
558
-		return "#" . $this->identifier . " tbody";
558
+		return "#".$this->identifier." tbody";
559 559
 	}
560 560
 
561 561
 	/**
@@ -564,7 +564,7 @@  discard block
 block discarded – undo
564 564
 	 * @return DataTable
565 565
 	 */
566 566
 	public function setRefreshSelector($_refreshSelector) {
567
-		$this->_refreshSelector = $_refreshSelector;
567
+		$this->_refreshSelector=$_refreshSelector;
568 568
 		return $this;
569 569
 	}
570 570
 
@@ -576,9 +576,9 @@  discard block
 block discarded – undo
576 576
 	public function show($modelInstance) {
577 577
 		if (\is_array($modelInstance)) {
578 578
 			if (isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0]))
579
-				$modelInstance = \json_decode(\json_encode($modelInstance), FALSE);
579
+				$modelInstance=\json_decode(\json_encode($modelInstance), FALSE);
580 580
 		}
581
-		$this->_modelInstance = $modelInstance;
581
+		$this->_modelInstance=$modelInstance;
582 582
 	}
583 583
 
584 584
 	public function getRowClass() {
@@ -592,7 +592,7 @@  discard block
 block discarded – undo
592 592
 	 * @return DataTable
593 593
 	 */
594 594
 	public function setRowClass($_rowClass) {
595
-		$this->_rowClass = $_rowClass;
595
+		$this->_rowClass=$_rowClass;
596 596
 		return $this;
597 597
 	}
598 598
 
@@ -603,34 +603,34 @@  discard block
 block discarded – undo
603 603
 	 * @return DataTable
604 604
 	 */
605 605
 	public function setEmptyMessage($_emptyMessage) {
606
-		$this->_emptyMessage = $_emptyMessage;
606
+		$this->_emptyMessage=$_emptyMessage;
607 607
 		return $this;
608 608
 	}
609 609
 
610
-	public function setSortable($colIndex = NULL) {
611
-		$this->_sortable = $colIndex;
610
+	public function setSortable($colIndex=NULL) {
611
+		$this->_sortable=$colIndex;
612 612
 		return $this;
613 613
 	}
614 614
 
615
-	public function setActiveRowSelector($class = "active", $event = "click", $multiple = false) {
615
+	public function setActiveRowSelector($class="active", $event="click", $multiple=false) {
616 616
 		$this->_self->setActiveRowSelector($class, $event, $multiple);
617 617
 		return $this;
618 618
 	}
619 619
 
620 620
 	public function hideColumn($colIndex) {
621
-		if (! \is_array($this->_hiddenColumns))
622
-			$this->_hiddenColumns = [];
623
-		$this->_hiddenColumns[] = $colIndex;
621
+		if (!\is_array($this->_hiddenColumns))
622
+			$this->_hiddenColumns=[];
623
+		$this->_hiddenColumns[]=$colIndex;
624 624
 		return $this;
625 625
 	}
626 626
 
627 627
 	public function setColWidth($colIndex, $width) {
628
-		$this->_colWidths[$colIndex] = $width;
628
+		$this->_colWidths[$colIndex]=$width;
629 629
 		return $this;
630 630
 	}
631 631
 
632 632
 	public function setColWidths($_colWidths) {
633
-		$this->_colWidths = $_colWidths;
633
+		$this->_colWidths=$_colWidths;
634 634
 		return $this;
635 635
 	}
636 636
 
@@ -639,7 +639,7 @@  discard block
 block discarded – undo
639 639
 		return $this;
640 640
 	}
641 641
 
642
-	public function trigger($event, $params = "[]") {
642
+	public function trigger($event, $params="[]") {
643 643
 		return $this->getHtmlComponent()->trigger($event, $params);
644 644
 	}
645 645
 
@@ -677,7 +677,7 @@  discard block
 block discarded – undo
677 677
 	 * @param mixed $_displayBehavior
678 678
 	 */
679 679
 	public function setDisplayBehavior($_displayBehavior) {
680
-		$this->_displayBehavior = $_displayBehavior;
680
+		$this->_displayBehavior=$_displayBehavior;
681 681
 	}
682 682
 
683 683
 	/**
@@ -701,7 +701,7 @@  discard block
 block discarded – undo
701 701
 	 * @param boolean $_visibleHover
702 702
 	 */
703 703
 	public function setVisibleHover($_visibleHover) {
704
-		$this->_visibleHover = $_visibleHover;
704
+		$this->_visibleHover=$_visibleHover;
705 705
 	}
706 706
 	/**
707 707
 	 * @return \Ajax\semantic\html\collections\menus\HtmlPaginationMenu
@@ -710,9 +710,9 @@  discard block
 block discarded – undo
710 710
 		return $this->_paginationToolbar;
711 711
 	}
712 712
 	
713
-	public function setInverted($recursive=true){
713
+	public function setInverted($recursive=true) {
714 714
 		$this->getHtmlComponent()->setInverted($recursive);
715
-		if($this->_emptyMessage instanceof HtmlSemDoubleElement){
715
+		if ($this->_emptyMessage instanceof HtmlSemDoubleElement) {
716 716
 			$this->_emptyMessage->setInverted($recursive);
717 717
 		}
718 718
 	}
Please login to merge, or discard this patch.
Ajax/semantic/widgets/dataform/DataForm.php 1 patch
Spacing   +40 added lines, -40 removed lines patch added patch discarded remove patch
@@ -24,39 +24,39 @@  discard block
 block discarded – undo
24 24
 	private $_inverted;
25 25
 	
26 26
 	public function __construct($identifier, $modelInstance=NULL) {
27
-		parent::__construct($identifier, null,$modelInstance);
27
+		parent::__construct($identifier, null, $modelInstance);
28 28
 		$this->_form=new HtmlForm($identifier);
29 29
 		$this->_init(new FormInstanceViewer($identifier), "form", $this->_form, true);
30 30
 	}
31 31
 
32
-	protected function _getFieldIdentifier($prefix,$name=""){
32
+	protected function _getFieldIdentifier($prefix, $name="") {
33 33
 		return $this->identifier."-{$name}-".$this->_instanceViewer->getIdentifier();
34 34
 	}
35 35
 
36
-	public function compile(JsUtils $js=NULL,&$view=NULL){
37
-		if(!$this->_generated){
36
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
37
+		if (!$this->_generated) {
38 38
 			$this->_instanceViewer->setInstance($this->_modelInstance);
39 39
 
40 40
 			$form=$this->content["form"];
41 41
 			$this->_generateContent($form);
42 42
 
43
-			if(isset($this->_toolbar)){
43
+			if (isset($this->_toolbar)) {
44 44
 				$this->_setToolbarPosition($form);
45 45
 			}
46
-			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"form",PositionInTable::AFTERTABLE]);
47
-			if($this->_inverted){
46
+			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "form", PositionInTable::AFTERTABLE]);
47
+			if ($this->_inverted) {
48 48
 				$this->content['form']->setInverted(true);
49 49
 			}
50 50
 			$this->_generated=true;
51 51
 		}
52
-		return parent::compile($js,$view);
52
+		return parent::compile($js, $view);
53 53
 	}
54 54
 
55 55
 	/**
56 56
 	 * @param HtmlForm $form
57 57
 	 */
58
-	protected function _generateContent($form){
59
-		$values= $this->_instanceViewer->getValues();
58
+	protected function _generateContent($form) {
59
+		$values=$this->_instanceViewer->getValues();
60 60
 		$count=$this->_instanceViewer->count();
61 61
 		$separators=$this->_instanceViewer->getSeparators();
62 62
 		$headers=$this->_instanceViewer->getHeaders();
@@ -64,41 +64,41 @@  discard block
 block discarded – undo
64 64
 		\sort($separators);
65 65
 		$size=\sizeof($separators);
66 66
 		$nb=0;
67
-		if($size===1){
67
+		if ($size===1) {
68 68
 			$i=-1;
69
-			foreach ($values as $v){
70
-				$this->_generateFields($form, [$v], $headers, $i, $wrappers,$nb++);
69
+			foreach ($values as $v) {
70
+				$this->_generateFields($form, [$v], $headers, $i, $wrappers, $nb++);
71 71
 				$i++;
72 72
 			}
73
-		}else{
73
+		} else {
74 74
 			$separators[]=$count;
75
-			for($i=0;$i<$size;$i++){
76
-				$fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]);
77
-				$this->_generateFields($form, $fields, $headers, $separators[$i], $wrappers,$nb++);
75
+			for ($i=0; $i<$size; $i++) {
76
+				$fields=\array_slice($values, $separators[$i]+1, $separators[$i+1]-$separators[$i]);
77
+				$this->_generateFields($form, $fields, $headers, $separators[$i], $wrappers, $nb++);
78 78
 			}
79 79
 		}
80
-		if($this->_hasRules && !$this->getForm()->hasValidationParams()){
80
+		if ($this->_hasRules && !$this->getForm()->hasValidationParams()) {
81 81
 				$this->setValidationParams(["inline"=>true]);
82 82
 		}
83 83
 	}
84 84
 
85
-	protected function _generateFields($form,$values,$headers,$sepFirst,$wrappers,$nb){
85
+	protected function _generateFields($form, $values, $headers, $sepFirst, $wrappers, $nb) {
86 86
 		$wrapper=null;
87
-		if(isset($headers[$sepFirst+1]))
88
-			$form->addHeader($headers[$sepFirst+1],4,true);
89
-		if(isset($wrappers[$sepFirst+1])){
87
+		if (isset($headers[$sepFirst+1]))
88
+			$form->addHeader($headers[$sepFirst+1], 4, true);
89
+		if (isset($wrappers[$sepFirst+1])) {
90 90
 			$wrapper=$wrappers[$sepFirst+1];
91 91
 		}
92
-		if(\sizeof($values)===1){
92
+		if (\sizeof($values)===1) {
93 93
 			$added=$form->addField($values[0]);
94
-		}elseif(\sizeof($values)>1){
94
+		}elseif (\sizeof($values)>1) {
95 95
 			$added=$form->addFields($values);
96
-		}else
96
+		} else
97 97
 			return;
98
-		if(isset($wrapper)){
99
-			$added->wrap($wrapper[0],$wrapper[1]);
98
+		if (isset($wrapper)) {
99
+			$added->wrap($wrapper[0], $wrapper[1]);
100 100
 		}
101
-		$this->execHook("onGenerateFields",$added,$nb);
101
+		$this->execHook("onGenerateFields", $added, $nb);
102 102
 	}
103 103
 	
104 104
 	/**
@@ -106,18 +106,18 @@  discard block
 block discarded – undo
106 106
 	 * the generated field is the first parameter
107 107
 	 * @param callable $callback the fonction to call when a field is generated
108 108
 	 */
109
-	public function onGenerateField($callback){
110
-		$this->addHook("onGenerateFields",$callback);
109
+	public function onGenerateField($callback) {
110
+		$this->addHook("onGenerateFields", $callback);
111 111
 	}
112 112
 
113 113
 	/**
114 114
 	 * @return HtmlForm
115 115
 	 */
116
-	public function getForm(){
116
+	public function getForm() {
117 117
 		return $this->content["form"];
118 118
 	}
119 119
 
120
-	public function addSeparatorAfter($fieldNum){
120
+	public function addSeparatorAfter($fieldNum) {
121 121
 		$fieldNum=$this->_getIndex($fieldNum);
122 122
 		$this->_instanceViewer->addSeparatorAfter($fieldNum);
123 123
 		return $this;
@@ -132,12 +132,12 @@  discard block
 block discarded – undo
132 132
 		return $this;
133 133
 	}
134 134
 
135
-	public function fieldAsReset($index,$cssStyle=NULL,$attributes=NULL){
136
-		return $this->_fieldAs(function($id,$name,$value) use ($cssStyle){
137
-			$button=new HtmlButton($id,$value,$cssStyle);
135
+	public function fieldAsReset($index, $cssStyle=NULL, $attributes=NULL) {
136
+		return $this->_fieldAs(function($id, $name, $value) use ($cssStyle){
137
+			$button=new HtmlButton($id, $value, $cssStyle);
138 138
 			$button->setProperty("type", "reset");
139 139
 			return $button;
140
-		}, $index,$attributes);
140
+		}, $index, $attributes);
141 141
 	}
142 142
 
143 143
 	/**
@@ -156,19 +156,19 @@  discard block
 block discarded – undo
156 156
 		$this->content[$this->_toolbarPosition]=$this->_toolbar;
157 157
 	}
158 158
 
159
-	public function addDividerBefore($index,$title){
159
+	public function addDividerBefore($index, $title) {
160 160
 		$index=$this->_getIndex($index);
161 161
 		$this->_instanceViewer->addHeaderDividerBefore($index, $title);
162 162
 		return $this;
163 163
 	}
164 164
 
165
-	public function addWrapper($index,$contentBefore,$contentAfter=null){
165
+	public function addWrapper($index, $contentBefore, $contentAfter=null) {
166 166
 		$index=$this->_getIndex($index);
167
-		$this->_instanceViewer->addWrapper($index, $contentBefore,$contentAfter);
167
+		$this->_instanceViewer->addWrapper($index, $contentBefore, $contentAfter);
168 168
 		return $this;
169 169
 	}
170 170
 
171
-	public function run(JsUtils $js){
171
+	public function run(JsUtils $js) {
172 172
 		parent::run($js);
173 173
 	}
174 174
 	
Please login to merge, or discard this patch.