@@ -15,14 +15,15 @@ discard block |
||
15 | 15 | $field=new \Ajax\common\html\html5\HtmlInput($identifier, $inputType, $value); |
16 | 16 | $field->setProperty("name", $name); |
17 | 17 | $this->setField($field); |
18 | - if (isset($label)) |
|
19 | - $this->setLabel($label); |
|
18 | + if (isset($label)) { |
|
19 | + $this->setLabel($label); |
|
20 | + } |
|
20 | 21 | } |
21 | 22 | |
22 | 23 | public function setChecked($value=true){ |
23 | 24 | if($value===true){ |
24 | 25 | $this->getField()->setProperty("checked", "checked"); |
25 | - }else{ |
|
26 | + } else{ |
|
26 | 27 | $this->getField()->removeProperty("checked"); |
27 | 28 | } |
28 | 29 | return $this; |
@@ -51,8 +52,9 @@ discard block |
||
51 | 52 | * @return mixed |
52 | 53 | */ |
53 | 54 | public function getLabel() { |
54 | - if (\array_key_exists("label", $this->content)) |
|
55 | - return $this->content["label"]; |
|
55 | + if (\array_key_exists("label", $this->content)) { |
|
56 | + return $this->content["label"]; |
|
57 | + } |
|
56 | 58 | } |
57 | 59 | |
58 | 60 | /** |
@@ -127,8 +129,9 @@ discard block |
||
127 | 129 | } |
128 | 130 | |
129 | 131 | public function run(JsUtils $js) { |
130 | - if(!isset($this->_bsComponent)) |
|
131 | - $this->_bsComponent=$js->semantic()->checkbox("#" . $this->identifier, $this->_params); |
|
132 | + if(!isset($this->_bsComponent)) { |
|
133 | + $this->_bsComponent=$js->semantic()->checkbox("#" . $this->identifier, $this->_params); |
|
134 | + } |
|
132 | 135 | return parent::run($js); |
133 | 136 | } |
134 | 137 | } |
135 | 138 | \ No newline at end of file |
@@ -60,9 +60,9 @@ discard block |
||
60 | 60 | } |
61 | 61 | |
62 | 62 | private function afterInsert($item) { |
63 | - if (!$item instanceof HtmlMenu && $item->propertyContains("class", "header")===false) |
|
64 | - $item->addToPropertyCtrl("class", "item", array ("item" )); |
|
65 | - else { |
|
63 | + if (!$item instanceof HtmlMenu && $item->propertyContains("class", "header")===false) { |
|
64 | + $item->addToPropertyCtrl("class", "item", array ("item" )); |
|
65 | + } else { |
|
66 | 66 | $this->setSecondary(); |
67 | 67 | } |
68 | 68 | return $item; |
@@ -77,8 +77,9 @@ discard block |
||
77 | 77 | public function addItem($item) { |
78 | 78 | $number=$item; |
79 | 79 | $item=parent::addItem($this->getItemToInsert($item)); |
80 | - if(\is_int($number)) |
|
81 | - $item->setProperty("data-page", $number); |
|
80 | + if(\is_int($number)) { |
|
81 | + $item->setProperty("data-page", $number); |
|
82 | + } |
|
82 | 83 | return $this->afterInsert($item); |
83 | 84 | } |
84 | 85 | |
@@ -151,10 +152,11 @@ discard block |
||
151 | 152 | } |
152 | 153 | |
153 | 154 | public function setSecondary($value=true) { |
154 | - if($value) |
|
155 | - $this->addToProperty("class", "secondary"); |
|
156 | - else |
|
157 | - $this->removePropertyValue("class", "secondary"); |
|
155 | + if($value) { |
|
156 | + $this->addToProperty("class", "secondary"); |
|
157 | + } else { |
|
158 | + $this->removePropertyValue("class", "secondary"); |
|
159 | + } |
|
158 | 160 | return $this; |
159 | 161 | } |
160 | 162 | |
@@ -174,8 +176,9 @@ discard block |
||
174 | 176 | $this->apply(function (HtmlDoubleElement &$item) { |
175 | 177 | $item->setTagName("a"); |
176 | 178 | }); |
177 | - if ($vertical === true) |
|
178 | - $this->setVertical(); |
|
179 | + if ($vertical === true) { |
|
180 | + $this->setVertical(); |
|
181 | + } |
|
179 | 182 | return $this->addToProperty("class", "tabular"); |
180 | 183 | } |
181 | 184 | |
@@ -204,10 +207,11 @@ discard block |
||
204 | 207 | */ |
205 | 208 | public function fromDatabaseObject($object, $function) { |
206 | 209 | $return=$function($object); |
207 | - if (\is_array($return)) |
|
208 | - $this->addItems($return); |
|
209 | - else |
|
210 | - $this->addItem($return); |
|
210 | + if (\is_array($return)) { |
|
211 | + $this->addItems($return); |
|
212 | + } else { |
|
213 | + $this->addItem($return); |
|
214 | + } |
|
211 | 215 | } |
212 | 216 | |
213 | 217 | /** |
@@ -240,8 +244,9 @@ discard block |
||
240 | 244 | } |
241 | 245 | |
242 | 246 | public function run(JsUtils $js){ |
243 | - if($this->identifier!=="" && !isset($this->_bsComponent)) |
|
244 | - $this->onClick('if(!$(this).hasClass("dropdown")&&!$(this).hasClass("no-active")){$(this).addClass("active").siblings().removeClass("active");}',false,false); |
|
247 | + if($this->identifier!=="" && !isset($this->_bsComponent)) { |
|
248 | + $this->onClick('if(!$(this).hasClass("dropdown")&&!$(this).hasClass("no-active")){$(this).addClass("active").siblings().removeClass("active");}',false,false); |
|
249 | + } |
|
245 | 250 | $result= parent::run($js); |
246 | 251 | return $result->setItemSelector(".item"); |
247 | 252 | } |
@@ -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 | } |
@@ -99,16 +102,16 @@ discard block |
||
99 | 102 | if($property instanceof \ReflectionProperty){ |
100 | 103 | $value=$this->_getPropertyValue($property, $index); |
101 | 104 | $propertyName=$property->getName(); |
102 | - }elseif(\is_callable($property)) |
|
103 | - $value=$property($this->instance); |
|
104 | - elseif(\is_array($property)){ |
|
105 | + } elseif(\is_callable($property)) { |
|
106 | + $value=$property($this->instance); |
|
107 | + } elseif(\is_array($property)){ |
|
105 | 108 | $values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property); |
106 | 109 | $value=\implode("", $values); |
107 | - }elseif(\is_string($property)){ |
|
110 | + } elseif(\is_string($property)){ |
|
108 | 111 | $value=$property; |
109 | 112 | if(isset($this->instance->{$property})){ |
110 | 113 | $value=$this->instance->{$property}; |
111 | - }elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){ |
|
114 | + } elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){ |
|
112 | 115 | $value=JReflection::callMethod($this->instance, $getter, []); |
113 | 116 | } |
114 | 117 | } |
@@ -118,7 +121,7 @@ discard block |
||
118 | 121 | protected function _postGetValue($index,$propertyName,$value){ |
119 | 122 | if(isset($this->values[$index])){ |
120 | 123 | $value= $this->values[$index]($value,$this->instance,$index); |
121 | - }else{ |
|
124 | + } else{ |
|
122 | 125 | $value=$this->_getDefaultValue($propertyName,$value, $index); |
123 | 126 | } |
124 | 127 | if(isset($this->afterCompile[$index])){ |
@@ -139,10 +142,10 @@ discard block |
||
139 | 142 | if(isset($vb[$index])){ |
140 | 143 | if(\is_array($vb[$index])){ |
141 | 144 | $this->visibleProperties[$index][]=$field; |
142 | - }else{ |
|
145 | + } else{ |
|
143 | 146 | $this->visibleProperties[$index]=[$vb[$index],$field]; |
144 | 147 | } |
145 | - }else{ |
|
148 | + } else{ |
|
146 | 149 | return $this->insertField($index, $field); |
147 | 150 | } |
148 | 151 | return $this; |
@@ -169,9 +172,9 @@ discard block |
||
169 | 172 | $property=$this->getProperty($index); |
170 | 173 | if($property instanceof \ReflectionProperty){ |
171 | 174 | $result=$property->getName(); |
172 | - }elseif(\is_callable($property)){ |
|
175 | + } elseif(\is_callable($property)){ |
|
173 | 176 | $result=$this->visibleProperties[$index]; |
174 | - }else{ |
|
177 | + } else{ |
|
175 | 178 | $result=$property; |
176 | 179 | } |
177 | 180 | return $result; |
@@ -191,7 +194,7 @@ discard block |
||
191 | 194 | $this->reflect=new \ReflectionClass($instance); |
192 | 195 | if(\sizeof($this->visibleProperties)===0){ |
193 | 196 | $this->properties=$this->getDefaultProperties(); |
194 | - }else{ |
|
197 | + } else{ |
|
195 | 198 | foreach ($this->visibleProperties as $property){ |
196 | 199 | $this->setInstanceProperty($property); |
197 | 200 | } |
@@ -202,22 +205,23 @@ discard block |
||
202 | 205 | private function setInstanceProperty($property){ |
203 | 206 | if(\is_callable($property)){ |
204 | 207 | $this->properties[]=$property; |
205 | - }elseif(\is_string($property)){ |
|
208 | + } elseif(\is_string($property)){ |
|
206 | 209 | try{ |
207 | 210 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
208 | 211 | $rProperty=$this->reflect->getProperty($property); |
209 | 212 | $this->properties[]=$rProperty; |
210 | - }catch(\Exception $e){ |
|
213 | + } catch(\Exception $e){ |
|
211 | 214 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
212 | 215 | $this->properties[]=$property; |
213 | 216 | } |
214 | - }elseif(\is_int($property)){ |
|
217 | + } elseif(\is_int($property)){ |
|
215 | 218 | $props=$this->getDefaultProperties(); |
216 | - if(isset($props[$property])) |
|
217 | - $this->properties[]=$props[$property]; |
|
218 | - else |
|
219 | - $this->properties[]=$property; |
|
220 | - }else{ |
|
219 | + if(isset($props[$property])) { |
|
220 | + $this->properties[]=$props[$property]; |
|
221 | + } else { |
|
222 | + $this->properties[]=$property; |
|
223 | + } |
|
224 | + } else{ |
|
221 | 225 | $this->properties[]=$property; |
222 | 226 | } |
223 | 227 | } |
@@ -261,12 +265,13 @@ discard block |
||
261 | 265 | if(isset($this->captions[$index])){ |
262 | 266 | return $this->captions[$index]; |
263 | 267 | } |
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]; |
|
268 | + if($this->properties[$index] instanceof \ReflectionProperty) { |
|
269 | + return $this->properties[$index]->getName(); |
|
270 | + } elseif(\is_callable($this->properties[$index])) { |
|
271 | + return ""; |
|
272 | + } else { |
|
273 | + return $this->properties[$index]; |
|
274 | + } |
|
270 | 275 | } |
271 | 276 | |
272 | 277 | public function getCaptions(){ |
@@ -275,7 +280,7 @@ discard block |
||
275 | 280 | for($i=\sizeof($captions);$i<$this->count();$i++){ |
276 | 281 | $captions[]=""; |
277 | 282 | } |
278 | - }else{ |
|
283 | + } else{ |
|
279 | 284 | $captions=[]; |
280 | 285 | $index=0; |
281 | 286 | $count=$this->count(); |
@@ -291,8 +296,9 @@ discard block |
||
291 | 296 | } |
292 | 297 | |
293 | 298 | public function setCaption($index,$caption){ |
294 | - if(isset($this->captions)===false) |
|
295 | - $this->captions=[]; |
|
299 | + if(isset($this->captions)===false) { |
|
300 | + $this->captions=[]; |
|
301 | + } |
|
296 | 302 | $this->captions[$index]=$caption; |
297 | 303 | return $this; |
298 | 304 | } |
@@ -64,8 +64,7 @@ discard block |
||
64 | 64 | $rules=$attributes["rules"]; |
65 | 65 | if(\is_array($rules)){ |
66 | 66 | $element->addRules($rules); |
67 | - } |
|
68 | - else{ |
|
67 | + } else{ |
|
69 | 68 | $element->addRule($rules); |
70 | 69 | } |
71 | 70 | unset($attributes["rules"]); |
@@ -117,8 +116,9 @@ discard block |
||
117 | 116 | public function fieldAsLabel($index,$icon=NULL,$attributes=NULL){ |
118 | 117 | return $this->_fieldAs(function($id,$name,$value) use($icon){ |
119 | 118 | $lbl=new HtmlLabel($id,$value); |
120 | - if(isset($icon)) |
|
121 | - $lbl->addIcon($icon); |
|
119 | + if(isset($icon)) { |
|
120 | + $lbl->addIcon($icon); |
|
121 | + } |
|
122 | 122 | return $lbl; |
123 | 123 | }, $index,$attributes,"label"); |
124 | 124 | } |
@@ -126,8 +126,9 @@ discard block |
||
126 | 126 | public function fieldAsHeader($index,$niveau=1,$icon=NULL,$attributes=NULL){ |
127 | 127 | return $this->_fieldAs(function($id,$name,$value) use($niveau,$icon){ |
128 | 128 | $header=new HtmlHeader($id,$niveau,$value); |
129 | - if(isset($icon)) |
|
130 | - $header->asIcon($icon, $value); |
|
129 | + if(isset($icon)) { |
|
130 | + $header->asIcon($icon, $value); |
|
131 | + } |
|
131 | 132 | return $header; |
132 | 133 | }, $index,$attributes,"header"); |
133 | 134 | } |
@@ -135,7 +136,9 @@ discard block |
||
135 | 136 | |
136 | 137 | public function fieldAsImage($index,$size=Size::MINI,$circular=false){ |
137 | 138 | $this->setValueFunction($index,function($img) use($size,$circular){ |
138 | - $image=new HtmlImage($this->_getFieldIdentifier("image"),$img);$image->setSize($size);if($circular)$image->setCircular(); |
|
139 | + $image=new HtmlImage($this->_getFieldIdentifier("image"),$img);$image->setSize($size);if($circular) { |
|
140 | + $image->setCircular(); |
|
141 | + } |
|
139 | 142 | return $image; |
140 | 143 | }); |
141 | 144 | return $this; |
@@ -230,14 +233,14 @@ discard block |
||
230 | 233 | $i=0; |
231 | 234 | if(JArray::isAssociative($types)){ |
232 | 235 | foreach ($types as $type=>$attributes){ |
233 | - if(\is_int($type)) |
|
234 | - $this->fieldAs($i++,$attributes,[]); |
|
235 | - else{ |
|
236 | + if(\is_int($type)) { |
|
237 | + $this->fieldAs($i++,$attributes,[]); |
|
238 | + } else{ |
|
236 | 239 | $type=preg_replace('/\d/', '', $type ); |
237 | 240 | $this->fieldAs($i++,$type,$attributes); |
238 | 241 | } |
239 | 242 | } |
240 | - }else{ |
|
243 | + } else{ |
|
241 | 244 | foreach ($types as $type){ |
242 | 245 | $this->fieldAs($i++,$type); |
243 | 246 | } |
@@ -249,7 +252,7 @@ discard block |
||
249 | 252 | if(\method_exists($this, $method)){ |
250 | 253 | if(!\is_array($attributes)){ |
251 | 254 | $attributes=[$index]; |
252 | - }else{ |
|
255 | + } else{ |
|
253 | 256 | \array_unshift($attributes, $index); |
254 | 257 | } |
255 | 258 | \call_user_func_array([$this,$method], $attributes); |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | } |
102 | 102 | if(!$item instanceof HtmlDropdownItem){ |
103 | 103 | $itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items),$item,$value,$image,$description); |
104 | - }elseif($itemO instanceof HtmlDropdownItem){ |
|
104 | + } elseif($itemO instanceof HtmlDropdownItem){ |
|
105 | 105 | $this->addToProperty("class", "vertical"); |
106 | 106 | } |
107 | 107 | return $itemO; |
@@ -115,8 +115,9 @@ discard block |
||
115 | 115 | } |
116 | 116 | |
117 | 117 | public function addInput($name){ |
118 | - if(!isset($name)) |
|
119 | - $name="input-".$this->identifier; |
|
118 | + if(!isset($name)) { |
|
119 | + $name="input-".$this->identifier; |
|
120 | + } |
|
120 | 121 | $this->setAction("activate"); |
121 | 122 | $this->input=new HtmlInput($name,"hidden"); |
122 | 123 | } |
@@ -173,7 +174,7 @@ discard block |
||
173 | 174 | foreach ($items as $k=>$v){ |
174 | 175 | $this->addItem($v)->setData($k); |
175 | 176 | } |
176 | - }else{ |
|
177 | + } else{ |
|
177 | 178 | foreach ($items as $item){ |
178 | 179 | $this->addItem($item); |
179 | 180 | } |
@@ -197,7 +198,7 @@ discard block |
||
197 | 198 | if($dropdown===false){ |
198 | 199 | $this->_template=include dirname(__FILE__).'/../templates/tplDropdownMenu.php'; |
199 | 200 | $dropdown="menu"; |
200 | - }else{ |
|
201 | + } else{ |
|
201 | 202 | $dropdown="dropdown"; |
202 | 203 | $this->mClass="menu"; |
203 | 204 | } |
@@ -218,20 +219,24 @@ discard block |
||
218 | 219 | |
219 | 220 | public function asButton($floating=false){ |
220 | 221 | $this->removeArrow(); |
221 | - if($floating) |
|
222 | - $this->addToProperty("class", "floating"); |
|
222 | + if($floating) { |
|
223 | + $this->addToProperty("class", "floating"); |
|
224 | + } |
|
223 | 225 | $this->removePropertyValue("class", "selection"); |
224 | 226 | return $this->addToProperty("class", "button"); |
225 | 227 | } |
226 | 228 | |
227 | 229 | public function asSelect($name=NULL,$multiple=false,$selection=true){ |
228 | - if(isset($name)) |
|
229 | - $this->addInput($name); |
|
230 | - if($multiple) |
|
231 | - $this->addToProperty("class", "multiple"); |
|
230 | + if(isset($name)) { |
|
231 | + $this->addInput($name); |
|
232 | + } |
|
233 | + if($multiple) { |
|
234 | + $this->addToProperty("class", "multiple"); |
|
235 | + } |
|
232 | 236 | if ($selection){ |
233 | - if($this->propertyContains("class", "button")===false) |
|
234 | - $this->addToPropertyCtrl("class", "selection",array("selection")); |
|
237 | + if($this->propertyContains("class", "button")===false) { |
|
238 | + $this->addToPropertyCtrl("class", "selection",array("selection")); |
|
239 | + } |
|
235 | 240 | } |
236 | 241 | return $this; |
237 | 242 | } |
@@ -242,8 +247,9 @@ discard block |
||
242 | 247 | } |
243 | 248 | |
244 | 249 | public function setSelect($name=NULL,$multiple=false){ |
245 | - if(!isset($name)) |
|
246 | - $name="select-".$this->identifier; |
|
250 | + if(!isset($name)) { |
|
251 | + $name="select-".$this->identifier; |
|
252 | + } |
|
247 | 253 | $this->input=null; |
248 | 254 | if($multiple){ |
249 | 255 | $this->setProperty("multiple", true); |
@@ -279,12 +285,13 @@ discard block |
||
279 | 285 | $value=$this->value; |
280 | 286 | if(isset($this->input) && isset($value)){ |
281 | 287 | $this->input->setProperty("value", $value); |
282 | - }else{ |
|
288 | + } else{ |
|
283 | 289 | $this->setProperty("value", $value); |
284 | 290 | } |
285 | 291 | $textElement=$this->getElementById("text-".$this->identifier, $this->content); |
286 | - if(isset($textElement)) |
|
287 | - $textElement->setContent($value); |
|
292 | + if(isset($textElement)) { |
|
293 | + $textElement->setContent($value); |
|
294 | + } |
|
288 | 295 | return $this; |
289 | 296 | } |
290 | 297 | |
@@ -294,8 +301,9 @@ discard block |
||
294 | 301 | */ |
295 | 302 | public function run(JsUtils $js) { |
296 | 303 | if($this->propertyContains("class", "simple")===false){ |
297 | - if(isset($this->_bsComponent)===false) |
|
298 | - $this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier,$this->_params); |
|
304 | + if(isset($this->_bsComponent)===false) { |
|
305 | + $this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier,$this->_params); |
|
306 | + } |
|
299 | 307 | $this->addEventsOnRun($js); |
300 | 308 | return $this->_bsComponent; |
301 | 309 | } |
@@ -322,8 +322,9 @@ discard block |
||
322 | 322 | $result= $this->getBody()->_addRow($result); |
323 | 323 | } |
324 | 324 | if(isset($this->_afterCompileEvents["onNewRow"])){ |
325 | - if(\is_callable($this->_afterCompileEvents["onNewRow"])) |
|
326 | - $this->_afterCompileEvents["onNewRow"]($result,$object); |
|
325 | + if(\is_callable($this->_afterCompileEvents["onNewRow"])) { |
|
326 | + $this->_afterCompileEvents["onNewRow"]($result,$object); |
|
327 | + } |
|
327 | 328 | } |
328 | 329 | return $result; |
329 | 330 | } |
@@ -345,8 +346,9 @@ discard block |
||
345 | 346 | |
346 | 347 | public function run(JsUtils $js){ |
347 | 348 | $result= parent::run($js); |
348 | - if(isset($this->_footer)) |
|
349 | - $this->_footer->run($js); |
|
349 | + if(isset($this->_footer)) { |
|
350 | + $this->_footer->run($js); |
|
351 | + } |
|
350 | 352 | return $result; |
351 | 353 | } |
352 | 354 | |
@@ -387,9 +389,10 @@ discard block |
||
387 | 389 | public function setColWidth($colIndex,$width){ |
388 | 390 | if($this->hasPart("thead")){ |
389 | 391 | $this->getHeader()->getCell(0, $colIndex)->setWidth($width); |
390 | - }else{ |
|
391 | - if($this->getBody()->count()>0) |
|
392 | - $this->getBody()->getCell(0, $colIndex)->setWidth($width); |
|
392 | + } else{ |
|
393 | + if($this->getBody()->count()>0) { |
|
394 | + $this->getBody()->getCell(0, $colIndex)->setWidth($width); |
|
395 | + } |
|
393 | 396 | } |
394 | 397 | return $this; |
395 | 398 | } |
@@ -57,10 +57,12 @@ discard block |
||
57 | 57 | $js->execOn("mouseover", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'visible');",["preventDefault"=>false,"stopPropagation"=>true]); |
58 | 58 | $js->execOn("mouseout", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'hidden');",["preventDefault"=>false,"stopPropagation"=>true]); |
59 | 59 | } |
60 | - if(\is_array($this->_deleteBehavior)) |
|
61 | - $this->_generateBehavior("delete",$this->_deleteBehavior, $js); |
|
62 | - if(\is_array($this->_editBehavior)) |
|
63 | - $this->_generateBehavior("edit",$this->_editBehavior,$js); |
|
60 | + if(\is_array($this->_deleteBehavior)) { |
|
61 | + $this->_generateBehavior("delete",$this->_deleteBehavior, $js); |
|
62 | + } |
|
63 | + if(\is_array($this->_editBehavior)) { |
|
64 | + $this->_generateBehavior("edit",$this->_editBehavior,$js); |
|
65 | + } |
|
64 | 66 | return parent::run($js); |
65 | 67 | } |
66 | 68 | |
@@ -96,12 +98,14 @@ discard block |
||
96 | 98 | $table->setRowCount(0, \sizeof($captions)); |
97 | 99 | $this->_generateHeader($table,$captions); |
98 | 100 | |
99 | - if(isset($this->_compileParts)) |
|
100 | - $table->setCompileParts($this->_compileParts); |
|
101 | + if(isset($this->_compileParts)) { |
|
102 | + $table->setCompileParts($this->_compileParts); |
|
103 | + } |
|
101 | 104 | |
102 | 105 | if(isset($this->_searchField) && isset($js)){ |
103 | - if(isset($this->_urls["refresh"])) |
|
104 | - $this->_searchField->postOn("change", $this->_urls["refresh"],"{'s':$(this).val()}","#".$this->identifier." tbody",["preventDefault"=>false,"jqueryDone"=>"replaceWith"]); |
|
106 | + if(isset($this->_urls["refresh"])) { |
|
107 | + $this->_searchField->postOn("change", $this->_urls["refresh"],"{'s':$(this).val()}","#".$this->identifier." tbody",["preventDefault"=>false,"jqueryDone"=>"replaceWith"]); |
|
108 | + } |
|
105 | 109 | } |
106 | 110 | |
107 | 111 | $this->_generateContent($table); |
@@ -119,8 +123,9 @@ discard block |
||
119 | 123 | |
120 | 124 | $this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"table",PositionInTable::AFTERTABLE]); |
121 | 125 | $this->_compileForm(); |
122 | - if(isset($this->_hiddenColumns)) |
|
123 | - $this->_hideColumns(); |
|
126 | + if(isset($this->_hiddenColumns)) { |
|
127 | + $this->_hideColumns(); |
|
128 | + } |
|
124 | 129 | if(isset($this->_colWidths)){ |
125 | 130 | foreach ($this->_colWidths as $colIndex=>$width){ |
126 | 131 | $table->setColWidth($colIndex,$width); |
@@ -176,8 +181,9 @@ discard block |
||
176 | 181 | $field=$ck->getField(); |
177 | 182 | $field->setProperty("value",$id); |
178 | 183 | $field->setProperty("name", "selection[]"); |
179 | - if(isset($checkedClass)) |
|
180 | - $field->setClass($checkedClass); |
|
184 | + if(isset($checkedClass)) { |
|
185 | + $field->setClass($checkedClass); |
|
186 | + } |
|
181 | 187 | \array_unshift($values, $ck); |
182 | 188 | } |
183 | 189 | $result=$table->newRow(); |
@@ -190,8 +196,9 @@ discard block |
||
190 | 196 | |
191 | 197 | protected function _generatePagination($table,$js=NULL){ |
192 | 198 | if(isset($this->_toolbar)){ |
193 | - if($this->_toolbarPosition==PositionInTable::FOOTER) |
|
194 | - $this->_toolbar->setFloated("left"); |
|
199 | + if($this->_toolbarPosition==PositionInTable::FOOTER) { |
|
200 | + $this->_toolbar->setFloated("left"); |
|
201 | + } |
|
195 | 202 | } |
196 | 203 | $footer=$table->getFooter(); |
197 | 204 | $footer->mergeCol(); |
@@ -210,8 +217,9 @@ discard block |
||
210 | 217 | |
211 | 218 | protected function _getFieldName($index){ |
212 | 219 | $fieldName=parent::_getFieldName($index); |
213 | - if(\is_object($fieldName)) |
|
214 | - $fieldName="field-".$index; |
|
220 | + if(\is_object($fieldName)) { |
|
221 | + $fieldName="field-".$index; |
|
222 | + } |
|
215 | 223 | return $fieldName."[]"; |
216 | 224 | } |
217 | 225 | |
@@ -251,7 +259,7 @@ discard block |
||
251 | 259 | $hasPart=$table->hasPart($part); |
252 | 260 | if($hasPart){ |
253 | 261 | $row=$table->getPart($part)->addRow(\sizeof($captions)); |
254 | - }else{ |
|
262 | + } else{ |
|
255 | 263 | $row=$table->getPart($part)->getRow(0); |
256 | 264 | } |
257 | 265 | $row->mergeCol(); |
@@ -276,7 +284,7 @@ discard block |
||
276 | 284 | $this->_urls["refresh"]=JArray::getValue($urls, "refresh",0); |
277 | 285 | $this->_urls["edit"]=JArray::getValue($urls, "edit",1); |
278 | 286 | $this->_urls["delete"]=JArray::getValue($urls, "delete",2); |
279 | - }else{ |
|
287 | + } else{ |
|
280 | 288 | $this->_urls=["refresh"=>$urls,"edit"=>$urls,"delete"=>$urls]; |
281 | 289 | } |
282 | 290 | return $this; |
@@ -350,8 +358,9 @@ discard block |
||
350 | 358 | |
351 | 359 | protected function getTargetSelector() { |
352 | 360 | $result=$this->_targetSelector; |
353 | - if(!isset($result)) |
|
354 | - $result="#".$this->identifier; |
|
361 | + if(!isset($result)) { |
|
362 | + $result="#".$this->identifier; |
|
363 | + } |
|
355 | 364 | return $result; |
356 | 365 | } |
357 | 366 | |
@@ -366,8 +375,9 @@ discard block |
||
366 | 375 | } |
367 | 376 | |
368 | 377 | public function getRefreshSelector() { |
369 | - if(isset($this->_refreshSelector)) |
|
370 | - return $this->_refreshSelector; |
|
378 | + if(isset($this->_refreshSelector)) { |
|
379 | + return $this->_refreshSelector; |
|
380 | + } |
|
371 | 381 | return "#".$this->identifier." tbody"; |
372 | 382 | } |
373 | 383 | |
@@ -386,8 +396,9 @@ discard block |
||
386 | 396 | */ |
387 | 397 | public function show($modelInstance){ |
388 | 398 | if(\is_array($modelInstance)){ |
389 | - if(\is_array(array_values($modelInstance)[0])) |
|
390 | - $modelInstance=\json_decode(\json_encode($modelInstance), FALSE); |
|
399 | + if(\is_array(array_values($modelInstance)[0])) { |
|
400 | + $modelInstance=\json_decode(\json_encode($modelInstance), FALSE); |
|
401 | + } |
|
391 | 402 | } |
392 | 403 | $this->_modelInstance=$modelInstance; |
393 | 404 | } |
@@ -427,8 +438,9 @@ discard block |
||
427 | 438 | } |
428 | 439 | |
429 | 440 | public function hideColumn($colIndex){ |
430 | - if(!\is_array($this->_hiddenColumns)) |
|
431 | - $this->_hiddenColumns=[]; |
|
441 | + if(!\is_array($this->_hiddenColumns)) { |
|
442 | + $this->_hiddenColumns=[]; |
|
443 | + } |
|
432 | 444 | $this->_hiddenColumns[]=$colIndex; |
433 | 445 | return $this; |
434 | 446 | } |