Completed
Push — master ( e9bdcb...b0560a )
by Jean-Christophe
04:52
created
Ajax/semantic/html/base/HtmlSemCollection.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -9,10 +9,10 @@
 block discarded – undo
9 9
  * @author jc
10 10
  * @version 1.001
11 11
  */
12
-abstract class HtmlSemCollection extends HtmlCollection{
12
+abstract class HtmlSemCollection extends HtmlCollection {
13 13
 	use BaseTrait;
14
-	public function __construct( $identifier, $tagName="div",$baseClass=""){
15
-		parent::__construct( $identifier, $tagName);
14
+	public function __construct($identifier, $tagName="div", $baseClass="") {
15
+		parent::__construct($identifier, $tagName);
16 16
 		$this->_baseClass=$baseClass;
17 17
 		$this->setClass($baseClass);
18 18
 	}
Please login to merge, or discard this patch.
Ajax/common/html/html5/HtmlTextarea.php 2 patches
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -7,26 +7,26 @@
 block discarded – undo
7 7
 
8 8
 class HtmlTextarea extends HtmlDoubleElement {
9 9
 
10
-	public function __construct($identifier,$value=NULL,$placeholder=NULL,$rows=NULL) {
10
+	public function __construct($identifier, $value=NULL, $placeholder=NULL, $rows=NULL) {
11 11
 		parent::__construct($identifier, "textarea");
12 12
 		$this->setValue($value);
13 13
 		$this->setPlaceholder($placeholder);
14
-		if(isset($rows))
14
+		if (isset($rows))
15 15
 			$this->setRows($rows);
16 16
 	}
17 17
 	public function setValue($value) {
18
-		if(isset($value))
18
+		if (isset($value))
19 19
 			$this->setContent($value);
20 20
 		return $this;
21 21
 	}
22 22
 
23
-	public function setPlaceholder($value){
24
-		if(JString::isNotNull($value))
23
+	public function setPlaceholder($value) {
24
+		if (JString::isNotNull($value))
25 25
 			$this->setProperty("placeholder", $value);
26 26
 		return $this;
27 27
 	}
28 28
 
29
-	public function setRows($count){
29
+	public function setRows($count) {
30 30
 		$this->setProperty("rows", $count);
31 31
 	}
32 32
 }
33 33
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +9 added lines, -6 removed lines patch added patch discarded remove patch
@@ -11,18 +11,21 @@
 block discarded – undo
11 11
 		parent::__construct($identifier, "textarea");
12 12
 		$this->setValue($value);
13 13
 		$this->setPlaceholder($placeholder);
14
-		if(isset($rows))
15
-			$this->setRows($rows);
14
+		if(isset($rows)) {
15
+					$this->setRows($rows);
16
+		}
16 17
 	}
17 18
 	public function setValue($value) {
18
-		if(isset($value))
19
-			$this->setContent($value);
19
+		if(isset($value)) {
20
+					$this->setContent($value);
21
+		}
20 22
 		return $this;
21 23
 	}
22 24
 
23 25
 	public function setPlaceholder($value){
24
-		if(JString::isNotNull($value))
25
-			$this->setProperty("placeholder", $value);
26
+		if(JString::isNotNull($value)) {
27
+					$this->setProperty("placeholder", $value);
28
+		}
26 29
 		return $this;
27 30
 	}
28 31
 
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/HtmlFormTextarea.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -8,17 +8,17 @@
 block discarded – undo
8 8
 class HtmlFormTextarea extends HtmlFormField {
9 9
 	use TextFieldsTrait;
10 10
 
11
-	public function __construct($identifier, $label=NULL,$value=NULL,$placeholder=NULL,$rows=NULL) {
12
-		if(!isset($placeholder))
11
+	public function __construct($identifier, $label=NULL, $value=NULL, $placeholder=NULL, $rows=NULL) {
12
+		if (!isset($placeholder))
13 13
 			$placeholder=$label;
14
-		parent::__construct("field-".$identifier, new HtmlTextarea($identifier,$value,$placeholder,$rows), $label);
14
+		parent::__construct("field-".$identifier, new HtmlTextarea($identifier, $value, $placeholder, $rows), $label);
15 15
 	}
16 16
 
17 17
 	/**
18 18
 	 * Defines the textarea row count
19 19
 	 * @param int $count
20 20
 	 */
21
-	public function setRows($count){
21
+	public function setRows($count) {
22 22
 		$this->getField()->setRows($count);
23 23
 	}
24 24
 }
25 25
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -8,8 +8,9 @@
 block discarded – undo
8 8
 class HtmlFormInput extends HtmlFormField {
9 9
 
10 10
 	public function __construct($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL) {
11
-		if(!isset($placeholder))
12
-			$placeholder=$label;
11
+		if(!isset($placeholder)) {
12
+					$placeholder=$label;
13
+		}
13 14
 		parent::__construct("field-".$identifier, new HtmlInput($identifier,$type,$value,$placeholder), $label);
14 15
 	}
15 16
 
Please login to merge, or discard this patch.
Ajax/Jquery.php 3 patches
Doc Comments   +5 added lines, -1 removed lines patch added patch discarded remove patch
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
 	 *
208 208
 	 * @param string $element
209 209
 	 * @param array $options
210
-	 * @return void
210
+	 * @return string
211 211
 	 */
212 212
 	public function sortable($element, $options=array()) {
213 213
 		if (count($options)>0) {
@@ -351,6 +351,7 @@  discard block
 block discarded – undo
351 351
 	/**
352 352
 	 * A wrapper for writing document.ready()
353 353
 	 *
354
+	 * @param string $js
354 355
 	 * @return string
355 356
 	 */
356 357
 	public function _document_ready($js) {
@@ -420,6 +421,9 @@  discard block
 block discarded – undo
420 421
 		return $speed;
421 422
 	}
422 423
 
424
+	/**
425
+	 * @param string $input
426
+	 */
423 427
 	private function minify($input) {
424 428
 	if(trim($input) === "") return $input;
425 429
 	return preg_replace(
Please login to merge, or discard this patch.
Braces   +23 added lines, -15 removed lines patch added patch discarded remove patch
@@ -173,10 +173,12 @@  discard block
 block discarded – undo
173 173
 		if (isset($param)) {
174 174
 			$param=$this->_prep_value($param);
175 175
 			$str="$({$element}).{$jQueryCall}({$param});";
176
-		} else
177
-			$str="$({$element}).{$jQueryCall}();";
178
-			if ($immediatly)
179
-				$this->jquery_code_for_compile[]=$str;
176
+		} else {
177
+					$str="$({$element}).{$jQueryCall}();";
178
+		}
179
+			if ($immediatly) {
180
+							$this->jquery_code_for_compile[]=$str;
181
+			}
180 182
 			return $str;
181 183
 	}
182 184
 	/**
@@ -191,8 +193,9 @@  discard block
 block discarded – undo
191 193
 		$to=$this->_prep_element($to);
192 194
 		$element=$this->_prep_element($element);
193 195
 		$str="$({$to}).{$jQueryCall}({$element});";
194
-		if ($immediatly)
195
-			$this->jquery_code_for_compile[]=$str;
196
+		if ($immediatly) {
197
+					$this->jquery_code_for_compile[]=$str;
198
+		}
196 199
 			return $str;
197 200
 	}
198 201
 	// --------------------------------------------------------------------
@@ -260,12 +263,14 @@  discard block
 block discarded – undo
260 263
 		if ($stopPropagation===true) {
261 264
 			$js="event.stopPropagation();\n".$js;
262 265
 		}
263
-		if (array_search($event, $this->jquery_events)===false)
264
-			$event="\n\t$(".$this->_prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n";
265
-		else
266
-			$event="\n\t$(".$this->_prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n";
267
-		if($immediatly)
268
-			$this->jquery_code_for_compile[]=$event;
266
+		if (array_search($event, $this->jquery_events)===false) {
267
+					$event="\n\t$(".$this->_prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n";
268
+		} else {
269
+					$event="\n\t$(".$this->_prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n";
270
+		}
271
+		if($immediatly) {
272
+					$this->jquery_code_for_compile[]=$event;
273
+		}
269 274
 		return $event;
270 275
 	}
271 276
 
@@ -326,8 +331,9 @@  discard block
 block discarded – undo
326 331
 		}
327 332
 		$output=($script_tags===FALSE) ? $script : $this->inline($script);
328 333
 
329
-		if ($view!=NULL)
330
-			$view->setVar($view_var, $output);
334
+		if ($view!=NULL) {
335
+					$view->setVar($view_var, $output);
336
+		}
331 337
 		return $output;
332 338
 	}
333 339
 
@@ -421,7 +427,9 @@  discard block
 block discarded – undo
421 427
 	}
422 428
 
423 429
 	private function minify($input) {
424
-	if(trim($input) === "") return $input;
430
+	if(trim($input) === "") {
431
+		return $input;
432
+	}
425 433
 	return preg_replace(
426 434
 			array(
427 435
 					// Remove comment(s)
Please login to merge, or discard this patch.
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -17,21 +17,21 @@  discard block
 block discarded – undo
17 17
  * jQuery Class
18 18
  */
19 19
 class Jquery {
20
-	use JqueryEventsTrait,JqueryAjaxTrait,JqueryActionsTrait;
20
+	use JqueryEventsTrait, JqueryAjaxTrait, JqueryActionsTrait;
21 21
 	protected $_di;
22 22
 	protected $_ui;
23 23
 	protected $_bootstrap;
24 24
 	protected $_semantic;
25 25
 	protected $libraryFile;
26 26
 	protected $_javascript_folder='js';
27
-	protected $jquery_code_for_load=array ();
28
-	protected $jquery_code_for_compile=array ();
27
+	protected $jquery_code_for_load=array();
28
+	protected $jquery_code_for_compile=array();
29 29
 	protected $jquery_corner_active=FALSE;
30 30
 	protected $jquery_table_sorter_active=FALSE;
31 31
 	protected $jquery_table_sorter_pager_active=FALSE;
32 32
 
33
-	protected $jquery_events=array (
34
-			"bind","blur","change","click","dblclick","delegate","die","error","focus","focusin","focusout","hover","keydown","keypress","keyup","live","load","mousedown","mousseenter","mouseleave","mousemove","mouseout","mouseover","mouseup","off","on","one","ready","resize","scroll","select","submit","toggle","trigger","triggerHandler","undind","undelegate","unload"
33
+	protected $jquery_events=array(
34
+			"bind", "blur", "change", "click", "dblclick", "delegate", "die", "error", "focus", "focusin", "focusout", "hover", "keydown", "keypress", "keyup", "live", "load", "mousedown", "mousseenter", "mouseleave", "mousemove", "mouseout", "mouseover", "mouseup", "off", "on", "one", "ready", "resize", "scroll", "select", "submit", "toggle", "trigger", "triggerHandler", "undind", "undelegate", "unload"
35 35
 	);
36 36
 
37 37
 	public function setDi($di) {
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 
62 62
 	public function __construct($params) {
63 63
 		$this->params=array();
64
-		foreach ( $params as $key => $val ) {
64
+		foreach ($params as $key => $val) {
65 65
 				$this->params[$key]=$params[$key];
66 66
 		}
67 67
 	}
@@ -135,12 +135,12 @@  discard block
 block discarded – undo
135 135
 	 */
136 136
 	public function _output($array_js='') {
137 137
 		if (!is_array($array_js)) {
138
-			$array_js=array (
138
+			$array_js=array(
139 139
 					$array_js
140 140
 			);
141 141
 		}
142 142
 
143
-		foreach ( $array_js as $js ) {
143
+		foreach ($array_js as $js) {
144 144
 			$this->jquery_code_for_compile[]="\t$js\n";
145 145
 		}
146 146
 	}
@@ -152,12 +152,12 @@  discard block
 block discarded – undo
152 152
 	 * @param string $param
153 153
 	 * @param boolean $immediatly delayed if false
154 154
 	 */
155
-	public function _genericCallValue($jQueryCall,$element='this', $param="", $immediatly=false) {
155
+	public function _genericCallValue($jQueryCall, $element='this', $param="", $immediatly=false) {
156 156
 		$element=$this->_prep_element($element);
157 157
 		if (isset($param)) {
158 158
 			$param=$this->_prep_value($param);
159 159
 			$str="$({$element}).{$jQueryCall}({$param});";
160
-		} else
160
+		}else
161 161
 			$str="$({$element}).{$jQueryCall}();";
162 162
 			if ($immediatly)
163 163
 				$this->jquery_code_for_compile[]=$str;
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
 	 * @param boolean $immediatly delayed if false
172 172
 	 * @return string
173 173
 	 */
174
-	public function _genericCallElement($jQueryCall,$to='this', $element, $immediatly=false) {
174
+	public function _genericCallElement($jQueryCall, $to='this', $element, $immediatly=false) {
175 175
 		$to=$this->_prep_element($to);
176 176
 		$element=$this->_prep_element($element);
177 177
 		$str="$({$to}).{$jQueryCall}({$element});";
@@ -189,12 +189,12 @@  discard block
 block discarded – undo
189 189
 	 */
190 190
 	public function sortable($element, $options=array()) {
191 191
 		if (count($options)>0) {
192
-			$sort_options=array ();
193
-			foreach ( $options as $k => $v ) {
192
+			$sort_options=array();
193
+			foreach ($options as $k => $v) {
194 194
 				$sort_options[]="\n\t\t".$k.': '.$v."";
195 195
 			}
196 196
 			$sort_options=implode(",", $sort_options);
197
-		} else {
197
+		}else {
198 198
 			$sort_options='';
199 199
 		}
200 200
 
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
 	 * @param boolean $stopPropagation Prevents the event from bubbling up the DOM tree, preventing any parent handlers from being notified of the event.
223 223
 	 * @return string
224 224
 	 */
225
-	public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true) {
225
+	public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true) {
226 226
 		if (is_array($js)) {
227 227
 			$js=implode("\n\t\t", $js);
228 228
 		}
@@ -236,7 +236,7 @@  discard block
 block discarded – undo
236 236
 			$event="\n\t$(".$this->_prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n";
237 237
 		else
238 238
 			$event="\n\t$(".$this->_prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n";
239
-		if($immediatly)
239
+		if ($immediatly)
240 240
 			$this->jquery_code_for_compile[]=$event;
241 241
 		return $event;
242 242
 	}
@@ -276,7 +276,7 @@  discard block
 block discarded – undo
276 276
 
277 277
 		// External references
278 278
 		$external_scripts=implode('', $this->jquery_code_for_load);
279
-		extract(array (
279
+		extract(array(
280 280
 				'library_src' => $external_scripts
281 281
 		));
282 282
 
@@ -291,7 +291,7 @@  discard block
 block discarded – undo
291 291
 		$script.='});';
292 292
 
293 293
 		$this->jquery_code_for_compile=array();
294
-		if($this->params["debug"]==false){
294
+		if ($this->params["debug"]==false) {
295 295
 			$script=$this->minify($script);
296 296
 		}
297 297
 		$output=($script_tags===FALSE) ? $script : $this->inline($script);
@@ -311,7 +311,7 @@  discard block
 block discarded – undo
311 311
 	 * @return void
312 312
 	 */
313 313
 	public function _clear_compile() {
314
-		$this->jquery_code_for_compile=array ();
314
+		$this->jquery_code_for_compile=array();
315 315
 	}
316 316
 
317 317
 	/**
@@ -320,12 +320,12 @@  discard block
 block discarded – undo
320 320
 	 */
321 321
 	public function _document_ready($js) {
322 322
 		if (!is_array($js)) {
323
-			$js=array (
323
+			$js=array(
324 324
 					$js
325 325
 			);
326 326
 		}
327 327
 
328
-		foreach ( $js as $script ) {
328
+		foreach ($js as $script) {
329 329
 			$this->jquery_code_for_compile[]=$script;
330 330
 		}
331 331
 	}
@@ -339,7 +339,7 @@  discard block
 block discarded – undo
339 339
 	 * @return string
340 340
 	 */
341 341
 	public function _prep_element($element) {
342
-		if (strrpos($element, 'this')===false&&strrpos($element, 'event')===false&&strrpos($element, 'self')===false) {
342
+		if (strrpos($element, 'this')===false && strrpos($element, 'event')===false && strrpos($element, 'self')===false) {
343 343
 			$element='"'.addslashes($element).'"';
344 344
 		}
345 345
 		return $element;
@@ -357,14 +357,14 @@  discard block
 block discarded – undo
357 357
 		if (is_array($value)) {
358 358
 			$value=implode(",", $value);
359 359
 		}
360
-		if (strrpos($value, 'this')===false&&strrpos($value, 'event')===false&&strrpos($value, 'self')===false) {
360
+		if (strrpos($value, 'this')===false && strrpos($value, 'event')===false && strrpos($value, 'self')===false) {
361 361
 			$value='"'.$value.'"';
362 362
 		}
363 363
 		return $value;
364 364
 	}
365 365
 
366 366
 	private function minify($input) {
367
-	if(trim($input) === "") return $input;
367
+	if (trim($input)==="") return $input;
368 368
 	return preg_replace(
369 369
 			array(
370 370
 					// Remove comment(s)
Please login to merge, or discard this patch.
Ajax/common/traits/JqueryActionsTrait.php 3 patches
Braces   +51 added lines, -34 removed lines patch added patch discarded remove patch
@@ -16,10 +16,12 @@  discard block
 block discarded – undo
16 16
 		if (isset($value)) {
17 17
 			$value=$this->_prep_value($value);
18 18
 			$str="$({$element}).attr(\"$attributeName\",{$value});";
19
-		} else
20
-			$str="$({$element}).attr(\"$attributeName\");";
21
-			if ($immediatly)
22
-				$this->jquery_code_for_compile[]=$str;
19
+		} else {
20
+					$str="$({$element}).attr(\"$attributeName\");";
21
+		}
22
+			if ($immediatly) {
23
+							$this->jquery_code_for_compile[]=$str;
24
+			}
23 25
 				return $str;
24 26
 	}
25 27
 
@@ -34,8 +36,9 @@  discard block
 block discarded – undo
34 36
 		$element=$this->_prep_element($element);
35 37
 		$value=$this->_prep_value($value);
36 38
 		$str="$({$element}).after({$value});";
37
-		if ($immediatly)
38
-			$this->jquery_code_for_compile[]=$str;
39
+		if ($immediatly) {
40
+					$this->jquery_code_for_compile[]=$str;
41
+		}
39 42
 			return $str;
40 43
 	}
41 44
 
@@ -71,8 +74,9 @@  discard block
 block discarded – undo
71 74
 
72 75
 		$str="$({$element}).animate({\n$animations\n\t\t}".$speed.$extra.");";
73 76
 
74
-		if ($immediatly)
75
-			$this->jquery_code_for_compile[]=$str;
77
+		if ($immediatly) {
78
+					$this->jquery_code_for_compile[]=$str;
79
+		}
76 80
 			return $str;
77 81
 	}
78 82
 
@@ -97,8 +101,9 @@  discard block
 block discarded – undo
97 101
 
98 102
 		$str="$({$element}).fadeIn({$speed}{$callback});";
99 103
 
100
-		if ($immediatly)
101
-			$this->jquery_code_for_compile[]=$str;
104
+		if ($immediatly) {
105
+					$this->jquery_code_for_compile[]=$str;
106
+		}
102 107
 			return $str;
103 108
 	}
104 109
 
@@ -123,8 +128,9 @@  discard block
 block discarded – undo
123 128
 
124 129
 		$str="$({$element}).fadeOut({$speed}{$callback});";
125 130
 
126
-		if ($immediatly)
127
-			$this->jquery_code_for_compile[]=$str;
131
+		if ($immediatly) {
132
+					$this->jquery_code_for_compile[]=$str;
133
+		}
128 134
 			return $str;
129 135
 	}
130 136
 
@@ -149,8 +155,9 @@  discard block
 block discarded – undo
149 155
 
150 156
 		$str="$({$element}).hide({$speed}{$callback});";
151 157
 
152
-		if ($immediatly)
153
-			$this->jquery_code_for_compile[]=$str;
158
+		if ($immediatly) {
159
+					$this->jquery_code_for_compile[]=$str;
160
+		}
154 161
 			return $str;
155 162
 	}
156 163
 
@@ -177,8 +184,9 @@  discard block
 block discarded – undo
177 184
 
178 185
 		$str="$({$element}).slideUp({$speed}{$callback});";
179 186
 
180
-		if ($immediatly)
181
-			$this->jquery_code_for_compile[]=$str;
187
+		if ($immediatly) {
188
+					$this->jquery_code_for_compile[]=$str;
189
+		}
182 190
 			return $str;
183 191
 	}
184 192
 
@@ -203,8 +211,9 @@  discard block
 block discarded – undo
203 211
 
204 212
 		$str="$({$element}).slideDown({$speed}{$callback});";
205 213
 
206
-		if ($immediatly)
207
-			$this->jquery_code_for_compile[]=$str;
214
+		if ($immediatly) {
215
+					$this->jquery_code_for_compile[]=$str;
216
+		}
208 217
 			return $str;
209 218
 	}
210 219
 
@@ -229,8 +238,9 @@  discard block
 block discarded – undo
229 238
 
230 239
 		$str="$({$element}).slideToggle({$speed}{$callback});";
231 240
 
232
-		if ($immediatly)
233
-			$this->jquery_code_for_compile[]=$str;
241
+		if ($immediatly) {
242
+					$this->jquery_code_for_compile[]=$str;
243
+		}
234 244
 			return $str;
235 245
 	}
236 246
 
@@ -247,8 +257,9 @@  discard block
 block discarded – undo
247 257
 		$element=$this->_prep_element($element);
248 258
 		$str="$({$element}).toggle();";
249 259
 
250
-		if ($immediatly)
251
-			$this->jquery_code_for_compile[]=$str;
260
+		if ($immediatly) {
261
+					$this->jquery_code_for_compile[]=$str;
262
+		}
252 263
 			return $str;
253 264
 	}
254 265
 
@@ -264,8 +275,9 @@  discard block
 block discarded – undo
264 275
 		$element=$this->_prep_element($element);
265 276
 		$str="$({$element}).trigger(\"$event\");";
266 277
 
267
-		if ($immediatly)
268
-			$this->jquery_code_for_compile[]=$str;
278
+		if ($immediatly) {
279
+					$this->jquery_code_for_compile[]=$str;
280
+		}
269 281
 			return $str;
270 282
 	}
271 283
 
@@ -290,8 +302,9 @@  discard block
 block discarded – undo
290 302
 
291 303
 		$str="$({$element}).show({$speed}{$callback});";
292 304
 
293
-		if ($immediatly)
294
-			$this->jquery_code_for_compile[]=$str;
305
+		if ($immediatly) {
306
+					$this->jquery_code_for_compile[]=$str;
307
+		}
295 308
 			return $str;
296 309
 	}
297 310
 
@@ -309,8 +322,9 @@  discard block
 block discarded – undo
309 322
 			$str.="else{".$jsCodeIfFalse."}";
310 323
 		}
311 324
 
312
-		if ($immediatly)
313
-			$this->jquery_code_for_compile[]=$str;
325
+		if ($immediatly) {
326
+					$this->jquery_code_for_compile[]=$str;
327
+		}
314 328
 			return $str;
315 329
 	}
316 330
 
@@ -327,11 +341,13 @@  discard block
 block discarded – undo
327 341
 	public function _doJQuery($element, $jqueryCall, $param="", $jsCallback="", $immediatly=false) {
328 342
 		$param=$this->_prep_value($param);
329 343
 		$callback="";
330
-		if ($jsCallback!="")
331
-			$callback=", function(event){\n{$jsCallback}\n}";
344
+		if ($jsCallback!="") {
345
+					$callback=", function(event){\n{$jsCallback}\n}";
346
+		}
332 347
 			$script="$(".$this->_prep_element($element).").".$jqueryCall."(".$param.$callback.");\n";
333
-			if ($immediatly)
334
-				$this->jquery_code_for_compile[]=$script;
348
+			if ($immediatly) {
349
+							$this->jquery_code_for_compile[]=$script;
350
+			}
335 351
 				return $script;
336 352
 	}
337 353
 
@@ -360,8 +376,9 @@  discard block
 block discarded – undo
360 376
 	 */
361 377
 	public function _exec($js, $immediatly=false) {
362 378
 		$script=$js."\n";
363
-		if ($immediatly)
364
-			$this->jquery_code_for_compile[]=$script;
379
+		if ($immediatly) {
380
+					$this->jquery_code_for_compile[]=$script;
381
+		}
365 382
 			return $script;
366 383
 	}
367 384
 
Please login to merge, or discard this patch.
Doc Comments   +11 added lines, -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,17 @@  discard block
 block discarded – undo
3 3
 namespace Ajax\common\traits;
4 4
 
5 5
 trait JqueryActionsTrait {
6
+
7
+	/**
8
+	 * @param string $element
9
+	 * @param string $js
10
+	 * @param string $event
11
+	 */
6 12
 	public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
13
+
14
+	/**
15
+	 * @param string $element
16
+	 */
7 17
 	public abstract function _prep_element($element);
8 18
 	public abstract function _prep_value($value);
9 19
 
@@ -384,7 +394,7 @@  discard block
 block discarded – undo
384 394
 
385 395
 	/**
386 396
 	 * Ensures the speed parameter is valid for jQuery
387
-	 * @param string|int $speed
397
+	 * @param string $speed
388 398
 	 * @return string
389 399
 	 */
390 400
 	private function _validate_speed($speed) {
Please login to merge, or discard this patch.
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
3 3
 namespace Ajax\common\traits;
4 4
 
5 5
 trait JqueryActionsTrait {
6
-	public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
6
+	public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true);
7 7
 	public abstract function _prep_element($element);
8 8
 	public abstract function _prep_value($value);
9 9
 
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 		if (isset($value)) {
20 20
 			$value=$this->_prep_value($value);
21 21
 			$str="$({$element}).attr(\"$attributeName\",{$value});";
22
-		} else
22
+		}else
23 23
 			$str="$({$element}).attr(\"$attributeName\");";
24 24
 			if ($immediatly)
25 25
 				$this->jquery_code_for_compile[]=$str;
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
 	 * @param boolean $immediatly defers the execution if set to false
34 34
 	 * @return string
35 35
 	 */
36
-	public function after($element='this', $value='', $immediatly=false){
36
+	public function after($element='this', $value='', $immediatly=false) {
37 37
 		$element=$this->_prep_element($element);
38 38
 		$value=$this->_prep_value($value);
39 39
 		$str="$({$element}).after({$value});";
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 
59 59
 		$animations="\t\t\t";
60 60
 		if (is_array($params)) {
61
-			foreach ( $params as $param => $value ) {
61
+			foreach ($params as $param => $value) {
62 62
 				$animations.=$param.': \''.$value.'\', ';
63 63
 			}
64 64
 		}
@@ -351,8 +351,8 @@  discard block
 block discarded – undo
351 351
 	 * @param boolean $immediatly
352 352
 	 * @return string
353 353
 	 */
354
-	public function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $preventDefault=false, $stopPropagation=false, $jsCallback="",$immediatly=true) {
355
-		return $this->_add_event($element, $this->_doJQuery($elementToModify, $jqueryCall, $param, $jsCallback), $event, $preventDefault, $stopPropagation,$immediatly);
354
+	public function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $preventDefault=false, $stopPropagation=false, $jsCallback="", $immediatly=true) {
355
+		return $this->_add_event($element, $this->_doJQuery($elementToModify, $jqueryCall, $param, $jsCallback), $event, $preventDefault, $stopPropagation, $immediatly);
356 356
 	}
357 357
 
358 358
 	/**
@@ -378,8 +378,8 @@  discard block
 block discarded – undo
378 378
 	 * @param boolean $immediatly
379 379
 	 * @return String
380 380
 	 */
381
-	public function _execOn($element, $event, $js, $preventDefault=false, $stopPropagation=false,$immediatly=true) {
382
-		return $this->_add_event($element, $this->_exec($js), $event, $preventDefault, $stopPropagation,$immediatly);
381
+	public function _execOn($element, $event, $js, $preventDefault=false, $stopPropagation=false, $immediatly=true) {
382
+		return $this->_add_event($element, $this->_exec($js), $event, $preventDefault, $stopPropagation, $immediatly);
383 383
 	}
384 384
 
385 385
 	/**
@@ -388,8 +388,8 @@  discard block
 block discarded – undo
388 388
 	 * @return string
389 389
 	 */
390 390
 	private function _validate_speed($speed) {
391
-		if (in_array($speed, array (
392
-				'slow','normal','fast'
391
+		if (in_array($speed, array(
392
+				'slow', 'normal', 'fast'
393 393
 		))) {
394 394
 			$speed='"'.$speed.'"';
395 395
 		} elseif (preg_match("/[^0-9]/", $speed)) {
Please login to merge, or discard this patch.
Ajax/common/traits/JsUtilsAjaxTrait.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -17,8 +17,8 @@  discard block
 block discarded – undo
17 17
 	 * @param string $jsCallback javascript code to execute after the request
18 18
 	 * @param boolean $hasLoader true for showing ajax loader. default : true
19 19
 	 */
20
-	public function get($url, $responseElement="", $params="{}", $jsCallback=NULL,$hasLoader=true) {
21
-		return $this->js->_get($url, $params, $responseElement, $jsCallback, NULL, $hasLoader,true);
20
+	public function get($url, $responseElement="", $params="{}", $jsCallback=NULL, $hasLoader=true) {
21
+		return $this->js->_get($url, $params, $responseElement, $jsCallback, NULL, $hasLoader, true);
22 22
 	}
23 23
 
24 24
 	/**
@@ -29,8 +29,8 @@  discard block
 block discarded – undo
29 29
 	 * @param string $jsCallback javascript code to execute after the request
30 30
 	 * @param boolean $immediatly
31 31
 	 */
32
-	public function json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document",$immediatly=false) {
33
-		return $this->js->_json($url, $method, $params, $jsCallback, $attr, $context,$immediatly);
32
+	public function json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document", $immediatly=false) {
33
+		return $this->js->_json($url, $method, $params, $jsCallback, $attr, $context, $immediatly);
34 34
 	}
35 35
 
36 36
 	/**
@@ -40,8 +40,8 @@  discard block
 block discarded – undo
40 40
 	 * @param string $url the request address
41 41
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true)
42 42
 	 */
43
-	public function jsonOn($event,$element, $url,$parameters=array()) {
44
-		return $this->js->_jsonOn($event, $element, $url,$parameters);
43
+	public function jsonOn($event, $element, $url, $parameters=array()) {
44
+		return $this->js->_jsonOn($event, $element, $url, $parameters);
45 45
 	}
46 46
 
47 47
 	/**
@@ -85,8 +85,8 @@  discard block
 block discarded – undo
85 85
 	 * @param string $url the request url
86 86
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true)
87 87
 	 */
88
-	public function jsonArrayOn($event,$element,$maskSelector, $url,$parameters=array()) {
89
-		return $this->js->_jsonArrayOn($event,$element,$maskSelector, $url, $parameters);
88
+	public function jsonArrayOn($event, $element, $maskSelector, $url, $parameters=array()) {
89
+		return $this->js->_jsonArrayOn($event, $element, $maskSelector, $url, $parameters);
90 90
 	}
91 91
 
92 92
 	/**
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 	 * @param string $jsCallback javascript code to execute after the request
99 99
 	 * @param string $attr the html attribute added to the request
100 100
 	 */
101
-	public function getDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL,$attr="id") {
101
+	public function getDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id") {
102 102
 		return $this->js->_get($url, $params, $responseElement, $jsCallback, $attr, false);
103 103
 	}
104 104
 
@@ -136,8 +136,8 @@  discard block
 block discarded – undo
136 136
 	 * @param string $jsCallback javascript code to execute after the request
137 137
 	 * @param boolean $hasLoader true for showing ajax loader. default : true
138 138
 	 */
139
-	public function post($url, $responseElement="", $params="{}", $jsCallback=NULL,$hasLoader=true) {
140
-		return $this->js->_post($url, $params, $responseElement, $jsCallback, NULL, $hasLoader,true);
139
+	public function post($url, $responseElement="", $params="{}", $jsCallback=NULL, $hasLoader=true) {
140
+		return $this->js->_post($url, $params, $responseElement, $jsCallback, NULL, $hasLoader, true);
141 141
 	}
142 142
 
143 143
 	/**
@@ -150,8 +150,8 @@  discard block
 block discarded – undo
150 150
 	 * @param string $jsCallback javascript code to execute after the request
151 151
 	 * @param boolean $hasLoader true for showing ajax loader. default : true
152 152
 	 */
153
-	public function postDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id",$hasLoader=true) {
154
-		return $this->js->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader,false);
153
+	public function postDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id", $hasLoader=true) {
154
+		return $this->js->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader, false);
155 155
 	}
156 156
 
157 157
 	/**
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true)
166 166
 	 */
167 167
 	public function postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
168
-		return $this->js->_postOn($event, $element,  $url, $params, $responseElement, $parameters);
168
+		return $this->js->_postOn($event, $element, $url, $params, $responseElement, $parameters);
169 169
 	}
170 170
 
171 171
 	/**
@@ -189,8 +189,8 @@  discard block
 block discarded – undo
189 189
 	 * @param string $jsCallback javascript code to execute after the request
190 190
 	 * @param boolean $hasLoader true for showing ajax loader. default : true
191 191
 	 */
192
-	public function postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL,$hasLoader=true) {
193
-		return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, NULL, $hasLoader,true);
192
+	public function postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $hasLoader=true) {
193
+		return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, NULL, $hasLoader, true);
194 194
 	}
195 195
 
196 196
 	/**
@@ -203,8 +203,8 @@  discard block
 block discarded – undo
203 203
 	 * @param string $attr the html attribute added to the request
204 204
 	 * @param boolean $hasLoader true for showing ajax loader. default : true
205 205
 	 */
206
-	public function postFormDeferred($url, $form, $responseElement, $validation=false, $jsCallback=NULL,$attr="id",$hasLoader=true) {
207
-		return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader,false);
206
+	public function postFormDeferred($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true) {
207
+		return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader, false);
208 208
 	}
209 209
 
210 210
 	/**
@@ -218,7 +218,7 @@  discard block
 block discarded – undo
218 218
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true)
219 219
 	 */
220 220
 	public function postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) {
221
-		return $this->js->_postFormOn($event,$element, $url, $form, $responseElement, $parameters);
221
+		return $this->js->_postFormOn($event, $element, $url, $form, $responseElement, $parameters);
222 222
 	}
223 223
 
224 224
 	/**
Please login to merge, or discard this patch.
Ajax/common/traits/JsUtilsActionsTrait.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 	 * @return string
14 14
 	 */
15 15
 	public function addClass($element='this', $class='', $immediatly=false) {
16
-		return $this->js->_genericCallValue('addClass',$element, $class, $immediatly);
16
+		return $this->js->_genericCallValue('addClass', $element, $class, $immediatly);
17 17
 	}
18 18
 
19 19
 	/**
@@ -23,8 +23,8 @@  discard block
 block discarded – undo
23 23
 	 * @param boolean $immediatly defers the execution if set to false
24 24
 	 * @return string
25 25
 	 */
26
-	public function after($to, $element, $immediatly=false){
27
-		return $this->js->_genericCallElement('after',$to, $element, $immediatly);
26
+	public function after($to, $element, $immediatly=false) {
27
+		return $this->js->_genericCallElement('after', $to, $element, $immediatly);
28 28
 	}
29 29
 
30 30
 	/**
@@ -34,8 +34,8 @@  discard block
 block discarded – undo
34 34
 	 * @param boolean $immediatly defers the execution if set to false
35 35
 	 * @return string
36 36
 	 */
37
-	public function before($to, $element, $immediatly=false){
38
-		return $this->js->_genericCallElement('before',$to, $element, $immediatly);
37
+	public function before($to, $element, $immediatly=false) {
38
+		return $this->js->_genericCallElement('before', $to, $element, $immediatly);
39 39
 	}
40 40
 
41 41
 	/**
@@ -55,8 +55,8 @@  discard block
 block discarded – undo
55 55
 	 * @param string $value
56 56
 	 * @param boolean $immediatly defers the execution if set to false
57 57
 	 */
58
-	public function val($element='this',$value='',$immediatly=false){
59
-		return $this->js->_genericCallValue('val',$element,$value,$immediatly);
58
+	public function val($element='this', $value='', $immediatly=false) {
59
+		return $this->js->_genericCallValue('val', $element, $value, $immediatly);
60 60
 	}
61 61
 
62 62
 	/**
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 	 * @param boolean $immediatly defers the execution if set to false
67 67
 	 */
68 68
 	public function html($element='this', $value='', $immediatly=false) {
69
-		return $this->js->_genericCallValue('html',$element, $value, $immediatly);
69
+		return $this->js->_genericCallValue('html', $element, $value, $immediatly);
70 70
 	}
71 71
 
72 72
 	/**
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 	 * @return string
92 92
 	 */
93 93
 	public function append($to, $element, $immediatly=false) {
94
-		return $this->js->_genericCallElement('append',$to, $element, $immediatly);
94
+		return $this->js->_genericCallElement('append', $to, $element, $immediatly);
95 95
 	}
96 96
 
97 97
 	/**
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 	 * @return string
103 103
 	 */
104 104
 	public function prepend($to, $element, $immediatly=false) {
105
-		return $this->js->_genericCallElement('prepend',$to, $element, $immediatly);
105
+		return $this->js->_genericCallElement('prepend', $to, $element, $immediatly);
106 106
 	}
107 107
 
108 108
 	/**
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
 	 * @return string
154 154
 	 */
155 155
 	public function removeClass($element='this', $class='', $immediatly=false) {
156
-		return $this->js->_genericCall('removeClass',$element, $class, $immediatly);
156
+		return $this->js->_genericCall('removeClass', $element, $class, $immediatly);
157 157
 	}
158 158
 
159 159
 	/**
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
 	 * @return string
215 215
 	 */
216 216
 	public function toggleClass($element='this', $class='', $immediatly=false) {
217
-		return $this->js->_genericCallValue('toggleClass',$element, $class, $immediatly);
217
+		return $this->js->_genericCallValue('toggleClass', $element, $class, $immediatly);
218 218
 	}
219 219
 
220 220
 	/**
@@ -290,7 +290,7 @@  discard block
 block discarded – undo
290 290
 		$preventDefault=false;
291 291
 		$immediatly=true;
292 292
 		extract($parameters);
293
-		return $this->js->_doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param, $preventDefault, $stopPropagation, $jsCallback,$immediatly);
293
+		return $this->js->_doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param, $preventDefault, $stopPropagation, $jsCallback, $immediatly);
294 294
 	}
295 295
 
296 296
 	/**
@@ -317,7 +317,7 @@  discard block
 block discarded – undo
317 317
 		$preventDefault=false;
318 318
 		$immediatly=true;
319 319
 		extract($parameters);
320
-		$script=$this->js->_execOn($element, $event, $js, $preventDefault, $stopPropagation,$immediatly);
320
+		$script=$this->js->_execOn($element, $event, $js, $preventDefault, $stopPropagation, $immediatly);
321 321
 		return $script;
322 322
 	}
323 323
 }
324 324
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/common/traits/JqueryAjaxTrait.php 3 patches
Braces   +24 added lines, -17 removed lines patch added patch discarded remove patch
@@ -35,8 +35,9 @@  discard block
 block discarded – undo
35 35
 		}
36 36
 		$retour.="$.".$method."(url,".$params.").done(function( data ) {\n";
37 37
 		$retour.=$this->_getOnAjaxDone($responseElement, $jsCallback)."});\n";
38
-		if ($immediatly)
39
-			$this->jquery_code_for_compile[]=$retour;
38
+		if ($immediatly) {
39
+					$this->jquery_code_for_compile[]=$retour;
40
+		}
40 41
 			return $retour;
41 42
 	}
42 43
 
@@ -44,13 +45,15 @@  discard block
 block discarded – undo
44 45
 		$url=$this->_correctAjaxUrl($url);
45 46
 		$retour="url='".$url."';\n";
46 47
 		$slash="/";
47
-		if(PhalconUtils::endsWith($url, "/"))
48
-			$slash="";
48
+		if(PhalconUtils::endsWith($url, "/")) {
49
+					$slash="";
50
+		}
49 51
 			if(JString::isNotNull($attr)){
50
-				if ($attr=="value")
51
-					$retour.="url=url+'".$slash."'+$(this).val();\n";
52
-					else if($attr!=null && $attr!=="")
53
-						$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
52
+				if ($attr=="value") {
53
+									$retour.="url=url+'".$slash."'+$(this).val();\n";
54
+				} else if($attr!=null && $attr!=="") {
55
+											$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
56
+					}
54 57
 			}
55 58
 			return $retour;
56 59
 	}
@@ -72,8 +75,9 @@  discard block
 block discarded – undo
72 75
 	}
73 76
 
74 77
 	protected function _correctAjaxUrl($url) {
75
-		if (PhalconUtils::endsWith($url, "/"))
76
-			$url=substr($url, 0, strlen($url)-1);
78
+		if (PhalconUtils::endsWith($url, "/")) {
79
+					$url=substr($url, 0, strlen($url)-1);
80
+		}
77 81
 			if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
78 82
 				$url=$this->_di->get("url")->get($url);
79 83
 			}
@@ -97,8 +101,9 @@  discard block
 block discarded – undo
97 101
 				$retour.="\t".$jsCallback."\n".
98 102
 						"\t$(document).trigger('jsonReady',[data]);\n".
99 103
 						"});\n";
100
-				if ($immediatly)
101
-					$this->jquery_code_for_compile[]=$retour;
104
+				if ($immediatly) {
105
+									$this->jquery_code_for_compile[]=$retour;
106
+				}
102 107
 					return $retour;
103 108
 	}
104 109
 
@@ -137,7 +142,7 @@  discard block
 block discarded – undo
137 142
 		if($context===null){
138 143
 			$appendTo="\t\tnewElm.appendTo($('".$maskSelector."').parent());\n";
139 144
 			$newElm = "$('#'+newId)";
140
-		}else{
145
+		} else{
141 146
 			$appendTo="\t\tnewElm.appendTo(".$context.");\n";
142 147
 			$newElm = $context.".find('#'+newId)";
143 148
 		}
@@ -147,8 +152,9 @@  discard block
 block discarded – undo
147 152
 		$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";
148 153
 		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
149 154
 		$retour.="\t".$jsCallback."\n"."});\n";
150
-		if ($immediatly)
151
-			$this->jquery_code_for_compile[]=$retour;
155
+		if ($immediatly) {
156
+					$this->jquery_code_for_compile[]=$retour;
157
+		}
152 158
 			return $retour;
153 159
 	}
154 160
 	/**
@@ -189,8 +195,9 @@  discard block
 block discarded – undo
189 195
 			}});\n";
190 196
 			$retour.="$('#".$form."').submit();\n";
191 197
 		}
192
-		if ($immediatly)
193
-			$this->jquery_code_for_compile[]=$retour;
198
+		if ($immediatly) {
199
+					$this->jquery_code_for_compile[]=$retour;
200
+		}
194 201
 			return $retour;
195 202
 	}
196 203
 
Please login to merge, or discard this patch.
Doc Comments   +28 added lines patch added patch discarded remove patch
@@ -9,7 +9,17 @@  discard block
 block discarded – undo
9 9
 	protected $ajaxLoader='<span></span><span></span><span></span><span></span><span></span>';
10 10
 
11 11
 	public abstract function _prep_value($value);
12
+
13
+	/**
14
+	 * @param string $element
15
+	 * @param string $js
16
+	 * @param string $event
17
+	 */
12 18
 	public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
19
+
20
+	/**
21
+	 * @param string $retour
22
+	 */
13 23
 	protected function addLoading(&$retour, $responseElement) {
14 24
 		$loading_notifier='<div class="ajax-loader">';
15 25
 		if ($this->ajaxLoader=='') {
@@ -22,13 +32,23 @@  discard block
 block discarded – undo
22 32
 		$retour.="\t\t$({$responseElement}).prepend('{$loading_notifier}');\n";
23 33
 	}
24 34
 
35
+	/**
36
+	 * @param string $url
37
+	 */
25 38
 	public function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
26 39
 		return $this->_ajax("get", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$immediatly);
27 40
 	}
41
+
42
+	/**
43
+	 * @param string $url
44
+	 */
28 45
 	public function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
29 46
 		return $this->_ajax("post", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$immediatly);
30 47
 	}
31 48
 
49
+	/**
50
+	 * @param string $method
51
+	 */
32 52
 	protected function _ajax($method,$url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
33 53
 		if(JString::isNull($params)){$params="{}";}
34 54
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
@@ -45,6 +65,9 @@  discard block
 block discarded – undo
45 65
 			return $retour;
46 66
 	}
47 67
 
68
+	/**
69
+	 * @param string $attr
70
+	 */
48 71
 	protected function _getAjaxUrl($url,$attr){
49 72
 		$url=$this->_correctAjaxUrl($url);
50 73
 		$retour="url='".$url."';\n";
@@ -176,6 +199,11 @@  discard block
 block discarded – undo
176 199
 		return $this->_add_event($element, $this->_jsonArray($maskSelector,$url,$method, $params,$jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation,$immediatly);
177 200
 	}
178 201
 
202
+	/**
203
+	 * @param string $url
204
+	 * @param string $form
205
+	 * @param string $responseElement
206
+	 */
179 207
 	public function _postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
180 208
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
181 209
 		$retour=$this->_getAjaxUrl($url, $attr);
Please login to merge, or discard this patch.
Spacing   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -9,12 +9,12 @@  discard block
 block discarded – undo
9 9
 	protected $ajaxLoader='<span></span><span></span><span></span><span></span><span></span>';
10 10
 
11 11
 	public abstract function _prep_value($value);
12
-	public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
12
+	public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true);
13 13
 	protected function addLoading(&$retour, $responseElement) {
14 14
 		$loading_notifier='<div class="ajax-loader">';
15 15
 		if ($this->ajaxLoader=='') {
16 16
 			$loading_notifier.="Loading...";
17
-		} else {
17
+		}else {
18 18
 			$loading_notifier.=$this->ajaxLoader;
19 19
 		}
20 20
 		$loading_notifier.='</div>';
@@ -22,20 +22,20 @@  discard block
 block discarded – undo
22 22
 		$retour.="\t\t$({$responseElement}).prepend('{$loading_notifier}');\n";
23 23
 	}
24 24
 
25
-	public function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
26
-		return $this->_ajax("get", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$immediatly);
25
+	public function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
26
+		return $this->_ajax("get", $url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $immediatly);
27 27
 	}
28
-	public function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
29
-		return $this->_ajax("post", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$immediatly);
28
+	public function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
29
+		return $this->_ajax("post", $url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $immediatly);
30 30
 	}
31 31
 
32
-	protected function _ajax($method,$url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
33
-		if(JString::isNull($params)){$params="{}";}
32
+	protected function _ajax($method, $url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
33
+		if (JString::isNull($params)) {$params="{}"; }
34 34
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
35 35
 		$retour=$this->_getAjaxUrl($url, $attr);
36 36
 		$responseElement=$this->_getResponseElement($responseElement);
37 37
 		$retour.="var self=this;\n";
38
-		if($hasLoader===true){
38
+		if ($hasLoader===true) {
39 39
 			$this->addLoading($retour, $responseElement);
40 40
 		}
41 41
 		$retour.="$.".$method."(url,".$params.").done(function( data ) {\n";
@@ -45,22 +45,22 @@  discard block
 block discarded – undo
45 45
 			return $retour;
46 46
 	}
47 47
 
48
-	protected function _getAjaxUrl($url,$attr){
48
+	protected function _getAjaxUrl($url, $attr) {
49 49
 		$url=$this->_correctAjaxUrl($url);
50 50
 		$retour="url='".$url."';\n";
51 51
 		$slash="/";
52
-		if(PhalconUtils::endsWith($url, "/"))
52
+		if (PhalconUtils::endsWith($url, "/"))
53 53
 			$slash="";
54
-			if(JString::isNotNull($attr)){
54
+			if (JString::isNotNull($attr)) {
55 55
 				if ($attr=="value")
56 56
 					$retour.="url=url+'".$slash."'+$(this).val();\n";
57
-					else if($attr!=null && $attr!=="")
57
+					else if ($attr!=null && $attr!=="")
58 58
 						$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
59 59
 			}
60 60
 			return $retour;
61 61
 	}
62 62
 
63
-	protected function _getOnAjaxDone($responseElement,$jsCallback){
63
+	protected function _getOnAjaxDone($responseElement, $jsCallback) {
64 64
 		$retour="";
65 65
 		if ($responseElement!=="") {
66 66
 			$retour="\t$({$responseElement}).html( data );\n";
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 		return $retour;
70 70
 	}
71 71
 
72
-	protected function _getResponseElement($responseElement){
72
+	protected function _getResponseElement($responseElement) {
73 73
 		if ($responseElement!=="") {
74 74
 			$responseElement=$this->_prep_value($responseElement);
75 75
 		}
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 	protected function _correctAjaxUrl($url) {
80 80
 		if (PhalconUtils::endsWith($url, "/"))
81 81
 			$url=substr($url, 0, strlen($url)-1);
82
-			if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
82
+			if (strncmp($url, 'http://', 7)!=0 && strncmp($url, 'https://', 8)!=0) {
83 83
 				$url=$this->_di->get("url")->get($url);
84 84
 			}
85 85
 			return $url;
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
 	 * @param string $jsCallback javascript code to execute after the request
94 94
 	 * @param boolean $immediatly
95 95
 	 */
96
-	public function _json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document",$immediatly=false) {
96
+	public function _json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document", $immediatly=false) {
97 97
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
98 98
 		$retour=$this->_getAjaxUrl($url, $attr);
99 99
 		$retour.="$.{$method}(url,".$params.").done(function( data ) {\n";
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
 	 * @param string $url the request address
115 115
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true)
116 116
 	 */
117
-	public function _jsonOn($event,$element, $url,$parameters=array()) {
117
+	public function _jsonOn($event, $element, $url, $parameters=array()) {
118 118
 		$preventDefault=true;
119 119
 		$stopPropagation=true;
120 120
 		$jsCallback=null;
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
 		$params="{}";
125 125
 		$immediatly=true;
126 126
 		extract($parameters);
127
-		return $this->_add_event($element, $this->_json($url,$method, $params,$jsCallback, $attr,$context), $event, $preventDefault, $stopPropagation,$immediatly);
127
+		return $this->_add_event($element, $this->_json($url, $method, $params, $jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation, $immediatly);
128 128
 	}
129 129
 
130 130
 	/**
@@ -136,19 +136,19 @@  discard block
 block discarded – undo
136 136
 	 * @param string $context jquery DOM element, array container.
137 137
 	 * @param boolean $immediatly
138 138
 	 */
139
-	public function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context=null,$immediatly=false) {
139
+	public function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context=null, $immediatly=false) {
140 140
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
141 141
 		$retour=$this->_getAjaxUrl($url, $attr);
142
-		if($context===null){
142
+		if ($context===null) {
143 143
 			$appendTo="\t\tnewElm.appendTo($('".$maskSelector."').parent());\n";
144
-			$newElm = "$('#'+newId)";
145
-		}else{
144
+			$newElm="$('#'+newId)";
145
+		}else {
146 146
 			$appendTo="\t\tnewElm.appendTo(".$context.");\n";
147
-			$newElm = $context.".find('#'+newId)";
147
+			$newElm=$context.".find('#'+newId)";
148 148
 		}
149 149
 		$retour.="var self = $(this);\n$.{$method}(url,".$params.").done(function( data ) {\n";
150 150
 		$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";
151
-		$retour.= $appendTo;
151
+		$retour.=$appendTo;
152 152
 		$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";
153 153
 		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
154 154
 		$retour.="\t".$jsCallback."\n"."});\n";
@@ -163,26 +163,26 @@  discard block
 block discarded – undo
163 163
 	 * @param string $url the request address
164 164
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get", "context"=>null)
165 165
 	 */
166
-	public function _jsonArrayOn($event,$element, $maskSelector,$url,$parameters=array()) {
166
+	public function _jsonArrayOn($event, $element, $maskSelector, $url, $parameters=array()) {
167 167
 		$preventDefault=true;
168 168
 		$stopPropagation=true;
169 169
 		$jsCallback=null;
170 170
 		$attr="id";
171 171
 		$method="get";
172
-		$context = null;
172
+		$context=null;
173 173
 		$params="{}";
174 174
 		$immediatly=true;
175 175
 		extract($parameters);
176
-		return $this->_add_event($element, $this->_jsonArray($maskSelector,$url,$method, $params,$jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation,$immediatly);
176
+		return $this->_add_event($element, $this->_jsonArray($maskSelector, $url, $method, $params, $jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation, $immediatly);
177 177
 	}
178 178
 
179
-	public function _postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
179
+	public function _postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
180 180
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
181 181
 		$retour=$this->_getAjaxUrl($url, $attr);
182 182
 		$retour.="\nvar params=$('#".$form."').serialize();\n";
183 183
 		$responseElement=$this->_getResponseElement($responseElement);
184 184
 		$retour.="var self=this;\n";
185
-		if($hasLoader===true){
185
+		if ($hasLoader===true) {
186 186
 			$this->addLoading($retour, $responseElement);
187 187
 		}
188 188
 		$retour.="$.post(url,params).done(function( data ) {\n";
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
209 209
 	 * @param string $responseElement
210 210
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true)
211 211
 	 */
212
-	public function _getOn($event,$element, $url, $params="{}", $responseElement="", $parameters=array()) {
212
+	public function _getOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
213 213
 		$preventDefault=true;
214 214
 		$stopPropagation=true;
215 215
 		$jsCallback=null;
@@ -217,7 +217,7 @@  discard block
 block discarded – undo
217 217
 		$hasLoader=true;
218 218
 		$immediatly=true;
219 219
 		extract($parameters);
220
-		return $this->_add_event($element, $this->_get($url, $params, $responseElement, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation,$immediatly);
220
+		return $this->_add_event($element, $this->_get($url, $params, $responseElement, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation, $immediatly);
221 221
 	}
222 222
 
223 223
 	/**
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
230 230
 	 * @param string $responseElement
231 231
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true)
232 232
 	 */
233
-	public function _postOn($event,$element, $url, $params="{}", $responseElement="", $parameters=array()) {
233
+	public function _postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
234 234
 		$preventDefault=true;
235 235
 		$stopPropagation=true;
236 236
 		$jsCallback=null;
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
 		$hasLoader=true;
239 239
 		$immediatly=true;
240 240
 		extract($parameters);
241
-		return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation,$immediatly);
241
+		return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation, $immediatly);
242 242
 	}
243 243
 
244 244
 	/**
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
251 251
 	 * @param string $responseElement
252 252
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true)
253 253
 	 */
254
-	public function _postFormOn($event,$element, $url, $form, $responseElement="", $parameters=array()) {
254
+	public function _postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) {
255 255
 		$preventDefault=true;
256 256
 		$stopPropagation=true;
257 257
 		$validation=false;
@@ -260,6 +260,6 @@  discard block
 block discarded – undo
260 260
 		$hasLoader=true;
261 261
 		$immediatly=true;
262 262
 		extract($parameters);
263
-		return $this->_add_event($element, $this->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation,$immediatly);
263
+		return $this->_add_event($element, $this->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation, $immediatly);
264 264
 	}
265 265
 }
266 266
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/HtmlForm.php 2 patches
Spacing   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -13,62 +13,62 @@  discard block
 block discarded – undo
13 13
  * @author jc
14 14
  * @version 1.001
15 15
  */
16
-class HtmlForm extends HtmlSemCollection{
16
+class HtmlForm extends HtmlSemCollection {
17 17
 
18 18
 	use FieldsTrait;
19 19
 
20 20
 	protected $_fields;
21 21
 
22
-	public function __construct( $identifier, $elements=array()){
23
-		parent::__construct( $identifier, "form", "ui form");
24
-		$this->_states=[State::ERROR,State::SUCCESS,State::WARNING,State::DISABLED];
22
+	public function __construct($identifier, $elements=array()) {
23
+		parent::__construct($identifier, "form", "ui form");
24
+		$this->_states=[State::ERROR, State::SUCCESS, State::WARNING, State::DISABLED];
25 25
 		$this->setProperty("name", $this->identifier);
26 26
 		$this->_fields=array();
27 27
 		$this->addItems($elements);
28 28
 	}
29 29
 
30
-	public function addHeader($title,$niveau=1,$dividing=true){
31
-		$header=new HtmlHeader("",$niveau,$title);
32
-		if($dividing)
30
+	public function addHeader($title, $niveau=1, $dividing=true) {
31
+		$header=new HtmlHeader("", $niveau, $title);
32
+		if ($dividing)
33 33
 			$header->setDividing();
34 34
 		return $this->addItem($header);
35 35
 	}
36 36
 
37
-	public function addFields($fields=NULL,$label=NULL){
38
-		if(isset($fields)){
39
-			if(!$fields instanceof HtmlFormFields){
40
-				if(\is_array($fields)===false){
41
-					$fields = \func_get_args();
37
+	public function addFields($fields=NULL, $label=NULL) {
38
+		if (isset($fields)) {
39
+			if (!$fields instanceof HtmlFormFields) {
40
+				if (\is_array($fields)===false) {
41
+					$fields=\func_get_args();
42 42
 					$end=\end($fields);
43
-					if(\is_string($end)){
43
+					if (\is_string($end)) {
44 44
 						$label=$end;
45 45
 						\array_pop($fields);
46 46
 					}else $label=NULL;
47 47
 				}
48
-				$this->_fields=\array_merge($this->_fields,$fields);
49
-				$fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count(),$fields);
48
+				$this->_fields=\array_merge($this->_fields, $fields);
49
+				$fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count(), $fields);
50 50
 			}
51
-			if(isset($label))
52
-			 $fields=new HtmlFormField("", $fields,$label);
53
-		}else{
51
+			if (isset($label))
52
+			 $fields=new HtmlFormField("", $fields, $label);
53
+		}else {
54 54
 			$fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count());
55 55
 		}
56 56
 		$this->addItem($fields);
57 57
 		return $fields;
58 58
 	}
59 59
 
60
-	public function addItem($item){
60
+	public function addItem($item) {
61 61
 		$item=parent::addItem($item);
62
-		if(\is_subclass_of($item, HtmlFormField::class)===true){
62
+		if (\is_subclass_of($item, HtmlFormField::class)===true) {
63 63
 			$this->_fields[]=$item;
64 64
 		}
65 65
 		return $item;
66 66
 	}
67 67
 
68
-	public function getField($index){
69
-		if(\is_string($index)){
68
+	public function getField($index) {
69
+		if (\is_string($index)) {
70 70
 			$field=$this->getElementById($index, $this->_fields);
71
-		}else{
71
+		}else {
72 72
 			$field=$this->_fields[$index];
73 73
 		}
74 74
 		return $field;
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 	 * automatically divide fields to be equal width
79 79
 	 * @return \Ajax\semantic\html\collections\form\HtmlForm
80 80
 	 */
81
-	public function setEqualWidth(){
81
+	public function setEqualWidth() {
82 82
 		return $this->addToProperty("class", "equal width");
83 83
 	}
84 84
 
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 	 * @param HtmlFormField $field
88 88
 	 * @return \Ajax\common\html\HtmlDoubleElement
89 89
 	 */
90
-	public function addField($field){
90
+	public function addField($field) {
91 91
 		return $this->addItem($field);
92 92
 	}
93 93
 
@@ -99,22 +99,22 @@  discard block
 block discarded – undo
99 99
 	 * @param string $type
100 100
 	 * @return \Ajax\semantic\html\collections\HtmlMessage
101 101
 	 */
102
-	public function addMessage($identifier,$content,$header=NULL,$icon=NULL,$type=NULL){
103
-		$message=new HtmlMessage($identifier,$content);
104
-		if(isset($header))
102
+	public function addMessage($identifier, $content, $header=NULL, $icon=NULL, $type=NULL) {
103
+		$message=new HtmlMessage($identifier, $content);
104
+		if (isset($header))
105 105
 			$message->addHeader($header);
106
-		if(isset($icon))
106
+		if (isset($icon))
107 107
 			$message->setIcon($icon);
108
-		if(isset($type))
108
+		if (isset($type))
109 109
 			$message->setStyle($type);
110 110
 		return $this->addItem($message);
111 111
 	}
112 112
 
113
-	public function setLoading(){
113
+	public function setLoading() {
114 114
 		return $this->addToProperty("class", "loading");
115 115
 	}
116 116
 
117
-	public function jsState($state){
118
-		return $this->jsDoJquery("addClass",$state);
117
+	public function jsState($state) {
118
+		return $this->jsDoJquery("addClass", $state);
119 119
 	}
120 120
 }
121 121
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +20 added lines, -13 removed lines patch added patch discarded remove patch
@@ -29,8 +29,9 @@  discard block
 block discarded – undo
29 29
 
30 30
 	public function addHeader($title,$niveau=1,$dividing=true){
31 31
 		$header=new HtmlHeader("",$niveau,$title);
32
-		if($dividing)
33
-			$header->setDividing();
32
+		if($dividing) {
33
+					$header->setDividing();
34
+		}
34 35
 		return $this->addItem($header);
35 36
 	}
36 37
 
@@ -43,14 +44,17 @@  discard block
 block discarded – undo
43 44
 					if(\is_string($end)){
44 45
 						$label=$end;
45 46
 						\array_pop($fields);
46
-					}else $label=NULL;
47
+					} else {
48
+						$label=NULL;
49
+					}
47 50
 				}
48 51
 				$this->_fields=\array_merge($this->_fields,$fields);
49 52
 				$fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count(),$fields);
50 53
 			}
51
-			if(isset($label))
52
-			 $fields=new HtmlFormField("", $fields,$label);
53
-		}else{
54
+			if(isset($label)) {
55
+						 $fields=new HtmlFormField("", $fields,$label);
56
+			}
57
+		} else{
54 58
 			$fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count());
55 59
 		}
56 60
 		$this->addItem($fields);
@@ -68,7 +72,7 @@  discard block
 block discarded – undo
68 72
 	public function getField($index){
69 73
 		if(\is_string($index)){
70 74
 			$field=$this->getElementById($index, $this->_fields);
71
-		}else{
75
+		} else{
72 76
 			$field=$this->_fields[$index];
73 77
 		}
74 78
 		return $field;
@@ -101,12 +105,15 @@  discard block
 block discarded – undo
101 105
 	 */
102 106
 	public function addMessage($identifier,$content,$header=NULL,$icon=NULL,$type=NULL){
103 107
 		$message=new HtmlMessage($identifier,$content);
104
-		if(isset($header))
105
-			$message->addHeader($header);
106
-		if(isset($icon))
107
-			$message->setIcon($icon);
108
-		if(isset($type))
109
-			$message->setStyle($type);
108
+		if(isset($header)) {
109
+					$message->addHeader($header);
110
+		}
111
+		if(isset($icon)) {
112
+					$message->setIcon($icon);
113
+		}
114
+		if(isset($type)) {
115
+					$message->setStyle($type);
116
+		}
110 117
 		return $this->addItem($message);
111 118
 	}
112 119
 
Please login to merge, or discard this patch.