Completed
Push — master ( b6875a...29801f )
by Jean-Christophe
03:06
created
Ajax/common/components/SimpleComponent.php 2 patches
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -17,18 +17,18 @@  discard block
 block discarded – undo
17 17
 
18 18
 	public function __construct(JsUtils $js) {
19 19
 		parent::__construct($js);
20
-		$this->events=array ();
20
+		$this->events=array();
21 21
 	}
22 22
 
23 23
 	protected function compileEvents() {
24
-		foreach ( $this->events as $event => $jsCode ) {
25
-			if($event=="execute"){
24
+		foreach ($this->events as $event => $jsCode) {
25
+			if ($event=="execute") {
26 26
 				$this->jquery_code_for_compile []=$jsCode;
27
-			}else if($event=="beforeExecute"){
27
+			} else if ($event=="beforeExecute") {
28 28
 				\array_unshift($this->jquery_code_for_compile, $jsCode);
29
-			}else{
29
+			} else {
30 30
 				$selector=$this->attachTo;
31
-				if(isset($this->itemSelector)){
31
+				if (isset($this->itemSelector)) {
32 32
 					$selector.=" ".$this->itemSelector;
33 33
 				}
34 34
 				$this->jquery_code_for_compile []="$( \"".$selector."\" ).on(\"".$event."\" , function( event, data ) {".$jsCode."});";
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 		$result=implode("\n", $this->jquery_code_for_compile);
41 41
 		$result=str_ireplace("\"%", "", $result);
42 42
 		$result=str_ireplace("%\"", "", $result);
43
-		$result=str_replace(array (
43
+		$result=str_replace(array(
44 44
 				"\\n",
45 45
 				"\\r",
46 46
 				"\\t"
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 
51 51
 	public function getScript() {
52 52
 		$allParams=$this->params;
53
-		$this->jquery_code_for_compile=array ();
53
+		$this->jquery_code_for_compile=array();
54 54
 		$this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).{$this->uiName}(".$this->getParamsAsJSON($allParams).");";
55 55
 		$this->compileEvents();
56 56
 		return $this->compileJQueryCode();
Please login to merge, or discard this patch.
Braces   +5 added lines, -4 removed lines patch added patch discarded remove patch
@@ -24,9 +24,9 @@  discard block
 block discarded – undo
24 24
 		foreach ( $this->events as $event => $jsCode ) {
25 25
 			if($event=="execute"){
26 26
 				$this->jquery_code_for_compile []=$jsCode;
27
-			}else if($event=="beforeExecute"){
27
+			} else if($event=="beforeExecute"){
28 28
 				\array_unshift($this->jquery_code_for_compile, $jsCode);
29
-			}else{
29
+			} else{
30 30
 				$selector=$this->attachTo;
31 31
 				if(isset($this->itemSelector)){
32 32
 					$selector.=" ".$this->itemSelector;
@@ -75,8 +75,9 @@  discard block
 block discarded – undo
75 75
 
76 76
 	protected function setParamCtrl($key, $value, $typeCtrl) {
77 77
 		if (is_array($typeCtrl)) {
78
-			if (array_search($value, $typeCtrl)===false)
79
-				throw new \Exception("La valeur passée a propriété `".$key."` pour le composant `".$this->uiName."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
78
+			if (array_search($value, $typeCtrl)===false) {
79
+							throw new \Exception("La valeur passée a propriété `".$key."` pour le composant `".$this->uiName."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
80
+			}
80 81
 		} else {
81 82
 			if (!$typeCtrl($value)) {
82 83
 				throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$key." au composant ".$this->uiName);
Please login to merge, or discard this patch.
Ajax/common/traits/JqueryAjaxTrait.php 2 patches
Braces   +27 added lines, -20 removed lines patch added patch discarded remove patch
@@ -46,8 +46,9 @@  discard block
 block discarded – undo
46 46
 		}
47 47
 		$retour.="$.".$method."(url,".$params.").done(function( data ) {\n";
48 48
 		$retour.=$this->_getOnAjaxDone($responseElement, $jsCallback)."});\n";
49
-		if ($immediatly)
50
-			$this->jquery_code_for_compile[]=$retour;
49
+		if ($immediatly) {
50
+					$this->jquery_code_for_compile[]=$retour;
51
+		}
51 52
 			return $retour;
52 53
 	}
53 54
 
@@ -55,15 +56,17 @@  discard block
 block discarded – undo
55 56
 		$url=$this->_correctAjaxUrl($url);
56 57
 		$retour="url='".$url."';\n";
57 58
 		$slash="/";
58
-		if(JString::endswith($url, "/")===true)
59
-			$slash="";
59
+		if(JString::endswith($url, "/")===true) {
60
+					$slash="";
61
+		}
60 62
 		if(JString::isNotNull($attr)){
61
-			if ($attr==="value")
62
-				$retour.="url=url+'".$slash."'+$(this).val();\n";
63
-			elseif ($attr==="html")
64
-			$retour.="url=url+'".$slash."'+$(this).html();\n";
65
-			elseif($attr!=null && $attr!=="")
66
-					$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
63
+			if ($attr==="value") {
64
+							$retour.="url=url+'".$slash."'+$(this).val();\n";
65
+			} elseif ($attr==="html") {
66
+						$retour.="url=url+'".$slash."'+$(this).html();\n";
67
+			} elseif($attr!=null && $attr!=="") {
68
+								$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
69
+			}
67 70
 		}
68 71
 		return $retour;
69 72
 	}
@@ -74,7 +77,7 @@  discard block
 block discarded – undo
74 77
 			if(JString::startswith($responseElement, "\"-")===true){
75 78
 				$responseElement=\str_replace("\"-", "\"", $responseElement);
76 79
 				$retour="\t$({$responseElement}).replaceWith( data );\n";
77
-			}else{
80
+			} else{
78 81
 				$retour="\t$({$responseElement}).html( data );\n";
79 82
 			}
80 83
 		}
@@ -90,8 +93,9 @@  discard block
 block discarded – undo
90 93
 	}
91 94
 
92 95
 	protected function _correctAjaxUrl($url) {
93
-		if ($url!=="/" && JString::endsWith($url, "/")===true)
94
-			$url=substr($url, 0, strlen($url)-1);
96
+		if ($url!=="/" && JString::endsWith($url, "/")===true) {
97
+					$url=substr($url, 0, strlen($url)-1);
98
+		}
95 99
 		if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
96 100
 			$url=$this->jsUtils->getUrl($url);
97 101
 		}
@@ -115,8 +119,9 @@  discard block
 block discarded – undo
115 119
 				$retour.="\t".$jsCallback."\n".
116 120
 						"\t$(document).trigger('jsonReady',[data]);\n".
117 121
 						"});\n";
118
-				if ($immediatly)
119
-					$this->jquery_code_for_compile[]=$retour;
122
+				if ($immediatly) {
123
+									$this->jquery_code_for_compile[]=$retour;
124
+				}
120 125
 					return $retour;
121 126
 	}
122 127
 
@@ -155,7 +160,7 @@  discard block
 block discarded – undo
155 160
 		if($context===null){
156 161
 			$appendTo="\t\tnewElm.appendTo($('".$maskSelector."').parent());\n";
157 162
 			$newElm = "$('#'+newId)";
158
-		}else{
163
+		} else{
159 164
 			$appendTo="\t\tnewElm.appendTo(".$context.");\n";
160 165
 			$newElm = $context.".find('#'+newId)";
161 166
 		}
@@ -165,8 +170,9 @@  discard block
 block discarded – undo
165 170
 		$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";
166 171
 		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
167 172
 		$retour.="\t".$jsCallback."\n"."});\n";
168
-		if ($immediatly)
169
-			$this->jquery_code_for_compile[]=$retour;
173
+		if ($immediatly) {
174
+					$this->jquery_code_for_compile[]=$retour;
175
+		}
170 176
 			return $retour;
171 177
 	}
172 178
 	/**
@@ -207,8 +213,9 @@  discard block
 block discarded – undo
207 213
 			}});\n";
208 214
 			$retour.="$('#".$form."').submit();\n";
209 215
 		}
210
-		if ($immediatly)
211
-			$this->jquery_code_for_compile[]=$retour;
216
+		if ($immediatly) {
217
+					$this->jquery_code_for_compile[]=$retour;
218
+		}
212 219
 			return $retour;
213 220
 	}
214 221
 
Please login to merge, or discard this patch.
Spacing   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
 
16 16
 	protected $ajaxLoader='<span></span><span></span><span></span><span></span><span></span>';
17 17
 
18
-	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
18
+	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true);
19 19
 	protected function addLoading(&$retour, $responseElement) {
20 20
 		$loading_notifier='<div class="ajax-loader">';
21 21
 		if ($this->ajaxLoader=='') {
@@ -28,20 +28,20 @@  discard block
 block discarded – undo
28 28
 		$retour.="\t\t$({$responseElement}).prepend('{$loading_notifier}');\n";
29 29
 	}
30 30
 
31
-	public function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
32
-		return $this->_ajax("get", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$immediatly);
31
+	public function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
32
+		return $this->_ajax("get", $url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $immediatly);
33 33
 	}
34
-	public function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
35
-		return $this->_ajax("post", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$immediatly);
34
+	public function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
35
+		return $this->_ajax("post", $url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $immediatly);
36 36
 	}
37 37
 
38
-	protected function _ajax($method,$url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
39
-		if(JString::isNull($params)){$params="{}";}
38
+	protected function _ajax($method, $url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
39
+		if (JString::isNull($params)) {$params="{}"; }
40 40
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
41 41
 		$retour=$this->_getAjaxUrl($url, $attr);
42 42
 		$responseElement=$this->_getResponseElement($responseElement);
43 43
 		$retour.="var self=this;\n";
44
-		if($hasLoader===true){
44
+		if ($hasLoader===true) {
45 45
 			$this->addLoading($retour, $responseElement);
46 46
 		}
47 47
 		$retour.="$.".$method."(url,".$params.").done(function( data ) {\n";
@@ -51,30 +51,30 @@  discard block
 block discarded – undo
51 51
 			return $retour;
52 52
 	}
53 53
 
54
-	protected function _getAjaxUrl($url,$attr){
54
+	protected function _getAjaxUrl($url, $attr) {
55 55
 		$url=$this->_correctAjaxUrl($url);
56 56
 		$retour="url='".$url."';\n";
57 57
 		$slash="/";
58
-		if(JString::endswith($url, "/")===true)
58
+		if (JString::endswith($url, "/")===true)
59 59
 			$slash="";
60
-		if(JString::isNotNull($attr)){
60
+		if (JString::isNotNull($attr)) {
61 61
 			if ($attr==="value")
62 62
 				$retour.="url=url+'".$slash."'+$(this).val();\n";
63 63
 			elseif ($attr==="html")
64 64
 			$retour.="url=url+'".$slash."'+$(this).html();\n";
65
-			elseif($attr!=null && $attr!=="")
65
+			elseif ($attr!=null && $attr!=="")
66 66
 					$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
67 67
 		}
68 68
 		return $retour;
69 69
 	}
70 70
 
71
-	protected function _getOnAjaxDone($responseElement,$jsCallback){
71
+	protected function _getOnAjaxDone($responseElement, $jsCallback) {
72 72
 		$retour="";
73 73
 		if ($responseElement!=="") {
74
-			if(JString::startswith($responseElement, "\"-")===true){
74
+			if (JString::startswith($responseElement, "\"-")===true) {
75 75
 				$responseElement=\str_replace("\"-", "\"", $responseElement);
76 76
 				$retour="\t$({$responseElement}).replaceWith( data );\n";
77
-			}else{
77
+			} else {
78 78
 				$retour="\t$({$responseElement}).html( data );\n";
79 79
 			}
80 80
 		}
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 		return $retour;
83 83
 	}
84 84
 
85
-	protected function _getResponseElement($responseElement){
85
+	protected function _getResponseElement($responseElement) {
86 86
 		if ($responseElement!=="") {
87 87
 			$responseElement=Javascript::prep_value($responseElement);
88 88
 		}
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 	protected function _correctAjaxUrl($url) {
93 93
 		if ($url!=="/" && JString::endsWith($url, "/")===true)
94 94
 			$url=substr($url, 0, strlen($url)-1);
95
-		if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
95
+		if (strncmp($url, 'http://', 7)!=0 && strncmp($url, 'https://', 8)!=0) {
96 96
 			$url=$this->jsUtils->getUrl($url);
97 97
 		}
98 98
 		return $url;
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
 	 * @param string $jsCallback javascript code to execute after the request
107 107
 	 * @param boolean $immediatly
108 108
 	 */
109
-	public function _json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document",$immediatly=false) {
109
+	public function _json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document", $immediatly=false) {
110 110
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
111 111
 		$retour=$this->_getAjaxUrl($url, $attr);
112 112
 		$retour.="$.{$method}(url,".$params.").done(function( data ) {\n";
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
 	 * @param string $url the request address
128 128
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true)
129 129
 	 */
130
-	public function _jsonOn($event,$element, $url,$parameters=array()) {
130
+	public function _jsonOn($event, $element, $url, $parameters=array()) {
131 131
 		$preventDefault=true;
132 132
 		$stopPropagation=true;
133 133
 		$jsCallback=null;
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
 		$params="{}";
138 138
 		$immediatly=true;
139 139
 		extract($parameters);
140
-		return $this->_add_event($element, $this->_json($url,$method, $params,$jsCallback, $attr,$context), $event, $preventDefault, $stopPropagation,$immediatly);
140
+		return $this->_add_event($element, $this->_json($url, $method, $params, $jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation, $immediatly);
141 141
 	}
142 142
 
143 143
 	/**
@@ -149,19 +149,19 @@  discard block
 block discarded – undo
149 149
 	 * @param string $context jquery DOM element, array container.
150 150
 	 * @param boolean $immediatly
151 151
 	 */
152
-	public function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context=null,$immediatly=false) {
152
+	public function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context=null, $immediatly=false) {
153 153
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
154 154
 		$retour=$this->_getAjaxUrl($url, $attr);
155
-		if($context===null){
155
+		if ($context===null) {
156 156
 			$appendTo="\t\tnewElm.appendTo($('".$maskSelector."').parent());\n";
157
-			$newElm = "$('#'+newId)";
158
-		}else{
157
+			$newElm="$('#'+newId)";
158
+		} else {
159 159
 			$appendTo="\t\tnewElm.appendTo(".$context.");\n";
160
-			$newElm = $context.".find('#'+newId)";
160
+			$newElm=$context.".find('#'+newId)";
161 161
 		}
162 162
 		$retour.="var self = $(this);\n$.{$method}(url,".$params.").done(function( data ) {\n";
163 163
 		$retour.="\tdata=$.parseJSON(data);$.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();newElm.attr('id',newId);\n";
164
-		$retour.= $appendTo;
164
+		$retour.=$appendTo;
165 165
 		$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";
166 166
 		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
167 167
 		$retour.="\t".$jsCallback."\n"."});\n";
@@ -176,26 +176,26 @@  discard block
 block discarded – undo
176 176
 	 * @param string $url the request address
177 177
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get", "context"=>null)
178 178
 	 */
179
-	public function _jsonArrayOn($event,$element, $maskSelector,$url,$parameters=array()) {
179
+	public function _jsonArrayOn($event, $element, $maskSelector, $url, $parameters=array()) {
180 180
 		$preventDefault=true;
181 181
 		$stopPropagation=true;
182 182
 		$jsCallback=null;
183 183
 		$attr="id";
184 184
 		$method="get";
185
-		$context = null;
185
+		$context=null;
186 186
 		$params="{}";
187 187
 		$immediatly=true;
188 188
 		extract($parameters);
189
-		return $this->_add_event($element, $this->_jsonArray($maskSelector,$url,$method, $params,$jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation,$immediatly);
189
+		return $this->_add_event($element, $this->_jsonArray($maskSelector, $url, $method, $params, $jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation, $immediatly);
190 190
 	}
191 191
 
192
-	public function _postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
192
+	public function _postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
193 193
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
194 194
 		$retour=$this->_getAjaxUrl($url, $attr);
195 195
 		$retour.="\nvar params=$('#".$form."').serialize();\n";
196 196
 		$responseElement=$this->_getResponseElement($responseElement);
197 197
 		$retour.="var self=this;\n";
198
-		if($hasLoader===true){
198
+		if ($hasLoader===true) {
199 199
 			$this->addLoading($retour, $responseElement);
200 200
 		}
201 201
 		$retour.="$.post(url,params).done(function( data ) {\n";
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
 	 * @param string $responseElement
223 223
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true)
224 224
 	 */
225
-	public function _getOn($event,$element, $url, $params="{}", $responseElement="", $parameters=array()) {
225
+	public function _getOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
226 226
 		$preventDefault=true;
227 227
 		$stopPropagation=true;
228 228
 		$jsCallback=null;
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
230 230
 		$hasLoader=true;
231 231
 		$immediatly=true;
232 232
 		extract($parameters);
233
-		return $this->_add_event($element, $this->_get($url, $params, $responseElement, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation,$immediatly);
233
+		return $this->_add_event($element, $this->_get($url, $params, $responseElement, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation, $immediatly);
234 234
 	}
235 235
 
236 236
 	/**
@@ -243,7 +243,7 @@  discard block
 block discarded – undo
243 243
 	 * @param string $responseElement
244 244
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true)
245 245
 	 */
246
-	public function _postOn($event,$element, $url, $params="{}", $responseElement="", $parameters=array()) {
246
+	public function _postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
247 247
 		$preventDefault=true;
248 248
 		$stopPropagation=true;
249 249
 		$jsCallback=null;
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
251 251
 		$hasLoader=true;
252 252
 		$immediatly=true;
253 253
 		extract($parameters);
254
-		return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation,$immediatly);
254
+		return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation, $immediatly);
255 255
 	}
256 256
 
257 257
 	/**
@@ -264,7 +264,7 @@  discard block
 block discarded – undo
264 264
 	 * @param string $responseElement
265 265
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true)
266 266
 	 */
267
-	public function _postFormOn($event,$element, $url, $form, $responseElement="", $parameters=array()) {
267
+	public function _postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) {
268 268
 		$preventDefault=true;
269 269
 		$stopPropagation=true;
270 270
 		$validation=false;
@@ -273,6 +273,6 @@  discard block
 block discarded – undo
273 273
 		$hasLoader=true;
274 274
 		$immediatly=true;
275 275
 		extract($parameters);
276
-		return $this->_add_event($element, $this->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation,$immediatly);
276
+		return $this->_add_event($element, $this->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation, $immediatly);
277 277
 	}
278 278
 }
279 279
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/widgets/datatable/Pagination.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -8,34 +8,34 @@  discard block
 block discarded – undo
8 8
 	private $page_count;
9 9
 	private $pages_visibles;
10 10
 
11
-	public function __construct($items_per_page=10,$pages_visibles=4,$page=1){
11
+	public function __construct($items_per_page=10, $pages_visibles=4, $page=1) {
12 12
 		$this->items_per_page=$items_per_page;
13 13
 		$this->page=$page;
14 14
 		$this->pages_visibles=$pages_visibles;
15 15
 		$this->visible=true;
16 16
 	}
17 17
 
18
-	public function getObjects($objects){
19
-		$offset = ($this->page - 1) * $this->items_per_page;
18
+	public function getObjects($objects) {
19
+		$offset=($this->page-1)*$this->items_per_page;
20 20
 		$os=$objects;
21
-		if(\is_array($os)===false){
21
+		if (\is_array($os)===false) {
22 22
 			$os=[];
23
-			foreach ($objects as $o){
23
+			foreach ($objects as $o) {
24 24
 				$os[]=$o;
25 25
 			}
26 26
 		}
27
-		$this->page_count = 0;
27
+		$this->page_count=0;
28 28
 		$row_count=\sizeof($os);
29
-		if (0 === $row_count) {
29
+		if (0===$row_count) {
30 30
 			$this->visible=false;
31 31
 		} else {
32 32
 			$this->visible=true;
33
-			$this->page_count = (int)ceil($row_count / $this->items_per_page);
34
-			if($this->page > $this->page_count+1) {
35
-				$this->page = 1;
33
+			$this->page_count=(int)ceil($row_count/$this->items_per_page);
34
+			if ($this->page>$this->page_count+1) {
35
+				$this->page=1;
36 36
 			}
37 37
 		}
38
-		return array_slice($os, $offset,$this->items_per_page);
38
+		return array_slice($os, $offset, $this->items_per_page);
39 39
 	}
40 40
 
41 41
 	public function getItemsPerPage() {
@@ -69,14 +69,14 @@  discard block
 block discarded – undo
69 69
 		return $this->page_count;
70 70
 	}
71 71
 
72
-	public function getPagesNumbers(){
73
-		$middle= (int)ceil(($this->pages_visibles-1)/ 2);
72
+	public function getPagesNumbers() {
73
+		$middle=(int)ceil(($this->pages_visibles-1)/2);
74 74
 		$first=$this->page-$middle;
75
-		if($first<1){
75
+		if ($first<1) {
76 76
 			$first=1;
77 77
 		}
78 78
 		$last=$first+$this->pages_visibles-1;
79
-		if($last>$this->page_count){
79
+		if ($last>$this->page_count) {
80 80
 			$last=$this->page_count;
81 81
 		}
82 82
 		return \range($first, $last);
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/menus/HtmlPaginationMenu.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -7,20 +7,20 @@
 block discarded – undo
7 7
 
8 8
 use Ajax\semantic\html\elements\HtmlIcon;
9 9
 
10
-class HtmlPaginationMenu extends HtmlMenu{
10
+class HtmlPaginationMenu extends HtmlMenu {
11 11
 	private $_page;
12
-	public function __construct( $identifier, $items=array() ){
13
-		parent::__construct( $identifier,$items);
12
+	public function __construct($identifier, $items=array()) {
13
+		parent::__construct($identifier, $items);
14 14
 	}
15 15
 	/**
16 16
 	 * {@inheritDoc}
17 17
 	 * @see \Ajax\common\html\BaseHtml::compile()
18 18
 	 */
19
-	public function compile(JsUtils $js=NULL,&$view=NULL){
20
-		$this->insertItem(new HtmlIcon("", "left chevron"))->setProperty("data-page", \max([1,$this->_page-1]));
21
-		$this->addItem(new HtmlIcon("", "right chevron"))->setProperty("data-page", \min([\sizeof($this->content)-2,$this->_page+1]));
19
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
20
+		$this->insertItem(new HtmlIcon("", "left chevron"))->setProperty("data-page", \max([1, $this->_page-1]));
21
+		$this->addItem(new HtmlIcon("", "right chevron"))->setProperty("data-page", \min([\sizeof($this->content)-2, $this->_page+1]));
22 22
 		$this->asPagination();
23
-		return parent::compile($js,$view);
23
+		return parent::compile($js, $view);
24 24
 	}
25 25
 
26 26
 	public function setActiveItem($index) {
Please login to merge, or discard this patch.
Ajax/semantic/html/elements/HtmlInput.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -10,13 +10,13 @@  discard block
 block discarded – undo
10 10
 use Ajax\JsUtils;
11 11
 
12 12
 class HtmlInput extends HtmlSemDoubleElement {
13
-	use IconTrait,TextFieldsTrait,FieldTrait;
13
+	use IconTrait, TextFieldsTrait, FieldTrait;
14 14
 
15 15
 	public function __construct($identifier, $type="text", $value="", $placeholder="") {
16
-		parent::__construct("div-" . $identifier, "div", "ui input");
17
-		$this->content=[ "field" => new \Ajax\common\html\html5\HtmlInput($identifier, $type, $value, $placeholder) ];
18
-		$this->_states=[ State::DISABLED,State::FOCUS,State::ERROR ];
19
-		$this->_variations=[ Variation::TRANSPARENT ];
16
+		parent::__construct("div-".$identifier, "div", "ui input");
17
+		$this->content=["field" => new \Ajax\common\html\html5\HtmlInput($identifier, $type, $value, $placeholder)];
18
+		$this->_states=[State::DISABLED, State::FOCUS, State::ERROR];
19
+		$this->_variations=[Variation::TRANSPARENT];
20 20
 	}
21 21
 
22 22
 	public function getField() {
@@ -36,11 +36,11 @@  discard block
 block discarded – undo
36 36
 
37 37
 	public function run(JsUtils $js) {
38 38
 		$result=parent::run($js);
39
-		$result->attach("#" . $this->getDataField()->getIdentifier());
39
+		$result->attach("#".$this->getDataField()->getIdentifier());
40 40
 		return $result;
41 41
 	}
42 42
 
43
-	public function setTransparent(){
43
+	public function setTransparent() {
44 44
 		return $this->addToProperty("class", "transparent");
45 45
 	}
46 46
 }
47 47
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/html/base/traits/MenuItemTrait.php 2 patches
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -8,16 +8,16 @@  discard block
 block discarded – undo
8 8
 
9 9
 trait MenuItemTrait {
10 10
 
11
-	public function setContent($content){
12
-		if($content==="-"){
11
+	public function setContent($content) {
12
+		if ($content==="-") {
13 13
 			$this->asDivider();
14
-		}elseif($content==="-search-"){
15
-			$values=\explode(",",$content,-1);
16
-			$this->asSearchInput(JArray::getDefaultValue($values, 0, "Search..."),JArray::getDefaultValue($values, 1, "search"));
17
-		}elseif(JString::startswith($content, "-")){
18
-			$content=\ltrim($content,"-");
14
+		}elseif ($content==="-search-") {
15
+			$values=\explode(",", $content, -1);
16
+			$this->asSearchInput(JArray::getDefaultValue($values, 0, "Search..."), JArray::getDefaultValue($values, 1, "search"));
17
+		}elseif (JString::startswith($content, "-")) {
18
+			$content=\ltrim($content, "-");
19 19
 			$this->asHeader($content);
20
-		}else
20
+		} else
21 21
 			parent::setContent($content);
22 22
 		return $this;
23 23
 	}
@@ -27,13 +27,13 @@  discard block
 block discarded – undo
27 27
 	 * @param string $icon
28 28
 	 * @return \Ajax\semantic\html\content\HtmlDropdownItem|\Ajax\semantic\html\content\HtmlMenuItem
29 29
 	 */
30
-	public function asSearchInput($placeholder=NULL,$icon=NULL){
30
+	public function asSearchInput($placeholder=NULL, $icon=NULL) {
31 31
 		$this->setClass("ui icon search input");
32 32
 		$input=new HtmlInput("search-".$this->identifier);
33
-		if(isset($placeholder))
33
+		if (isset($placeholder))
34 34
 			$input->setProperty("placeholder", $placeholder);
35 35
 			$this->content=$input;
36
-			if(isset($icon))
36
+			if (isset($icon))
37 37
 				$this->addIcon($icon);
38 38
 				return $this;
39 39
 	}
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 	/**
42 42
 	 * @return \Ajax\semantic\html\content\HtmlDropdownItem|\Ajax\semantic\html\content\HtmlMenuItem
43 43
 	 */
44
-	public function asDivider(){
44
+	public function asDivider() {
45 45
 		$this->content=NULL;
46 46
 		$this->tagName="div";
47 47
 		$this->setClass("divider");
@@ -53,16 +53,16 @@  discard block
 block discarded – undo
53 53
 	 * @param string $icon
54 54
 	 * @return \Ajax\semantic\html\content\HtmlDropdownItem|\Ajax\semantic\html\content\HtmlMenuItem
55 55
 	 */
56
-	public function asHeader($caption=NULL,$icon=NULL){
56
+	public function asHeader($caption=NULL, $icon=NULL) {
57 57
 		$this->setClass("header");
58 58
 		$this->tagName="div";
59 59
 		$this->content=$caption;
60
-		if(isset($icon))
61
-			$this->addIcon($icon,Direction::LEFT);
60
+		if (isset($icon))
61
+			$this->addIcon($icon, Direction::LEFT);
62 62
 			return $this;
63 63
 	}
64 64
 
65
-	public function setPosition($direction){
66
-		$this->addToProperty("class",$direction);
65
+	public function setPosition($direction) {
66
+		$this->addToProperty("class", $direction);
67 67
 	}
68 68
 }
69 69
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +14 added lines, -10 removed lines patch added patch discarded remove patch
@@ -11,14 +11,15 @@  discard block
 block discarded – undo
11 11
 	public function setContent($content){
12 12
 		if($content==="-"){
13 13
 			$this->asDivider();
14
-		}elseif($content==="-search-"){
14
+		} elseif($content==="-search-"){
15 15
 			$values=\explode(",",$content,-1);
16 16
 			$this->asSearchInput(JArray::getDefaultValue($values, 0, "Search..."),JArray::getDefaultValue($values, 1, "search"));
17
-		}elseif(JString::startswith($content, "-")){
17
+		} elseif(JString::startswith($content, "-")){
18 18
 			$content=\ltrim($content,"-");
19 19
 			$this->asHeader($content);
20
-		}else
21
-			parent::setContent($content);
20
+		} else {
21
+					parent::setContent($content);
22
+		}
22 23
 		return $this;
23 24
 	}
24 25
 
@@ -30,11 +31,13 @@  discard block
 block discarded – undo
30 31
 	public function asSearchInput($placeholder=NULL,$icon=NULL){
31 32
 		$this->setClass("ui icon search input");
32 33
 		$input=new HtmlInput("search-".$this->identifier);
33
-		if(isset($placeholder))
34
-			$input->setProperty("placeholder", $placeholder);
34
+		if(isset($placeholder)) {
35
+					$input->setProperty("placeholder", $placeholder);
36
+		}
35 37
 			$this->content=$input;
36
-			if(isset($icon))
37
-				$this->addIcon($icon);
38
+			if(isset($icon)) {
39
+							$this->addIcon($icon);
40
+			}
38 41
 				return $this;
39 42
 	}
40 43
 
@@ -57,8 +60,9 @@  discard block
 block discarded – undo
57 60
 		$this->setClass("header");
58 61
 		$this->tagName="div";
59 62
 		$this->content=$caption;
60
-		if(isset($icon))
61
-			$this->addIcon($icon,Direction::LEFT);
63
+		if(isset($icon)) {
64
+					$this->addIcon($icon,Direction::LEFT);
65
+		}
62 66
 			return $this;
63 67
 	}
64 68
 
Please login to merge, or discard this patch.
Ajax/service/JString.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -2,33 +2,33 @@
 block discarded – undo
2 2
 namespace Ajax\service;
3 3
 class JString {
4 4
 
5
-	public static function contains($hay,$needle){
6
-		return strpos($hay, $needle) !== false;
5
+	public static function contains($hay, $needle) {
6
+		return strpos($hay, $needle)!==false;
7 7
 	}
8 8
 	public static function startswith($hay, $needle) {
9
-		return substr($hay, 0, strlen($needle)) === $needle;
9
+		return substr($hay, 0, strlen($needle))===$needle;
10 10
 	}
11 11
 
12 12
 	public static function endswith($hay, $needle) {
13
-		return substr($hay, -strlen($needle)) === $needle;
13
+		return substr($hay, -strlen($needle))===$needle;
14 14
 	}
15 15
 
16
-	public static function isNull($s){
16
+	public static function isNull($s) {
17 17
 		return (!isset($s) || NULL===$s || ""===$s);
18 18
 	}
19
-	public static function isNotNull($s){
19
+	public static function isNotNull($s) {
20 20
 		return (isset($s) && NULL!==$s && ""!==$s);
21 21
 	}
22 22
 
23
-	public static function isBoolean($value){
23
+	public static function isBoolean($value) {
24 24
 		return \is_bool($value) || $value==1 || $value==0;
25 25
 	}
26 26
 
27
-	public static function isBooleanTrue($value){
27
+	public static function isBooleanTrue($value) {
28 28
 		return $value==1 || $value;
29 29
 	}
30 30
 
31
-	public static function isBooleanFalse($value){
31
+	public static function isBooleanFalse($value) {
32 32
 		return $value==0 || !$value;
33 33
 	}
34 34
 }
35 35
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/widgets/datatable/PositionInTable.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -3,5 +3,5 @@
 block discarded – undo
3 3
 use Ajax\common\BaseEnum;
4 4
 
5 5
 abstract class PositionInTable extends BaseEnum {
6
-	const BEFORETABLE="beforeTable",AFTERTABLE="afterTable",HEADER="thead",FOOTER="tfoot",BODY="tbody";
6
+	const BEFORETABLE="beforeTable", AFTERTABLE="afterTable", HEADER="thead", FOOTER="tfoot", BODY="tbody";
7 7
 }
8 8
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/widgets/datatable/DataTable.php 3 patches
Doc Comments   +19 added lines, -3 removed lines patch added patch discarded remove patch
@@ -39,6 +39,10 @@  discard block
 block discarded – undo
39 39
 		parent::run($js);
40 40
 	}
41 41
 
42
+	/**
43
+	 * @param string $identifier
44
+	 * @param string $model
45
+	 */
42 46
 	public function __construct($identifier,$model,$modelInstance=NULL) {
43 47
 		parent::__construct($identifier, $model,$modelInstance);
44 48
 		$this->_instanceViewer=new InstanceViewer();
@@ -141,6 +145,9 @@  discard block
 block discarded – undo
141 145
 		return $this;
142 146
 	}
143 147
 
148
+	/**
149
+	 * @param PositionInTable $part
150
+	 */
144 151
 	private function addToolbarRow($part,$table,$captions){
145 152
 		$row=$table->getPart($part)->addRow(\sizeof($captions));
146 153
 		$row->mergeCol();
@@ -180,16 +187,17 @@  discard block
 block discarded – undo
180 187
 	/**
181 188
 	 * @param string $caption
182 189
 	 * @param callable $callback
183
-	 * @return callable
190
+	 * @return \Closure
184 191
 	 */
185 192
 	private function getFieldButtonCallable($caption,$callback=null){
186 193
 		return $this->getCallable("getFieldButton",[$caption],$callback);
187 194
 	}
188 195
 
189 196
 	/**
190
-	 * @param mixed $object
191 197
 	 * @param callable $callback
192
-	 * @return callable
198
+	 * @param string $thisCallback
199
+	 * @param string[] $parameters
200
+	 * @return \Closure
193 201
 	 */
194 202
 	private function getCallable($thisCallback,$parameters,$callback=null){
195 203
 		$result=function($instance) use($thisCallback,$parameters,$callback){
@@ -250,11 +258,19 @@  discard block
 block discarded – undo
250 258
 		return $this;
251 259
 	}
252 260
 
261
+	/**
262
+	 * @param string $icon
263
+	 * @param string $class
264
+	 */
253 265
 	private function addDefaultButton($icon,$class=null,$callback=null){
254 266
 		$this->addField($this->getCallable("getDefaultButton",[$icon,$class],$callback));
255 267
 		return $this;
256 268
 	}
257 269
 
270
+	/**
271
+	 * @param string $icon
272
+	 * @param string $class
273
+	 */
258 274
 	private function insertDefaultButtonIn($index,$icon,$class=null,$callback=null){
259 275
 		$this->insertInField($index,$this->getCallable("getDefaultButton",[$icon,$class],$callback));
260 276
 		return $this;
Please login to merge, or discard this patch.
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -68,8 +68,9 @@  discard block
 block discarded – undo
68 68
 
69 69
 		$table->setRowCount(0, \sizeof($captions));
70 70
 		$table->setHeaderValues($captions);
71
-		if(isset($this->_compileParts))
72
-			$table->setCompileParts($this->_compileParts);
71
+		if(isset($this->_compileParts)) {
72
+					$table->setCompileParts($this->_compileParts);
73
+		}
73 74
 		if(isset($this->_searchField) && isset($js)){
74 75
 			$this->_searchField->postOn("change", $this->_urls,"{'s':$(this).val()}","-#".$this->identifier." tbody",["preventDefault"=>false]);
75 76
 		}
@@ -275,8 +276,9 @@  discard block
 block discarded – undo
275 276
 	private function getDefaultButton($icon,$class=null){
276 277
 		$bt=$this->getFieldButton("");
277 278
 		$bt->asIcon($icon);
278
-		if(isset($class))
279
-			$bt->addToProperty("class", $class);
279
+		if(isset($class)) {
280
+					$bt->addToProperty("class", $class);
281
+		}
280 282
 		return $bt;
281 283
 	}
282 284
 
Please login to merge, or discard this patch.
Spacing   +78 added lines, -78 removed lines patch added patch discarded remove patch
@@ -30,8 +30,8 @@  discard block
 block discarded – undo
30 30
 	protected $_hasCheckboxes;
31 31
 	protected $_compileParts;
32 32
 
33
-	public function run(JsUtils $js){
34
-		if($this->_hasCheckboxes && isset($js)){
33
+	public function run(JsUtils $js) {
34
+		if ($this->_hasCheckboxes && isset($js)) {
35 35
 			$js->execOn("change", "#".$this->identifier." [name='selection[]']", "
36 36
 		var \$parentCheckbox=\$('#ck-main-ck-{$this->identifier}'),\$checkbox=\$('#{$this->identifier} [name=\"selection[]\"]'),allChecked=true,allUnchecked=true;
37 37
 		\$checkbox.each(function() {if($(this).prop('checked')){allUnchecked = false;}else{allChecked = false;}});
@@ -40,9 +40,9 @@  discard block
 block discarded – undo
40 40
 		parent::run($js);
41 41
 	}
42 42
 
43
-	public function __construct($identifier,$model,$modelInstance=NULL) {
44
-		parent::__construct($identifier, $model,$modelInstance);
45
-		$this->_init(new InstanceViewer($identifier), "table", new HtmlTable($identifier, 0,0), false);
43
+	public function __construct($identifier, $model, $modelInstance=NULL) {
44
+		parent::__construct($identifier, $model, $modelInstance);
45
+		$this->_init(new InstanceViewer($identifier), "table", new HtmlTable($identifier, 0, 0), false);
46 46
 	}
47 47
 
48 48
 	/**
@@ -54,61 +54,61 @@  discard block
 block discarded – undo
54 54
 	}
55 55
 
56 56
 
57
-	public function compile(JsUtils $js=NULL,&$view=NULL){
57
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
58 58
 		$this->_instanceViewer->setInstance($this->_model);
59 59
 		$captions=$this->_instanceViewer->getCaptions();
60 60
 
61 61
 		$table=$this->content["table"];
62 62
 
63
-		if($this->_hasCheckboxes){
63
+		if ($this->_hasCheckboxes) {
64 64
 			$this->_generateMainCheckbox($captions);
65 65
 		}
66 66
 
67 67
 		$table->setRowCount(0, \sizeof($captions));
68 68
 		$table->setHeaderValues($captions);
69
-		if(isset($this->_compileParts))
69
+		if (isset($this->_compileParts))
70 70
 			$table->setCompileParts($this->_compileParts);
71
-		if(isset($this->_searchField) && isset($js)){
72
-			$this->_searchField->postOn("change", $this->_urls,"{'s':$(this).val()}","-#".$this->identifier." tbody",["preventDefault"=>false]);
71
+		if (isset($this->_searchField) && isset($js)) {
72
+			$this->_searchField->postOn("change", $this->_urls, "{'s':$(this).val()}", "-#".$this->identifier." tbody", ["preventDefault"=>false]);
73 73
 		}
74 74
 
75 75
 		$this->_generateContent($table);
76 76
 
77
-		if($this->_hasCheckboxes && $table->hasPart("thead")){
78
-				$table->getHeader()->getCell(0, 0)->addToProperty("class","no-sort");
77
+		if ($this->_hasCheckboxes && $table->hasPart("thead")) {
78
+				$table->getHeader()->getCell(0, 0)->addToProperty("class", "no-sort");
79 79
 		}
80 80
 
81
-		if(isset($this->_pagination) && $this->_pagination->getVisible()){
81
+		if (isset($this->_pagination) && $this->_pagination->getVisible()) {
82 82
 			$this->_generatePagination($table);
83 83
 		}
84
-		if(isset($this->_toolbar)){
84
+		if (isset($this->_toolbar)) {
85 85
 			$this->_setToolbarPosition($table, $captions);
86 86
 		}
87
-		$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"table",PositionInTable::AFTERTABLE]);
88
-		return parent::compile($js,$view);
87
+		$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "table", PositionInTable::AFTERTABLE]);
88
+		return parent::compile($js, $view);
89 89
 	}
90 90
 
91
-	private function _generateMainCheckbox(&$captions){
92
-		$ck=new HtmlCheckbox("main-ck-".$this->identifier,"");
91
+	private function _generateMainCheckbox(&$captions) {
92
+		$ck=new HtmlCheckbox("main-ck-".$this->identifier, "");
93 93
 		$ck->setOnChecked("$('#".$this->identifier." [name=%quote%selection[]%quote%]').prop('checked',true);");
94 94
 		$ck->setOnUnchecked("$('#".$this->identifier." [name=%quote%selection[]%quote%]').prop('checked',false);");
95 95
 		\array_unshift($captions, $ck);
96 96
 	}
97 97
 
98
-	protected function _generateContent($table){
98
+	protected function _generateContent($table) {
99 99
 		$objects=$this->_modelInstance;
100
-		if(isset($this->_pagination)){
100
+		if (isset($this->_pagination)) {
101 101
 			$objects=$this->_pagination->getObjects($this->_modelInstance);
102 102
 		}
103 103
 		InstanceViewer::setIndex(0);
104
-		$table->fromDatabaseObjects($objects, function($instance){
104
+		$table->fromDatabaseObjects($objects, function($instance) {
105 105
 			$this->_instanceViewer->setInstance($instance);
106 106
 			InstanceViewer::$index++;
107
-			$result= $this->_instanceViewer->getValues();
108
-			if($this->_hasCheckboxes){
109
-				$ck=new HtmlCheckbox("ck-".$this->identifier,"");
107
+			$result=$this->_instanceViewer->getValues();
108
+			if ($this->_hasCheckboxes) {
109
+				$ck=new HtmlCheckbox("ck-".$this->identifier, "");
110 110
 				$field=$ck->getField();
111
-				$field->setProperty("value",$this->_instanceViewer->getIdentifier());
111
+				$field->setProperty("value", $this->_instanceViewer->getIdentifier());
112 112
 				$field->setProperty("name", "selection[]");
113 113
 				\array_unshift($result, $ck);
114 114
 			}
@@ -116,25 +116,25 @@  discard block
 block discarded – undo
116 116
 		});
117 117
 	}
118 118
 
119
-	private function _generatePagination($table){
119
+	private function _generatePagination($table) {
120 120
 		$footer=$table->getFooter();
121 121
 		$footer->mergeCol();
122
-		$menu=new HtmlPaginationMenu("pagination-".$this->identifier,$this->_pagination->getPagesNumbers());
122
+		$menu=new HtmlPaginationMenu("pagination-".$this->identifier, $this->_pagination->getPagesNumbers());
123 123
 		$menu->floatRight();
124 124
 		$menu->setActiveItem($this->_pagination->getPage()-1);
125 125
 		$footer->setValues($menu);
126
-		$menu->postOnClick($this->_urls,"{'p':$(this).attr('data-page')}","-#".$this->identifier." tbody",["preventDefault"=>false]);
126
+		$menu->postOnClick($this->_urls, "{'p':$(this).attr('data-page')}", "-#".$this->identifier." tbody", ["preventDefault"=>false]);
127 127
 	}
128 128
 
129
-	protected function _setToolbarPosition($table,$captions=NULL){
130
-		switch ($this->_toolbarPosition){
129
+	protected function _setToolbarPosition($table, $captions=NULL) {
130
+		switch ($this->_toolbarPosition) {
131 131
 			case PositionInTable::BEFORETABLE:case PositionInTable::AFTERTABLE:
132
-				if(isset($this->_compileParts)===false){
132
+				if (isset($this->_compileParts)===false) {
133 133
 					$this->content[$this->_toolbarPosition]=$this->_toolbar;
134 134
 				}
135 135
 				break;
136 136
 			case PositionInTable::HEADER:case PositionInTable::FOOTER: case PositionInTable::BODY:
137
-				$this->addToolbarRow($this->_toolbarPosition,$table, $captions);
137
+				$this->addToolbarRow($this->_toolbarPosition, $table, $captions);
138 138
 				break;
139 139
 		}
140 140
 	}
@@ -146,18 +146,18 @@  discard block
 block discarded – undo
146 146
 	 * @param callable $callback function called after the field compilation
147 147
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
148 148
 	 */
149
-	public function afterCompile($index,$callback){
150
-		$this->_instanceViewer->afterCompile($index,$callback);
149
+	public function afterCompile($index, $callback) {
150
+		$this->_instanceViewer->afterCompile($index, $callback);
151 151
 		return $this;
152 152
 	}
153 153
 
154
-	private function addToolbarRow($part,$table,$captions){
154
+	private function addToolbarRow($part, $table, $captions) {
155 155
 		$row=$table->getPart($part)->addRow(\sizeof($captions));
156 156
 		$row->mergeCol();
157 157
 		$row->setValues([$this->_toolbar]);
158 158
 	}
159 159
 
160
-	public function getHtmlComponent(){
160
+	public function getHtmlComponent() {
161 161
 		return $this->content["table"];
162 162
 	}
163 163
 
@@ -170,8 +170,8 @@  discard block
 block discarded – undo
170 170
 		return $this;
171 171
 	}
172 172
 
173
-	public function paginate($items_per_page=10,$page=1){
174
-		$this->_pagination=new Pagination($items_per_page,4,$page);
173
+	public function paginate($items_per_page=10, $page=1) {
174
+		$this->_pagination=new Pagination($items_per_page, 4, $page);
175 175
 	}
176 176
 
177 177
 	public function getHasCheckboxes() {
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
183 183
 		return $this;
184 184
 	}
185 185
 
186
-	public function refresh($compileParts=["tbody"]){
186
+	public function refresh($compileParts=["tbody"]) {
187 187
 		$this->_compileParts=$compileParts;
188 188
 		return $this;
189 189
 	}
@@ -192,8 +192,8 @@  discard block
 block discarded – undo
192 192
 	 * @param callable $callback
193 193
 	 * @return callable
194 194
 	 */
195
-	private function getFieldButtonCallable($caption,$callback=null){
196
-		return $this->getCallable("getFieldButton",[$caption],$callback);
195
+	private function getFieldButtonCallable($caption, $callback=null) {
196
+		return $this->getCallable("getFieldButton", [$caption], $callback);
197 197
 	}
198 198
 
199 199
 	/**
@@ -201,16 +201,16 @@  discard block
 block discarded – undo
201 201
 	 * @param callable $callback
202 202
 	 * @return callable
203 203
 	 */
204
-	private function getCallable($thisCallback,$parameters,$callback=null){
205
-		$result=function($instance) use($thisCallback,$parameters,$callback){
206
-			$object=call_user_func_array(array($this,$thisCallback), $parameters);
207
-			if(isset($callback)){
208
-				if(\is_callable($callback)){
209
-					$callback($object,$instance);
204
+	private function getCallable($thisCallback, $parameters, $callback=null) {
205
+		$result=function($instance) use($thisCallback, $parameters, $callback){
206
+			$object=call_user_func_array(array($this, $thisCallback), $parameters);
207
+			if (isset($callback)) {
208
+				if (\is_callable($callback)) {
209
+					$callback($object, $instance);
210 210
 				}
211 211
 			}
212
-			if($object instanceof HtmlSemDoubleElement){
213
-				$object->setProperty("data-ajax",$this->_instanceViewer->getIdentifier());
212
+			if ($object instanceof HtmlSemDoubleElement) {
213
+				$object->setProperty("data-ajax", $this->_instanceViewer->getIdentifier());
214 214
 			}
215 215
 			return $object;
216 216
 		};
@@ -221,8 +221,8 @@  discard block
 block discarded – undo
221 221
 	 * @param string $caption
222 222
 	 * @return HtmlButton
223 223
 	 */
224
-	private function getFieldButton($caption){
225
-		return new HtmlButton("",$caption);
224
+	private function getFieldButton($caption) {
225
+		return new HtmlButton("", $caption);
226 226
 	}
227 227
 
228 228
 	/**
@@ -231,8 +231,8 @@  discard block
 block discarded – undo
231 231
 	 * @param callable $callback
232 232
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
233 233
 	 */
234
-	public function addFieldButton($caption,$callback=null){
235
-		$this->addField($this->getCallable("getFieldButton",[$caption],$callback));
234
+	public function addFieldButton($caption, $callback=null) {
235
+		$this->addField($this->getCallable("getFieldButton", [$caption], $callback));
236 236
 		return $this;
237 237
 	}
238 238
 
@@ -243,8 +243,8 @@  discard block
 block discarded – undo
243 243
 	 * @param callable $callback
244 244
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
245 245
 	 */
246
-	public function insertFieldButton($index,$caption,$callback=null){
247
-		$this->insertField($index, $this->getFieldButtonCallable($caption,$callback));
246
+	public function insertFieldButton($index, $caption, $callback=null) {
247
+		$this->insertField($index, $this->getFieldButtonCallable($caption, $callback));
248 248
 		return $this;
249 249
 	}
250 250
 
@@ -255,60 +255,60 @@  discard block
 block discarded – undo
255 255
 	 * @param callable $callback
256 256
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
257 257
 	 */
258
-	public function insertInFieldButton($index,$caption,$callback=null){
259
-		$this->insertInField($index, $this->getFieldButtonCallable($caption,$callback));
258
+	public function insertInFieldButton($index, $caption, $callback=null) {
259
+		$this->insertInField($index, $this->getFieldButtonCallable($caption, $callback));
260 260
 		return $this;
261 261
 	}
262 262
 
263
-	private function addDefaultButton($icon,$class=null,$callback=null){
264
-		$this->addField($this->getCallable("getDefaultButton",[$icon,$class],$callback));
263
+	private function addDefaultButton($icon, $class=null, $callback=null) {
264
+		$this->addField($this->getCallable("getDefaultButton", [$icon, $class], $callback));
265 265
 		return $this;
266 266
 	}
267 267
 
268
-	private function insertDefaultButtonIn($index,$icon,$class=null,$callback=null){
269
-		$this->insertInField($index,$this->getCallable("getDefaultButton",[$icon,$class],$callback));
268
+	private function insertDefaultButtonIn($index, $icon, $class=null, $callback=null) {
269
+		$this->insertInField($index, $this->getCallable("getDefaultButton", [$icon, $class], $callback));
270 270
 		return $this;
271 271
 	}
272 272
 
273
-	private function getDefaultButton($icon,$class=null){
273
+	private function getDefaultButton($icon, $class=null) {
274 274
 		$bt=$this->getFieldButton("");
275 275
 		$bt->asIcon($icon);
276
-		if(isset($class))
276
+		if (isset($class))
277 277
 			$bt->addToProperty("class", $class);
278 278
 		return $bt;
279 279
 	}
280 280
 
281
-	public function addDeleteButton($callback=null){
282
-		return $this->addDefaultButton("remove","delete red basic",$callback);
281
+	public function addDeleteButton($callback=null) {
282
+		return $this->addDefaultButton("remove", "delete red basic", $callback);
283 283
 	}
284 284
 
285
-	public function addEditButton($callback=null){
286
-		return $this->addDefaultButton("edit","edit basic",$callback);
285
+	public function addEditButton($callback=null) {
286
+		return $this->addDefaultButton("edit", "edit basic", $callback);
287 287
 	}
288 288
 
289
-	public function addEditDeleteButtons($callbackEdit=null,$callbackDelete=null){
289
+	public function addEditDeleteButtons($callbackEdit=null, $callbackDelete=null) {
290 290
 		$this->addEditButton($callbackEdit);
291 291
 		$index=$this->_instanceViewer->visiblePropertiesCount()-1;
292
-		$this->insertDeleteButtonIn($index,$callbackDelete);
292
+		$this->insertDeleteButtonIn($index, $callbackDelete);
293 293
 		return $this;
294 294
 	}
295 295
 
296
-	public function insertDeleteButtonIn($index,$callback=null){
297
-		return $this->insertDefaultButtonIn($index,"remove","delete red basic",$callback);
296
+	public function insertDeleteButtonIn($index, $callback=null) {
297
+		return $this->insertDefaultButtonIn($index, "remove", "delete red basic", $callback);
298 298
 	}
299 299
 
300
-	public function insertEditButtonIn($index,$callback=null){
301
-		return $this->insertDefaultButtonIn($index,"edit","edit basic",$callback);
300
+	public function insertEditButtonIn($index, $callback=null) {
301
+		return $this->insertDefaultButtonIn($index, "edit", "edit basic", $callback);
302 302
 	}
303 303
 
304
-	public function addSearchInToolbar($position=Direction::RIGHT){
304
+	public function addSearchInToolbar($position=Direction::RIGHT) {
305 305
 		return $this->addInToolbar($this->getSearchField())->setPosition($position);
306 306
 	}
307 307
 
308
-	public function getSearchField(){
309
-		if(isset($this->_searchField)===false){
310
-			$this->_searchField=new HtmlInput("search-".$this->identifier,"search","","Search...");
311
-			$this->_searchField->addIcon("search",Direction::RIGHT);
308
+	public function getSearchField() {
309
+		if (isset($this->_searchField)===false) {
310
+			$this->_searchField=new HtmlInput("search-".$this->identifier, "search", "", "Search...");
311
+			$this->_searchField->addIcon("search", Direction::RIGHT);
312 312
 		}
313 313
 		return $this->_searchField;
314 314
 	}
Please login to merge, or discard this patch.