Completed
Push — master ( 3abce3...7abd10 )
by Jean-Christophe
03:33
created
Ajax/semantic/html/base/traits/BaseTrait.php 2 patches
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -12,8 +12,8 @@  discard block
 block discarded – undo
12 12
  * @property string $identifier
13 13
  */
14 14
 trait BaseTrait {
15
-	protected $_variations=[ ];
16
-	protected $_states=[ ];
15
+	protected $_variations=[];
16
+	protected $_states=[];
17 17
 	protected $_baseClass;
18 18
 
19 19
 	abstract protected function setPropertyCtrl($name, $value, $typeCtrl);
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 
27 27
 	abstract public function setProperty($name, $value);
28 28
 
29
-	abstract public function addContent($content,$before=false);
29
+	abstract public function addContent($content, $before=false);
30 30
 
31 31
 	abstract public function onCreate($jsCode);
32 32
 
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 		$this->setProperty("class", $this->_baseClass);
48 48
 		if (\is_string($variations))
49 49
 			$variations=\explode(" ", $variations);
50
-		foreach ( $variations as $variation ) {
50
+		foreach ($variations as $variation) {
51 51
 			$this->addVariation($variation);
52 52
 		}
53 53
 		return $this;
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 	public function addVariations($variations=array()) {
62 62
 		if (\is_string($variations))
63 63
 			$variations=\explode(" ", $variations);
64
-		foreach ( $variations as $variation ) {
64
+		foreach ($variations as $variation) {
65 65
 			$this->addVariation($variation);
66 66
 		}
67 67
 		return $this;
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 	public function addStates($states=array()) {
71 71
 		if (\is_string($states))
72 72
 			$states=\explode(" ", $states);
73
-		foreach ( $states as $state ) {
73
+		foreach ($states as $state) {
74 74
 			$this->addState($state);
75 75
 		}
76 76
 		return $this;
@@ -80,17 +80,17 @@  discard block
 block discarded – undo
80 80
 		$this->setProperty("class", $this->_baseClass);
81 81
 		if (\is_string($states))
82 82
 			$states=\explode(" ", $states);
83
-		foreach ( $states as $state ) {
83
+		foreach ($states as $state) {
84 84
 			$this->addState($state);
85 85
 		}
86 86
 		return $this;
87 87
 	}
88 88
 
89 89
 	public function addIcon($icon, $before=true) {
90
-		return $this->addContent(new HtmlIcon("icon-" . $this->identifier, $icon), $before);
90
+		return $this->addContent(new HtmlIcon("icon-".$this->identifier, $icon), $before);
91 91
 	}
92 92
 
93
-	public function addSticky($context="body"){
93
+	public function addSticky($context="body") {
94 94
 		$this->onCreate("$('#".$this->identifier."').sticky({ context: '".$context."'});");
95 95
 		return $this;
96 96
 	}
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
 	 * @return \Ajax\semantic\html\elements\HtmlSemDoubleElement
112 112
 	 */
113 113
 	public function setDisabled($disable=true) {
114
-		if($disable)
114
+		if ($disable)
115 115
 			$this->addToProperty("class", "disabled");
116 116
 		return $this;
117 117
 	}
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
 	 *
138 138
 	 * @return \Ajax\semantic\html\base\HtmlSemDoubleElement
139 139
 	 */
140
-	public function asHeader(){
140
+	public function asHeader() {
141 141
 		return $this->addToProperty("class", "header");
142 142
 	}
143 143
 
@@ -145,8 +145,8 @@  discard block
 block discarded – undo
145 145
 	 * show it is currently the active user selection
146 146
 	 * @return \Ajax\semantic\html\base\HtmlSemDoubleElement
147 147
 	 */
148
-	public function setActive($value=true){
149
-		if($value)
148
+	public function setActive($value=true) {
149
+		if ($value)
150 150
 			$this->addToProperty("class", "active");
151 151
 		return $this;
152 152
 	}
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
 	}
164 164
 
165 165
 	public function setFloated($direction="right") {
166
-		return $this->addToPropertyCtrl("class", $direction . " floated", Direction::getConstantValues("floated"));
166
+		return $this->addToPropertyCtrl("class", $direction." floated", Direction::getConstantValues("floated"));
167 167
 	}
168 168
 
169 169
 	public function floatRight() {
Please login to merge, or discard this patch.
Braces   +18 added lines, -12 removed lines patch added patch discarded remove patch
@@ -45,8 +45,9 @@  discard block
 block discarded – undo
45 45
 
46 46
 	public function setVariations($variations) {
47 47
 		$this->setProperty("class", $this->_baseClass);
48
-		if (\is_string($variations))
49
-			$variations=\explode(" ", $variations);
48
+		if (\is_string($variations)) {
49
+					$variations=\explode(" ", $variations);
50
+		}
50 51
 		foreach ( $variations as $variation ) {
51 52
 			$this->addVariation($variation);
52 53
 		}
@@ -59,8 +60,9 @@  discard block
 block discarded – undo
59 60
 	}
60 61
 
61 62
 	public function addVariations($variations=array()) {
62
-		if (\is_string($variations))
63
-			$variations=\explode(" ", $variations);
63
+		if (\is_string($variations)) {
64
+					$variations=\explode(" ", $variations);
65
+		}
64 66
 		foreach ( $variations as $variation ) {
65 67
 			$this->addVariation($variation);
66 68
 		}
@@ -68,8 +70,9 @@  discard block
 block discarded – undo
68 70
 	}
69 71
 
70 72
 	public function addStates($states=array()) {
71
-		if (\is_string($states))
72
-			$states=\explode(" ", $states);
73
+		if (\is_string($states)) {
74
+					$states=\explode(" ", $states);
75
+		}
73 76
 		foreach ( $states as $state ) {
74 77
 			$this->addState($state);
75 78
 		}
@@ -78,8 +81,9 @@  discard block
 block discarded – undo
78 81
 
79 82
 	public function setStates($states) {
80 83
 		$this->setProperty("class", $this->_baseClass);
81
-		if (\is_string($states))
82
-			$states=\explode(" ", $states);
84
+		if (\is_string($states)) {
85
+					$states=\explode(" ", $states);
86
+		}
83 87
 		foreach ( $states as $state ) {
84 88
 			$this->addState($state);
85 89
 		}
@@ -111,8 +115,9 @@  discard block
 block discarded – undo
111 115
 	 * @return \Ajax\semantic\html\elements\HtmlSemDoubleElement
112 116
 	 */
113 117
 	public function setDisabled($disable=true) {
114
-		if($disable)
115
-			$this->addToProperty("class", "disabled");
118
+		if($disable) {
119
+					$this->addToProperty("class", "disabled");
120
+		}
116 121
 		return $this;
117 122
 	}
118 123
 
@@ -146,8 +151,9 @@  discard block
 block discarded – undo
146 151
 	 * @return \Ajax\semantic\html\base\HtmlSemDoubleElement
147 152
 	 */
148 153
 	public function setActive($value=true){
149
-		if($value)
150
-			$this->addToProperty("class", "active");
154
+		if($value) {
155
+					$this->addToProperty("class", "active");
156
+		}
151 157
 		return $this;
152 158
 	}
153 159
 
Please login to merge, or discard this patch.
Ajax/Semantic.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -11,8 +11,8 @@  discard block
 block discarded – undo
11 11
 use Ajax\semantic\traits\SemanticWidgetsTrait;
12 12
 
13 13
 class Semantic extends BaseGui {
14
-	use SemanticComponentsTrait,SemanticHtmlElementsTrait,SemanticHtmlCollectionsTrait,
15
-	SemanticHtmlModulesTrait,SemanticHtmlViewsTrait,SemanticWidgetsTrait;
14
+	use SemanticComponentsTrait, SemanticHtmlElementsTrait, SemanticHtmlCollectionsTrait,
15
+	SemanticHtmlModulesTrait, SemanticHtmlViewsTrait, SemanticWidgetsTrait;
16 16
 
17 17
 	private $language;
18 18
 
@@ -21,12 +21,12 @@  discard block
 block discarded – undo
21 21
 	}
22 22
 
23 23
 
24
-	public function setLanguage($language){
25
-		if($language!==$this->language){
24
+	public function setLanguage($language) {
25
+		if ($language!==$this->language) {
26 26
 			$file=\realpath(dirname(__FILE__)."/semantic/components/validation/languages/".$language.".js");
27
-			if(\file_exists($file)){
27
+			if (\file_exists($file)) {
28 28
 				$script=\file_get_contents($file);
29
-				$this->js->exec($script,true);
29
+				$this->js->exec($script, true);
30 30
 				$this->language=$language;
31 31
 			}
32 32
 		}
Please login to merge, or discard this patch.
Ajax/common/traits/JqueryActionsTrait.php 2 patches
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
  */
11 11
 
12 12
 trait JqueryActionsTrait {
13
-	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
13
+	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true);
14 14
 
15 15
 	/**
16 16
 	 * Get or set the value of an attribute for the first element in the set of matched elements or set one or more attributes for every matched element.
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 	 * @param boolean $immediatly defers the execution if set to false
39 39
 	 * @return string
40 40
 	 */
41
-	public function after($element='this', $value='', $immediatly=false){
41
+	public function after($element='this', $value='', $immediatly=false) {
42 42
 		$element=Javascript::prep_element($element);
43 43
 		$value=Javascript::prep_value($value);
44 44
 		$str="$({$element}).after({$value});";
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 
64 64
 		$animations="\t\t\t";
65 65
 		if (\is_array($params)) {
66
-			foreach ( $params as $param => $value ) {
66
+			foreach ($params as $param => $value) {
67 67
 				$animations.=$param.': \''.$value.'\', ';
68 68
 			}
69 69
 		}
@@ -356,8 +356,8 @@  discard block
 block discarded – undo
356 356
 	 * @param boolean $immediatly
357 357
 	 * @return string
358 358
 	 */
359
-	public function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $preventDefault=false, $stopPropagation=false, $jsCallback="",$immediatly=true) {
360
-		return $this->_add_event($element, $this->_doJQuery($elementToModify, $jqueryCall, $param, $jsCallback), $event, $preventDefault, $stopPropagation,$immediatly);
359
+	public function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $preventDefault=false, $stopPropagation=false, $jsCallback="", $immediatly=true) {
360
+		return $this->_add_event($element, $this->_doJQuery($elementToModify, $jqueryCall, $param, $jsCallback), $event, $preventDefault, $stopPropagation, $immediatly);
361 361
 	}
362 362
 
363 363
 	/**
@@ -383,8 +383,8 @@  discard block
 block discarded – undo
383 383
 	 * @param boolean $immediatly
384 384
 	 * @return String
385 385
 	 */
386
-	public function _execOn($element, $event, $js, $preventDefault=false, $stopPropagation=false,$immediatly=true) {
387
-		return $this->_add_event($element, $this->_exec($js), $event, $preventDefault, $stopPropagation,$immediatly);
386
+	public function _execOn($element, $event, $js, $preventDefault=false, $stopPropagation=false, $immediatly=true) {
387
+		return $this->_add_event($element, $this->_exec($js), $event, $preventDefault, $stopPropagation, $immediatly);
388 388
 	}
389 389
 
390 390
 	/**
@@ -393,8 +393,8 @@  discard block
 block discarded – undo
393 393
 	 * @return string
394 394
 	 */
395 395
 	private function _validate_speed($speed) {
396
-		if (in_array($speed, array (
397
-				'slow','normal','fast'
396
+		if (in_array($speed, array(
397
+				'slow', 'normal', 'fast'
398 398
 		))) {
399 399
 			$speed='"'.$speed.'"';
400 400
 		} elseif (preg_match("/[^0-9]/", $speed)) {
Please login to merge, or discard this patch.
Braces   +51 added lines, -34 removed lines patch added patch discarded remove patch
@@ -24,10 +24,12 @@  discard block
 block discarded – undo
24 24
 		if (isset($value)) {
25 25
 			$value=Javascript::prep_value($value);
26 26
 			$str="$({$element}).attr(\"$attributeName\",{$value});";
27
-		} else
28
-			$str="$({$element}).attr(\"$attributeName\");";
29
-			if ($immediatly)
30
-				$this->jquery_code_for_compile[]=$str;
27
+		} else {
28
+					$str="$({$element}).attr(\"$attributeName\");";
29
+		}
30
+			if ($immediatly) {
31
+							$this->jquery_code_for_compile[]=$str;
32
+			}
31 33
 				return $str;
32 34
 	}
33 35
 
@@ -42,8 +44,9 @@  discard block
 block discarded – undo
42 44
 		$element=Javascript::prep_element($element);
43 45
 		$value=Javascript::prep_value($value);
44 46
 		$str="$({$element}).after({$value});";
45
-		if ($immediatly)
46
-			$this->jquery_code_for_compile[]=$str;
47
+		if ($immediatly) {
48
+					$this->jquery_code_for_compile[]=$str;
49
+		}
47 50
 			return $str;
48 51
 	}
49 52
 
@@ -79,8 +82,9 @@  discard block
 block discarded – undo
79 82
 
80 83
 		$str="$({$element}).animate({\n$animations\n\t\t}".$speed.$extra.");";
81 84
 
82
-		if ($immediatly)
83
-			$this->jquery_code_for_compile[]=$str;
85
+		if ($immediatly) {
86
+					$this->jquery_code_for_compile[]=$str;
87
+		}
84 88
 			return $str;
85 89
 	}
86 90
 
@@ -105,8 +109,9 @@  discard block
 block discarded – undo
105 109
 
106 110
 		$str="$({$element}).fadeIn({$speed}{$callback});";
107 111
 
108
-		if ($immediatly)
109
-			$this->jquery_code_for_compile[]=$str;
112
+		if ($immediatly) {
113
+					$this->jquery_code_for_compile[]=$str;
114
+		}
110 115
 			return $str;
111 116
 	}
112 117
 
@@ -131,8 +136,9 @@  discard block
 block discarded – undo
131 136
 
132 137
 		$str="$({$element}).fadeOut({$speed}{$callback});";
133 138
 
134
-		if ($immediatly)
135
-			$this->jquery_code_for_compile[]=$str;
139
+		if ($immediatly) {
140
+					$this->jquery_code_for_compile[]=$str;
141
+		}
136 142
 			return $str;
137 143
 	}
138 144
 
@@ -157,8 +163,9 @@  discard block
 block discarded – undo
157 163
 
158 164
 		$str="$({$element}).hide({$speed}{$callback});";
159 165
 
160
-		if ($immediatly)
161
-			$this->jquery_code_for_compile[]=$str;
166
+		if ($immediatly) {
167
+					$this->jquery_code_for_compile[]=$str;
168
+		}
162 169
 			return $str;
163 170
 	}
164 171
 
@@ -185,8 +192,9 @@  discard block
 block discarded – undo
185 192
 
186 193
 		$str="$({$element}).slideUp({$speed}{$callback});";
187 194
 
188
-		if ($immediatly)
189
-			$this->jquery_code_for_compile[]=$str;
195
+		if ($immediatly) {
196
+					$this->jquery_code_for_compile[]=$str;
197
+		}
190 198
 			return $str;
191 199
 	}
192 200
 
@@ -211,8 +219,9 @@  discard block
 block discarded – undo
211 219
 
212 220
 		$str="$({$element}).slideDown({$speed}{$callback});";
213 221
 
214
-		if ($immediatly)
215
-			$this->jquery_code_for_compile[]=$str;
222
+		if ($immediatly) {
223
+					$this->jquery_code_for_compile[]=$str;
224
+		}
216 225
 			return $str;
217 226
 	}
218 227
 
@@ -237,8 +246,9 @@  discard block
 block discarded – undo
237 246
 
238 247
 		$str="$({$element}).slideToggle({$speed}{$callback});";
239 248
 
240
-		if ($immediatly)
241
-			$this->jquery_code_for_compile[]=$str;
249
+		if ($immediatly) {
250
+					$this->jquery_code_for_compile[]=$str;
251
+		}
242 252
 			return $str;
243 253
 	}
244 254
 
@@ -255,8 +265,9 @@  discard block
 block discarded – undo
255 265
 		$element=Javascript::prep_element($element);
256 266
 		$str="$({$element}).toggle();";
257 267
 
258
-		if ($immediatly)
259
-			$this->jquery_code_for_compile[]=$str;
268
+		if ($immediatly) {
269
+					$this->jquery_code_for_compile[]=$str;
270
+		}
260 271
 			return $str;
261 272
 	}
262 273
 
@@ -272,8 +283,9 @@  discard block
 block discarded – undo
272 283
 		$element=Javascript::prep_element($element);
273 284
 		$str="$({$element}).trigger(\"$event\");";
274 285
 
275
-		if ($immediatly)
276
-			$this->jquery_code_for_compile[]=$str;
286
+		if ($immediatly) {
287
+					$this->jquery_code_for_compile[]=$str;
288
+		}
277 289
 			return $str;
278 290
 	}
279 291
 
@@ -298,8 +310,9 @@  discard block
 block discarded – undo
298 310
 
299 311
 		$str="$({$element}).show({$speed}{$callback});";
300 312
 
301
-		if ($immediatly)
302
-			$this->jquery_code_for_compile[]=$str;
313
+		if ($immediatly) {
314
+					$this->jquery_code_for_compile[]=$str;
315
+		}
303 316
 			return $str;
304 317
 	}
305 318
 
@@ -317,8 +330,9 @@  discard block
 block discarded – undo
317 330
 			$str.="else{".$jsCodeIfFalse."}";
318 331
 		}
319 332
 
320
-		if ($immediatly)
321
-			$this->jquery_code_for_compile[]=$str;
333
+		if ($immediatly) {
334
+					$this->jquery_code_for_compile[]=$str;
335
+		}
322 336
 			return $str;
323 337
 	}
324 338
 
@@ -335,11 +349,13 @@  discard block
 block discarded – undo
335 349
 	public function _doJQuery($element, $jqueryCall, $param="", $jsCallback="", $immediatly=false) {
336 350
 		$param=Javascript::prep_value($param);
337 351
 		$callback="";
338
-		if ($jsCallback!="")
339
-			$callback=", function(event){\n{$jsCallback}\n}";
352
+		if ($jsCallback!="") {
353
+					$callback=", function(event){\n{$jsCallback}\n}";
354
+		}
340 355
 			$script="$(".Javascript::prep_element($element).").".$jqueryCall."(".$param.$callback.");\n";
341
-			if ($immediatly)
342
-				$this->jquery_code_for_compile[]=$script;
356
+			if ($immediatly) {
357
+							$this->jquery_code_for_compile[]=$script;
358
+			}
343 359
 				return $script;
344 360
 	}
345 361
 
@@ -368,8 +384,9 @@  discard block
 block discarded – undo
368 384
 	 */
369 385
 	public function _exec($js, $immediatly=false) {
370 386
 		$script=$js."\n";
371
-		if ($immediatly)
372
-			$this->jquery_code_for_compile[]=$script;
387
+		if ($immediatly) {
388
+					$this->jquery_code_for_compile[]=$script;
389
+		}
373 390
 			return $script;
374 391
 	}
375 392
 
Please login to merge, or discard this patch.
Ajax/common/components/SimpleComponent.php 2 patches
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -17,18 +17,18 @@  discard block
 block discarded – undo
17 17
 
18 18
 	public function __construct(JsUtils $js=NULL) {
19 19
 		parent::__construct($js);
20
-		$this->events=array ();
20
+		$this->events=array();
21 21
 	}
22 22
 
23 23
 	protected function compileEvents() {
24
-		foreach ( $this->events as $event => $jsCode ) {
25
-			if($event=="execute"){
24
+		foreach ($this->events as $event => $jsCode) {
25
+			if ($event=="execute") {
26 26
 				$this->jquery_code_for_compile []=$jsCode;
27
-			}else if($event=="beforeExecute"){
27
+			} else if ($event=="beforeExecute") {
28 28
 				\array_unshift($this->jquery_code_for_compile, $jsCode);
29
-			}else{
29
+			} else {
30 30
 				$selector=$this->attachTo;
31
-				if(isset($this->itemSelector)){
31
+				if (isset($this->itemSelector)) {
32 32
 					$selector.=" ".$this->itemSelector;
33 33
 				}
34 34
 				$this->jquery_code_for_compile []="$( \"".$selector."\" ).on(\"".$event."\" , function( event, data ) {".$jsCode."});";
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 		$result=implode("\n", $this->jquery_code_for_compile);
41 41
 		$result=str_ireplace("\"%", "", $result);
42 42
 		$result=str_ireplace("%\"", "", $result);
43
-		$result=str_replace(array (
43
+		$result=str_replace(array(
44 44
 				"\\n",
45 45
 				"\\r",
46 46
 				"\\t"
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 
51 51
 	public function getScript() {
52 52
 		$allParams=$this->params;
53
-		$this->jquery_code_for_compile=array ();
53
+		$this->jquery_code_for_compile=array();
54 54
 		$this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).{$this->uiName}(".$this->getParamsAsJSON($allParams).");";
55 55
 		$this->compileEvents();
56 56
 		return $this->compileJQueryCode();
Please login to merge, or discard this patch.
Braces   +5 added lines, -4 removed lines patch added patch discarded remove patch
@@ -24,9 +24,9 @@  discard block
 block discarded – undo
24 24
 		foreach ( $this->events as $event => $jsCode ) {
25 25
 			if($event=="execute"){
26 26
 				$this->jquery_code_for_compile []=$jsCode;
27
-			}else if($event=="beforeExecute"){
27
+			} else if($event=="beforeExecute"){
28 28
 				\array_unshift($this->jquery_code_for_compile, $jsCode);
29
-			}else{
29
+			} else{
30 30
 				$selector=$this->attachTo;
31 31
 				if(isset($this->itemSelector)){
32 32
 					$selector.=" ".$this->itemSelector;
@@ -75,8 +75,9 @@  discard block
 block discarded – undo
75 75
 
76 76
 	protected function setParamCtrl($key, $value, $typeCtrl) {
77 77
 		if (\is_array($typeCtrl)) {
78
-			if (array_search($value, $typeCtrl)===false)
79
-				throw new \Exception("La valeur passée a propriété `".$key."` pour le composant `".$this->uiName."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
78
+			if (array_search($value, $typeCtrl)===false) {
79
+							throw new \Exception("La valeur passée a propriété `".$key."` pour le composant `".$this->uiName."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
80
+			}
80 81
 		} else {
81 82
 			if (!$typeCtrl($value)) {
82 83
 				throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$key." au composant ".$this->uiName);
Please login to merge, or discard this patch.
Ajax/common/html/HtmlCollection.php 2 patches
Spacing   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -12,36 +12,36 @@  discard block
 block discarded – undo
12 12
  */
13 13
 abstract class HtmlCollection extends HtmlDoubleElement {
14 14
 
15
-	public function __construct($identifier,$tagName="div"){
16
-		parent::__construct($identifier,$tagName);
15
+	public function __construct($identifier, $tagName="div") {
16
+		parent::__construct($identifier, $tagName);
17 17
 		$this->content=array();
18 18
 	}
19 19
 
20
-	public function addItems($items){
21
-		if(JArray::isAssociative($items)){
22
-			foreach ($items as $k=>$v){
23
-				$this->addItem([$k,$v]);
20
+	public function addItems($items) {
21
+		if (JArray::isAssociative($items)) {
22
+			foreach ($items as $k=>$v) {
23
+				$this->addItem([$k, $v]);
24 24
 			}
25
-		}else{
26
-			foreach ($items as $item){
25
+		} else {
26
+			foreach ($items as $item) {
27 27
 				$this->addItem($item);
28 28
 			}
29 29
 		}
30 30
 		return $this;
31 31
 	}
32 32
 
33
-	public function setItems($items){
33
+	public function setItems($items) {
34 34
 		$this->content=$items;
35 35
 		return $this;
36 36
 	}
37 37
 
38
-	public function getItems(){
38
+	public function getItems() {
39 39
 		return $this->content;
40 40
 	}
41 41
 
42
-	protected function getItemToAdd($item){
42
+	protected function getItemToAdd($item) {
43 43
 		$itemO=$item;
44
-		if($this->createCondition($item)===true){
44
+		if ($this->createCondition($item)===true) {
45 45
 			$itemO=$this->createItem($item);
46 46
 		}
47 47
 		return $itemO;
@@ -52,15 +52,15 @@  discard block
 block discarded – undo
52 52
 	 * @param HtmlDoubleElement|string|array $item
53 53
 	 * @return \Ajax\common\html\HtmlDoubleElement
54 54
 	 */
55
-	public function addItem($item){
55
+	public function addItem($item) {
56 56
 		$itemO=$this->getItemToAdd($item);
57 57
 		$this->addContent($itemO);
58 58
 		return $itemO;
59 59
 	}
60 60
 
61
-	public function insertItem($item,$position=0){
61
+	public function insertItem($item, $position=0) {
62 62
 		$itemO=$this->getItemToAdd($item);
63
-		\array_splice( $this->content, $position, 0, array($itemO));
63
+		\array_splice($this->content, $position, 0, array($itemO));
64 64
 		return $itemO;
65 65
 	}
66 66
 
@@ -83,11 +83,11 @@  discard block
 block discarded – undo
83 83
 		return $this;
84 84
 	}
85 85
 
86
-	public function removeItem($index){
86
+	public function removeItem($index) {
87 87
 		return array_splice($this->content, $index, 1);
88 88
 	}
89 89
 
90
-	public function count(){
90
+	public function count() {
91 91
 		return \sizeof($this->content);
92 92
 	}
93 93
 
@@ -98,8 +98,8 @@  discard block
 block discarded – undo
98 98
 		return $this->addItem($function($object));
99 99
 	}
100 100
 
101
-	public function apply($callBack){
102
-		foreach ($this->content as $item){
101
+	public function apply($callBack) {
102
+		foreach ($this->content as $item) {
103 103
 			$callBack($item);
104 104
 		}
105 105
 		return $this;
@@ -119,40 +119,40 @@  discard block
 block discarded – undo
119 119
 	 */
120 120
 	abstract protected function createItem($value);
121 121
 
122
-	protected function createCondition($value){
122
+	protected function createCondition($value) {
123 123
 		return \is_object($value)===false;
124 124
 	}
125 125
 
126
-	protected function contentAs($tagName){
127
-		foreach ($this->content as $item){
126
+	protected function contentAs($tagName) {
127
+		foreach ($this->content as $item) {
128 128
 			$item->setTagName($tagName);
129 129
 		}
130 130
 		return $this;
131 131
 	}
132 132
 
133
-	public function setProperties($properties){
133
+	public function setProperties($properties) {
134 134
 		$i=0;
135
-		foreach ($properties as $k=>$v){
135
+		foreach ($properties as $k=>$v) {
136 136
 			$c=$this->content[$i++];
137
-			if(isset($c))
138
-				$c->setProperty($k,$v);
137
+			if (isset($c))
138
+				$c->setProperty($k, $v);
139 139
 			else
140 140
 				return $this;
141 141
 		}
142 142
 		return $this;
143 143
 	}
144 144
 
145
-	public function setPropertyValues($property,$values){
145
+	public function setPropertyValues($property, $values) {
146 146
 		$i=0;
147
-		if(\is_array($values)===false){
148
-			$values=\array_fill(0, $this->count(),$values);
147
+		if (\is_array($values)===false) {
148
+			$values=\array_fill(0, $this->count(), $values);
149 149
 		}
150
-		foreach ($values as $value){
150
+		foreach ($values as $value) {
151 151
 			$c=$this->content[$i++];
152
-			if(isset($c)){
153
-				$c->setProperty($property,$value);
152
+			if (isset($c)) {
153
+				$c->setProperty($property, $value);
154 154
 			}
155
-			else{
155
+			else {
156 156
 				return $this;
157 157
 			}
158 158
 		}
Please login to merge, or discard this patch.
Braces   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
 			foreach ($items as $k=>$v){
23 23
 				$this->addItem([$k,$v]);
24 24
 			}
25
-		}else{
25
+		} else{
26 26
 			foreach ($items as $item){
27 27
 				$this->addItem($item);
28 28
 			}
@@ -70,9 +70,9 @@  discard block
 block discarded – undo
70 70
 	 * @return \Ajax\common\html\HtmlDoubleElement
71 71
 	 */
72 72
 	public function getItem($index) {
73
-		if (is_int($index))
74
-			return $this->content[$index];
75
-		else {
73
+		if (is_int($index)) {
74
+					return $this->content[$index];
75
+		} else {
76 76
 			$elm=$this->getElementById($index, $this->content);
77 77
 			return $elm;
78 78
 		}
@@ -134,10 +134,11 @@  discard block
 block discarded – undo
134 134
 		$i=0;
135 135
 		foreach ($properties as $k=>$v){
136 136
 			$c=$this->content[$i++];
137
-			if(isset($c))
138
-				$c->setProperty($k,$v);
139
-			else
140
-				return $this;
137
+			if(isset($c)) {
138
+							$c->setProperty($k,$v);
139
+			} else {
140
+							return $this;
141
+			}
141 142
 		}
142 143
 		return $this;
143 144
 	}
@@ -151,8 +152,7 @@  discard block
 block discarded – undo
151 152
 			$c=$this->content[$i++];
152 153
 			if(isset($c)){
153 154
 				$c->setProperty($property,$value);
154
-			}
155
-			else{
155
+			} else{
156 156
 				return $this;
157 157
 			}
158 158
 		}
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,27 +7,27 @@
 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->setProperty("name", $identifier);
13 13
 		$this->setValue($value);
14 14
 		$this->setPlaceholder($placeholder);
15
-		if(isset($rows))
15
+		if (isset($rows))
16 16
 			$this->setRows($rows);
17 17
 	}
18 18
 	public function setValue($value) {
19
-		if(isset($value))
19
+		if (isset($value))
20 20
 			$this->setContent($value);
21 21
 		return $this;
22 22
 	}
23 23
 
24
-	public function setPlaceholder($value){
25
-		if(JString::isNotNull($value))
24
+	public function setPlaceholder($value) {
25
+		if (JString::isNotNull($value))
26 26
 			$this->setProperty("placeholder", $value);
27 27
 		return $this;
28 28
 	}
29 29
 
30
-	public function setRows($count){
30
+	public function setRows($count) {
31 31
 		$this->setProperty("rows", $count);
32 32
 	}
33 33
 }
34 34
\ 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
@@ -12,18 +12,21 @@
 block discarded – undo
12 12
 		$this->setProperty("name", $identifier);
13 13
 		$this->setValue($value);
14 14
 		$this->setPlaceholder($placeholder);
15
-		if(isset($rows))
16
-			$this->setRows($rows);
15
+		if(isset($rows)) {
16
+					$this->setRows($rows);
17
+		}
17 18
 	}
18 19
 	public function setValue($value) {
19
-		if(isset($value))
20
-			$this->setContent($value);
20
+		if(isset($value)) {
21
+					$this->setContent($value);
22
+		}
21 23
 		return $this;
22 24
 	}
23 25
 
24 26
 	public function setPlaceholder($value){
25
-		if(JString::isNotNull($value))
26
-			$this->setProperty("placeholder", $value);
27
+		if(JString::isNotNull($value)) {
28
+					$this->setProperty("placeholder", $value);
29
+		}
27 30
 		return $this;
28 31
 	}
29 32
 
Please login to merge, or discard this patch.
Ajax/common/traits/JqueryAjaxTrait.php 2 patches
Spacing   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
 
16 16
 	protected $ajaxLoader='<span></span><span></span><span></span><span></span><span></span>';
17 17
 
18
-	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
18
+	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true);
19 19
 	protected function addLoading(&$retour, $responseElement) {
20 20
 		$loading_notifier='<div class="ajax-loader">';
21 21
 		if ($this->ajaxLoader=='') {
@@ -28,47 +28,47 @@  discard block
 block discarded – undo
28 28
 		$retour.="\t\t$({$responseElement}).prepend('{$loading_notifier}');\n";
29 29
 	}
30 30
 
31
-	public function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$jqueryDone="html",$immediatly=false) {
32
-		return $this->_ajax("get", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$jqueryDone,$immediatly);
31
+	public function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $jqueryDone="html", $immediatly=false) {
32
+		return $this->_ajax("get", $url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $jqueryDone, $immediatly);
33 33
 	}
34
-	public function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$jqueryDone="html",$immediatly=false) {
35
-		return $this->_ajax("post", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$jqueryDone,$immediatly);
34
+	public function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $jqueryDone="html", $immediatly=false) {
35
+		return $this->_ajax("post", $url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $jqueryDone, $immediatly);
36 36
 	}
37 37
 
38
-	protected function _ajax($method,$url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$jqueryDone="html",$immediatly=false) {
39
-		if(JString::isNull($params)){$params="{}";}
38
+	protected function _ajax($method, $url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $jqueryDone="html", $immediatly=false) {
39
+		if (JString::isNull($params)) {$params="{}"; }
40 40
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
41 41
 		$retour=$this->_getAjaxUrl($url, $attr);
42 42
 		$responseElement=$this->_getResponseElement($responseElement);
43 43
 		$retour.="var self=this;\n";
44
-		if($hasLoader===true){
44
+		if ($hasLoader===true) {
45 45
 			$this->addLoading($retour, $responseElement);
46 46
 		}
47 47
 		$retour.="$.".$method."(url,".$params.").done(function( data ) {\n";
48
-		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$jsCallback)."});\n";
48
+		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $jsCallback)."});\n";
49 49
 		if ($immediatly)
50 50
 			$this->jquery_code_for_compile[]=$retour;
51 51
 			return $retour;
52 52
 	}
53 53
 
54
-	protected function _getAjaxUrl($url,$attr){
54
+	protected function _getAjaxUrl($url, $attr) {
55 55
 		$url=$this->_correctAjaxUrl($url);
56 56
 		$retour="url='".$url."';\n";
57 57
 		$slash="/";
58
-		if(JString::endswith($url, "/")===true)
58
+		if (JString::endswith($url, "/")===true)
59 59
 			$slash="";
60
-		if(JString::isNotNull($attr)){
60
+		if (JString::isNotNull($attr)) {
61 61
 			if ($attr==="value")
62 62
 				$retour.="url=url+'".$slash."'+$(this).val();\n";
63 63
 			elseif ($attr==="html")
64 64
 			$retour.="url=url+'".$slash."'+$(this).html();\n";
65
-			elseif($attr!=null && $attr!=="")
65
+			elseif ($attr!=null && $attr!=="")
66 66
 					$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
67 67
 		}
68 68
 		return $retour;
69 69
 	}
70 70
 
71
-	protected function _getOnAjaxDone($responseElement,$jqueryDone,$jsCallback){
71
+	protected function _getOnAjaxDone($responseElement, $jqueryDone, $jsCallback) {
72 72
 		$retour="";
73 73
 		if ($responseElement!=="") {
74 74
 			$retour="\t$({$responseElement}).{$jqueryDone}( data );\n";
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
 		return $retour;
78 78
 	}
79 79
 
80
-	protected function _getResponseElement($responseElement){
80
+	protected function _getResponseElement($responseElement) {
81 81
 		if ($responseElement!=="") {
82 82
 			$responseElement=Javascript::prep_value($responseElement);
83 83
 		}
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 	protected function _correctAjaxUrl($url) {
88 88
 		if ($url!=="/" && JString::endsWith($url, "/")===true)
89 89
 			$url=substr($url, 0, strlen($url)-1);
90
-		if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
90
+		if (strncmp($url, 'http://', 7)!=0 && strncmp($url, 'https://', 8)!=0) {
91 91
 			$url=$this->jsUtils->getUrl($url);
92 92
 		}
93 93
 		return $url;
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 	 * @param string $jsCallback javascript code to execute after the request
102 102
 	 * @param boolean $immediatly
103 103
 	 */
104
-	public function _json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document",$immediatly=false) {
104
+	public function _json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document", $immediatly=false) {
105 105
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
106 106
 		$retour=$this->_getAjaxUrl($url, $attr);
107 107
 		$retour.="$.{$method}(url,".$params.").done(function( data ) {\n";
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
 	 * @param string $url the request address
123 123
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true)
124 124
 	 */
125
-	public function _jsonOn($event,$element, $url,$parameters=array()) {
125
+	public function _jsonOn($event, $element, $url, $parameters=array()) {
126 126
 		$preventDefault=true;
127 127
 		$stopPropagation=true;
128 128
 		$jsCallback=null;
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 		$params="{}";
133 133
 		$immediatly=true;
134 134
 		extract($parameters);
135
-		return $this->_add_event($element, $this->_json($url,$method, $params,$jsCallback, $attr,$context), $event, $preventDefault, $stopPropagation,$immediatly);
135
+		return $this->_add_event($element, $this->_json($url, $method, $params, $jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation, $immediatly);
136 136
 	}
137 137
 
138 138
 	/**
@@ -144,19 +144,19 @@  discard block
 block discarded – undo
144 144
 	 * @param string $context jquery DOM element, array container.
145 145
 	 * @param boolean $immediatly
146 146
 	 */
147
-	public function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context=null,$immediatly=false) {
147
+	public function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context=null, $immediatly=false) {
148 148
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
149 149
 		$retour=$this->_getAjaxUrl($url, $attr);
150
-		if($context===null){
150
+		if ($context===null) {
151 151
 			$appendTo="\t\tnewElm.appendTo($('".$maskSelector."').parent());\n";
152
-			$newElm = "$('#'+newId)";
153
-		}else{
152
+			$newElm="$('#'+newId)";
153
+		} else {
154 154
 			$appendTo="\t\tnewElm.appendTo(".$context.");\n";
155
-			$newElm = $context.".find('#'+newId)";
155
+			$newElm=$context.".find('#'+newId)";
156 156
 		}
157 157
 		$retour.="var self = $(this);\n$.{$method}(url,".$params.").done(function( data ) {\n";
158 158
 		$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";
159
-		$retour.= $appendTo;
159
+		$retour.=$appendTo;
160 160
 		$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";
161 161
 		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
162 162
 		$retour.="\t".$jsCallback."\n"."});\n";
@@ -171,30 +171,30 @@  discard block
 block discarded – undo
171 171
 	 * @param string $url the request address
172 172
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get", "context"=>null)
173 173
 	 */
174
-	public function _jsonArrayOn($event,$element, $maskSelector,$url,$parameters=array()) {
174
+	public function _jsonArrayOn($event, $element, $maskSelector, $url, $parameters=array()) {
175 175
 		$preventDefault=true;
176 176
 		$stopPropagation=true;
177 177
 		$jsCallback=null;
178 178
 		$attr="id";
179 179
 		$method="get";
180
-		$context = null;
180
+		$context=null;
181 181
 		$params="{}";
182 182
 		$immediatly=true;
183 183
 		extract($parameters);
184
-		return $this->_add_event($element, $this->_jsonArray($maskSelector,$url,$method, $params,$jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation,$immediatly);
184
+		return $this->_add_event($element, $this->_jsonArray($maskSelector, $url, $method, $params, $jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation, $immediatly);
185 185
 	}
186 186
 
187
-	public function _postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true,$jqueryDone="html",$immediatly=false) {
187
+	public function _postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true, $jqueryDone="html", $immediatly=false) {
188 188
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
189 189
 		$retour=$this->_getAjaxUrl($url, $attr);
190 190
 		$retour.="\nvar params=$('#".$form."').serialize();\n";
191 191
 		$responseElement=$this->_getResponseElement($responseElement);
192 192
 		$retour.="var self=this;\n";
193
-		if($hasLoader===true){
193
+		if ($hasLoader===true) {
194 194
 			$this->addLoading($retour, $responseElement);
195 195
 		}
196 196
 		$retour.="$.post(url,params).done(function( data ) {\n";
197
-		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$jsCallback)."});\n";
197
+		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $jsCallback)."});\n";
198 198
 
199 199
 		if ($validation) {
200 200
 			$retour="$('#".$form."').validate({submitHandler: function(form) {
@@ -217,7 +217,7 @@  discard block
 block discarded – undo
217 217
 	 * @param string $responseElement
218 218
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"jqueryDone"=>"html")
219 219
 	 */
220
-	public function _getOn($event,$element, $url, $params="{}", $responseElement="", $parameters=array()) {
220
+	public function _getOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
221 221
 		$preventDefault=true;
222 222
 		$stopPropagation=true;
223 223
 		$jsCallback=null;
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
 		$immediatly=true;
227 227
 		$jqueryDone="html";
228 228
 		extract($parameters);
229
-		return $this->_add_event($element, $this->_get($url, $params, $responseElement, $jsCallback, $attr,$hasLoader,$jqueryDone), $event, $preventDefault, $stopPropagation,$immediatly);
229
+		return $this->_add_event($element, $this->_get($url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $jqueryDone), $event, $preventDefault, $stopPropagation, $immediatly);
230 230
 	}
231 231
 
232 232
 	/**
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
 	 * @param string $responseElement
240 240
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true)
241 241
 	 */
242
-	public function _postOn($event,$element, $url, $params="{}", $responseElement="", $parameters=array()) {
242
+	public function _postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
243 243
 		$preventDefault=true;
244 244
 		$stopPropagation=true;
245 245
 		$jsCallback=null;
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
 		$immediatly=true;
249 249
 		$jqueryDone="html";
250 250
 		extract($parameters);
251
-		return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr,$hasLoader,$jqueryDone), $event, $preventDefault, $stopPropagation,$immediatly);
251
+		return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $jqueryDone), $event, $preventDefault, $stopPropagation, $immediatly);
252 252
 	}
253 253
 
254 254
 	/**
@@ -261,7 +261,7 @@  discard block
 block discarded – undo
261 261
 	 * @param string $responseElement
262 262
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true)
263 263
 	 */
264
-	public function _postFormOn($event,$element, $url, $form, $responseElement="", $parameters=array()) {
264
+	public function _postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) {
265 265
 		$preventDefault=true;
266 266
 		$stopPropagation=true;
267 267
 		$validation=false;
@@ -271,6 +271,6 @@  discard block
 block discarded – undo
271 271
 		$immediatly=true;
272 272
 		$jqueryDone="html";
273 273
 		extract($parameters);
274
-		return $this->_add_event($element, $this->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr,$hasLoader,$jqueryDone), $event, $preventDefault, $stopPropagation,$immediatly);
274
+		return $this->_add_event($element, $this->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader, $jqueryDone), $event, $preventDefault, $stopPropagation, $immediatly);
275 275
 	}
276 276
 }
277 277
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +26 added lines, -19 removed lines patch added patch discarded remove patch
@@ -46,8 +46,9 @@  discard block
 block discarded – undo
46 46
 		}
47 47
 		$retour.="$.".$method."(url,".$params.").done(function( data ) {\n";
48 48
 		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$jsCallback)."});\n";
49
-		if ($immediatly)
50
-			$this->jquery_code_for_compile[]=$retour;
49
+		if ($immediatly) {
50
+					$this->jquery_code_for_compile[]=$retour;
51
+		}
51 52
 			return $retour;
52 53
 	}
53 54
 
@@ -55,15 +56,17 @@  discard block
 block discarded – undo
55 56
 		$url=$this->_correctAjaxUrl($url);
56 57
 		$retour="url='".$url."';\n";
57 58
 		$slash="/";
58
-		if(JString::endswith($url, "/")===true)
59
-			$slash="";
59
+		if(JString::endswith($url, "/")===true) {
60
+					$slash="";
61
+		}
60 62
 		if(JString::isNotNull($attr)){
61
-			if ($attr==="value")
62
-				$retour.="url=url+'".$slash."'+$(this).val();\n";
63
-			elseif ($attr==="html")
64
-			$retour.="url=url+'".$slash."'+$(this).html();\n";
65
-			elseif($attr!=null && $attr!=="")
66
-					$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
63
+			if ($attr==="value") {
64
+							$retour.="url=url+'".$slash."'+$(this).val();\n";
65
+			} elseif ($attr==="html") {
66
+						$retour.="url=url+'".$slash."'+$(this).html();\n";
67
+			} elseif($attr!=null && $attr!=="") {
68
+								$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
69
+			}
67 70
 		}
68 71
 		return $retour;
69 72
 	}
@@ -85,8 +88,9 @@  discard block
 block discarded – undo
85 88
 	}
86 89
 
87 90
 	protected function _correctAjaxUrl($url) {
88
-		if ($url!=="/" && JString::endsWith($url, "/")===true)
89
-			$url=substr($url, 0, strlen($url)-1);
91
+		if ($url!=="/" && JString::endsWith($url, "/")===true) {
92
+					$url=substr($url, 0, strlen($url)-1);
93
+		}
90 94
 		if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
91 95
 			$url=$this->jsUtils->getUrl($url);
92 96
 		}
@@ -110,8 +114,9 @@  discard block
 block discarded – undo
110 114
 				$retour.="\t".$jsCallback."\n".
111 115
 						"\t$(document).trigger('jsonReady',[data]);\n".
112 116
 						"});\n";
113
-				if ($immediatly)
114
-					$this->jquery_code_for_compile[]=$retour;
117
+				if ($immediatly) {
118
+									$this->jquery_code_for_compile[]=$retour;
119
+				}
115 120
 					return $retour;
116 121
 	}
117 122
 
@@ -150,7 +155,7 @@  discard block
 block discarded – undo
150 155
 		if($context===null){
151 156
 			$appendTo="\t\tnewElm.appendTo($('".$maskSelector."').parent());\n";
152 157
 			$newElm = "$('#'+newId)";
153
-		}else{
158
+		} else{
154 159
 			$appendTo="\t\tnewElm.appendTo(".$context.");\n";
155 160
 			$newElm = $context.".find('#'+newId)";
156 161
 		}
@@ -160,8 +165,9 @@  discard block
 block discarded – undo
160 165
 		$retour.="\t}\n"."\tfor(var key in value){\n"."\t\t\tvar html = $('<div />').append($(newElm).clone()).html();\n"."\t\t\tif(html.indexOf('[['+key+']]')>-1){\n"."\t\t\t\tcontent=$(html.split('[['+key+']]').join(value[key]));\n"."\t\t\t\t$(newElm).replaceWith(content);newElm=content;\n"."\t\t\t}\n"."\t\tvar sel='[data-id=\"'+key+'\"]';if($(sel,newElm).length){\n"."\t\t\tvar selElm=$(sel,newElm);\n"."\t\t\t if(selElm.is('[value]')) { selElm.attr('value',value[key]);selElm.val(value[key]);} else { selElm.html(value[key]); }\n"."\t\t}\n"."}\n"."\t$(newElm).show(true);"."\n"."\t$(newElm).removeClass('hide');"."});\n";
161 166
 		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
162 167
 		$retour.="\t".$jsCallback."\n"."});\n";
163
-		if ($immediatly)
164
-			$this->jquery_code_for_compile[]=$retour;
168
+		if ($immediatly) {
169
+					$this->jquery_code_for_compile[]=$retour;
170
+		}
165 171
 			return $retour;
166 172
 	}
167 173
 	/**
@@ -202,8 +208,9 @@  discard block
 block discarded – undo
202 208
 			}});\n";
203 209
 			$retour.="$('#".$form."').submit();\n";
204 210
 		}
205
-		if ($immediatly)
206
-			$this->jquery_code_for_compile[]=$retour;
211
+		if ($immediatly) {
212
+					$this->jquery_code_for_compile[]=$retour;
213
+		}
207 214
 			return $retour;
208 215
 	}
209 216
 
Please login to merge, or discard this patch.
Ajax/common/traits/JsUtilsAjaxTrait.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -24,8 +24,8 @@  discard block
 block discarded – undo
24 24
 	 * @param boolean $hasLoader true for showing ajax loader. default : true
25 25
 	 * @param string $jqueryDone the jquery function call on ajax data. default:html
26 26
 	 */
27
-	public function get($url, $responseElement="", $params="{}", $jsCallback=NULL,$hasLoader=true,$jqueryDone="html") {
28
-		return $this->js->_get($url, $params, $responseElement, $jsCallback, NULL, $hasLoader,$jqueryDone,true);
27
+	public function get($url, $responseElement="", $params="{}", $jsCallback=NULL, $hasLoader=true, $jqueryDone="html") {
28
+		return $this->js->_get($url, $params, $responseElement, $jsCallback, NULL, $hasLoader, $jqueryDone, true);
29 29
 	}
30 30
 
31 31
 	/**
@@ -36,8 +36,8 @@  discard block
 block discarded – undo
36 36
 	 * @param string $jsCallback javascript code to execute after the request
37 37
 	 * @param boolean $immediatly
38 38
 	 */
39
-	public function json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document",$immediatly=false) {
40
-		return $this->js->_json($url, $method, $params, $jsCallback, $attr, $context,$immediatly);
39
+	public function json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document", $immediatly=false) {
40
+		return $this->js->_json($url, $method, $params, $jsCallback, $attr, $context, $immediatly);
41 41
 	}
42 42
 
43 43
 	/**
@@ -47,8 +47,8 @@  discard block
 block discarded – undo
47 47
 	 * @param string $url the request address
48 48
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true)
49 49
 	 */
50
-	public function jsonOn($event,$element, $url,$parameters=array()) {
51
-		return $this->js->_jsonOn($event, $element, $url,$parameters);
50
+	public function jsonOn($event, $element, $url, $parameters=array()) {
51
+		return $this->js->_jsonOn($event, $element, $url, $parameters);
52 52
 	}
53 53
 
54 54
 	/**
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 	 * @param string $jsCallback javascript code to execute after the request
71 71
 	 */
72 72
 	public function jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL) {
73
-		return $this->js->_jsonArray($maskSelector, $url, $method, $params, $jsCallback, NULL,true);
73
+		return $this->js->_jsonArray($maskSelector, $url, $method, $params, $jsCallback, NULL, true);
74 74
 	}
75 75
 
76 76
 	/**
@@ -93,8 +93,8 @@  discard block
 block discarded – undo
93 93
 	 * @param string $url the request url
94 94
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true)
95 95
 	 */
96
-	public function jsonArrayOn($event,$element,$maskSelector, $url,$parameters=array()) {
97
-		return $this->js->_jsonArrayOn($event,$element,$maskSelector, $url, $parameters);
96
+	public function jsonArrayOn($event, $element, $maskSelector, $url, $parameters=array()) {
97
+		return $this->js->_jsonArrayOn($event, $element, $maskSelector, $url, $parameters);
98 98
 	}
99 99
 
100 100
 	/**
@@ -107,8 +107,8 @@  discard block
 block discarded – undo
107 107
 	 * @param string $attr the html attribute added to the request
108 108
 	 * @param string $jqueryDone the jquery function call on ajax data. default:html
109 109
 	 */
110
-	public function getDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL,$attr="id",$jqueryDone="html") {
111
-		return $this->js->_get($url, $params, $responseElement, $jsCallback, $attr, false,$jqueryDone);
110
+	public function getDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id", $jqueryDone="html") {
111
+		return $this->js->_get($url, $params, $responseElement, $jsCallback, $attr, false, $jqueryDone);
112 112
 	}
113 113
 
114 114
 	/**
@@ -146,8 +146,8 @@  discard block
 block discarded – undo
146 146
 	 * @param boolean $hasLoader true for showing ajax loader. default : true
147 147
 	 * @param string $jqueryDone the jquery function call on ajax data. default:html
148 148
 	 */
149
-	public function post($url, $responseElement="", $params="{}", $jsCallback=NULL,$hasLoader=true,$jqueryDone="html") {
150
-		return $this->js->_post($url, $params, $responseElement, $jsCallback, NULL, $hasLoader,$jqueryDone,true);
149
+	public function post($url, $responseElement="", $params="{}", $jsCallback=NULL, $hasLoader=true, $jqueryDone="html") {
150
+		return $this->js->_post($url, $params, $responseElement, $jsCallback, NULL, $hasLoader, $jqueryDone, true);
151 151
 	}
152 152
 
153 153
 	/**
@@ -161,8 +161,8 @@  discard block
 block discarded – undo
161 161
 	 * @param boolean $hasLoader true for showing ajax loader. default : true
162 162
 	 * @param string $jqueryDone the jquery function call on ajax data. default:html
163 163
 	 */
164
-	public function postDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id",$hasLoader=true,$jqueryDone="html") {
165
-		return $this->js->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader,$jqueryDone,false);
164
+	public function postDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id", $hasLoader=true, $jqueryDone="html") {
165
+		return $this->js->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $jqueryDone, false);
166 166
 	}
167 167
 
168 168
 	/**
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true,"jqueryDone"=>"html")
177 177
 	 */
178 178
 	public function postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
179
-		return $this->js->_postOn($event, $element,  $url, $params, $responseElement, $parameters);
179
+		return $this->js->_postOn($event, $element, $url, $params, $responseElement, $parameters);
180 180
 	}
181 181
 
182 182
 	/**
@@ -201,8 +201,8 @@  discard block
 block discarded – undo
201 201
 	 * @param boolean $hasLoader true for showing ajax loader. default : true
202 202
 	 * @param string $jqueryDone the jquery function call on ajax data. default:html
203 203
 	 */
204
-	public function postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL,$hasLoader=true,$jqueryDone="html") {
205
-		return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, NULL, $hasLoader,$jqueryDone,true);
204
+	public function postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $hasLoader=true, $jqueryDone="html") {
205
+		return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, NULL, $hasLoader, $jqueryDone, true);
206 206
 	}
207 207
 
208 208
 	/**
@@ -216,8 +216,8 @@  discard block
 block discarded – undo
216 216
 	 * @param boolean $hasLoader true for showing ajax loader. default : true
217 217
 	 * @param string $jqueryDone the jquery function call on ajax data. default:html
218 218
 	 */
219
-	public function postFormDeferred($url, $form, $responseElement, $validation=false, $jsCallback=NULL,$attr="id",$hasLoader=true,$jqueryDone="html") {
220
-		return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader,$jqueryDone,false);
219
+	public function postFormDeferred($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true, $jqueryDone="html") {
220
+		return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader, $jqueryDone, false);
221 221
 	}
222 222
 
223 223
 	/**
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
231 231
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true,"jqueryDone"=>"html")
232 232
 	 */
233 233
 	public function postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) {
234
-		return $this->js->_postFormOn($event,$element, $url, $form, $responseElement, $parameters);
234
+		return $this->js->_postFormOn($event, $element, $url, $form, $responseElement, $parameters);
235 235
 	}
236 236
 
237 237
 	/**
Please login to merge, or discard this patch.
Ajax/semantic/html/elements/HtmlSegmentGroups.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -7,20 +7,20 @@  discard block
 block discarded – undo
7 7
 use Ajax\semantic\html\base\constants\Sens;
8 8
 use Ajax\JsUtils;
9 9
 
10
-class HtmlSegmentGroups extends HtmlSemCollection{
10
+class HtmlSegmentGroups extends HtmlSemCollection {
11 11
 
12 12
 
13
-	public function __construct( $identifier, $items=array()){
14
-		parent::__construct( $identifier, "div","ui segments");
13
+	public function __construct($identifier, $items=array()) {
14
+		parent::__construct($identifier, "div", "ui segments");
15 15
 		$this->addItems($items);
16 16
 	}
17 17
 
18 18
 
19
-	protected function createItem($value){
20
-		return new HtmlSegment("segment-".$this->count(),$value);
19
+	protected function createItem($value) {
20
+		return new HtmlSegment("segment-".$this->count(), $value);
21 21
 	}
22 22
 
23
-	protected function createCondition($value){
23
+	protected function createCondition($value) {
24 24
 		return !($value instanceof HtmlSegment);
25 25
 	}
26 26
 
@@ -29,21 +29,21 @@  discard block
 block discarded – undo
29 29
 	 * @param string $type one of "raised","stacked","piled" default : ""
30 30
 	 * @return \Ajax\semantic\html\elements\HtmlSegmentGroups
31 31
 	 */
32
-	public function setType($type){
32
+	public function setType($type) {
33 33
 		return $this->addToPropertyCtrl("class", $type, SegmentType::getConstants());
34 34
 	}
35 35
 
36
-	public function setSens($sens=Sens::VERTICAL){
36
+	public function setSens($sens=Sens::VERTICAL) {
37 37
 		return $this->addToPropertyCtrl("class", $sens, Sens::getConstants());
38 38
 	}
39 39
 
40
-	public function run(JsUtils $js){
41
-		$result= parent::run($js);
40
+	public function run(JsUtils $js) {
41
+		$result=parent::run($js);
42 42
 		return $result->setItemSelector(".ui.segment");
43 43
 	}
44 44
 
45
-	public static function group($identifier,$items=array(),$type="",$sens=Sens::VERTICAL){
46
-		$group=new HtmlSegmentGroups($identifier,$items);
45
+	public static function group($identifier, $items=array(), $type="", $sens=Sens::VERTICAL) {
46
+		$group=new HtmlSegmentGroups($identifier, $items);
47 47
 		$group->setSens($sens);
48 48
 		return $group->setType($type);
49 49
 	}
Please login to merge, or discard this patch.