@@ -54,8 +54,9 @@ discard block |
||
54 | 54 | $this->params[$key]=$params[$key]; |
55 | 55 | } |
56 | 56 | $this->jsUtils=$jsUtils; |
57 | - if(isset($params["ajaxTransition"])) |
|
58 | - $this->ajaxTransition=$this->setAjaxDataCall($params["ajaxTransition"]); |
|
57 | + if(isset($params["ajaxTransition"])) { |
|
58 | + $this->ajaxTransition=$this->setAjaxDataCall($params["ajaxTransition"]); |
|
59 | + } |
|
59 | 60 | } |
60 | 61 | |
61 | 62 | /** |
@@ -138,10 +139,12 @@ discard block |
||
138 | 139 | if (isset($param)) { |
139 | 140 | $param=Javascript::prep_value($param); |
140 | 141 | $str="$({$element}).{$jQueryCall}({$param});"; |
141 | - } else |
|
142 | - $str="$({$element}).{$jQueryCall}();"; |
|
143 | - if ($immediatly) |
|
144 | - $this->jquery_code_for_compile[]=$str; |
|
142 | + } else { |
|
143 | + $str="$({$element}).{$jQueryCall}();"; |
|
144 | + } |
|
145 | + if ($immediatly) { |
|
146 | + $this->jquery_code_for_compile[]=$str; |
|
147 | + } |
|
145 | 148 | return $str; |
146 | 149 | } |
147 | 150 | /** |
@@ -156,8 +159,9 @@ discard block |
||
156 | 159 | $to=Javascript::prep_element($to); |
157 | 160 | $element=Javascript::prep_element($element); |
158 | 161 | $str="$({$to}).{$jQueryCall}({$element});"; |
159 | - if ($immediatly) |
|
160 | - $this->jquery_code_for_compile[]=$str; |
|
162 | + if ($immediatly) { |
|
163 | + $this->jquery_code_for_compile[]=$str; |
|
164 | + } |
|
161 | 165 | return $str; |
162 | 166 | } |
163 | 167 | |
@@ -213,12 +217,14 @@ discard block |
||
213 | 217 | if ($stopPropagation===true) { |
214 | 218 | $js=Javascript::$stopPropagation.$js; |
215 | 219 | } |
216 | - if (array_search($event, $this->jquery_events)===false) |
|
217 | - $event="\n\t$(".Javascript::prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n"; |
|
218 | - else |
|
219 | - $event="\n\t$(".Javascript::prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n"; |
|
220 | - if($immediatly) |
|
221 | - $this->jquery_code_for_compile[]=$event; |
|
220 | + if (array_search($event, $this->jquery_events)===false) { |
|
221 | + $event="\n\t$(".Javascript::prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n"; |
|
222 | + } else { |
|
223 | + $event="\n\t$(".Javascript::prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n"; |
|
224 | + } |
|
225 | + if($immediatly) { |
|
226 | + $this->jquery_code_for_compile[]=$event; |
|
227 | + } |
|
222 | 228 | return $event; |
223 | 229 | } |
224 | 230 | |
@@ -261,8 +267,9 @@ discard block |
||
261 | 267 | |
262 | 268 | public function getScript($offset=0){ |
263 | 269 | $code=$this->jquery_code_for_compile; |
264 | - if($offset>0) |
|
265 | - $code=\array_slice($code, $offset); |
|
270 | + if($offset>0) { |
|
271 | + $code=\array_slice($code, $offset); |
|
272 | + } |
|
266 | 273 | return implode('', $code); |
267 | 274 | } |
268 | 275 | |
@@ -314,7 +321,9 @@ discard block |
||
314 | 321 | } |
315 | 322 | |
316 | 323 | private function minify($input) { |
317 | - if(trim($input) === "") return $input; |
|
324 | + if(trim($input) === "") { |
|
325 | + return $input; |
|
326 | + } |
|
318 | 327 | return preg_replace( |
319 | 328 | array( |
320 | 329 | // Remove comment(s) |
@@ -23,8 +23,9 @@ discard block |
||
23 | 23 | $this->widgetIdentifier=$identifier; |
24 | 24 | $this->values=[]; |
25 | 25 | $this->afterCompile=[]; |
26 | - if(isset($instance)) |
|
27 | - $this->setInstance($instance); |
|
26 | + if(isset($instance)) { |
|
27 | + $this->setInstance($instance); |
|
28 | + } |
|
28 | 29 | $this->setCaptions($captions); |
29 | 30 | $this->captionCallback=NULL; |
30 | 31 | $this->defaultValueFunction=function($name,$value){return $value;}; |
@@ -62,14 +63,16 @@ discard block |
||
62 | 63 | } |
63 | 64 | |
64 | 65 | public function getIdentifier($index=NULL){ |
65 | - if(!isset($index)) |
|
66 | - $index=self::$index; |
|
66 | + if(!isset($index)) { |
|
67 | + $index=self::$index; |
|
68 | + } |
|
67 | 69 | $value=$index; |
68 | 70 | if(isset($this->values["identifier"])){ |
69 | - if(\is_string($this->values["identifier"])) |
|
70 | - $value=JReflection::callMethod($this->instance, $this->values["identifier"], []); |
|
71 | - else |
|
72 | - $value=$this->values["identifier"]($index,$this->instance); |
|
71 | + if(\is_string($this->values["identifier"])) { |
|
72 | + $value=JReflection::callMethod($this->instance, $this->values["identifier"], []); |
|
73 | + } else { |
|
74 | + $value=$this->values["identifier"]($index,$this->instance); |
|
75 | + } |
|
73 | 76 | } |
74 | 77 | return $value; |
75 | 78 | } |
@@ -93,7 +96,7 @@ discard block |
||
93 | 96 | $value=$property->getValue($this->instance); |
94 | 97 | if(isset($this->values[$index])){ |
95 | 98 | $value= $this->values[$index]($value,$this->instance,$index); |
96 | - }else{ |
|
99 | + } else{ |
|
97 | 100 | $value=$this->_getDefaultValue($property->getName(),$value, $index); |
98 | 101 | } |
99 | 102 | return $value; |
@@ -103,16 +106,16 @@ discard block |
||
103 | 106 | $value=null; |
104 | 107 | if($property instanceof \ReflectionProperty){ |
105 | 108 | $value=$this->_getPropertyValue($property, $index); |
106 | - }else{ |
|
107 | - if(\is_callable($property)) |
|
108 | - $value=$property($this->instance); |
|
109 | - elseif(\is_array($property)){ |
|
109 | + } else{ |
|
110 | + if(\is_callable($property)) { |
|
111 | + $value=$property($this->instance); |
|
112 | + } elseif(\is_array($property)){ |
|
110 | 113 | $values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property); |
111 | 114 | $value=\implode("", $values); |
112 | - }else{ |
|
115 | + } else{ |
|
113 | 116 | if(isset($this->values[$index])){ |
114 | 117 | $value= $this->values[$index]($property,$this->instance,$index); |
115 | - }elseif(isset($this->instance->{$property})){ |
|
118 | + } elseif(isset($this->instance->{$property})){ |
|
116 | 119 | $value=$this->instance->{$property}; |
117 | 120 | } |
118 | 121 | } |
@@ -135,10 +138,10 @@ discard block |
||
135 | 138 | if(isset($vb[$index])){ |
136 | 139 | if(\is_array($vb[$index])){ |
137 | 140 | $this->visibleProperties[$index][]=$field; |
138 | - }else{ |
|
141 | + } else{ |
|
139 | 142 | $this->visibleProperties[$index]=[$vb[$index],$field]; |
140 | 143 | } |
141 | - }else{ |
|
144 | + } else{ |
|
142 | 145 | return $this->insertField($index, $field); |
143 | 146 | } |
144 | 147 | return $this; |
@@ -165,9 +168,9 @@ discard block |
||
165 | 168 | $property=$this->getProperty($index); |
166 | 169 | if($property instanceof \ReflectionProperty){ |
167 | 170 | $result=$property->getName(); |
168 | - }elseif(\is_callable($property)){ |
|
171 | + } elseif(\is_callable($property)){ |
|
169 | 172 | $result=$this->visibleProperties[$index]; |
170 | - }else{ |
|
173 | + } else{ |
|
171 | 174 | $result=$property; |
172 | 175 | } |
173 | 176 | return $result; |
@@ -187,7 +190,7 @@ discard block |
||
187 | 190 | $this->reflect=new \ReflectionClass($instance); |
188 | 191 | if(\sizeof($this->visibleProperties)===0){ |
189 | 192 | $this->properties=$this->getDefaultProperties(); |
190 | - }else{ |
|
193 | + } else{ |
|
191 | 194 | foreach ($this->visibleProperties as $property){ |
192 | 195 | $this->setInstanceProperty($property); |
193 | 196 | } |
@@ -198,22 +201,23 @@ discard block |
||
198 | 201 | private function setInstanceProperty($property){ |
199 | 202 | if(\is_callable($property)){ |
200 | 203 | $this->properties[]=$property; |
201 | - }elseif(\is_string($property)){ |
|
204 | + } elseif(\is_string($property)){ |
|
202 | 205 | try{ |
203 | 206 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
204 | 207 | $rProperty=$this->reflect->getProperty($property); |
205 | 208 | $this->properties[]=$rProperty; |
206 | - }catch(\Exception $e){ |
|
209 | + } catch(\Exception $e){ |
|
207 | 210 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
208 | 211 | $this->properties[]=$property; |
209 | 212 | } |
210 | - }elseif(\is_int($property)){ |
|
213 | + } elseif(\is_int($property)){ |
|
211 | 214 | $props=$this->getDefaultProperties(); |
212 | - if(isset($props[$property])) |
|
213 | - $this->properties[]=$props[$property]; |
|
214 | - else |
|
215 | - $this->properties[]=$property; |
|
216 | - }else{ |
|
215 | + if(isset($props[$property])) { |
|
216 | + $this->properties[]=$props[$property]; |
|
217 | + } else { |
|
218 | + $this->properties[]=$property; |
|
219 | + } |
|
220 | + } else{ |
|
217 | 221 | $this->properties[]=$property; |
218 | 222 | } |
219 | 223 | } |
@@ -257,12 +261,13 @@ discard block |
||
257 | 261 | if(isset($this->captions[$index])){ |
258 | 262 | return $this->captions[$index]; |
259 | 263 | } |
260 | - if($this->properties[$index] instanceof \ReflectionProperty) |
|
261 | - return $this->properties[$index]->getName(); |
|
262 | - elseif(\is_callable($this->properties[$index])) |
|
263 | - return ""; |
|
264 | - else |
|
265 | - return $this->properties[$index]; |
|
264 | + if($this->properties[$index] instanceof \ReflectionProperty) { |
|
265 | + return $this->properties[$index]->getName(); |
|
266 | + } elseif(\is_callable($this->properties[$index])) { |
|
267 | + return ""; |
|
268 | + } else { |
|
269 | + return $this->properties[$index]; |
|
270 | + } |
|
266 | 271 | } |
267 | 272 | |
268 | 273 | public function getCaptions(){ |
@@ -271,7 +276,7 @@ discard block |
||
271 | 276 | for($i=\sizeof($captions);$i<$this->count();$i++){ |
272 | 277 | $captions[]=""; |
273 | 278 | } |
274 | - }else{ |
|
279 | + } else{ |
|
275 | 280 | $captions=[]; |
276 | 281 | $index=0; |
277 | 282 | $count=$this->count(); |
@@ -287,8 +292,9 @@ discard block |
||
287 | 292 | } |
288 | 293 | |
289 | 294 | public function setCaption($index,$caption){ |
290 | - if(isset($this->captions)===false) |
|
291 | - $this->captions=[]; |
|
295 | + if(isset($this->captions)===false) { |
|
296 | + $this->captions=[]; |
|
297 | + } |
|
292 | 298 | $this->captions[$index]=$caption; |
293 | 299 | return $this; |
294 | 300 | } |
@@ -50,8 +50,9 @@ discard block |
||
50 | 50 | if(isset($this->_checkedClass)){ |
51 | 51 | $checkedMessageCall.="$(this).closest('tr').toggleClass('".$this->_checkedClass."',$(this).prop('checked'));"; |
52 | 52 | } |
53 | - if(isset($js)) |
|
54 | - $js->exec($this->_getCheckedMessageFunction(),true); |
|
53 | + if(isset($js)) { |
|
54 | + $js->exec($this->_getCheckedMessageFunction(),true); |
|
55 | + } |
|
55 | 56 | } |
56 | 57 | return $checkedMessageCall; |
57 | 58 | } |
@@ -59,8 +60,9 @@ discard block |
||
59 | 60 | protected function _generateMainCheckbox(&$captions){ |
60 | 61 | $ck=new HtmlCheckbox("main-ck-".$this->identifier,""); |
61 | 62 | $checkedMessageCall=""; |
62 | - if($this->_hasCheckedMessage) |
|
63 | - $checkedMessageCall="$('#{$this->identifier}').trigger('updateChecked');"; |
|
63 | + if($this->_hasCheckedMessage) { |
|
64 | + $checkedMessageCall="$('#{$this->identifier}').trigger('updateChecked');"; |
|
65 | + } |
|
64 | 66 | |
65 | 67 | $ck->setOnChecked($this->_setAllChecked("true").$checkedMessageCall); |
66 | 68 | $ck->setOnUnchecked($this->_setAllChecked("false").$checkedMessageCall); |
@@ -108,8 +110,9 @@ discard block |
||
108 | 110 | * @param callable $callback |
109 | 111 | */ |
110 | 112 | public function addCountCheckedInToolbar(array $checkedMessage=null,$callback=null){ |
111 | - if(isset($checkedMessage)) |
|
112 | - $this->_checkedMessage=$checkedMessage; |
|
113 | + if(isset($checkedMessage)) { |
|
114 | + $this->_checkedMessage=$checkedMessage; |
|
115 | + } |
|
113 | 116 | $checkedMessage=$this->getCheckedMessage(); |
114 | 117 | $this->_hasCheckboxes=true; |
115 | 118 | $this->_hasCheckedMessage=true; |
@@ -89,8 +89,9 @@ |
||
89 | 89 | } |
90 | 90 | |
91 | 91 | public function setPagesVisibles($pages_visibles) { |
92 | - if(!isset($pages_visibles)) |
|
93 | - $pages_visibles=(int)ceil($this->row_count / $this->items_per_page)+1; |
|
92 | + if(!isset($pages_visibles)) { |
|
93 | + $pages_visibles=(int)ceil($this->row_count / $this->items_per_page)+1; |
|
94 | + } |
|
94 | 95 | $this->pages_visibles=$pages_visibles; |
95 | 96 | return $this; |
96 | 97 | } |
@@ -48,8 +48,9 @@ |
||
48 | 48 | $('#pagination-{$id} ._firstPage').attr('data-page',Math.max(1,page-1)); |
49 | 49 | var lastPage=$('#pagination-{$id} ._lastPage');lastPage.attr('data-page',Math.min(lastPage.attr('data-max'),page+1));"; |
50 | 50 | } |
51 | - if(isset($this->_urls["refresh"])) |
|
52 | - $this->jsonArrayOnClick($menu, $this->_urls["refresh"],"post","{'p':$(this).attr('data-page')}",$callback); |
|
51 | + if(isset($this->_urls["refresh"])) { |
|
52 | + $this->jsonArrayOnClick($menu, $this->_urls["refresh"],"post","{'p':$(this).attr('data-page')}",$callback); |
|
53 | + } |
|
53 | 54 | } |
54 | 55 | |
55 | 56 | /** |
@@ -21,7 +21,7 @@ |
||
21 | 21 | if($class->getProperty($property)!==null){ |
22 | 22 | \call_user_func_array([$object,$name],[$value]); |
23 | 23 | } |
24 | - }catch(\Exception $e){ |
|
24 | + } catch(\Exception $e){ |
|
25 | 25 | //Nothing to do |
26 | 26 | } |
27 | 27 | } |
@@ -13,8 +13,9 @@ |
||
13 | 13 | public function __construct($identifier, $href="#", $content="Link",$target=NULL) { |
14 | 14 | parent::__construct($identifier, "a", ""); |
15 | 15 | $this->setHref($href); |
16 | - if(isset($target)) |
|
17 | - $this->setTarget($target); |
|
16 | + if(isset($target)) { |
|
17 | + $this->setTarget($target); |
|
18 | + } |
|
18 | 19 | $this->content=$content; |
19 | 20 | } |
20 | 21 |
@@ -89,8 +89,9 @@ discard block |
||
89 | 89 | public function asLink($href=NULL,$target=NULL) { |
90 | 90 | if (isset($href)) { |
91 | 91 | $_target=""; |
92 | - if(isset($target)) |
|
93 | - $_target="target='{$target}'"; |
|
92 | + if(isset($target)) { |
|
93 | + $_target="target='{$target}'"; |
|
94 | + } |
|
94 | 95 | $this->wrap("<a href='" . $href . "' {$_target}>", "</a>"); |
95 | 96 | } |
96 | 97 | return $this->addToProperty("class", "link"); |
@@ -107,8 +108,9 @@ discard block |
||
107 | 108 | */ |
108 | 109 | public function setBordered($inverted=false) { |
109 | 110 | $invertedStr=""; |
110 | - if ($inverted !== false) |
|
111 | - $invertedStr=" inverted"; |
|
111 | + if ($inverted !== false) { |
|
112 | + $invertedStr=" inverted"; |
|
113 | + } |
|
112 | 114 | return $this->addToProperty("class", "bordered" . $invertedStr); |
113 | 115 | } |
114 | 116 | |
@@ -121,12 +123,14 @@ discard block |
||
121 | 123 | } |
122 | 124 | |
123 | 125 | public function addLabel($label, $before=false, $icon=NULL) { |
124 | - if($before) |
|
125 | - $this->wrap($label); |
|
126 | - else |
|
127 | - $this->wrap("", $label); |
|
128 | - if(isset($icon)) |
|
129 | - $this->addToIcon($icon); |
|
126 | + if($before) { |
|
127 | + $this->wrap($label); |
|
128 | + } else { |
|
129 | + $this->wrap("", $label); |
|
130 | + } |
|
131 | + if(isset($icon)) { |
|
132 | + $this->addToIcon($icon); |
|
133 | + } |
|
130 | 134 | return $this; |
131 | 135 | } |
132 | 136 |
@@ -56,9 +56,9 @@ discard block |
||
56 | 56 | } |
57 | 57 | |
58 | 58 | public function setFocusable($value=true) { |
59 | - if ($value === true) |
|
60 | - $this->setProperty("tabindex", "0"); |
|
61 | - else { |
|
59 | + if ($value === true) { |
|
60 | + $this->setProperty("tabindex", "0"); |
|
61 | + } else { |
|
62 | 62 | $this->removeProperty("tabindex"); |
63 | 63 | } |
64 | 64 | return $this; |
@@ -184,8 +184,9 @@ discard block |
||
184 | 184 | * @return HtmlButton |
185 | 185 | */ |
186 | 186 | public static function social($identifier, $social, $value=NULL) { |
187 | - if ($value === NULL) |
|
188 | - $value=\ucfirst($social); |
|
187 | + if ($value === NULL) { |
|
188 | + $value=\ucfirst($social); |
|
189 | + } |
|
189 | 190 | $return=new HtmlButton($identifier, $value); |
190 | 191 | $return->addIcon($social); |
191 | 192 | return $return->addToPropertyCtrl("class", $social, Social::getConstants()); |