@@ -42,8 +42,9 @@ discard block |
||
42 | 42 | } |
43 | 43 | |
44 | 44 | public function compile($internal=false) { |
45 | - if ($internal===false&&$this->autoCompile===true) |
|
46 | - throw new \Exception("Impossible to compile if autoCompile is set to 'true'"); |
|
45 | + if ($internal===false&&$this->autoCompile===true) { |
|
46 | + throw new \Exception("Impossible to compile if autoCompile is set to 'true'"); |
|
47 | + } |
|
47 | 48 | foreach ( $this->components as $component ) { |
48 | 49 | $component->compile(); |
49 | 50 | } |
@@ -60,13 +61,14 @@ discard block |
||
60 | 61 | $this->components [$attachTo]=$component; |
61 | 62 | } |
62 | 63 | $component->attach($attachTo); |
63 | - }else{ |
|
64 | + } else{ |
|
64 | 65 | $this->components []=$component; |
65 | 66 | } |
66 | 67 | } |
67 | - if (isset($params)) |
|
68 | - if (\is_array($params)) |
|
68 | + if (isset($params)) { |
|
69 | + if (\is_array($params)) |
|
69 | 70 | $component->setParams($params); |
71 | + } |
|
70 | 72 | return $component; |
71 | 73 | } |
72 | 74 |
@@ -58,8 +58,9 @@ discard block |
||
58 | 58 | */ |
59 | 59 | public function addHeader($title, $niveau=1, $dividing=true) { |
60 | 60 | $header=new HtmlHeader("", $niveau, $title); |
61 | - if ($dividing) |
|
62 | - $header->setDividing(); |
|
61 | + if ($dividing) { |
|
62 | + $header->setDividing(); |
|
63 | + } |
|
63 | 64 | return $this->addItem($header); |
64 | 65 | } |
65 | 66 | |
@@ -87,8 +88,9 @@ discard block |
||
87 | 88 | if (\is_string($end)) { |
88 | 89 | $label=$end; |
89 | 90 | \array_pop($fields); |
90 | - } else |
|
91 | - $label=NULL; |
|
91 | + } else { |
|
92 | + $label=NULL; |
|
93 | + } |
|
92 | 94 | } |
93 | 95 | $this->_fields=\array_merge($this->_fields, $fields); |
94 | 96 | $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count(), $fields); |
@@ -152,27 +154,31 @@ discard block |
||
152 | 154 | */ |
153 | 155 | public function addMessage($identifier, $content, $header=NULL, $icon=NULL, $type=NULL) { |
154 | 156 | $message=new HtmlMessage($identifier, $content); |
155 | - if (isset($header)) |
|
156 | - $message->addHeader($header); |
|
157 | - if (isset($icon)) |
|
158 | - $message->setIcon($icon); |
|
159 | - if (isset($type)) |
|
160 | - $message->setStyle($type); |
|
157 | + if (isset($header)) { |
|
158 | + $message->addHeader($header); |
|
159 | + } |
|
160 | + if (isset($icon)) { |
|
161 | + $message->setIcon($icon); |
|
162 | + } |
|
163 | + if (isset($type)) { |
|
164 | + $message->setStyle($type); |
|
165 | + } |
|
161 | 166 | return $this->addItem($message); |
162 | 167 | } |
163 | 168 | |
164 | 169 | |
165 | 170 | |
166 | 171 | public function compile(JsUtils $js=NULL,&$view=NULL){ |
167 | - if(\sizeof($this->_validationParams)>0) |
|
168 | - $this->setProperty("novalidate", ""); |
|
172 | + if(\sizeof($this->_validationParams)>0) { |
|
173 | + $this->setProperty("novalidate", ""); |
|
174 | + } |
|
169 | 175 | return parent::compile($js,$view); |
170 | 176 | } |
171 | 177 | |
172 | 178 | public function run(JsUtils $js) { |
173 | 179 | if(isset($js)){ |
174 | 180 | $compo=$js->semantic()->form("#".$this->identifier); |
175 | - }else{ |
|
181 | + } else{ |
|
176 | 182 | $compo=new Form(); |
177 | 183 | $compo->attach("#".$this->identifier); |
178 | 184 | } |
@@ -185,8 +191,9 @@ discard block |
||
185 | 191 | if($field instanceof HtmlFormFields){ |
186 | 192 | $items=$field->getItems(); |
187 | 193 | foreach ($items as $_field){ |
188 | - if($_field instanceof HtmlFormField) |
|
189 | - $this->addCompoValidation($compo, $_field); |
|
194 | + if($_field instanceof HtmlFormField) { |
|
195 | + $this->addCompoValidation($compo, $_field); |
|
196 | + } |
|
190 | 197 | } |
191 | 198 | } |
192 | 199 | } |
@@ -71,8 +71,9 @@ discard block |
||
71 | 71 | if($index<$menu->count()){ |
72 | 72 | if(isset($this->content[$index])===false){ |
73 | 73 | $this->content[$index]=$this->createSegment($index, $content, $menu->getItem($index)->getIdentifier()); |
74 | - }else |
|
75 | - $this->content[$index]->setContent($content); |
|
74 | + } else { |
|
75 | + $this->content[$index]->setContent($content); |
|
76 | + } |
|
76 | 77 | } |
77 | 78 | return $this; |
78 | 79 | } |
@@ -239,15 +240,17 @@ discard block |
||
239 | 240 | * @see BaseHtml::run() |
240 | 241 | */ |
241 | 242 | public function run(JsUtils $js) { |
242 | - if(isset($this->_bsComponent)===false) |
|
243 | - $this->_bsComponent=$js->semantic()->tab("#".$this->identifier." .item",$this->params); |
|
243 | + if(isset($this->_bsComponent)===false) { |
|
244 | + $this->_bsComponent=$js->semantic()->tab("#".$this->identifier." .item",$this->params); |
|
245 | + } |
|
244 | 246 | $this->addEventsOnRun($js); |
245 | 247 | return $this->_bsComponent; |
246 | 248 | } |
247 | 249 | |
248 | 250 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
249 | - if(!$this->_activated && $this->content["menu"]->count()>0 && \sizeof($this->content)>1) |
|
250 | - $this->activate(0); |
|
251 | + if(!$this->_activated && $this->content["menu"]->count()>0 && \sizeof($this->content)>1) { |
|
252 | + $this->activate(0); |
|
253 | + } |
|
251 | 254 | return parent::compile($js,$view); |
252 | 255 | } |
253 | 256 | } |
@@ -59,8 +59,9 @@ discard block |
||
59 | 59 | $retour .= "$.ajax({" . $this->implodeAjaxParameters($ajaxParameters) . "}).done(function( data, textStatus, jqXHR ) {\n"; |
60 | 60 | $retour .= $this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader, ($historize ? $originalSelector : null)) . "});\n"; |
61 | 61 | $retour = $this->_addJsCondition($jsCondition, $retour); |
62 | - if ($immediatly) |
|
63 | - $this->jquery_code_for_compile[] = $retour; |
|
62 | + if ($immediatly) { |
|
63 | + $this->jquery_code_for_compile[] = $retour; |
|
64 | + } |
|
64 | 65 | return $retour; |
65 | 66 | } |
66 | 67 | |
@@ -114,8 +115,9 @@ discard block |
||
114 | 115 | $retour .= "url=url+'" . $slash . "'+$(this).html();\n"; |
115 | 116 | } elseif (\substr($attr, 0, 3) === "js:") { |
116 | 117 | $retour .= "url=url+'" . $slash . "'+" . \substr($attr, 3) . ";\n"; |
117 | - } elseif ($attr !== null && $attr !== "") |
|
118 | - $retour .= "url=url+'" . $slash . "'+($(this).attr('" . $attr . "')||'');\n"; |
|
118 | + } elseif ($attr !== null && $attr !== "") { |
|
119 | + $retour .= "url=url+'" . $slash . "'+($(this).attr('" . $attr . "')||'');\n"; |
|
120 | + } |
|
119 | 121 | } |
120 | 122 | return $retour; |
121 | 123 | } |
@@ -139,10 +141,11 @@ discard block |
||
139 | 141 | } elseif (isset($this->ajaxTransition)) { |
140 | 142 | $call = $this->ajaxTransition; |
141 | 143 | } |
142 | - if (\is_callable($call)) |
|
143 | - $retour = "\t" . $call($responseElement, $jqueryDone) . ";\n"; |
|
144 | - else |
|
145 | - $retour = "\t{$responseElement}.{$jqueryDone}( data );\n"; |
|
144 | + if (\is_callable($call)) { |
|
145 | + $retour = "\t" . $call($responseElement, $jqueryDone) . ";\n"; |
|
146 | + } else { |
|
147 | + $retour = "\t{$responseElement}.{$jqueryDone}( data );\n"; |
|
148 | + } |
|
146 | 149 | } |
147 | 150 | if (isset($history)) { |
148 | 151 | if ($this->params["autoActiveLinks"]) { |
@@ -165,8 +168,9 @@ discard block |
||
165 | 168 | } |
166 | 169 | |
167 | 170 | protected function _correctAjaxUrl($url) { |
168 | - if ($url !== "/" && JString::endsWith($url, "/") === true) |
|
169 | - $url = substr($url, 0, strlen($url) - 1); |
|
171 | + if ($url !== "/" && JString::endsWith($url, "/") === true) { |
|
172 | + $url = substr($url, 0, strlen($url) - 1); |
|
173 | + } |
|
170 | 174 | if (strncmp($url, 'http://', 7) != 0 && strncmp($url, 'https://', 8) != 0) { |
171 | 175 | $url = $this->getUrl($url); |
172 | 176 | } |
@@ -190,8 +194,9 @@ discard block |
||
190 | 194 | public static function _implodeParams($parameters) { |
191 | 195 | $allParameters = []; |
192 | 196 | foreach ($parameters as $params) { |
193 | - if (isset($params)) |
|
194 | - $allParameters[] = self::_correctParams($params); |
|
197 | + if (isset($params)) { |
|
198 | + $allParameters[] = self::_correctParams($params); |
|
199 | + } |
|
195 | 200 | } |
196 | 201 | return \implode("+'&'+", $allParameters); |
197 | 202 | } |
@@ -217,8 +222,9 @@ discard block |
||
217 | 222 | |
218 | 223 | protected function setDefaultParameters(&$parameters, $default) { |
219 | 224 | foreach ($default as $k => $v) { |
220 | - if (! isset($parameters[$k])) |
|
221 | - $parameters[$k] = $v; |
|
225 | + if (! isset($parameters[$k])) { |
|
226 | + $parameters[$k] = $v; |
|
227 | + } |
|
222 | 228 | } |
223 | 229 | } |
224 | 230 | |
@@ -746,8 +752,9 @@ discard block |
||
746 | 752 | $retour .= "$('#" . $form . "').submit();\n"; |
747 | 753 | } |
748 | 754 | $retour = $this->_addJsCondition($jsCondition, $retour); |
749 | - if ($immediatly) |
|
750 | - $this->jquery_code_for_compile[] = $retour; |
|
755 | + if ($immediatly) { |
|
756 | + $this->jquery_code_for_compile[] = $retour; |
|
757 | + } |
|
751 | 758 | return $retour; |
752 | 759 | } |
753 | 760 |
@@ -34,8 +34,9 @@ discard block |
||
34 | 34 | $callback = ", function(){\n{$callback}\n}"; |
35 | 35 | } |
36 | 36 | $str = "$({$element}).{$action}({$speed}{$callback});"; |
37 | - if ($immediatly) |
|
38 | - $this->jquery_code_for_compile[] = $str; |
|
37 | + if ($immediatly) { |
|
38 | + $this->jquery_code_for_compile[] = $str; |
|
39 | + } |
|
39 | 40 | return $str; |
40 | 41 | } |
41 | 42 | |
@@ -73,10 +74,12 @@ discard block |
||
73 | 74 | if (isset($param)) { |
74 | 75 | $param = Javascript::prep_value($param); |
75 | 76 | $str = "$({$element}).{$jQueryCall}({$param});"; |
76 | - } else |
|
77 | - $str = "$({$element}).{$jQueryCall}();"; |
|
78 | - if ($immediatly) |
|
79 | - $this->jquery_code_for_compile[] = $str; |
|
77 | + } else { |
|
78 | + $str = "$({$element}).{$jQueryCall}();"; |
|
79 | + } |
|
80 | + if ($immediatly) { |
|
81 | + $this->jquery_code_for_compile[] = $str; |
|
82 | + } |
|
80 | 83 | return $str; |
81 | 84 | } |
82 | 85 | |
@@ -94,8 +97,9 @@ discard block |
||
94 | 97 | $to = Javascript::prep_element($to); |
95 | 98 | $element = Javascript::prep_element($element); |
96 | 99 | $str = "$({$to}).{$jQueryCall}({$element});"; |
97 | - if ($immediatly) |
|
98 | - $this->jquery_code_for_compile[] = $str; |
|
100 | + if ($immediatly) { |
|
101 | + $this->jquery_code_for_compile[] = $str; |
|
102 | + } |
|
99 | 103 | return $str; |
100 | 104 | } |
101 | 105 | |
@@ -153,10 +157,12 @@ discard block |
||
153 | 157 | if (isset($value)) { |
154 | 158 | $value = Javascript::prep_value($value); |
155 | 159 | $str = "$({$element}).attr(\"$attributeName\",{$value});"; |
156 | - } else |
|
157 | - $str = "$({$element}).attr(\"$attributeName\");"; |
|
158 | - if ($immediatly) |
|
159 | - $this->jquery_code_for_compile[] = $str; |
|
160 | + } else { |
|
161 | + $str = "$({$element}).attr(\"$attributeName\");"; |
|
162 | + } |
|
163 | + if ($immediatly) { |
|
164 | + $this->jquery_code_for_compile[] = $str; |
|
165 | + } |
|
160 | 166 | return $str; |
161 | 167 | } |
162 | 168 | |
@@ -219,8 +225,9 @@ discard block |
||
219 | 225 | |
220 | 226 | $str = "$({$element}).animate({\n$animations\n\t\t}" . $speed . $extra . ");"; |
221 | 227 | |
222 | - if ($immediatly) |
|
223 | - $this->jquery_code_for_compile[] = $str; |
|
228 | + if ($immediatly) { |
|
229 | + $this->jquery_code_for_compile[] = $str; |
|
230 | + } |
|
224 | 231 | return $str; |
225 | 232 | } |
226 | 233 | |
@@ -410,8 +417,9 @@ discard block |
||
410 | 417 | $element = Javascript::prep_element($element); |
411 | 418 | $str = "$({$element}).trigger(\"$event\");"; |
412 | 419 | |
413 | - if ($immediatly) |
|
414 | - $this->jquery_code_for_compile[] = $str; |
|
420 | + if ($immediatly) { |
|
421 | + $this->jquery_code_for_compile[] = $str; |
|
422 | + } |
|
415 | 423 | return $str; |
416 | 424 | } |
417 | 425 | |
@@ -481,8 +489,9 @@ discard block |
||
481 | 489 | $str .= "else{" . $jsCodeIfFalse . "}"; |
482 | 490 | } |
483 | 491 | |
484 | - if ($immediatly) |
|
485 | - $this->jquery_code_for_compile[] = $str; |
|
492 | + if ($immediatly) { |
|
493 | + $this->jquery_code_for_compile[] = $str; |
|
494 | + } |
|
486 | 495 | return $str; |
487 | 496 | } |
488 | 497 | |
@@ -500,11 +509,13 @@ discard block |
||
500 | 509 | private function _doJQuery($element, $jqueryCall, $param = "", $jsCallback = "", $immediatly = false) { |
501 | 510 | $param = Javascript::prep_value($param); |
502 | 511 | $callback = ""; |
503 | - if ($jsCallback != "") |
|
504 | - $callback = ", function(event){\n{$jsCallback}\n}"; |
|
512 | + if ($jsCallback != "") { |
|
513 | + $callback = ", function(event){\n{$jsCallback}\n}"; |
|
514 | + } |
|
505 | 515 | $script = "$(" . Javascript::prep_element($element) . ")." . $jqueryCall . "(" . $param . $callback . ");\n"; |
506 | - if ($immediatly) |
|
507 | - $this->jquery_code_for_compile[] = $script; |
|
516 | + if ($immediatly) { |
|
517 | + $this->jquery_code_for_compile[] = $script; |
|
518 | + } |
|
508 | 519 | return $script; |
509 | 520 | } |
510 | 521 | |
@@ -591,8 +602,9 @@ discard block |
||
591 | 602 | */ |
592 | 603 | public function exec($js, $immediatly = false) { |
593 | 604 | $script = $js . "\n"; |
594 | - if ($immediatly) |
|
595 | - $this->jquery_code_for_compile[] = $script; |
|
605 | + if ($immediatly) { |
|
606 | + $this->jquery_code_for_compile[] = $script; |
|
607 | + } |
|
596 | 608 | return $script; |
597 | 609 | } |
598 | 610 |