Passed
Push — master ( e7f8f8...90de72 )
by Jean-Christophe
02:16
created
Ajax/semantic/html/modules/checkbox/AbstractCheckbox.php 1 patch
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -7,12 +7,12 @@  discard block
 block discarded – undo
7 7
 
8 8
 abstract class AbstractCheckbox extends HtmlSemDoubleElement {
9 9
 
10
-	protected $_params = [];
10
+	protected $_params=[];
11 11
 
12
-	public function __construct($identifier, $name = NULL, $label = NULL, $value = NULL, $inputType = "checkbox", $type = "checkbox") {
13
-		parent::__construct("ck-" . $identifier, "div", "ui " . $type);
14
-		$this->_identifier = $identifier;
15
-		$field = new \Ajax\common\html\html5\HtmlInput($identifier, $inputType, $value);
12
+	public function __construct($identifier, $name=NULL, $label=NULL, $value=NULL, $inputType="checkbox", $type="checkbox") {
13
+		parent::__construct("ck-".$identifier, "div", "ui ".$type);
14
+		$this->_identifier=$identifier;
15
+		$field=new \Ajax\common\html\html5\HtmlInput($identifier, $inputType, $value);
16 16
 		$field->setProperty("name", $name);
17 17
 		$this->setField($field);
18 18
 		if (isset($label))
@@ -20,8 +20,8 @@  discard block
 block discarded – undo
20 20
 		$this->setLibraryId($identifier);
21 21
 	}
22 22
 
23
-	public function setChecked($value = true) {
24
-		if ($value === true) {
23
+	public function setChecked($value=true) {
24
+		if ($value===true) {
25 25
 			$this->getField()->setProperty("checked", "checked");
26 26
 		} else {
27 27
 			$this->getField()->removeProperty("checked");
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 		return $this;
30 30
 	}
31 31
 
32
-	public function forceValue($value = 'true') {
32
+	public function forceValue($value='true') {
33 33
 		$this->getField()->forceValue($value);
34 34
 		return $this;
35 35
 	}
@@ -38,21 +38,21 @@  discard block
 block discarded – undo
38 38
 		return $this->addToPropertyCtrl("class", $checkboxType, CheckboxType::getConstants());
39 39
 	}
40 40
 
41
-	public function setLabel($label, $value = null) {
42
-		$labelO = $label;
41
+	public function setLabel($label, $value=null) {
42
+		$labelO=$label;
43 43
 		if (\is_string($label)) {
44
-			$labelO = new HtmlSemDoubleElement("", "label", "");
44
+			$labelO=new HtmlSemDoubleElement("", "label", "");
45 45
 			$labelO->setContent($label);
46 46
 			$labelO->setProperty("for", $this->getField()
47 47
 				->getIdentifier());
48 48
 			if (isset($value))
49 49
 				$labelO->setProperty("data-value", $value);
50 50
 		}
51
-		$this->content["label"] = $labelO;
51
+		$this->content["label"]=$labelO;
52 52
 	}
53 53
 
54 54
 	public function setField($field) {
55
-		$this->content["field"] = $field;
55
+		$this->content["field"]=$field;
56 56
 	}
57 57
 
58 58
 	/**
@@ -78,9 +78,9 @@  discard block
 block discarded – undo
78 78
 	 * puts the label before or behind
79 79
 	 */
80 80
 	public function swapLabel() {
81
-		$label = $this->getLabel();
81
+		$label=$this->getLabel();
82 82
 		unset($this->content["label"]);
83
-		$this->content["label"] = $label;
83
+		$this->content["label"]=$label;
84 84
 	}
85 85
 
86 86
 	public function setReadonly() {
@@ -97,13 +97,13 @@  discard block
 block discarded – undo
97 97
 	 *        	action to execute : check, uncheck or NULL for toggle
98 98
 	 * @return AbstractCheckbox
99 99
 	 */
100
-	public function attachEvent($selector, $action = NULL) {
101
-		if (isset($action) || \is_numeric($action) === true) {
102
-			$js = '$("#%identifier%").checkbox("attach events", "' . $selector . '", "' . $action . '");';
100
+	public function attachEvent($selector, $action=NULL) {
101
+		if (isset($action) || \is_numeric($action)===true) {
102
+			$js='$("#%identifier%").checkbox("attach events", "'.$selector.'", "'.$action.'");';
103 103
 		} else {
104
-			$js = '$("#%identifier%").checkbox("attach events", "' . $selector . '");';
104
+			$js='$("#%identifier%").checkbox("attach events", "'.$selector.'");';
105 105
 		}
106
-		$js = \str_replace("%identifier%", $this->identifier, $js);
106
+		$js=\str_replace("%identifier%", $this->identifier, $js);
107 107
 		return $this->executeOnRun($js);
108 108
 	}
109 109
 
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
 	 *        	associative array of events to attach ex : ["#bt-toggle","check"=>"#bt-check","uncheck"=>"#bt-uncheck"]
115 115
 	 * @return AbstractCheckbox
116 116
 	 */
117
-	public function attachEvents($events = array()) {
117
+	public function attachEvents($events=array()) {
118 118
 		if (\is_array($events)) {
119 119
 			foreach ($events as $action => $selector) {
120 120
 				$this->attachEvent($selector, $action);
@@ -128,23 +128,23 @@  discard block
 block discarded – undo
128 128
 	}
129 129
 
130 130
 	public function setOnChecked($jsCode) {
131
-		$this->_params["onChecked"] = $jsCode;
131
+		$this->_params["onChecked"]=$jsCode;
132 132
 		return $this;
133 133
 	}
134 134
 
135 135
 	public function setOnUnchecked($jsCode) {
136
-		$this->_params["onUnchecked"] = $jsCode;
136
+		$this->_params["onUnchecked"]=$jsCode;
137 137
 		return $this;
138 138
 	}
139 139
 
140 140
 	public function setOnChange($jsCode) {
141
-		$this->_params["onChange"] = $jsCode;
141
+		$this->_params["onChange"]=$jsCode;
142 142
 		return $this;
143 143
 	}
144 144
 
145 145
 	public function run(JsUtils $js) {
146
-		if (! isset($this->_bsComponent))
147
-			$this->_bsComponent = $js->semantic()->checkbox("#" . $this->identifier, $this->_params);
146
+		if (!isset($this->_bsComponent))
147
+			$this->_bsComponent=$js->semantic()->checkbox("#".$this->identifier, $this->_params);
148 148
 		return parent::run($js);
149 149
 	}
150 150
 }
Please login to merge, or discard this patch.
Ajax/semantic/html/modules/HtmlDropdown.php 1 patch
Spacing   +91 added lines, -91 removed lines patch added patch discarded remove patch
@@ -13,17 +13,17 @@  discard block
 block discarded – undo
13 13
 use Ajax\service\JArray;
14 14
 
15 15
 class HtmlDropdown extends HtmlSemDoubleElement {
16
-	use FieldTrait,LabeledIconTrait {
16
+	use FieldTrait, LabeledIconTrait {
17 17
 		addIcon as addIconP;
18 18
 	}
19 19
 
20
-	protected $mClass = "menu";
20
+	protected $mClass="menu";
21 21
 
22
-	protected $mTagName = "div";
22
+	protected $mTagName="div";
23 23
 
24
-	protected $items = array();
24
+	protected $items=array();
25 25
 
26
-	protected $_params = array(
26
+	protected $_params=array(
27 27
 		"action" => "nothing",
28 28
 		"on" => "hover",
29 29
 		"showOnFocus" => true
@@ -37,26 +37,26 @@  discard block
 block discarded – undo
37 37
 
38 38
 	protected $_multiple;
39 39
 
40
-	public function __construct($identifier, $value = "", $items = array(), $associative = true) {
40
+	public function __construct($identifier, $value="", $items=array(), $associative=true) {
41 41
 		parent::__construct($identifier, "div");
42
-		$this->_template = include dirname(__FILE__) . '/../templates/tplDropdown.php';
42
+		$this->_template=include dirname(__FILE__).'/../templates/tplDropdown.php';
43 43
 		$this->setProperty("class", "ui dropdown");
44
-		$this->_multiple = false;
45
-		$content = [];
44
+		$this->_multiple=false;
45
+		$content=[];
46 46
 		if ($value instanceof HtmlSemDoubleElement) {
47
-			$text = $value;
47
+			$text=$value;
48 48
 		} else {
49
-			$text = new HtmlSemDoubleElement("text-" . $this->identifier, "div");
49
+			$text=new HtmlSemDoubleElement("text-".$this->identifier, "div");
50 50
 			$text->setClass("text");
51 51
 			$this->setValue($value);
52 52
 		}
53
-		$content = [
53
+		$content=[
54 54
 			"text" => $text
55 55
 		];
56
-		$content["arrow"] = new HtmlIcon($identifier . "-icon", "dropdown");
57
-		$this->content = $content;
58
-		$this->tagName = "div";
59
-		$this->_associative = $associative;
56
+		$content["arrow"]=new HtmlIcon($identifier."-icon", "dropdown");
57
+		$this->content=$content;
58
+		$this->tagName="div";
59
+		$this->_associative=$associative;
60 60
 		$this->addItems($items);
61 61
 	}
62 62
 
@@ -68,16 +68,16 @@  discard block
 block discarded – undo
68 68
 		return $this->input;
69 69
 	}
70 70
 
71
-	public function addItem($item, $value = NULL, $image = NULL, $description = NULL) {
72
-		$itemO = $this->beforeAddItem($item, $value, $image, $description);
73
-		$this->items[] = $itemO;
71
+	public function addItem($item, $value=NULL, $image=NULL, $description=NULL) {
72
+		$itemO=$this->beforeAddItem($item, $value, $image, $description);
73
+		$this->items[]=$itemO;
74 74
 		return $itemO;
75 75
 	}
76 76
 
77
-	public function addIcon($icon, $before = true, $labeled = false) {
77
+	public function addIcon($icon, $before=true, $labeled=false) {
78 78
 		$this->removeArrow();
79 79
 		$this->addIconP($icon, $before, $labeled);
80
-		$elm = $this->getElementById("text-" . $this->identifier, $this->content);
80
+		$elm=$this->getElementById("text-".$this->identifier, $this->content);
81 81
 		if (isset($elm)) {
82 82
 			$elm->setWrapAfter("");
83 83
 		}
@@ -85,8 +85,8 @@  discard block
 block discarded – undo
85 85
 	}
86 86
 
87 87
 	public function addIcons($icons) {
88
-		$count = $this->count();
89
-		for ($i = 0; $i < \sizeof($icons) && $i < $count; $i ++) {
88
+		$count=$this->count();
89
+		for ($i=0; $i<\sizeof($icons) && $i<$count; $i++) {
90 90
 			$this->getItem($i)->addIcon($icons[$i]);
91 91
 		}
92 92
 	}
@@ -98,32 +98,32 @@  discard block
 block discarded – undo
98 98
 	 * @param int $position
99 99
 	 * @return HtmlDropdownItem
100 100
 	 */
101
-	public function insertItem($item, $position = 0) {
102
-		$itemO = $this->beforeAddItem($item);
103
-		$start = array_slice($this->items, 0, $position);
104
-		$end = array_slice($this->items, $position);
105
-		$start[] = $item;
106
-		$this->items = array_merge($start, $end);
101
+	public function insertItem($item, $position=0) {
102
+		$itemO=$this->beforeAddItem($item);
103
+		$start=array_slice($this->items, 0, $position);
104
+		$end=array_slice($this->items, $position);
105
+		$start[]=$item;
106
+		$this->items=array_merge($start, $end);
107 107
 		return $itemO;
108 108
 	}
109 109
 
110 110
 	protected function removeArrow() {
111
-		if (\sizeof($this->content) > 1) {
111
+		if (\sizeof($this->content)>1) {
112 112
 			unset($this->content["arrow"]);
113
-			$this->content = \array_values($this->content);
113
+			$this->content=\array_values($this->content);
114 114
 		}
115 115
 	}
116 116
 
117
-	protected function beforeAddItem($item, $value = NULL, $image = NULL, $description = NULL) {
118
-		$itemO = $item;
117
+	protected function beforeAddItem($item, $value=NULL, $image=NULL, $description=NULL) {
118
+		$itemO=$item;
119 119
 		if (\is_array($item)) {
120
-			$description = JArray::getValue($item, "description", 3);
121
-			$value = JArray::getValue($item, "value", 1);
122
-			$image = JArray::getValue($item, "image", 2);
123
-			$item = JArray::getValue($item, "item", 0);
120
+			$description=JArray::getValue($item, "description", 3);
121
+			$value=JArray::getValue($item, "value", 1);
122
+			$image=JArray::getValue($item, "image", 2);
123
+			$item=JArray::getValue($item, "item", 0);
124 124
 		}
125
-		if (! $item instanceof HtmlDropdownItem) {
126
-			$itemO = new HtmlDropdownItem("dd-item-" . $this->identifier . "-" . \sizeof($this->items), $item, $value, $image, $description);
125
+		if (!$item instanceof HtmlDropdownItem) {
126
+			$itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items), $item, $value, $image, $description);
127 127
 		} elseif ($itemO instanceof HtmlDropdownItem) {
128 128
 			$this->addToProperty("class", "vertical");
129 129
 		}
@@ -139,11 +139,11 @@  discard block
 block discarded – undo
139 139
 	}
140 140
 
141 141
 	public function addInput($name) {
142
-		if (! isset($name))
143
-			$name = "input-" . $this->identifier;
142
+		if (!isset($name))
143
+			$name="input-".$this->identifier;
144 144
 		$this->setAction("activate");
145
-		$this->input = new HtmlInput($name, "hidden");
146
-		$this->input->setIdentifier("input-" . $this->identifier);
145
+		$this->input=new HtmlInput($name, "hidden");
146
+		$this->input->setIdentifier("input-".$this->identifier);
147 147
 		return $this->input;
148 148
 	}
149 149
 
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
 	 * @param string $icon
155 155
 	 * @return HtmlDropdownItem
156 156
 	 */
157
-	public function addSearchInputItem($placeHolder = NULL, $icon = NULL) {
157
+	public function addSearchInputItem($placeHolder=NULL, $icon=NULL) {
158 158
 		return $this->addItem(HtmlDropdownItem::searchInput($placeHolder, $icon));
159 159
 	}
160 160
 
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
174 174
 	 * @param string $icon
175 175
 	 * @return HtmlDropdownItem
176 176
 	 */
177
-	public function addHeaderItem($caption = NULL, $icon = NULL) {
177
+	public function addHeaderItem($caption=NULL, $icon=NULL) {
178 178
 		return $this->addItem(HtmlDropdownItem::header($caption, $icon));
179 179
 	}
180 180
 
@@ -219,12 +219,12 @@  discard block
 block discarded – undo
219 219
 	 * @return $this
220 220
 	 */
221 221
 	public function setPropertyValues($property, $values) {
222
-		$i = 0;
223
-		if (\is_array($values) === false) {
224
-			$values = \array_fill(0, $this->count(), $values);
222
+		$i=0;
223
+		if (\is_array($values)===false) {
224
+			$values=\array_fill(0, $this->count(), $values);
225 225
 		}
226 226
 		foreach ($values as $value) {
227
-			$c = $this->items[$i ++];
227
+			$c=$this->items[$i++];
228 228
 			if (isset($c)) {
229 229
 				$c->setProperty($property, $value);
230 230
 			} else {
@@ -258,12 +258,12 @@  discard block
 block discarded – undo
258 258
 	 * @param boolean $dropdown
259 259
 	 */
260 260
 	public function asDropdown($dropdown) {
261
-		if ($dropdown === false) {
262
-			$this->_template = include dirname(__FILE__) . '/../templates/tplDropdownMenu.php';
263
-			$dropdown = "menu";
261
+		if ($dropdown===false) {
262
+			$this->_template=include dirname(__FILE__).'/../templates/tplDropdownMenu.php';
263
+			$dropdown="menu";
264 264
 		} else {
265
-			$dropdown = "dropdown";
266
-			$this->mClass = "menu";
265
+			$dropdown="dropdown";
266
+			$this->mClass="menu";
267 267
 		}
268 268
 		return $this->addToPropertyCtrl("class", $dropdown, array(
269 269
 			"menu",
@@ -289,7 +289,7 @@  discard block
 block discarded – undo
289 289
 		));
290 290
 	}
291 291
 
292
-	public function asButton($floating = false) {
292
+	public function asButton($floating=false) {
293 293
 		$this->removeArrow();
294 294
 		if ($floating)
295 295
 			$this->addToProperty("class", "floating");
@@ -297,15 +297,15 @@  discard block
 block discarded – undo
297 297
 		return $this->addToProperty("class", "button");
298 298
 	}
299 299
 
300
-	public function asSelect($name = NULL, $multiple = false, $selection = true) {
301
-		$this->_multiple = $multiple;
300
+	public function asSelect($name=NULL, $multiple=false, $selection=true) {
301
+		$this->_multiple=$multiple;
302 302
 		if (isset($name))
303 303
 			$this->addInput($name);
304 304
 		if ($multiple) {
305 305
 			$this->addToProperty("class", "multiple");
306 306
 		}
307 307
 		if ($selection) {
308
-			if ($this->propertyContains("class", "button") === false)
308
+			if ($this->propertyContains("class", "button")===false)
309 309
 				$this->addToPropertyCtrl("class", "selection", array(
310 310
 					"selection"
311 311
 				));
@@ -313,31 +313,31 @@  discard block
 block discarded – undo
313 313
 		return $this;
314 314
 	}
315 315
 
316
-	public function asSearch($name = NULL, $multiple = false, $selection = true) {
316
+	public function asSearch($name=NULL, $multiple=false, $selection=true) {
317 317
 		$this->asSelect($name, $multiple, $selection);
318 318
 		return $this->addToProperty("class", "search");
319 319
 	}
320 320
 
321
-	public function setSelect($name = NULL, $multiple = false) {
322
-		$this->_template = '<%tagName% id="%identifier%" %properties%>%items%</%tagName%>';
323
-		if (! isset($name))
324
-			$name = "select-" . $this->identifier;
325
-		$this->input = null;
321
+	public function setSelect($name=NULL, $multiple=false) {
322
+		$this->_template='<%tagName% id="%identifier%" %properties%>%items%</%tagName%>';
323
+		if (!isset($name))
324
+			$name="select-".$this->identifier;
325
+		$this->input=null;
326 326
 		if ($multiple) {
327 327
 			$this->setProperty("multiple", true);
328 328
 			$this->addToProperty("class", "multiple");
329 329
 		}
330 330
 		$this->setAction("activate");
331
-		$this->tagName = "select";
331
+		$this->tagName="select";
332 332
 		$this->setProperty("name", $name);
333
-		$this->content = null;
333
+		$this->content=null;
334 334
 		foreach ($this->items as $item) {
335 335
 			$item->asOption();
336 336
 		}
337 337
 		return $this;
338 338
 	}
339 339
 
340
-	public function asSubmenu($pointing = NULL) {
340
+	public function asSubmenu($pointing=NULL) {
341 341
 		$this->setClass("ui dropdown link item");
342 342
 		if (isset($pointing)) {
343 343
 			$this->setPointing($pointing);
@@ -345,29 +345,29 @@  discard block
 block discarded – undo
345 345
 		return $this;
346 346
 	}
347 347
 
348
-	public function setPointing($value = Direction::NONE) {
349
-		return $this->addToPropertyCtrl("class", $value . " pointing", Direction::getConstantValues("pointing"));
348
+	public function setPointing($value=Direction::NONE) {
349
+		return $this->addToPropertyCtrl("class", $value." pointing", Direction::getConstantValues("pointing"));
350 350
 	}
351 351
 
352 352
 	public function setValue($value) {
353
-		$this->value = $value;
353
+		$this->value=$value;
354 354
 		return $this;
355 355
 	}
356 356
 
357 357
 	public function setDefaultText($text) {
358
-		$this->content["text"] = new HtmlSemDoubleElement("", "div", "default text", $text);
358
+		$this->content["text"]=new HtmlSemDoubleElement("", "div", "default text", $text);
359 359
 		return $this;
360 360
 	}
361 361
 
362 362
 	private function applyValue() {
363
-		$value = $this->value;
363
+		$value=$this->value;
364 364
 		if (isset($this->input) && isset($value)) {
365 365
 			$this->input->setProperty("value", $value);
366 366
 		} else {
367 367
 			$this->setProperty("value", $value);
368 368
 		}
369
-		$textElement = $this->getElementById("text-" . $this->identifier, $this->content);
370
-		if (isset($textElement) && ($textElement instanceof HtmlDoubleElement) && ! $this->_multiple)
369
+		$textElement=$this->getElementById("text-".$this->identifier, $this->content);
370
+		if (isset($textElement) && ($textElement instanceof HtmlDoubleElement) && !$this->_multiple)
371 371
 			$textElement->setContent($value);
372 372
 		return $this;
373 373
 	}
@@ -377,9 +377,9 @@  discard block
 block discarded – undo
377 377
 	 * @see BaseHtml::run()
378 378
 	 */
379 379
 	public function run(JsUtils $js) {
380
-		if ($this->propertyContains("class", "simple") === false) {
381
-			if (isset($this->_bsComponent) === false) {
382
-				$this->_bsComponent = $js->semantic()->dropdown("#" . $this->identifier, $this->_params);
380
+		if ($this->propertyContains("class", "simple")===false) {
381
+			if (isset($this->_bsComponent)===false) {
382
+				$this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier, $this->_params);
383 383
 				$this->_bsComponent->setItemSelector(".item");
384 384
 			}
385 385
 			$this->addEventsOnRun($js);
@@ -394,31 +394,31 @@  discard block
 block discarded – undo
394 394
 	}
395 395
 
396 396
 	public function setAction($action) {
397
-		$this->_params["action"] = $action;
397
+		$this->_params["action"]=$action;
398 398
 		return $this;
399 399
 	}
400 400
 
401 401
 	public function setOn($on) {
402
-		$this->_params["on"] = $on;
402
+		$this->_params["on"]=$on;
403 403
 		return $this;
404 404
 	}
405 405
 
406 406
 	public function setShowOnFocus($value) {
407
-		$this->_params["showOnFocus"] = $value;
407
+		$this->_params["showOnFocus"]=$value;
408 408
 		return $this;
409 409
 	}
410 410
 
411 411
 	public function setAllowAdditions($value) {
412
-		$this->_params["allowAdditions"] = $value;
412
+		$this->_params["allowAdditions"]=$value;
413 413
 		return $this;
414 414
 	}
415 415
 
416 416
 	public function setFullTextSearch($value) {
417
-		$this->_params["fullTextSearch"] = $value;
417
+		$this->_params["fullTextSearch"]=$value;
418 418
 		return $this;
419 419
 	}
420 420
 
421
-	public function compile(JsUtils $js = NULL, &$view = NULL) {
421
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
422 422
 		$this->applyValue();
423 423
 		return parent::compile($js, $view);
424 424
 	}
@@ -427,19 +427,19 @@  discard block
 block discarded – undo
427 427
 		return $this->input;
428 428
 	}
429 429
 
430
-	public function setIcon($icon = "dropdown") {
431
-		$this->content["arrow"] = new HtmlIcon($this->identifier . "-icon", $icon);
430
+	public function setIcon($icon="dropdown") {
431
+		$this->content["arrow"]=new HtmlIcon($this->identifier."-icon", $icon);
432 432
 		return $this;
433 433
 	}
434 434
 
435
-	public function jsAddItem($caption, $value = null) {
436
-		$value = $value ?? $caption;
437
-		$js = "var first=$('#{$this->identifier} .item').first();if(first!=undefined){var newItem =first.clone();first.parent().append(newItem);newItem.html({$caption});newItem.attr('data-value',{$value}).removeClass('active filtered');}";
435
+	public function jsAddItem($caption, $value=null) {
436
+		$value=$value ?? $caption;
437
+		$js="var first=$('#{$this->identifier} .item').first();if(first!=undefined){var newItem =first.clone();first.parent().append(newItem);newItem.html({$caption});newItem.attr('data-value',{$value}).removeClass('active filtered');}";
438 438
 		return $js;
439 439
 	}
440 440
 
441 441
 	public function setClearable($value) {
442
-		$this->_params["clearable"] = $value;
442
+		$this->_params["clearable"]=$value;
443 443
 		return $this;
444 444
 	}
445 445
 
@@ -448,7 +448,7 @@  discard block
 block discarded – undo
448 448
 	 * Parameters addedValue, addedText, $addedChoice
449 449
 	 */
450 450
 	public function setOnAdd($jsCode) {
451
-		$this->_params["onAdd"] = $jsCode;
451
+		$this->_params["onAdd"]=$jsCode;
452 452
 		return $this;
453 453
 	}
454 454
 
@@ -457,7 +457,7 @@  discard block
 block discarded – undo
457 457
 	 * Parameters removedValue, removedText, $removedChoice
458 458
 	 */
459 459
 	public function setOnRemove($jsCode) {
460
-		$this->_params["onRemove"] = $jsCode;
460
+		$this->_params["onRemove"]=$jsCode;
461 461
 		return $this;
462 462
 	}
463 463
 }
Please login to merge, or discard this patch.
Ajax/common/html/html5/HtmlInput.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
 
10 10
 	protected $_placeholder;
11 11
 
12
-	public function __construct($identifier, $type = "text", $value = NULL, $placeholder = NULL) {
12
+	public function __construct($identifier, $type="text", $value=NULL, $placeholder=NULL) {
13 13
 		parent::__construct($identifier, "input");
14 14
 		$this->setProperty("name", $identifier);
15 15
 		$this->setValue($value);
@@ -27,23 +27,23 @@  discard block
 block discarded – undo
27 27
 		return $this->setProperty("type", $value);
28 28
 	}
29 29
 
30
-	public function forceValue($value = 'true') {
31
-		$this->wrap('<input type="hidden" value="false" name="' . $this->identifier . '"/>');
30
+	public function forceValue($value='true') {
31
+		$this->wrap('<input type="hidden" value="false" name="'.$this->identifier.'"/>');
32 32
 		$this->setValue($value);
33 33
 		return $this;
34 34
 	}
35 35
 
36 36
 	public function setPlaceholder($value) {
37 37
 		if (JString::isNotNull($value))
38
-			$this->_placeholder = $value;
38
+			$this->_placeholder=$value;
39 39
 		return $this;
40 40
 	}
41 41
 
42
-	public function compile(JsUtils $js = NULL, &$view = NULL) {
43
-		$value = $this->_placeholder;
42
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
43
+		$value=$this->_placeholder;
44 44
 		if (JString::isNull($value)) {
45 45
 			if (JString::isNotNull($this->getProperty("name")))
46
-				$value = \ucfirst($this->getProperty("name"));
46
+				$value=\ucfirst($this->getProperty("name"));
47 47
 		}
48 48
 		$this->setProperty("placeholder", $value);
49 49
 		return parent::compile($js, $view);
Please login to merge, or discard this patch.
Ajax/service/JString.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -4,64 +4,64 @@
 block discarded – undo
4 4
 class JString {
5 5
 
6 6
 	public static function contains($hay, $needle) {
7
-		return strpos($hay, "$needle") !== false;
7
+		return strpos($hay, "$needle")!==false;
8 8
 	}
9 9
 
10 10
 	public static function startswith($hay, $needle) {
11
-		return substr($hay, 0, strlen($needle)) === $needle;
11
+		return substr($hay, 0, strlen($needle))===$needle;
12 12
 	}
13 13
 
14 14
 	public static function endswith($hay, $needle) {
15
-		return substr($hay, - strlen($needle)) === $needle;
15
+		return substr($hay, - strlen($needle))===$needle;
16 16
 	}
17 17
 
18 18
 	public static function isNull($s) {
19
-		return (! isset($s) || NULL === $s || "" === $s);
19
+		return (!isset($s) || NULL===$s || ""===$s);
20 20
 	}
21 21
 
22 22
 	public static function isNotNull($s) {
23
-		return (isset($s) && NULL !== $s && "" !== $s);
23
+		return (isset($s) && NULL!==$s && ""!==$s);
24 24
 	}
25 25
 
26 26
 	public static function isBoolean($value) {
27
-		return \is_bool($value) || $value == 1 || $value == 0;
27
+		return \is_bool($value) || $value==1 || $value==0;
28 28
 	}
29 29
 
30 30
 	public static function isBooleanTrue($value) {
31
-		return $value == 1 || $value;
31
+		return $value==1 || $value;
32 32
 	}
33 33
 
34 34
 	public static function isBooleanFalse($value) {
35
-		return $value == 0 || ! $value;
35
+		return $value==0 || !$value;
36 36
 	}
37 37
 
38
-	public static function camelCaseToSeparated($input, $separator = " ") {
39
-		return strtolower(preg_replace('/(?<!^)[A-Z]/', $separator . '$0', $input));
38
+	public static function camelCaseToSeparated($input, $separator=" ") {
39
+		return strtolower(preg_replace('/(?<!^)[A-Z]/', $separator.'$0', $input));
40 40
 	}
41 41
 
42 42
 	public static function replaceAtFirst($subject, $from, $to) {
43
-		$from = '/\A' . preg_quote($from, '/') . '/';
43
+		$from='/\A'.preg_quote($from, '/').'/';
44 44
 		return \preg_replace($from, $to, $subject, 1);
45 45
 	}
46 46
 
47 47
 	public static function replaceAtLast($subject, $from, $to) {
48
-		$from = '/' . preg_quote($from, '/') . '\z/';
48
+		$from='/'.preg_quote($from, '/').'\z/';
49 49
 		return \preg_replace($from, $to, $subject, 1);
50 50
 	}
51 51
 
52 52
 	public static function replaceAtFirstAndLast($subject, $fromFirst, $toFirst, $fromLast, $toLast) {
53
-		$s = self::replaceAtFirst($subject, $fromFirst, $toFirst);
53
+		$s=self::replaceAtFirst($subject, $fromFirst, $toFirst);
54 54
 		return self::replaceAtLast($s, $fromLast, $toLast);
55 55
 	}
56 56
 
57
-	public static function getValueBetween(&$str, $before = "{{", $after = "}}") {
58
-		$matches = [];
59
-		$result = null;
60
-		$_before = \preg_quote($before);
61
-		$_after = \preg_quote($after);
62
-		if (\preg_match('/' . $_before . '(.*?)' . $_after . '/s', $str, $matches) === 1) {
63
-			$result = $matches[1];
64
-			$str = \str_replace($before . $result . $after, "", $str);
57
+	public static function getValueBetween(&$str, $before="{{", $after="}}") {
58
+		$matches=[];
59
+		$result=null;
60
+		$_before=\preg_quote($before);
61
+		$_after=\preg_quote($after);
62
+		if (\preg_match('/'.$_before.'(.*?)'.$_after.'/s', $str, $matches)===1) {
63
+			$result=$matches[1];
64
+			$str=\str_replace($before.$result.$after, "", $str);
65 65
 		}
66 66
 		return $result;
67 67
 	}
Please login to merge, or discard this patch.
Ajax/common/traits/JsUtilsAjaxTrait.php 1 patch
Spacing   +181 added lines, -181 removed lines patch added patch discarded remove patch
@@ -15,56 +15,56 @@  discard block
 block discarded – undo
15 15
 
16 16
 	protected $ajaxTransition;
17 17
 
18
-	protected $ajaxLoader = "<div class=\"ui active centered inline text loader\">Loading</div>";
18
+	protected $ajaxLoader="<div class=\"ui active centered inline text loader\">Loading</div>";
19 19
 
20 20
 	abstract public function getUrl($url);
21 21
 
22
-	abstract public function _add_event($element, $js, $event, $preventDefault = false, $stopPropagation = false, $immediatly = true);
22
+	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true);
23 23
 
24
-	abstract public function interval($jsCode, $time, $globalName = null, $immediatly = true);
24
+	abstract public function interval($jsCode, $time, $globalName=null, $immediatly=true);
25 25
 
26
-	protected function _ajax($method, $url, $responseElement = "", $parameters = []) {
26
+	protected function _ajax($method, $url, $responseElement="", $parameters=[]) {
27 27
 		if (isset($this->params["ajax"])) {
28 28
 			extract($this->params["ajax"]);
29 29
 		}
30 30
 		extract($parameters);
31 31
 
32
-		$jsCallback = isset($jsCallback) ? $jsCallback : "";
33
-		$retour = $this->_getAjaxUrl($url, $attr);
34
-		$originalSelector = $responseElement;
35
-		$responseElement = $this->_getResponseElement($responseElement);
36
-		$retour .= "var self=this;\n";
37
-		$before = isset($before) ? $before : "";
38
-		$retour .= $before;
39
-		if ($hasLoader === true && JString::isNotNull($responseElement)) {
32
+		$jsCallback=isset($jsCallback) ? $jsCallback : "";
33
+		$retour=$this->_getAjaxUrl($url, $attr);
34
+		$originalSelector=$responseElement;
35
+		$responseElement=$this->_getResponseElement($responseElement);
36
+		$retour.="var self=this;\n";
37
+		$before=isset($before) ? $before : "";
38
+		$retour.=$before;
39
+		if ($hasLoader===true && JString::isNotNull($responseElement)) {
40 40
 			$this->addLoading($retour, $responseElement, $ajaxLoader);
41
-		} elseif ($hasLoader === "internal") {
42
-			$retour .= "\n$(this).addClass('loading');";
41
+		} elseif ($hasLoader==="internal") {
42
+			$retour.="\n$(this).addClass('loading');";
43 43
 		}
44
-		$ajaxParameters = [
44
+		$ajaxParameters=[
45 45
 			"url" => "url",
46
-			"method" => "'" . \strtoupper($method) . "'"
46
+			"method" => "'".\strtoupper($method)."'"
47 47
 		];
48 48
 
49
-		$ajaxParameters["async"] = ($async ? "true" : "false");
49
+		$ajaxParameters["async"]=($async ? "true" : "false");
50 50
 
51 51
 		if (isset($params)) {
52
-			$ajaxParameters["data"] = self::_correctParams($params, $parameters);
52
+			$ajaxParameters["data"]=self::_correctParams($params, $parameters);
53 53
 		}
54 54
 		if (isset($headers)) {
55
-			$ajaxParameters["headers"] = $headers;
55
+			$ajaxParameters["headers"]=$headers;
56 56
 		}
57 57
 		$this->createAjaxParameters($ajaxParameters, $parameters);
58
-		$retour .= "$.ajax({" . $this->implodeAjaxParameters($ajaxParameters) . "}).done(function( data, textStatus, jqXHR ) {\n";
59
-		$retour .= $this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader, ($historize ? $originalSelector : null)) . "});\n";
60
-		$retour = $this->_addJsCondition($jsCondition, $retour);
58
+		$retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data, textStatus, jqXHR ) {\n";
59
+		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader, ($historize ? $originalSelector : null))."});\n";
60
+		$retour=$this->_addJsCondition($jsCondition, $retour);
61 61
 		if ($immediatly)
62
-			$this->jquery_code_for_compile[] = $retour;
62
+			$this->jquery_code_for_compile[]=$retour;
63 63
 		return $retour;
64 64
 	}
65 65
 
66 66
 	protected function createAjaxParameters(&$original, $parameters) {
67
-		$validParameters = [
67
+		$validParameters=[
68 68
 			"contentType" => "%value%",
69 69
 			"dataType" => "'%value%'",
70 70
 			"beforeSend" => "function(jqXHR,settings){%value%}",
@@ -73,21 +73,21 @@  discard block
 block discarded – undo
73 73
 		];
74 74
 		foreach ($validParameters as $param => $mask) {
75 75
 			if (isset($parameters[$param])) {
76
-				$original[$param] = \str_replace("%value%", $parameters[$param], $mask);
76
+				$original[$param]=\str_replace("%value%", $parameters[$param], $mask);
77 77
 			}
78 78
 		}
79 79
 	}
80 80
 
81 81
 	protected function implodeAjaxParameters($ajaxParameters) {
82
-		$s = '';
82
+		$s='';
83 83
 		foreach ($ajaxParameters as $k => $v) {
84
-			if ($s !== '') {
85
-				$s .= ',';
84
+			if ($s!=='') {
85
+				$s.=',';
86 86
 			}
87 87
 			if (is_array($v)) {
88
-				$s .= "'{$k}':{" . self::implodeAjaxParameters($v) . "}";
88
+				$s.="'{$k}':{".self::implodeAjaxParameters($v)."}";
89 89
 			} else {
90
-				$s .= "'{$k}':{$v}";
90
+				$s.="'{$k}':{$v}";
91 91
 			}
92 92
 		}
93 93
 		return $s;
@@ -95,27 +95,27 @@  discard block
 block discarded – undo
95 95
 
96 96
 	protected function _addJsCondition($jsCondition, $jsSource) {
97 97
 		if (isset($jsCondition)) {
98
-			return "if(" . $jsCondition . "){\n" . $jsSource . "\n}";
98
+			return "if(".$jsCondition."){\n".$jsSource."\n}";
99 99
 		}
100 100
 		return $jsSource;
101 101
 	}
102 102
 
103 103
 	protected function _getAjaxUrl($url, $attr) {
104
-		$url = $this->_correctAjaxUrl($url);
105
-		$retour = "url='" . $url . "';";
106
-		$slash = "/";
107
-		if (JString::endswith($url, "/") === true) {
108
-			$slash = "";
104
+		$url=$this->_correctAjaxUrl($url);
105
+		$retour="url='".$url."';";
106
+		$slash="/";
107
+		if (JString::endswith($url, "/")===true) {
108
+			$slash="";
109 109
 		}
110 110
 		if (JString::isNotNull($attr)) {
111
-			if ($attr === "value") {
112
-				$retour .= "url=url+'" . $slash . "'+$(this).val();\n";
113
-			} elseif ($attr === "html") {
114
-				$retour .= "url=url+'" . $slash . "'+$(this).html();\n";
115
-			} elseif (\substr($attr, 0, 3) === "js:") {
116
-				$retour .= "url=url+'" . $slash . "'+" . \substr($attr, 3) . ";\n";
117
-			} elseif ($attr !== null && $attr !== "")
118
-				$retour .= "url=url+'" . $slash . "'+($(this).attr('" . $attr . "')||'');\n";
111
+			if ($attr==="value") {
112
+				$retour.="url=url+'".$slash."'+$(this).val();\n";
113
+			} elseif ($attr==="html") {
114
+				$retour.="url=url+'".$slash."'+$(this).html();\n";
115
+			} elseif (\substr($attr, 0, 3)==="js:") {
116
+				$retour.="url=url+'".$slash."'+".\substr($attr, 3).";\n";
117
+			} elseif ($attr!==null && $attr!=="")
118
+				$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
119 119
 		}
120 120
 		return $retour;
121 121
 	}
@@ -124,91 +124,91 @@  discard block
 block discarded – undo
124 124
 		return "window.onpopstate = function(e){if(e.state){var target=e.state.jqueryDone;$(e.state.selector)[target](e.state.html);}};";
125 125
 	}
126 126
 
127
-	protected function autoActiveLinks($previousURL = "window.location.href") {
128
-		$result = "\nfunction getHref(url) { return \$('a').filter(function(){return \$(this).prop('href') == url; });}";
129
-		$result .= "\nvar myurl={$previousURL};if(window._previousURL) getHref(window._previousURL).removeClass('active');getHref(myurl).addClass('active');window._previousURL=myurl;";
127
+	protected function autoActiveLinks($previousURL="window.location.href") {
128
+		$result="\nfunction getHref(url) { return \$('a').filter(function(){return \$(this).prop('href') == url; });}";
129
+		$result.="\nvar myurl={$previousURL};if(window._previousURL) getHref(window._previousURL).removeClass('active');getHref(myurl).addClass('active');window._previousURL=myurl;";
130 130
 		return $result;
131 131
 	}
132 132
 
133
-	protected function _getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader = false, $history = null) {
134
-		$retour = "";
135
-		$call = null;
133
+	protected function _getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader=false, $history=null) {
134
+		$retour="";
135
+		$call=null;
136 136
 		if (JString::isNotNull($responseElement)) {
137 137
 			if (isset($ajaxTransition)) {
138
-				$call = $this->setAjaxDataCall($ajaxTransition);
138
+				$call=$this->setAjaxDataCall($ajaxTransition);
139 139
 			} elseif (isset($this->ajaxTransition)) {
140
-				$call = $this->ajaxTransition;
140
+				$call=$this->ajaxTransition;
141 141
 			}
142 142
 			if (\is_callable($call))
143
-				$retour = "\t" . $call($responseElement, $jqueryDone) . ";\n";
143
+				$retour="\t".$call($responseElement, $jqueryDone).";\n";
144 144
 			else
145
-				$retour = "\t{$responseElement}.{$jqueryDone}( data );\n";
145
+				$retour="\t{$responseElement}.{$jqueryDone}( data );\n";
146 146
 		}
147 147
 		if (isset($history)) {
148 148
 			if ($this->params["autoActiveLinks"]) {
149
-				$retour .= $this->autoActiveLinks("url");
149
+				$retour.=$this->autoActiveLinks("url");
150 150
 			}
151
-			$retour .= "\nwindow.history.pushState({'html':data,'selector':" . Javascript::prep_value($history) . ",'jqueryDone':'{$jqueryDone}'},'', url);";
151
+			$retour.="\nwindow.history.pushState({'html':data,'selector':".Javascript::prep_value($history).",'jqueryDone':'{$jqueryDone}'},'', url);";
152 152
 		}
153
-		if ($hasLoader === "internal") {
154
-			$retour .= "\n$(self).removeClass('loading');";
153
+		if ($hasLoader==="internal") {
154
+			$retour.="\n$(self).removeClass('loading');";
155 155
 		}
156
-		$retour .= "\t" . $jsCallback . "\n";
156
+		$retour.="\t".$jsCallback."\n";
157 157
 		return $retour;
158 158
 	}
159 159
 
160 160
 	protected function _getResponseElement($responseElement) {
161 161
 		if (JString::isNotNull($responseElement)) {
162
-			$responseElement = Javascript::prep_jquery_selector($responseElement);
162
+			$responseElement=Javascript::prep_jquery_selector($responseElement);
163 163
 		}
164 164
 		return $responseElement;
165 165
 	}
166 166
 
167 167
 	protected function _correctAjaxUrl($url) {
168
-		if ($url !== "/" && JString::endsWith($url, "/") === true)
169
-			$url = substr($url, 0, strlen($url) - 1);
170
-		if (strncmp($url, 'http://', 7) != 0 && strncmp($url, 'https://', 8) != 0) {
171
-			$url = $this->getUrl($url);
168
+		if ($url!=="/" && JString::endsWith($url, "/")===true)
169
+			$url=substr($url, 0, strlen($url)-1);
170
+		if (strncmp($url, 'http://', 7)!=0 && strncmp($url, 'https://', 8)!=0) {
171
+			$url=$this->getUrl($url);
172 172
 		}
173 173
 		return $url;
174 174
 	}
175 175
 
176
-	public static function _correctParams($params, $ajaxParameters = []) {
176
+	public static function _correctParams($params, $ajaxParameters=[]) {
177 177
 		if (JString::isNull($params)) {
178 178
 			return "";
179 179
 		}
180 180
 		if (\preg_match("@^\{.*?\}$@", $params)) {
181
-			if (! isset($ajaxParameters['contentType']) || ! JString::contains($ajaxParameters['contentType'], 'json')) {
182
-				return '$.param(' . $params . ')';
181
+			if (!isset($ajaxParameters['contentType']) || !JString::contains($ajaxParameters['contentType'], 'json')) {
182
+				return '$.param('.$params.')';
183 183
 			} else {
184
-				return 'JSON.stringify(' . $params . ')';
184
+				return 'JSON.stringify('.$params.')';
185 185
 			}
186 186
 		}
187 187
 		return $params;
188 188
 	}
189 189
 
190 190
 	public static function _implodeParams($parameters) {
191
-		$allParameters = [];
191
+		$allParameters=[];
192 192
 		foreach ($parameters as $params) {
193 193
 			if (isset($params))
194
-				$allParameters[] = self::_correctParams($params);
194
+				$allParameters[]=self::_correctParams($params);
195 195
 		}
196 196
 		return \implode("+'&'+", $allParameters);
197 197
 	}
198 198
 
199
-	protected function addLoading(&$retour, $responseElement, $ajaxLoader = null) {
200
-		if (! isset($ajaxLoader)) {
201
-			$ajaxLoader = $this->ajaxLoader;
199
+	protected function addLoading(&$retour, $responseElement, $ajaxLoader=null) {
200
+		if (!isset($ajaxLoader)) {
201
+			$ajaxLoader=$this->ajaxLoader;
202 202
 		}
203
-		$loading_notifier = '<div class="ajax-loader">' . $ajaxLoader . '</div>';
204
-		$retour .= "{$responseElement}.empty();\n";
205
-		$retour .= "\t\t{$responseElement}.prepend('{$loading_notifier}');\n";
203
+		$loading_notifier='<div class="ajax-loader">'.$ajaxLoader.'</div>';
204
+		$retour.="{$responseElement}.empty();\n";
205
+		$retour.="\t\t{$responseElement}.prepend('{$loading_notifier}');\n";
206 206
 	}
207 207
 
208 208
 	protected function setAjaxDataCall($params) {
209
-		$result = null;
210
-		if (! \is_callable($params)) {
211
-			$result = function ($responseElement, $jqueryDone = "html") use ($params) {
209
+		$result=null;
210
+		if (!\is_callable($params)) {
211
+			$result=function($responseElement, $jqueryDone="html") use ($params) {
212 212
 				return AjaxTransition::{$params}($responseElement, $jqueryDone);
213 213
 			};
214 214
 		}
@@ -217,13 +217,13 @@  discard block
 block discarded – undo
217 217
 
218 218
 	protected function setDefaultParameters(&$parameters, $default) {
219 219
 		foreach ($default as $k => $v) {
220
-			if (! isset($parameters[$k]))
221
-				$parameters[$k] = $v;
220
+			if (!isset($parameters[$k]))
221
+				$parameters[$k]=$v;
222 222
 		}
223 223
 	}
224 224
 
225 225
 	public function setAjaxLoader($loader) {
226
-		$this->ajaxLoader = $loader;
226
+		$this->ajaxLoader=$loader;
227 227
 	}
228 228
 
229 229
 	/**
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
 	 * @param string $responseElement
235 235
 	 *        	selector of the HTML element displaying the answer
236 236
 	 */
237
-	private function _get($url, $responseElement = "", $parameters = []) {
237
+	private function _get($url, $responseElement="", $parameters=[]) {
238 238
 		return $this->_ajax("get", $url, $responseElement, $parameters);
239 239
 	}
240 240
 
@@ -248,8 +248,8 @@  discard block
 block discarded – undo
248 248
 	 * @param array $parameters
249 249
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null)
250 250
 	 */
251
-	public function get($url, $responseElement = "", $parameters = []) {
252
-		$parameters["immediatly"] = true;
251
+	public function get($url, $responseElement="", $parameters=[]) {
252
+		$parameters["immediatly"]=true;
253 253
 		return $this->_get($url, $responseElement, $parameters);
254 254
 	}
255 255
 
@@ -265,8 +265,8 @@  discard block
 block discarded – undo
265 265
 	 * @param array $parameters
266 266
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null)
267 267
 	 */
268
-	public function ajax($method, $url, $responseElement = "", $parameters = []) {
269
-		$parameters["immediatly"] = true;
268
+	public function ajax($method, $url, $responseElement="", $parameters=[]) {
269
+		$parameters["immediatly"]=true;
270 270
 		return $this->_ajax($method, $url, $responseElement, $parameters);
271 271
 	}
272 272
 
@@ -288,7 +288,7 @@  discard block
 block discarded – undo
288 288
 	 *        	$immediatly
289 289
 	 * @return string
290 290
 	 */
291
-	public function ajaxInterval($method, $url, $interval, $globalName = null, $responseElement = "", $parameters = [], $immediatly = true) {
291
+	public function ajaxInterval($method, $url, $interval, $globalName=null, $responseElement="", $parameters=[], $immediatly=true) {
292 292
 		return $this->interval($this->ajaxDeferred($method, $url, $responseElement, $parameters), $interval, $globalName, $immediatly);
293 293
 	}
294 294
 
@@ -304,8 +304,8 @@  discard block
 block discarded – undo
304 304
 	 * @param array $parameters
305 305
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null)
306 306
 	 */
307
-	public function ajaxDeferred($method, $url, $responseElement = "", $parameters = []) {
308
-		$parameters["immediatly"] = false;
307
+	public function ajaxDeferred($method, $url, $responseElement="", $parameters=[]) {
308
+		$parameters["immediatly"]=false;
309 309
 		return $this->_ajax($method, $url, $responseElement, $parameters);
310 310
 	}
311 311
 
@@ -319,15 +319,15 @@  discard block
 block discarded – undo
319 319
 	 * @param array $parameters
320 320
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>"document","jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"before"=>null)
321 321
 	 */
322
-	private function _json($url, $method = "get", $parameters = []) {
323
-		$parameters = \array_merge($parameters, [
322
+	private function _json($url, $method="get", $parameters=[]) {
323
+		$parameters=\array_merge($parameters, [
324 324
 			"hasLoader" => false
325 325
 		]);
326
-		$jsCallback = isset($parameters['jsCallback']) ? $parameters['jsCallback'] : "";
327
-		$context = isset($parameters['context']) ? $parameters['context'] : "document";
328
-		$retour = "\tdata=($.isPlainObject(data))?data:JSON.parse(data);\t" . $jsCallback . ";" . "\n\tfor(var key in data){" . "if($('#'+key," . $context . ").length){ if($('#'+key," . $context . ").is('[value]')) { $('#'+key," . $context . ").val(data[key]);} else { $('#'+key," . $context . ").html(data[key]); }}};\n";
329
-		$retour .= "\t$(document).trigger('jsonReady',[data]);\n";
330
-		$parameters["jsCallback"] = $retour;
326
+		$jsCallback=isset($parameters['jsCallback']) ? $parameters['jsCallback'] : "";
327
+		$context=isset($parameters['context']) ? $parameters['context'] : "document";
328
+		$retour="\tdata=($.isPlainObject(data))?data:JSON.parse(data);\t".$jsCallback.";"."\n\tfor(var key in data){"."if($('#'+key,".$context.").length){ if($('#'+key,".$context.").is('[value]')) { $('#'+key,".$context.").val(data[key]);} else { $('#'+key,".$context.").html(data[key]); }}};\n";
329
+		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
330
+		$parameters["jsCallback"]=$retour;
331 331
 		return $this->_ajax($method, $url, null, $parameters);
332 332
 	}
333 333
 
@@ -341,7 +341,7 @@  discard block
 block discarded – undo
341 341
 	 * @param array $parameters
342 342
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>"document","jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"before"=>null)
343 343
 	 */
344
-	public function json($url, $method = "get", $parameters = []) {
344
+	public function json($url, $method="get", $parameters=[]) {
345 345
 		return $this->_json($url, $method, $parameters);
346 346
 	}
347 347
 
@@ -357,7 +357,7 @@  discard block
 block discarded – undo
357 357
 	 * @param array $parameters
358 358
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true,"before"=>null)
359 359
 	 */
360
-	public function jsonOn($event, $element, $url, $method = "get", $parameters = array()) {
360
+	public function jsonOn($event, $element, $url, $method="get", $parameters=array()) {
361 361
 		$this->setDefaultParameters($parameters, [
362 362
 			"preventDefault" => true,
363 363
 			"stopPropagation" => true,
@@ -376,8 +376,8 @@  discard block
 block discarded – undo
376 376
 	 * @param array $parameters
377 377
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>"document","jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"before"=>null)
378 378
 	 */
379
-	public function jsonDeferred($url, $method = "get", $parameters = []) {
380
-		$parameters["immediatly"] = false;
379
+	public function jsonDeferred($url, $method="get", $parameters=[]) {
380
+		$parameters["immediatly"]=false;
381 381
 		return $this->_json($url, $method, $parameters);
382 382
 	}
383 383
 
@@ -392,29 +392,29 @@  discard block
 block discarded – undo
392 392
 	 * @param array $parameters
393 393
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"rowClass"=>"_json","before"=>null)
394 394
 	 */
395
-	private function _jsonArray($maskSelector, $url, $method = "get", $parameters = []) {
396
-		$parameters = \array_merge($parameters, [
395
+	private function _jsonArray($maskSelector, $url, $method="get", $parameters=[]) {
396
+		$parameters=\array_merge($parameters, [
397 397
 			"hasLoader" => false
398 398
 		]);
399
-		$rowClass = isset($parameters['rowClass']) ? $parameters['rowClass'] : "_json";
400
-		$jsCallback = isset($parameters['jsCallback']) ? $parameters['jsCallback'] : "";
401
-		$context = isset($parameters['context']) ? $parameters['context'] : null;
402
-		if ($context === null) {
403
-			$parent = "$('" . $maskSelector . "').parent()";
404
-			$newElm = "$('#'+newId)";
399
+		$rowClass=isset($parameters['rowClass']) ? $parameters['rowClass'] : "_json";
400
+		$jsCallback=isset($parameters['jsCallback']) ? $parameters['jsCallback'] : "";
401
+		$context=isset($parameters['context']) ? $parameters['context'] : null;
402
+		if ($context===null) {
403
+			$parent="$('".$maskSelector."').parent()";
404
+			$newElm="$('#'+newId)";
405 405
 		} else {
406
-			$parent = $context;
407
-			$newElm = $context . ".find('#'+newId)";
406
+			$parent=$context;
407
+			$newElm=$context.".find('#'+newId)";
408 408
 		}
409
-		$appendTo = "\t\tnewElm.appendTo(" . $parent . ");\n";
410
-		$retour = $parent . ".find('.{$rowClass}').remove();";
411
-		$retour .= "\tdata=($.isPlainObject(data)||$.isArray(data))?data:JSON.parse(data);\n$.each(data, function(index, value) {\n" . "\tvar created=false;var maskElm=$('" . $maskSelector . "').first();maskElm.hide();" . "\tvar newId=(maskElm.attr('id') || 'mask')+'-'+index;" . "\tvar newElm=" . $newElm . ";\n" . "\tif(!newElm.length){\n" . "\t\tnewElm=maskElm.clone();
409
+		$appendTo="\t\tnewElm.appendTo(".$parent.");\n";
410
+		$retour=$parent.".find('.{$rowClass}').remove();";
411
+		$retour.="\tdata=($.isPlainObject(data)||$.isArray(data))?data:JSON.parse(data);\n$.each(data, function(index, value) {\n"."\tvar created=false;var maskElm=$('".$maskSelector."').first();maskElm.hide();"."\tvar newId=(maskElm.attr('id') || 'mask')+'-'+index;"."\tvar newElm=".$newElm.";\n"."\tif(!newElm.length){\n"."\t\tnewElm=maskElm.clone();
412 412
 		newElm.attr('id',newId);\n;newElm.addClass('{$rowClass}').removeClass('_jsonArrayModel');\nnewElm.find('[id]').each(function(){ var newId=$(this).attr('id')+'-'+index;$(this).attr('id',newId).removeClass('_jsonArrayChecked');});\n";
413
-		$retour .= $appendTo;
414
-		$retour .= "\t}\n" . "\tfor(var key in value){\n" . "\t\t\tvar html = $('<div />').append($(newElm).clone()).html();\n" . "\t\t\tif(html.indexOf('__'+key+'__')>-1){\n" . "\t\t\t\tcontent=$(html.split('__'+key+'__').join(value[key]));\n" . "\t\t\t\t$(newElm).replaceWith(content);newElm=content;\n" . "\t\t\t}\n" . "\t\tvar sel='[data-id=\"'+key+'\"]';if($(sel,newElm).length){\n" . "\t\t\tvar selElm=$(sel,newElm);\n" . "\t\t\t if(selElm.is('[value]')) { selElm.attr('value',value[key]);selElm.val(value[key]);} else { selElm.html(value[key]); }\n" . "\t\t}\n" . "}\n" . "\t$(newElm).show(true);" . "\n" . "\t$(newElm).removeClass('hide');" . "});\n";
415
-		$retour .= "\t$(document).trigger('jsonReady',[data]);\n";
416
-		$retour .= "\t" . $jsCallback;
417
-		$parameters["jsCallback"] = $retour;
413
+		$retour.=$appendTo;
414
+		$retour.="\t}\n"."\tfor(var key in value){\n"."\t\t\tvar html = $('<div />').append($(newElm).clone()).html();\n"."\t\t\tif(html.indexOf('__'+key+'__')>-1){\n"."\t\t\t\tcontent=$(html.split('__'+key+'__').join(value[key]));\n"."\t\t\t\t$(newElm).replaceWith(content);newElm=content;\n"."\t\t\t}\n"."\t\tvar sel='[data-id=\"'+key+'\"]';if($(sel,newElm).length){\n"."\t\t\tvar selElm=$(sel,newElm);\n"."\t\t\t if(selElm.is('[value]')) { selElm.attr('value',value[key]);selElm.val(value[key]);} else { selElm.html(value[key]); }\n"."\t\t}\n"."}\n"."\t$(newElm).show(true);"."\n"."\t$(newElm).removeClass('hide');"."});\n";
415
+		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
416
+		$retour.="\t".$jsCallback;
417
+		$parameters["jsCallback"]=$retour;
418 418
 		return $this->_ajax($method, $url, null, $parameters);
419 419
 	}
420 420
 
@@ -429,7 +429,7 @@  discard block
 block discarded – undo
429 429
 	 * @param array $parameters
430 430
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"rowClass"=>"_json","before"=>null)
431 431
 	 */
432
-	public function jsonArray($maskSelector, $url, $method = "get", $parameters = []) {
432
+	public function jsonArray($maskSelector, $url, $method="get", $parameters=[]) {
433 433
 		return $this->_jsonArray($maskSelector, $url, $method, $parameters);
434 434
 	}
435 435
 
@@ -444,8 +444,8 @@  discard block
 block discarded – undo
444 444
 	 * @param array $parameters
445 445
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"rowClass"=>"_json","before"=>null)
446 446
 	 */
447
-	public function jsonArrayDeferred($maskSelector, $url, $method = "get", $parameters) {
448
-		$parameters["immediatly"] = false;
447
+	public function jsonArrayDeferred($maskSelector, $url, $method="get", $parameters) {
448
+		$parameters["immediatly"]=false;
449 449
 		return $this->jsonArray($maskSelector, $url, $method, $parameters);
450 450
 	}
451 451
 
@@ -461,7 +461,7 @@  discard block
 block discarded – undo
461 461
 	 * @param array $parameters
462 462
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","rowClass"=>"_json","immediatly"=>true,"before"=>null)
463 463
 	 */
464
-	public function jsonArrayOn($event, $element, $maskSelector, $url, $method = "get", $parameters = array()) {
464
+	public function jsonArrayOn($event, $element, $maskSelector, $url, $method="get", $parameters=array()) {
465 465
 		$this->setDefaultParameters($parameters, [
466 466
 			"preventDefault" => true,
467 467
 			"stopPropagation" => true,
@@ -481,8 +481,8 @@  discard block
 block discarded – undo
481 481
 	 * @param array $parameters
482 482
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null)
483 483
 	 */
484
-	public function getDeferred($url, $responseElement = "", $parameters = []) {
485
-		$parameters["immediatly"] = false;
484
+	public function getDeferred($url, $responseElement="", $parameters=[]) {
485
+		$parameters["immediatly"]=false;
486 486
 		return $this->_get($url, $responseElement, $parameters);
487 487
 	}
488 488
 
@@ -501,7 +501,7 @@  discard block
 block discarded – undo
501 501
 	 * @param array $parameters
502 502
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>null,"headers"=>null,"historize"=>false,"before"=>null)
503 503
 	 */
504
-	public function getOn($event, $element, $url, $responseElement = "", $parameters = array()) {
504
+	public function getOn($event, $element, $url, $responseElement="", $parameters=array()) {
505 505
 		$this->setDefaultParameters($parameters, [
506 506
 			"preventDefault" => true,
507 507
 			"stopPropagation" => true,
@@ -525,7 +525,7 @@  discard block
 block discarded – undo
525 525
 	 * @param array $parameters
526 526
 	 *        	default : array("method"=>"get","preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null)
527 527
 	 */
528
-	public function ajaxOn($event, $element, $url, $responseElement = "", $parameters = array()) {
528
+	public function ajaxOn($event, $element, $url, $responseElement="", $parameters=array()) {
529 529
 		$this->setDefaultParameters($parameters, [
530 530
 			"preventDefault" => true,
531 531
 			"stopPropagation" => true,
@@ -548,7 +548,7 @@  discard block
 block discarded – undo
548 548
 	 * @param array $parameters
549 549
 	 *        	default : array("method"=>"get","preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null)
550 550
 	 */
551
-	public function ajaxOnClick($element, $url, $responseElement = "", $parameters = array()) {
551
+	public function ajaxOnClick($element, $url, $responseElement="", $parameters=array()) {
552 552
 		return $this->ajaxOn("click", $element, $url, $responseElement, $parameters);
553 553
 	}
554 554
 
@@ -565,7 +565,7 @@  discard block
 block discarded – undo
565 565
 	 * @param array $parameters
566 566
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null)
567 567
 	 */
568
-	public function getOnClick($element, $url, $responseElement = "", $parameters = array()) {
568
+	public function getOnClick($element, $url, $responseElement="", $parameters=array()) {
569 569
 		return $this->getOn("click", $element, $url, $responseElement, $parameters);
570 570
 	}
571 571
 
@@ -580,15 +580,15 @@  discard block
 block discarded – undo
580 580
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"href","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>true,"before"=>null)
581 581
 	 * @return $this
582 582
 	 */
583
-	public function getHref($element, $responseElement = "", $parameters = array()) {
584
-		$parameters["attr"] = "href";
583
+	public function getHref($element, $responseElement="", $parameters=array()) {
584
+		$parameters["attr"]="href";
585 585
 		if (JString::isNull($responseElement)) {
586
-			$responseElement = '%$(self).attr("data-target")%';
586
+			$responseElement='%$(self).attr("data-target")%';
587 587
 		} else {
588
-			$responseElement = '%$(self).attr("data-target") || "' . $responseElement . '"%';
588
+			$responseElement='%$(self).attr("data-target") || "'.$responseElement.'"%';
589 589
 		}
590
-		if (! isset($parameters["historize"])) {
591
-			$parameters["historize"] = true;
590
+		if (!isset($parameters["historize"])) {
591
+			$parameters["historize"]=true;
592 592
 		}
593 593
 		return $this->getOnClick($element, "", $responseElement, $parameters);
594 594
 	}
@@ -604,21 +604,21 @@  discard block
 block discarded – undo
604 604
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"href","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>true,"before"=>null)
605 605
 	 * @return $this
606 606
 	 */
607
-	public function postHref($element, $responseElement = "", $parameters = array()) {
608
-		$parameters["attr"] = "href";
607
+	public function postHref($element, $responseElement="", $parameters=array()) {
608
+		$parameters["attr"]="href";
609 609
 		if (JString::isNull($responseElement)) {
610
-			$responseElement = '%$(this).attr("data-target")%';
610
+			$responseElement='%$(this).attr("data-target")%';
611 611
 		} else {
612
-			$responseElement = '%$(self).attr("data-target") || "' . $responseElement . '"%';
612
+			$responseElement='%$(self).attr("data-target") || "'.$responseElement.'"%';
613 613
 		}
614
-		if (! isset($parameters["historize"])) {
615
-			$parameters["historize"] = true;
614
+		if (!isset($parameters["historize"])) {
615
+			$parameters["historize"]=true;
616 616
 		}
617 617
 		return $this->postOnClick($element, "", "{}", $responseElement, $parameters);
618 618
 	}
619 619
 
620
-	private function _post($url, $params = "{}", $responseElement = "", $parameters = []) {
621
-		$parameters["params"] = $params;
620
+	private function _post($url, $params="{}", $responseElement="", $parameters=[]) {
621
+		$parameters["params"]=$params;
622 622
 		return $this->_ajax("POST", $url, $responseElement, $parameters);
623 623
 	}
624 624
 
@@ -634,7 +634,7 @@  discard block
 block discarded – undo
634 634
 	 * @param array $parameters
635 635
 	 *        	default : array("jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null)
636 636
 	 */
637
-	public function post($url, $params = "{}", $responseElement = "", $parameters = []) {
637
+	public function post($url, $params="{}", $responseElement="", $parameters=[]) {
638 638
 		return $this->_post($url, $params, $responseElement, $parameters);
639 639
 	}
640 640
 
@@ -651,8 +651,8 @@  discard block
 block discarded – undo
651 651
 	 * @param array $parameters
652 652
 	 *        	default : array("jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null)
653 653
 	 */
654
-	public function postDeferred($url, $params = "{}", $responseElement = "", $parameters = []) {
655
-		$parameters["immediatly"] = false;
654
+	public function postDeferred($url, $params="{}", $responseElement="", $parameters=[]) {
655
+		$parameters["immediatly"]=false;
656 656
 		return $this->_post($url, $params, $responseElement, $parameters);
657 657
 	}
658 658
 
@@ -671,7 +671,7 @@  discard block
 block discarded – undo
671 671
 	 * @param array $parameters
672 672
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null)
673 673
 	 */
674
-	public function postOn($event, $element, $url, $params = "{}", $responseElement = "", $parameters = array()) {
674
+	public function postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
675 675
 		$this->setDefaultParameters($parameters, [
676 676
 			"preventDefault" => true,
677 677
 			"stopPropagation" => true,
@@ -694,60 +694,60 @@  discard block
 block discarded – undo
694 694
 	 * @param array $parameters
695 695
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null,"before"=>null)
696 696
 	 */
697
-	public function postOnClick($element, $url, $params = "{}", $responseElement = "", $parameters = array()) {
697
+	public function postOnClick($element, $url, $params="{}", $responseElement="", $parameters=array()) {
698 698
 		return $this->postOn("click", $element, $url, $params, $responseElement, $parameters);
699 699
 	}
700 700
 
701
-	private function _postForm($url, $form, $responseElement, $parameters = []) {
701
+	private function _postForm($url, $form, $responseElement, $parameters=[]) {
702 702
 		if (isset($this->params["ajax"])) {
703 703
 			extract($this->params["ajax"]);
704 704
 		}
705
-		$params = "{}";
706
-		$validation = false;
705
+		$params="{}";
706
+		$validation=false;
707 707
 		\extract($parameters);
708
-		$async = ($async) ? "true" : "false";
709
-		$jsCallback = isset($jsCallback) ? $jsCallback : "";
710
-		$retour = $this->_getAjaxUrl($url, $attr);
711
-		$retour .= "\n$('#" . $form . "').trigger('ajaxSubmit');";
712
-		if (! isset($contentType) || $contentType != 'false') {
713
-			$retour .= "\nvar params=$('#" . $form . "').serialize();\n";
708
+		$async=($async) ? "true" : "false";
709
+		$jsCallback=isset($jsCallback) ? $jsCallback : "";
710
+		$retour=$this->_getAjaxUrl($url, $attr);
711
+		$retour.="\n$('#".$form."').trigger('ajaxSubmit');";
712
+		if (!isset($contentType) || $contentType!='false') {
713
+			$retour.="\nvar params=$('#".$form."').serialize();\n";
714 714
 			if (isset($params)) {
715
-				$retour .= "params+='&'+" . self::_correctParams($params) . ";\n";
715
+				$retour.="params+='&'+".self::_correctParams($params).";\n";
716 716
 			}
717 717
 		} else {
718
-			$retour .= "\nvar params=new FormData($('#" . $form . "')[0]);\n";
718
+			$retour.="\nvar params=new FormData($('#".$form."')[0]);\n";
719 719
 		}
720
-		$responseElement = $this->_getResponseElement($responseElement);
721
-		$retour .= "var self=this;\n";
722
-		$before = isset($before) ? $before : "";
723
-		$retour .= $before;
724
-		if ($hasLoader === true) {
720
+		$responseElement=$this->_getResponseElement($responseElement);
721
+		$retour.="var self=this;\n";
722
+		$before=isset($before) ? $before : "";
723
+		$retour.=$before;
724
+		if ($hasLoader===true) {
725 725
 			$this->addLoading($retour, $responseElement, $ajaxLoader);
726
-		} elseif ($hasLoader === "internal") {
727
-			$retour .= "\n$(this).addClass('loading');";
726
+		} elseif ($hasLoader==="internal") {
727
+			$retour.="\n$(this).addClass('loading');";
728 728
 		}
729
-		$ajaxParameters = [
729
+		$ajaxParameters=[
730 730
 			"url" => "url",
731 731
 			"method" => "'POST'",
732 732
 			"data" => "params",
733 733
 			"async" => $async
734 734
 		];
735 735
 		if (isset($headers)) {
736
-			$ajaxParameters["headers"] = $headers;
736
+			$ajaxParameters["headers"]=$headers;
737 737
 		}
738 738
 		$this->createAjaxParameters($ajaxParameters, $parameters);
739
-		$retour .= "$.ajax({" . $this->implodeAjaxParameters($ajaxParameters) . "}).done(function( data ) {\n";
740
-		$retour .= $this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader) . "});\n";
739
+		$retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data ) {\n";
740
+		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader)."});\n";
741 741
 
742 742
 		if ($validation) {
743
-			$retour = "$('#" . $form . "').validate({submitHandler: function(form) {
744
-			" . $retour . "
743
+			$retour="$('#".$form."').validate({submitHandler: function(form) {
744
+			" . $retour."
745 745
 			}});\n";
746
-			$retour .= "$('#" . $form . "').submit();\n";
746
+			$retour.="$('#".$form."').submit();\n";
747 747
 		}
748
-		$retour = $this->_addJsCondition($jsCondition, $retour);
748
+		$retour=$this->_addJsCondition($jsCondition, $retour);
749 749
 		if ($immediatly)
750
-			$this->jquery_code_for_compile[] = $retour;
750
+			$this->jquery_code_for_compile[]=$retour;
751 751
 		return $retour;
752 752
 	}
753 753
 
@@ -763,8 +763,8 @@  discard block
 block discarded – undo
763 763
 	 * @param array $parameters
764 764
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null)
765 765
 	 */
766
-	public function postForm($url, $form, $responseElement, $parameters = []) {
767
-		$parameters["immediatly"] = true;
766
+	public function postForm($url, $form, $responseElement, $parameters=[]) {
767
+		$parameters["immediatly"]=true;
768 768
 		return $this->_postForm($url, $form, $responseElement, $parameters);
769 769
 	}
770 770
 
@@ -781,8 +781,8 @@  discard block
 block discarded – undo
781 781
 	 * @param array $parameters
782 782
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null)
783 783
 	 */
784
-	public function postFormDeferred($url, $form, $responseElement, $parameters = []) {
785
-		$parameters["immediatly"] = false;
784
+	public function postFormDeferred($url, $form, $responseElement, $parameters=[]) {
785
+		$parameters["immediatly"]=false;
786 786
 		return $this->_postForm($url, $form, $responseElement, $parameters);
787 787
 	}
788 788
 
@@ -799,7 +799,7 @@  discard block
 block discarded – undo
799 799
 	 * @param array $parameters
800 800
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>null,"headers"=>null,"historize"=>false,"before"=>null)
801 801
 	 */
802
-	public function postFormOn($event, $element, $url, $form, $responseElement = "", $parameters = array()) {
802
+	public function postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) {
803 803
 		$this->setDefaultParameters($parameters, [
804 804
 			"preventDefault" => true,
805 805
 			"stopPropagation" => true,
@@ -820,7 +820,7 @@  discard block
 block discarded – undo
820 820
 	 * @param array $parameters
821 821
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>null,"headers"=>null,"historize"=>false,"before"=>null)
822 822
 	 */
823
-	public function postFormOnClick($element, $url, $form, $responseElement = "", $parameters = array()) {
823
+	public function postFormOnClick($element, $url, $form, $responseElement="", $parameters=array()) {
824 824
 		return $this->postFormOn("click", $element, $url, $form, $responseElement, $parameters);
825 825
 	}
826 826
 }
Please login to merge, or discard this patch.
Ajax/semantic/html/elements/HtmlInput.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -13,21 +13,21 @@  discard block
 block discarded – undo
13 13
 use Ajax\semantic\html\elements\html5\HtmlDatalist;
14 14
 
15 15
 class HtmlInput extends HtmlSemDoubleElement {
16
-	use IconTrait,TextFieldsTrait,FieldTrait;
16
+	use IconTrait, TextFieldsTrait, FieldTrait;
17 17
 
18
-	public function __construct($identifier, $type = "text", $value = "", $placeholder = "") {
19
-		parent::__construct("div-" . $identifier, "div", "ui input");
20
-		$this->_identifier = $identifier;
21
-		$this->_libraryId = $identifier;
22
-		$this->content = [
18
+	public function __construct($identifier, $type="text", $value="", $placeholder="") {
19
+		parent::__construct("div-".$identifier, "div", "ui input");
20
+		$this->_identifier=$identifier;
21
+		$this->_libraryId=$identifier;
22
+		$this->content=[
23 23
 			"field" => new HtmlInput5($identifier, $type, $value, $placeholder)
24 24
 		];
25
-		$this->_states = [
25
+		$this->_states=[
26 26
 			State::DISABLED,
27 27
 			State::FOCUS,
28 28
 			State::ERROR
29 29
 		];
30
-		$this->_variations = [
30
+		$this->_variations=[
31 31
 			Variation::TRANSPARENT
32 32
 		];
33 33
 	}
@@ -40,16 +40,16 @@  discard block
 block discarded – undo
40 40
 		return $this->content["field"];
41 41
 	}
42 42
 
43
-	public static function outline($identifier, $icon, $value = "", $placeholder = "") {
44
-		$result = new HtmlInput($identifier, "text", $value, $placeholder);
43
+	public static function outline($identifier, $icon, $value="", $placeholder="") {
44
+		$result=new HtmlInput($identifier, "text", $value, $placeholder);
45 45
 		$result->addToProperty("class", "transparent");
46 46
 		$result->addIcon($icon)->setOutline();
47 47
 		return $result;
48 48
 	}
49 49
 
50 50
 	public function run(JsUtils $js) {
51
-		$result = parent::run($js);
52
-		$result->attach("#" . $this->getDataField()
51
+		$result=parent::run($js);
52
+		$result->attach("#".$this->getDataField()
53 53
 			->getIdentifier());
54 54
 		return $result;
55 55
 	}
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 		return $this->addToProperty("class", "transparent");
59 59
 	}
60 60
 
61
-	public function compile_once(\Ajax\JsUtils $js = NULL, &$view = NULL) {
61
+	public function compile_once(\Ajax\JsUtils $js=NULL, &$view=NULL) {
62 62
 		parent::compile_once($js, $view);
63 63
 		if (isset($this->content['file'])) {
64 64
 			$this->onCreate(Javascript::fileUploadBehavior($this->identifier));
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 	}
67 67
 
68 68
 	public function addDataList($items) {
69
-		$dl = new HtmlDatalist('list-' . $this->identifier);
69
+		$dl=new HtmlDatalist('list-'.$this->identifier);
70 70
 		$dl->addItems($items);
71 71
 		$this->getDataField()->setProperty('list', $dl->getIdentifier());
72 72
 		$this->getDataField()->wrap($dl);
Please login to merge, or discard this patch.
Ajax/semantic/html/elements/html5/HtmlDatalist.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@
 block discarded – undo
11 11
 	}
12 12
 
13 13
 	protected function createItem($value) {
14
-		$elm = new HtmlDoubleElement("", "option");
14
+		$elm=new HtmlDoubleElement("", "option");
15 15
 		$elm->setProperty("value", $value);
16 16
 		$elm->setContent($value);
17 17
 		return $elm;
Please login to merge, or discard this patch.