@@ -50,14 +50,14 @@ |
||
50 | 50 | } |
51 | 51 | |
52 | 52 | /** |
53 | - * render the content of $controller::$action and set the response to a new panel |
|
54 | - * @param JsUtils $js |
|
55 | - * @param string $title The panel title |
|
56 | - * @param Controller $initialController |
|
57 | - * @param string $controller a Phalcon controller |
|
58 | - * @param string $action a Phalcon action |
|
59 | - * @param array $params |
|
60 | - */ |
|
53 | + * render the content of $controller::$action and set the response to a new panel |
|
54 | + * @param JsUtils $js |
|
55 | + * @param string $title The panel title |
|
56 | + * @param Controller $initialController |
|
57 | + * @param string $controller a Phalcon controller |
|
58 | + * @param string $action a Phalcon action |
|
59 | + * @param array $params |
|
60 | + */ |
|
61 | 61 | public function forwardPanel(JsUtils $js,$title,$initialController,$controller,$action,$params=array()){ |
62 | 62 | return $this->addPanel($title, $js->forward($initialController, $controller, $action,$params)); |
63 | 63 | } |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | $this->setClass("panel-group"); |
20 | 20 | $this->setRole("tablist"); |
21 | 21 | $this->setProperty("aria-multiselectable", "true"); |
22 | - $this->content=array (); |
|
22 | + $this->content=array(); |
|
23 | 23 | } |
24 | 24 | |
25 | 25 | public function addPanel($title, $content) { |
@@ -45,8 +45,8 @@ discard block |
||
45 | 45 | * @param string $viewName |
46 | 46 | * @param $params The parameters to pass to the view |
47 | 47 | */ |
48 | - public function renderViewPanel(JsUtils $js,$title,$initialController, $viewName, $params=array()) { |
|
49 | - return $this->addPanel($title, $js->renderContent($initialController, $viewName,$params)); |
|
48 | + public function renderViewPanel(JsUtils $js, $title, $initialController, $viewName, $params=array()) { |
|
49 | + return $this->addPanel($title, $js->renderContent($initialController, $viewName, $params)); |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | /** |
@@ -58,12 +58,12 @@ discard block |
||
58 | 58 | * @param string $action a Phalcon action |
59 | 59 | * @param array $params |
60 | 60 | */ |
61 | - public function forwardPanel(JsUtils $js,$title,$initialController,$controller,$action,$params=array()){ |
|
62 | - return $this->addPanel($title, $js->forward($initialController, $controller, $action,$params)); |
|
61 | + public function forwardPanel(JsUtils $js, $title, $initialController, $controller, $action, $params=array()) { |
|
62 | + return $this->addPanel($title, $js->forward($initialController, $controller, $action, $params)); |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | public function run(JsUtils $js) { |
66 | - foreach ( $this->content as $content ) { |
|
66 | + foreach ($this->content as $content) { |
|
67 | 67 | $content->run($js); |
68 | 68 | } |
69 | 69 | } |
@@ -69,7 +69,8 @@ |
||
69 | 69 | } |
70 | 70 | |
71 | 71 | public function getPanel($index) { |
72 | - if ($index<sizeof($this->content)) |
|
73 | - return $this->content [$index]; |
|
72 | + if ($index<sizeof($this->content)) { |
|
73 | + return $this->content [$index]; |
|
74 | + } |
|
74 | 75 | } |
75 | 76 | } |
76 | 77 | \ No newline at end of file |
@@ -19,10 +19,12 @@ discard block |
||
19 | 19 | if (isset($value)) { |
20 | 20 | $value=$this->_prep_value($value); |
21 | 21 | $str="$({$element}).attr(\"$attributeName\",{$value});"; |
22 | - } else |
|
23 | - $str="$({$element}).attr(\"$attributeName\");"; |
|
24 | - if ($immediatly) |
|
25 | - $this->jquery_code_for_compile[]=$str; |
|
22 | + } else { |
|
23 | + $str="$({$element}).attr(\"$attributeName\");"; |
|
24 | + } |
|
25 | + if ($immediatly) { |
|
26 | + $this->jquery_code_for_compile[]=$str; |
|
27 | + } |
|
26 | 28 | return $str; |
27 | 29 | } |
28 | 30 | |
@@ -37,8 +39,9 @@ discard block |
||
37 | 39 | $element=$this->_prep_element($element); |
38 | 40 | $value=$this->_prep_value($value); |
39 | 41 | $str="$({$element}).after({$value});"; |
40 | - if ($immediatly) |
|
41 | - $this->jquery_code_for_compile[]=$str; |
|
42 | + if ($immediatly) { |
|
43 | + $this->jquery_code_for_compile[]=$str; |
|
44 | + } |
|
42 | 45 | return $str; |
43 | 46 | } |
44 | 47 | |
@@ -74,8 +77,9 @@ discard block |
||
74 | 77 | |
75 | 78 | $str="$({$element}).animate({\n$animations\n\t\t}".$speed.$extra.");"; |
76 | 79 | |
77 | - if ($immediatly) |
|
78 | - $this->jquery_code_for_compile[]=$str; |
|
80 | + if ($immediatly) { |
|
81 | + $this->jquery_code_for_compile[]=$str; |
|
82 | + } |
|
79 | 83 | return $str; |
80 | 84 | } |
81 | 85 | |
@@ -100,8 +104,9 @@ discard block |
||
100 | 104 | |
101 | 105 | $str="$({$element}).fadeIn({$speed}{$callback});"; |
102 | 106 | |
103 | - if ($immediatly) |
|
104 | - $this->jquery_code_for_compile[]=$str; |
|
107 | + if ($immediatly) { |
|
108 | + $this->jquery_code_for_compile[]=$str; |
|
109 | + } |
|
105 | 110 | return $str; |
106 | 111 | } |
107 | 112 | |
@@ -126,8 +131,9 @@ discard block |
||
126 | 131 | |
127 | 132 | $str="$({$element}).fadeOut({$speed}{$callback});"; |
128 | 133 | |
129 | - if ($immediatly) |
|
130 | - $this->jquery_code_for_compile[]=$str; |
|
134 | + if ($immediatly) { |
|
135 | + $this->jquery_code_for_compile[]=$str; |
|
136 | + } |
|
131 | 137 | return $str; |
132 | 138 | } |
133 | 139 | |
@@ -152,8 +158,9 @@ discard block |
||
152 | 158 | |
153 | 159 | $str="$({$element}).hide({$speed}{$callback});"; |
154 | 160 | |
155 | - if ($immediatly) |
|
156 | - $this->jquery_code_for_compile[]=$str; |
|
161 | + if ($immediatly) { |
|
162 | + $this->jquery_code_for_compile[]=$str; |
|
163 | + } |
|
157 | 164 | return $str; |
158 | 165 | } |
159 | 166 | |
@@ -180,8 +187,9 @@ discard block |
||
180 | 187 | |
181 | 188 | $str="$({$element}).slideUp({$speed}{$callback});"; |
182 | 189 | |
183 | - if ($immediatly) |
|
184 | - $this->jquery_code_for_compile[]=$str; |
|
190 | + if ($immediatly) { |
|
191 | + $this->jquery_code_for_compile[]=$str; |
|
192 | + } |
|
185 | 193 | return $str; |
186 | 194 | } |
187 | 195 | |
@@ -206,8 +214,9 @@ discard block |
||
206 | 214 | |
207 | 215 | $str="$({$element}).slideDown({$speed}{$callback});"; |
208 | 216 | |
209 | - if ($immediatly) |
|
210 | - $this->jquery_code_for_compile[]=$str; |
|
217 | + if ($immediatly) { |
|
218 | + $this->jquery_code_for_compile[]=$str; |
|
219 | + } |
|
211 | 220 | return $str; |
212 | 221 | } |
213 | 222 | |
@@ -232,8 +241,9 @@ discard block |
||
232 | 241 | |
233 | 242 | $str="$({$element}).slideToggle({$speed}{$callback});"; |
234 | 243 | |
235 | - if ($immediatly) |
|
236 | - $this->jquery_code_for_compile[]=$str; |
|
244 | + if ($immediatly) { |
|
245 | + $this->jquery_code_for_compile[]=$str; |
|
246 | + } |
|
237 | 247 | return $str; |
238 | 248 | } |
239 | 249 | |
@@ -250,8 +260,9 @@ discard block |
||
250 | 260 | $element=$this->_prep_element($element); |
251 | 261 | $str="$({$element}).toggle();"; |
252 | 262 | |
253 | - if ($immediatly) |
|
254 | - $this->jquery_code_for_compile[]=$str; |
|
263 | + if ($immediatly) { |
|
264 | + $this->jquery_code_for_compile[]=$str; |
|
265 | + } |
|
255 | 266 | return $str; |
256 | 267 | } |
257 | 268 | |
@@ -267,8 +278,9 @@ discard block |
||
267 | 278 | $element=$this->_prep_element($element); |
268 | 279 | $str="$({$element}).trigger(\"$event\");"; |
269 | 280 | |
270 | - if ($immediatly) |
|
271 | - $this->jquery_code_for_compile[]=$str; |
|
281 | + if ($immediatly) { |
|
282 | + $this->jquery_code_for_compile[]=$str; |
|
283 | + } |
|
272 | 284 | return $str; |
273 | 285 | } |
274 | 286 | |
@@ -293,8 +305,9 @@ discard block |
||
293 | 305 | |
294 | 306 | $str="$({$element}).show({$speed}{$callback});"; |
295 | 307 | |
296 | - if ($immediatly) |
|
297 | - $this->jquery_code_for_compile[]=$str; |
|
308 | + if ($immediatly) { |
|
309 | + $this->jquery_code_for_compile[]=$str; |
|
310 | + } |
|
298 | 311 | return $str; |
299 | 312 | } |
300 | 313 | |
@@ -312,8 +325,9 @@ discard block |
||
312 | 325 | $str.="else{".$jsCodeIfFalse."}"; |
313 | 326 | } |
314 | 327 | |
315 | - if ($immediatly) |
|
316 | - $this->jquery_code_for_compile[]=$str; |
|
328 | + if ($immediatly) { |
|
329 | + $this->jquery_code_for_compile[]=$str; |
|
330 | + } |
|
317 | 331 | return $str; |
318 | 332 | } |
319 | 333 | |
@@ -330,11 +344,13 @@ discard block |
||
330 | 344 | public function _doJQuery($element, $jqueryCall, $param="", $jsCallback="", $immediatly=false) { |
331 | 345 | $param=$this->_prep_value($param); |
332 | 346 | $callback=""; |
333 | - if ($jsCallback!="") |
|
334 | - $callback=", function(event){\n{$jsCallback}\n}"; |
|
347 | + if ($jsCallback!="") { |
|
348 | + $callback=", function(event){\n{$jsCallback}\n}"; |
|
349 | + } |
|
335 | 350 | $script="$(".$this->_prep_element($element).").".$jqueryCall."(".$param.$callback.");\n"; |
336 | - if ($immediatly) |
|
337 | - $this->jquery_code_for_compile[]=$script; |
|
351 | + if ($immediatly) { |
|
352 | + $this->jquery_code_for_compile[]=$script; |
|
353 | + } |
|
338 | 354 | return $script; |
339 | 355 | } |
340 | 356 | |
@@ -363,8 +379,9 @@ discard block |
||
363 | 379 | */ |
364 | 380 | public function _exec($js, $immediatly=false) { |
365 | 381 | $script=$js."\n"; |
366 | - if ($immediatly) |
|
367 | - $this->jquery_code_for_compile[]=$script; |
|
382 | + if ($immediatly) { |
|
383 | + $this->jquery_code_for_compile[]=$script; |
|
384 | + } |
|
368 | 385 | return $script; |
369 | 386 | } |
370 | 387 |
@@ -10,7 +10,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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)) { |
@@ -17,8 +17,8 @@ discard block |
||
17 | 17 | * @param string $jsCallback javascript code to execute after the request |
18 | 18 | * @param boolean $hasLoader true for showing ajax loader. default : true |
19 | 19 | */ |
20 | - public function get($url, $responseElement="", $params="{}", $jsCallback=NULL,$hasLoader=true) { |
|
21 | - return $this->js->_get($url, $params, $responseElement, $jsCallback, NULL, $hasLoader,true); |
|
20 | + public function get($url, $responseElement="", $params="{}", $jsCallback=NULL, $hasLoader=true) { |
|
21 | + return $this->js->_get($url, $params, $responseElement, $jsCallback, NULL, $hasLoader, true); |
|
22 | 22 | } |
23 | 23 | |
24 | 24 | /** |
@@ -29,8 +29,8 @@ discard block |
||
29 | 29 | * @param string $jsCallback javascript code to execute after the request |
30 | 30 | * @param boolean $immediatly |
31 | 31 | */ |
32 | - public function json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document",$immediatly=false) { |
|
33 | - return $this->js->_json($url, $method, $params, $jsCallback, $attr, $context,$immediatly); |
|
32 | + public function json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document", $immediatly=false) { |
|
33 | + return $this->js->_json($url, $method, $params, $jsCallback, $attr, $context, $immediatly); |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | /** |
@@ -40,8 +40,8 @@ discard block |
||
40 | 40 | * @param string $url the request address |
41 | 41 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true) |
42 | 42 | */ |
43 | - public function jsonOn($event,$element, $url,$parameters=array()) { |
|
44 | - return $this->js->_jsonOn($event, $element, $url,$parameters); |
|
43 | + public function jsonOn($event, $element, $url, $parameters=array()) { |
|
44 | + return $this->js->_jsonOn($event, $element, $url, $parameters); |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | /** |
@@ -85,8 +85,8 @@ discard block |
||
85 | 85 | * @param string $url the request url |
86 | 86 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true) |
87 | 87 | */ |
88 | - public function jsonArrayOn($event,$element,$maskSelector, $url,$parameters=array()) { |
|
89 | - return $this->js->_jsonArrayOn($event,$element,$maskSelector, $url, $parameters); |
|
88 | + public function jsonArrayOn($event, $element, $maskSelector, $url, $parameters=array()) { |
|
89 | + return $this->js->_jsonArrayOn($event, $element, $maskSelector, $url, $parameters); |
|
90 | 90 | } |
91 | 91 | |
92 | 92 | /** |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | * @param string $jsCallback javascript code to execute after the request |
99 | 99 | * @param string $attr the html attribute added to the request |
100 | 100 | */ |
101 | - public function getDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL,$attr="id") { |
|
101 | + public function getDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id") { |
|
102 | 102 | return $this->js->_get($url, $params, $responseElement, $jsCallback, $attr, false); |
103 | 103 | } |
104 | 104 | |
@@ -136,8 +136,8 @@ discard block |
||
136 | 136 | * @param string $jsCallback javascript code to execute after the request |
137 | 137 | * @param boolean $hasLoader true for showing ajax loader. default : true |
138 | 138 | */ |
139 | - public function post($url, $responseElement="", $params="{}", $jsCallback=NULL,$hasLoader=true) { |
|
140 | - return $this->js->_post($url, $params, $responseElement, $jsCallback, NULL, $hasLoader,true); |
|
139 | + public function post($url, $responseElement="", $params="{}", $jsCallback=NULL, $hasLoader=true) { |
|
140 | + return $this->js->_post($url, $params, $responseElement, $jsCallback, NULL, $hasLoader, true); |
|
141 | 141 | } |
142 | 142 | |
143 | 143 | /** |
@@ -150,8 +150,8 @@ discard block |
||
150 | 150 | * @param string $jsCallback javascript code to execute after the request |
151 | 151 | * @param boolean $hasLoader true for showing ajax loader. default : true |
152 | 152 | */ |
153 | - public function postDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id",$hasLoader=true) { |
|
154 | - return $this->js->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader,false); |
|
153 | + public function postDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id", $hasLoader=true) { |
|
154 | + return $this->js->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader, false); |
|
155 | 155 | } |
156 | 156 | |
157 | 157 | /** |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true) |
166 | 166 | */ |
167 | 167 | public function postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) { |
168 | - return $this->js->_postOn($event, $element, $url, $params, $responseElement, $parameters); |
|
168 | + return $this->js->_postOn($event, $element, $url, $params, $responseElement, $parameters); |
|
169 | 169 | } |
170 | 170 | |
171 | 171 | /** |
@@ -189,8 +189,8 @@ discard block |
||
189 | 189 | * @param string $jsCallback javascript code to execute after the request |
190 | 190 | * @param boolean $hasLoader true for showing ajax loader. default : true |
191 | 191 | */ |
192 | - public function postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL,$hasLoader=true) { |
|
193 | - return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, NULL, $hasLoader,true); |
|
192 | + public function postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $hasLoader=true) { |
|
193 | + return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, NULL, $hasLoader, true); |
|
194 | 194 | } |
195 | 195 | |
196 | 196 | /** |
@@ -203,8 +203,8 @@ discard block |
||
203 | 203 | * @param string $attr the html attribute added to the request |
204 | 204 | * @param boolean $hasLoader true for showing ajax loader. default : true |
205 | 205 | */ |
206 | - public function postFormDeferred($url, $form, $responseElement, $validation=false, $jsCallback=NULL,$attr="id",$hasLoader=true) { |
|
207 | - return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader,false); |
|
206 | + public function postFormDeferred($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true) { |
|
207 | + return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader, false); |
|
208 | 208 | } |
209 | 209 | |
210 | 210 | /** |
@@ -218,7 +218,7 @@ discard block |
||
218 | 218 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true) |
219 | 219 | */ |
220 | 220 | public function postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) { |
221 | - return $this->js->_postFormOn($event,$element, $url, $form, $responseElement, $parameters); |
|
221 | + return $this->js->_postFormOn($event, $element, $url, $form, $responseElement, $parameters); |
|
222 | 222 | } |
223 | 223 | |
224 | 224 | /** |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | * @return string |
14 | 14 | */ |
15 | 15 | public function addClass($element='this', $class='', $immediatly=false) { |
16 | - return $this->js->_genericCallValue('addClass',$element, $class, $immediatly); |
|
16 | + return $this->js->_genericCallValue('addClass', $element, $class, $immediatly); |
|
17 | 17 | } |
18 | 18 | |
19 | 19 | /** |
@@ -23,8 +23,8 @@ discard block |
||
23 | 23 | * @param boolean $immediatly defers the execution if set to false |
24 | 24 | * @return string |
25 | 25 | */ |
26 | - public function after($to, $element, $immediatly=false){ |
|
27 | - return $this->js->_genericCallElement('after',$to, $element, $immediatly); |
|
26 | + public function after($to, $element, $immediatly=false) { |
|
27 | + return $this->js->_genericCallElement('after', $to, $element, $immediatly); |
|
28 | 28 | } |
29 | 29 | |
30 | 30 | /** |
@@ -34,8 +34,8 @@ discard block |
||
34 | 34 | * @param boolean $immediatly defers the execution if set to false |
35 | 35 | * @return string |
36 | 36 | */ |
37 | - public function before($to, $element, $immediatly=false){ |
|
38 | - return $this->js->_genericCallElement('before',$to, $element, $immediatly); |
|
37 | + public function before($to, $element, $immediatly=false) { |
|
38 | + return $this->js->_genericCallElement('before', $to, $element, $immediatly); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | /** |
@@ -55,8 +55,8 @@ discard block |
||
55 | 55 | * @param string $value |
56 | 56 | * @param boolean $immediatly defers the execution if set to false |
57 | 57 | */ |
58 | - public function val($element='this',$value='',$immediatly=false){ |
|
59 | - return $this->js->_genericCallValue('val',$element,$value,$immediatly); |
|
58 | + public function val($element='this', $value='', $immediatly=false) { |
|
59 | + return $this->js->_genericCallValue('val', $element, $value, $immediatly); |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | /** |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | * @param boolean $immediatly defers the execution if set to false |
67 | 67 | */ |
68 | 68 | public function html($element='this', $value='', $immediatly=false) { |
69 | - return $this->js->_genericCallValue('html',$element, $value, $immediatly); |
|
69 | + return $this->js->_genericCallValue('html', $element, $value, $immediatly); |
|
70 | 70 | } |
71 | 71 | |
72 | 72 | /** |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | * @return string |
92 | 92 | */ |
93 | 93 | public function append($to, $element, $immediatly=false) { |
94 | - return $this->js->_genericCallElement('append',$to, $element, $immediatly); |
|
94 | + return $this->js->_genericCallElement('append', $to, $element, $immediatly); |
|
95 | 95 | } |
96 | 96 | |
97 | 97 | /** |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | * @return string |
103 | 103 | */ |
104 | 104 | public function prepend($to, $element, $immediatly=false) { |
105 | - return $this->js->_genericCallElement('prepend',$to, $element, $immediatly); |
|
105 | + return $this->js->_genericCallElement('prepend', $to, $element, $immediatly); |
|
106 | 106 | } |
107 | 107 | |
108 | 108 | /** |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | * @return string |
154 | 154 | */ |
155 | 155 | public function removeClass($element='this', $class='', $immediatly=false) { |
156 | - return $this->js->_genericCall('removeClass',$element, $class, $immediatly); |
|
156 | + return $this->js->_genericCall('removeClass', $element, $class, $immediatly); |
|
157 | 157 | } |
158 | 158 | |
159 | 159 | /** |
@@ -214,7 +214,7 @@ discard block |
||
214 | 214 | * @return string |
215 | 215 | */ |
216 | 216 | public function toggleClass($element='this', $class='', $immediatly=false) { |
217 | - return $this->js->_genericCallValue('toggleClass',$element, $class, $immediatly); |
|
217 | + return $this->js->_genericCallValue('toggleClass', $element, $class, $immediatly); |
|
218 | 218 | } |
219 | 219 | |
220 | 220 | /** |
@@ -290,7 +290,7 @@ discard block |
||
290 | 290 | $preventDefault=false; |
291 | 291 | $immediatly=true; |
292 | 292 | extract($parameters); |
293 | - return $this->js->_doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param, $preventDefault, $stopPropagation, $jsCallback,$immediatly); |
|
293 | + return $this->js->_doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param, $preventDefault, $stopPropagation, $jsCallback, $immediatly); |
|
294 | 294 | } |
295 | 295 | |
296 | 296 | /** |
@@ -317,7 +317,7 @@ discard block |
||
317 | 317 | $preventDefault=false; |
318 | 318 | $immediatly=true; |
319 | 319 | extract($parameters); |
320 | - $script=$this->js->_execOn($element, $event, $js, $preventDefault, $stopPropagation,$immediatly); |
|
320 | + $script=$this->js->_execOn($element, $event, $js, $preventDefault, $stopPropagation, $immediatly); |
|
321 | 321 | return $script; |
322 | 322 | } |
323 | 323 | } |
324 | 324 | \ No newline at end of file |
@@ -39,8 +39,9 @@ discard block |
||
39 | 39 | |
40 | 40 | public function getParam($key) { |
41 | 41 | $value=null; |
42 | - if (array_key_exists($key, $this->params)) |
|
43 | - $value=$this->params [$key]; |
|
42 | + if (array_key_exists($key, $this->params)) { |
|
43 | + $value=$this->params [$key]; |
|
44 | + } |
|
44 | 45 | return $value; |
45 | 46 | } |
46 | 47 | |
@@ -49,16 +50,18 @@ discard block |
||
49 | 50 | } |
50 | 51 | |
51 | 52 | public function compile(JsUtils $js=NULL) { |
52 | - if ($js==NULL) |
|
53 | - $js=$this->js; |
|
53 | + if ($js==NULL) { |
|
54 | + $js=$this->js; |
|
55 | + } |
|
54 | 56 | $script=$this->getScript(); |
55 | 57 | $js->addToCompile($script); |
56 | 58 | } |
57 | 59 | |
58 | 60 | protected function setParamCtrl($key, $value, $typeCtrl) { |
59 | 61 | if (is_array($typeCtrl)) { |
60 | - if (array_search($value, $typeCtrl)===false) |
|
61 | - throw new \Exception("La valeur passée a propriété `".$key."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}"); |
|
62 | + if (array_search($value, $typeCtrl)===false) { |
|
63 | + throw new \Exception("La valeur passée a propriété `".$key."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}"); |
|
64 | + } |
|
62 | 65 | } else { |
63 | 66 | if (!$typeCtrl($value)) { |
64 | 67 | throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$key); |
@@ -70,9 +73,9 @@ discard block |
||
70 | 73 | public function setParams($params) { |
71 | 74 | foreach ( $params as $k => $v ) { |
72 | 75 | $method="set".ucfirst($k); |
73 | - if (method_exists($this, $method)) |
|
74 | - $this->$method($v); |
|
75 | - else { |
|
76 | + if (method_exists($this, $method)) { |
|
77 | + $this->$method($v); |
|
78 | + } else { |
|
76 | 79 | $this->setParam($k, $v); |
77 | 80 | trigger_error("`".$k."` property n'existe pas", E_USER_NOTICE); |
78 | 81 | } |
@@ -10,8 +10,8 @@ discard block |
||
10 | 10 | * @version 1.001 |
11 | 11 | */ |
12 | 12 | abstract class BaseComponent { |
13 | - public $jquery_code_for_compile=array (); |
|
14 | - protected $params=array (); |
|
13 | + public $jquery_code_for_compile=array(); |
|
14 | + protected $params=array(); |
|
15 | 15 | |
16 | 16 | /** |
17 | 17 | * |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | } |
69 | 69 | |
70 | 70 | public function setParams($params) { |
71 | - foreach ( $params as $k => $v ) { |
|
71 | + foreach ($params as $k => $v) { |
|
72 | 72 | $method="set".ucfirst($k); |
73 | 73 | if (method_exists($this, $method)) |
74 | 74 | $this->$method($v); |
@@ -81,8 +81,8 @@ discard block |
||
81 | 81 | return $this; |
82 | 82 | } |
83 | 83 | |
84 | - public function addParams($params){ |
|
85 | - foreach ($params as $k=>$v){ |
|
84 | + public function addParams($params) { |
|
85 | + foreach ($params as $k=>$v) { |
|
86 | 86 | $this->setParam($k, $v); |
87 | 87 | } |
88 | 88 | return $this; |
@@ -6,8 +6,8 @@ discard block |
||
6 | 6 | use Ajax\common\JsCode; |
7 | 7 | |
8 | 8 | class SimpleExtComponent extends SimpleComponent { |
9 | - protected $events=array (); |
|
10 | - protected $jsCodes=array (); |
|
9 | + protected $events=array(); |
|
10 | + protected $jsCodes=array(); |
|
11 | 11 | |
12 | 12 | public function addEvent($event, $jsCode) { |
13 | 13 | $this->events [$event]=$jsCode; |
@@ -15,8 +15,8 @@ discard block |
||
15 | 15 | |
16 | 16 | public function getScript() { |
17 | 17 | parent::getScript(); |
18 | - foreach ( $this->jsCodes as $jsCode ) { |
|
19 | - $this->jquery_code_for_compile []=$jsCode->compile(array ( |
|
18 | + foreach ($this->jsCodes as $jsCode) { |
|
19 | + $this->jquery_code_for_compile []=$jsCode->compile(array( |
|
20 | 20 | "identifier" => $this->attachTo |
21 | 21 | )); |
22 | 22 | } |
@@ -11,9 +11,9 @@ |
||
11 | 11 | * @see \Ajax\common\components\SimpleExtComponent::getScript() |
12 | 12 | */ |
13 | 13 | public function getScript() { |
14 | - $this->jquery_code_for_compile=array (); |
|
15 | - foreach ( $this->jsCodes as $jsCode ) { |
|
16 | - $this->jquery_code_for_compile []=$jsCode->compile(array ( |
|
14 | + $this->jquery_code_for_compile=array(); |
|
15 | + foreach ($this->jsCodes as $jsCode) { |
|
16 | + $this->jquery_code_for_compile []=$jsCode->compile(array( |
|
17 | 17 | "identifier" => $this->attachTo |
18 | 18 | )); |
19 | 19 | } |
@@ -27,8 +27,8 @@ discard block |
||
27 | 27 | |
28 | 28 | public function __construct($autoCompile=true) { |
29 | 29 | $this->autoCompile=$autoCompile; |
30 | - $this->components=array (); |
|
31 | - $this->htmlComponents=array (); |
|
30 | + $this->components=array(); |
|
31 | + $this->htmlComponents=array(); |
|
32 | 32 | } |
33 | 33 | |
34 | 34 | public function isAutoCompile() { |
@@ -41,9 +41,9 @@ discard block |
||
41 | 41 | } |
42 | 42 | |
43 | 43 | public function compile($internal=false) { |
44 | - if ($internal===false&&$this->autoCompile===true) |
|
44 | + if ($internal===false && $this->autoCompile===true) |
|
45 | 45 | throw new \Exception("Impossible to compile if autoCompile is set to 'true'"); |
46 | - foreach ( $this->components as $component ) { |
|
46 | + foreach ($this->components as $component) { |
|
47 | 47 | $component->compile(); |
48 | 48 | } |
49 | 49 | } |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | } |
70 | 70 | |
71 | 71 | public function compileHtml(JsUtils $js=NULL, &$view=NULL) { |
72 | - foreach ( $this->htmlComponents as $htmlComponent ) { |
|
72 | + foreach ($this->htmlComponents as $htmlComponent) { |
|
73 | 73 | $htmlComponent->compile($js, $view); |
74 | 74 | } |
75 | 75 | } |
@@ -41,8 +41,9 @@ discard block |
||
41 | 41 | } |
42 | 42 | |
43 | 43 | public function compile($internal=false) { |
44 | - if ($internal===false&&$this->autoCompile===true) |
|
45 | - throw new \Exception("Impossible to compile if autoCompile is set to 'true'"); |
|
44 | + if ($internal===false&&$this->autoCompile===true) { |
|
45 | + throw new \Exception("Impossible to compile if autoCompile is set to 'true'"); |
|
46 | + } |
|
46 | 47 | foreach ( $this->components as $component ) { |
47 | 48 | $component->compile(); |
48 | 49 | } |
@@ -53,13 +54,16 @@ discard block |
||
53 | 54 | } |
54 | 55 | |
55 | 56 | public function addComponent(SimpleComponent $component, $attachTo, $params) { |
56 | - if ($this->autoCompile) |
|
57 | - $this->components []=$component; |
|
58 | - if (isset($attachTo)) |
|
59 | - $component->attach($attachTo); |
|
60 | - if (isset($params)) |
|
61 | - if (is_array($params)) |
|
57 | + if ($this->autoCompile) { |
|
58 | + $this->components []=$component; |
|
59 | + } |
|
60 | + if (isset($attachTo)) { |
|
61 | + $component->attach($attachTo); |
|
62 | + } |
|
63 | + if (isset($params)) { |
|
64 | + if (is_array($params)) |
|
62 | 65 | $component->setParams($params); |
66 | + } |
|
63 | 67 | return $component; |
64 | 68 | } |
65 | 69 |
@@ -12,8 +12,8 @@ discard block |
||
12 | 12 | private static $constCacheArray=NULL; |
13 | 13 | |
14 | 14 | public static function getConstants() { |
15 | - if (self::$constCacheArray == NULL) { |
|
16 | - self::$constCacheArray=[ ]; |
|
15 | + if (self::$constCacheArray==NULL) { |
|
16 | + self::$constCacheArray=[]; |
|
17 | 17 | } |
18 | 18 | $calledClass=get_called_class(); |
19 | 19 | if (!array_key_exists($calledClass, self::$constCacheArray)) { |
@@ -23,16 +23,16 @@ discard block |
||
23 | 23 | return self::$constCacheArray[$calledClass]; |
24 | 24 | } |
25 | 25 | |
26 | - public static function getConstantValues($postFix="",$prefixBefore=false) { |
|
27 | - if ($postFix == "") |
|
26 | + public static function getConstantValues($postFix="", $prefixBefore=false) { |
|
27 | + if ($postFix=="") |
|
28 | 28 | return \array_values(self::getConstants()); |
29 | 29 | else { |
30 | - if($prefixBefore===false){ |
|
31 | - return \array_map(function ($elem) use($postFix) { |
|
32 | - return $elem . " " . $postFix; |
|
30 | + if ($prefixBefore===false) { |
|
31 | + return \array_map(function($elem) use($postFix) { |
|
32 | + return $elem." ".$postFix; |
|
33 | 33 | }, \array_values(self::getConstants())); |
34 | - }else{ |
|
35 | - return \array_map(function ($elem) use($postFix) { |
|
34 | + } else { |
|
35 | + return \array_map(function($elem) use($postFix) { |
|
36 | 36 | return $postFix." ".$elem; |
37 | 37 | }, \array_values(self::getConstants())); |
38 | 38 | } |
@@ -24,14 +24,14 @@ |
||
24 | 24 | } |
25 | 25 | |
26 | 26 | public static function getConstantValues($postFix="",$prefixBefore=false) { |
27 | - if ($postFix == "") |
|
28 | - return \array_values(self::getConstants()); |
|
29 | - else { |
|
27 | + if ($postFix == "") { |
|
28 | + return \array_values(self::getConstants()); |
|
29 | + } else { |
|
30 | 30 | if($prefixBefore===false){ |
31 | 31 | return \array_map(function ($elem) use($postFix) { |
32 | 32 | return $elem . " " . $postFix; |
33 | 33 | }, \array_values(self::getConstants())); |
34 | - }else{ |
|
34 | + } else{ |
|
35 | 35 | return \array_map(function ($elem) use($postFix) { |
36 | 36 | return $postFix." ".$elem; |
37 | 37 | }, \array_values(self::getConstants())); |