@@ -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; |
@@ -106,8 +106,9 @@ discard block |
||
| 106 | 106 | */ |
| 107 | 107 | public function addLabel($label, $before=false, $icon=NULL) { |
| 108 | 108 | $this->tagName="div";$prefix=""; |
| 109 | - if($before) |
|
| 110 | - $prefix="left "; |
|
| 109 | + if($before) { |
|
| 110 | + $prefix="left "; |
|
| 111 | + } |
|
| 111 | 112 | $this->addToProperty("class", $prefix."labeled"); |
| 112 | 113 | $isIcon=(isset($this->content[0]) && $this->content[0] instanceof HtmlIcon); |
| 113 | 114 | $this->content=new HtmlButton("button-" . $this->identifier, $this->content); |
@@ -144,12 +145,13 @@ discard block |
||
| 144 | 145 | public function setColor($color){ |
| 145 | 146 | if(\is_array($this->content)){ |
| 146 | 147 | foreach ($this->content as $content){ |
| 147 | - if($content instanceof HtmlButton) |
|
| 148 | - $content->setColor($color); |
|
| 148 | + if($content instanceof HtmlButton) { |
|
| 149 | + $content->setColor($color); |
|
| 150 | + } |
|
| 149 | 151 | } |
| 152 | + } else { |
|
| 153 | + parent::setColor($color); |
|
| 150 | 154 | } |
| 151 | - else |
|
| 152 | - parent::setColor($color); |
|
| 153 | 155 | return $this; |
| 154 | 156 | } |
| 155 | 157 | |
@@ -202,8 +204,9 @@ discard block |
||
| 202 | 204 | * @return HtmlButton |
| 203 | 205 | */ |
| 204 | 206 | public static function social($identifier, $social, $value=NULL) { |
| 205 | - if ($value === NULL) |
|
| 206 | - $value=\ucfirst($social); |
|
| 207 | + if ($value === NULL) { |
|
| 208 | + $value=\ucfirst($social); |
|
| 209 | + } |
|
| 207 | 210 | $return=new HtmlButton($identifier, $value); |
| 208 | 211 | $return->addIcon($social); |
| 209 | 212 | return $return->addToPropertyCtrl("class", $social, Social::getConstants()); |
@@ -58,10 +58,12 @@ discard block |
||
| 58 | 58 | $js->execOn("mouseover", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'visible');",["preventDefault"=>false,"stopPropagation"=>true]); |
| 59 | 59 | $js->execOn("mouseout", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'hidden');",["preventDefault"=>false,"stopPropagation"=>true]); |
| 60 | 60 | } |
| 61 | - if(\is_array($this->_deleteBehavior)) |
|
| 62 | - $this->_generateBehavior("delete",$this->_deleteBehavior, $js); |
|
| 63 | - if(\is_array($this->_editBehavior)) |
|
| 64 | - $this->_generateBehavior("edit",$this->_editBehavior,$js); |
|
| 61 | + if(\is_array($this->_deleteBehavior)) { |
|
| 62 | + $this->_generateBehavior("delete",$this->_deleteBehavior, $js); |
|
| 63 | + } |
|
| 64 | + if(\is_array($this->_editBehavior)) { |
|
| 65 | + $this->_generateBehavior("edit",$this->_editBehavior,$js); |
|
| 66 | + } |
|
| 65 | 67 | return parent::run($js); |
| 66 | 68 | } |
| 67 | 69 | |
@@ -94,8 +96,9 @@ discard block |
||
| 94 | 96 | $table->setRowCount(0, \sizeof($captions)); |
| 95 | 97 | $this->_generateHeader($table,$captions); |
| 96 | 98 | |
| 97 | - if(isset($this->_compileParts)) |
|
| 98 | - $table->setCompileParts($this->_compileParts); |
|
| 99 | + if(isset($this->_compileParts)) { |
|
| 100 | + $table->setCompileParts($this->_compileParts); |
|
| 101 | + } |
|
| 99 | 102 | |
| 100 | 103 | $this->_generateContent($table); |
| 101 | 104 | |
@@ -126,8 +129,9 @@ discard block |
||
| 126 | 129 | } |
| 127 | 130 | |
| 128 | 131 | protected function _applyStyleAttributes($table){ |
| 129 | - if(isset($this->_hiddenColumns)) |
|
| 130 | - $this->_hideColumns(); |
|
| 132 | + if(isset($this->_hiddenColumns)) { |
|
| 133 | + $this->_hideColumns(); |
|
| 134 | + } |
|
| 131 | 135 | if(isset($this->_colWidths)){ |
| 132 | 136 | foreach ($this->_colWidths as $colIndex=>$width){ |
| 133 | 137 | $table->setColWidth($colIndex,$width); |
@@ -178,8 +182,9 @@ discard block |
||
| 178 | 182 | $field=$ck->getField(); |
| 179 | 183 | $field->setProperty("value",$id); |
| 180 | 184 | $field->setProperty("name", "selection[]"); |
| 181 | - if(isset($checkedClass)) |
|
| 182 | - $field->setClass($checkedClass); |
|
| 185 | + if(isset($checkedClass)) { |
|
| 186 | + $field->setClass($checkedClass); |
|
| 187 | + } |
|
| 183 | 188 | \array_unshift($values, $ck); |
| 184 | 189 | } |
| 185 | 190 | $result=$table->newRow(); |
@@ -192,8 +197,9 @@ discard block |
||
| 192 | 197 | |
| 193 | 198 | protected function _generatePagination($table,$js=NULL){ |
| 194 | 199 | if(isset($this->_toolbar)){ |
| 195 | - if($this->_toolbarPosition==PositionInTable::FOOTER) |
|
| 196 | - $this->_toolbar->setFloated("left"); |
|
| 200 | + if($this->_toolbarPosition==PositionInTable::FOOTER) { |
|
| 201 | + $this->_toolbar->setFloated("left"); |
|
| 202 | + } |
|
| 197 | 203 | } |
| 198 | 204 | $footer=$table->getFooter(); |
| 199 | 205 | $footer->mergeCol(); |
@@ -212,8 +218,9 @@ discard block |
||
| 212 | 218 | |
| 213 | 219 | protected function _getFieldName($index){ |
| 214 | 220 | $fieldName=parent::_getFieldName($index); |
| 215 | - if(\is_object($fieldName)) |
|
| 216 | - $fieldName="field-".$index; |
|
| 221 | + if(\is_object($fieldName)) { |
|
| 222 | + $fieldName="field-".$index; |
|
| 223 | + } |
|
| 217 | 224 | return $fieldName."[]"; |
| 218 | 225 | } |
| 219 | 226 | |
@@ -253,7 +260,7 @@ discard block |
||
| 253 | 260 | $hasPart=$table->hasPart($part); |
| 254 | 261 | if($hasPart){ |
| 255 | 262 | $row=$table->getPart($part)->addRow(\sizeof($captions)); |
| 256 | - }else{ |
|
| 263 | + } else{ |
|
| 257 | 264 | $row=$table->getPart($part)->getRow(0); |
| 258 | 265 | } |
| 259 | 266 | $row->mergeCol(); |
@@ -283,7 +290,7 @@ discard block |
||
| 283 | 290 | $this->_urls["refresh"]=JArray::getValue($urls, "refresh",0); |
| 284 | 291 | $this->_urls["edit"]=JArray::getValue($urls, "edit",1); |
| 285 | 292 | $this->_urls["delete"]=JArray::getValue($urls, "delete",2); |
| 286 | - }else{ |
|
| 293 | + } else{ |
|
| 287 | 294 | $this->_urls=["refresh"=>$urls,"edit"=>$urls,"delete"=>$urls]; |
| 288 | 295 | } |
| 289 | 296 | return $this; |
@@ -357,8 +364,9 @@ discard block |
||
| 357 | 364 | |
| 358 | 365 | protected function getTargetSelector($op) { |
| 359 | 366 | $result=$this->_targetSelector; |
| 360 | - if(!isset($result[$op])) |
|
| 361 | - $result="#".$this->identifier; |
|
| 367 | + if(!isset($result[$op])) { |
|
| 368 | + $result="#".$this->identifier; |
|
| 369 | + } |
|
| 362 | 370 | return $result[$op]; |
| 363 | 371 | } |
| 364 | 372 | |
@@ -376,8 +384,9 @@ discard block |
||
| 376 | 384 | } |
| 377 | 385 | |
| 378 | 386 | public function getRefreshSelector() { |
| 379 | - if(isset($this->_refreshSelector)) |
|
| 380 | - return $this->_refreshSelector; |
|
| 387 | + if(isset($this->_refreshSelector)) { |
|
| 388 | + return $this->_refreshSelector; |
|
| 389 | + } |
|
| 381 | 390 | return "#".$this->identifier." tbody"; |
| 382 | 391 | } |
| 383 | 392 | |
@@ -396,8 +405,9 @@ discard block |
||
| 396 | 405 | */ |
| 397 | 406 | public function show($modelInstance){ |
| 398 | 407 | if(\is_array($modelInstance)){ |
| 399 | - if(isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0])) |
|
| 400 | - $modelInstance=\json_decode(\json_encode($modelInstance), FALSE); |
|
| 408 | + if(isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0])) { |
|
| 409 | + $modelInstance=\json_decode(\json_encode($modelInstance), FALSE); |
|
| 410 | + } |
|
| 401 | 411 | } |
| 402 | 412 | $this->_modelInstance=$modelInstance; |
| 403 | 413 | } |
@@ -437,8 +447,9 @@ discard block |
||
| 437 | 447 | } |
| 438 | 448 | |
| 439 | 449 | public function hideColumn($colIndex){ |
| 440 | - if(!\is_array($this->_hiddenColumns)) |
|
| 441 | - $this->_hiddenColumns=[]; |
|
| 450 | + if(!\is_array($this->_hiddenColumns)) { |
|
| 451 | + $this->_hiddenColumns=[]; |
|
| 452 | + } |
|
| 442 | 453 | $this->_hiddenColumns[]=$colIndex; |
| 443 | 454 | return $this; |
| 444 | 455 | } |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | if(isset($value)){ |
| 35 | 35 | if($value instanceof HtmlSemDoubleElement){ |
| 36 | 36 | $text=$value; |
| 37 | - }else{ |
|
| 37 | + } else{ |
|
| 38 | 38 | $text=new HtmlSemDoubleElement("text-".$this->identifier,"div"); |
| 39 | 39 | $text->setClass("text"); |
| 40 | 40 | $this->setValue($value); |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | } |
| 108 | 108 | if(!$item instanceof HtmlDropdownItem){ |
| 109 | 109 | $itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items),$item,$value,$image,$description); |
| 110 | - }elseif($itemO instanceof HtmlDropdownItem){ |
|
| 110 | + } elseif($itemO instanceof HtmlDropdownItem){ |
|
| 111 | 111 | $this->addToProperty("class", "vertical"); |
| 112 | 112 | } |
| 113 | 113 | return $itemO; |
@@ -121,8 +121,9 @@ discard block |
||
| 121 | 121 | } |
| 122 | 122 | |
| 123 | 123 | public function addInput($name){ |
| 124 | - if(!isset($name)) |
|
| 125 | - $name="input-".$this->identifier; |
|
| 124 | + if(!isset($name)) { |
|
| 125 | + $name="input-".$this->identifier; |
|
| 126 | + } |
|
| 126 | 127 | $this->setAction("activate"); |
| 127 | 128 | $this->input=new HtmlInput($name,"hidden"); |
| 128 | 129 | } |
@@ -179,7 +180,7 @@ discard block |
||
| 179 | 180 | foreach ($items as $k=>$v){ |
| 180 | 181 | $this->addItem($v)->setData($k); |
| 181 | 182 | } |
| 182 | - }else{ |
|
| 183 | + } else{ |
|
| 183 | 184 | foreach ($items as $item){ |
| 184 | 185 | $this->addItem($item); |
| 185 | 186 | } |
@@ -203,7 +204,7 @@ discard block |
||
| 203 | 204 | if($dropdown===false){ |
| 204 | 205 | $this->_template=include dirname(__FILE__).'/../templates/tplDropdownMenu.php'; |
| 205 | 206 | $dropdown="menu"; |
| 206 | - }else{ |
|
| 207 | + } else{ |
|
| 207 | 208 | $dropdown="dropdown"; |
| 208 | 209 | $this->mClass="menu"; |
| 209 | 210 | } |
@@ -224,22 +225,25 @@ discard block |
||
| 224 | 225 | |
| 225 | 226 | public function asButton($floating=false){ |
| 226 | 227 | $this->removeArrow(); |
| 227 | - if($floating) |
|
| 228 | - $this->addToProperty("class", "floating"); |
|
| 228 | + if($floating) { |
|
| 229 | + $this->addToProperty("class", "floating"); |
|
| 230 | + } |
|
| 229 | 231 | $this->removePropertyValue("class", "selection"); |
| 230 | 232 | return $this->addToProperty("class", "button"); |
| 231 | 233 | } |
| 232 | 234 | |
| 233 | 235 | public function asSelect($name=NULL,$multiple=false,$selection=true){ |
| 234 | 236 | $this->_multiple=$multiple; |
| 235 | - if(isset($name)) |
|
| 236 | - $this->addInput($name); |
|
| 237 | + if(isset($name)) { |
|
| 238 | + $this->addInput($name); |
|
| 239 | + } |
|
| 237 | 240 | if($multiple){ |
| 238 | 241 | $this->addToProperty("class", "multiple"); |
| 239 | 242 | } |
| 240 | 243 | if ($selection){ |
| 241 | - if($this->propertyContains("class", "button")===false) |
|
| 242 | - $this->addToPropertyCtrl("class", "selection",array("selection")); |
|
| 244 | + if($this->propertyContains("class", "button")===false) { |
|
| 245 | + $this->addToPropertyCtrl("class", "selection",array("selection")); |
|
| 246 | + } |
|
| 243 | 247 | } |
| 244 | 248 | return $this; |
| 245 | 249 | } |
@@ -250,8 +254,9 @@ discard block |
||
| 250 | 254 | } |
| 251 | 255 | |
| 252 | 256 | public function setSelect($name=NULL,$multiple=false){ |
| 253 | - if(!isset($name)) |
|
| 254 | - $name="select-".$this->identifier; |
|
| 257 | + if(!isset($name)) { |
|
| 258 | + $name="select-".$this->identifier; |
|
| 259 | + } |
|
| 255 | 260 | $this->input=null; |
| 256 | 261 | if($multiple){ |
| 257 | 262 | $this->setProperty("multiple", true); |
@@ -287,12 +292,13 @@ discard block |
||
| 287 | 292 | $value=$this->value; |
| 288 | 293 | if(isset($this->input) && isset($value)){ |
| 289 | 294 | $this->input->setProperty("value", $value); |
| 290 | - }else{ |
|
| 295 | + } else{ |
|
| 291 | 296 | $this->setProperty("value", $value); |
| 292 | 297 | } |
| 293 | 298 | $textElement=$this->getElementById("text-".$this->identifier, $this->content); |
| 294 | - if(isset($textElement) && !$this->_multiple) |
|
| 295 | - $textElement->setContent($value); |
|
| 299 | + if(isset($textElement) && !$this->_multiple) { |
|
| 300 | + $textElement->setContent($value); |
|
| 301 | + } |
|
| 296 | 302 | return $this; |
| 297 | 303 | } |
| 298 | 304 | |
@@ -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,17 +102,17 @@ discard block |
||
| 99 | 102 | if($property instanceof \ReflectionProperty){ |
| 100 | 103 | $value=$this->_getPropertyValue($property, $index); |
| 101 | 104 | $propertyName=$property->getName(); |
| 102 | - }elseif(\is_array($property)){ |
|
| 105 | + } elseif(\is_array($property)){ |
|
| 103 | 106 | $values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property); |
| 104 | 107 | $value=\implode("", $values); |
| 105 | - }elseif(\is_string($property)){ |
|
| 108 | + } elseif(\is_string($property)){ |
|
| 106 | 109 | $value=$property; |
| 107 | 110 | if(isset($this->instance->{$property})){ |
| 108 | 111 | $value=$this->instance->{$property}; |
| 109 | - }elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){ |
|
| 112 | + } elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){ |
|
| 110 | 113 | $value=JReflection::callMethod($this->instance, $getter, []); |
| 111 | 114 | } |
| 112 | - }elseif(\is_callable($property)){ |
|
| 115 | + } elseif(\is_callable($property)){ |
|
| 113 | 116 | $value=$property($this->instance); |
| 114 | 117 | } |
| 115 | 118 | return $this->_postGetValue($index, $propertyName, $value); |
@@ -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; |
@@ -174,9 +177,9 @@ discard block |
||
| 174 | 177 | $property=$this->getProperty($index); |
| 175 | 178 | if($property instanceof \ReflectionProperty){ |
| 176 | 179 | $result=$property->getName(); |
| 177 | - }elseif(\is_callable($property)){ |
|
| 180 | + } elseif(\is_callable($property)){ |
|
| 178 | 181 | $result=$this->visibleProperties[$index]; |
| 179 | - }else{ |
|
| 182 | + } else{ |
|
| 180 | 183 | $result=$property; |
| 181 | 184 | } |
| 182 | 185 | return $result; |
@@ -196,7 +199,7 @@ discard block |
||
| 196 | 199 | $this->reflect=new \ReflectionClass($instance); |
| 197 | 200 | if(\sizeof($this->visibleProperties)===0){ |
| 198 | 201 | $this->properties=$this->getDefaultProperties(); |
| 199 | - }else{ |
|
| 202 | + } else{ |
|
| 200 | 203 | foreach ($this->visibleProperties as $property){ |
| 201 | 204 | $this->setInstanceProperty($property); |
| 202 | 205 | } |
@@ -207,22 +210,23 @@ discard block |
||
| 207 | 210 | private function setInstanceProperty($property){ |
| 208 | 211 | if(\is_callable($property)){ |
| 209 | 212 | $this->properties[]=$property; |
| 210 | - }elseif(\is_string($property)){ |
|
| 213 | + } elseif(\is_string($property)){ |
|
| 211 | 214 | try{ |
| 212 | 215 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
| 213 | 216 | $rProperty=$this->reflect->getProperty($property); |
| 214 | 217 | $this->properties[]=$rProperty; |
| 215 | - }catch(\Exception $e){ |
|
| 218 | + } catch(\Exception $e){ |
|
| 216 | 219 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
| 217 | 220 | $this->properties[]=$property; |
| 218 | 221 | } |
| 219 | - }elseif(\is_int($property)){ |
|
| 222 | + } elseif(\is_int($property)){ |
|
| 220 | 223 | $props=$this->getDefaultProperties(); |
| 221 | - if(isset($props[$property])) |
|
| 222 | - $this->properties[]=$props[$property]; |
|
| 223 | - else |
|
| 224 | - $this->properties[]=$property; |
|
| 225 | - }else{ |
|
| 224 | + if(isset($props[$property])) { |
|
| 225 | + $this->properties[]=$props[$property]; |
|
| 226 | + } else { |
|
| 227 | + $this->properties[]=$property; |
|
| 228 | + } |
|
| 229 | + } else{ |
|
| 226 | 230 | $this->properties[]=$property; |
| 227 | 231 | } |
| 228 | 232 | } |
@@ -266,12 +270,13 @@ discard block |
||
| 266 | 270 | if(isset($this->captions[$index])){ |
| 267 | 271 | return $this->captions[$index]; |
| 268 | 272 | } |
| 269 | - if($this->properties[$index] instanceof \ReflectionProperty) |
|
| 270 | - return $this->properties[$index]->getName(); |
|
| 271 | - elseif(\is_callable($this->properties[$index])) |
|
| 272 | - return ""; |
|
| 273 | - else |
|
| 274 | - return $this->properties[$index]; |
|
| 273 | + if($this->properties[$index] instanceof \ReflectionProperty) { |
|
| 274 | + return $this->properties[$index]->getName(); |
|
| 275 | + } elseif(\is_callable($this->properties[$index])) { |
|
| 276 | + return ""; |
|
| 277 | + } else { |
|
| 278 | + return $this->properties[$index]; |
|
| 279 | + } |
|
| 275 | 280 | } |
| 276 | 281 | |
| 277 | 282 | public function getCaptions(){ |
@@ -282,7 +287,7 @@ discard block |
||
| 282 | 287 | for($i=$captionsSize;$i<$count;$i++){ |
| 283 | 288 | $captions[]=""; |
| 284 | 289 | } |
| 285 | - }else{ |
|
| 290 | + } else{ |
|
| 286 | 291 | $captions=[]; |
| 287 | 292 | $index=0; |
| 288 | 293 | while($index<$count){ |
@@ -297,8 +302,9 @@ discard block |
||
| 297 | 302 | } |
| 298 | 303 | |
| 299 | 304 | public function setCaption($index,$caption){ |
| 300 | - if(isset($this->captions)===false) |
|
| 301 | - $this->captions=[]; |
|
| 305 | + if(isset($this->captions)===false) { |
|
| 306 | + $this->captions=[]; |
|
| 307 | + } |
|
| 302 | 308 | $this->captions[$index]=$caption; |
| 303 | 309 | return $this; |
| 304 | 310 | } |
@@ -22,8 +22,9 @@ discard block |
||
| 22 | 22 | */ |
| 23 | 23 | public function __construct($identifier, $tagName="tbody", $rowCount=NULL, $colCount=NULL) { |
| 24 | 24 | parent::__construct($identifier, $tagName, ""); |
| 25 | - if (isset($rowCount) && isset($colCount)) |
|
| 26 | - $this->setRowCount($rowCount, $colCount); |
|
| 25 | + if (isset($rowCount) && isset($colCount)) { |
|
| 26 | + $this->setRowCount($rowCount, $colCount); |
|
| 27 | + } |
|
| 27 | 28 | } |
| 28 | 29 | |
| 29 | 30 | /** |
@@ -148,8 +149,9 @@ discard block |
||
| 148 | 149 | $values=\array_fill(0, $count, $values); |
| 149 | 150 | $isArray=false; |
| 150 | 151 | } |
| 151 | - if (JArray::dimension($values) == 1 && $isArray) |
|
| 152 | - $values=[ $values ]; |
|
| 152 | + if (JArray::dimension($values) == 1 && $isArray) { |
|
| 153 | + $values=[ $values ]; |
|
| 154 | + } |
|
| 153 | 155 | |
| 154 | 156 | $count=\min(\sizeof($values), $count); |
| 155 | 157 | |
@@ -193,8 +195,9 @@ discard block |
||
| 193 | 195 | $count=$this->count(); |
| 194 | 196 | for($i=0; $i < $count; $i++) { |
| 195 | 197 | $index=$this->content[$i]->getColPosition($colIndex); |
| 196 | - if ($index !== NULL) |
|
| 197 | - $this->getCell($i, $index)->$function(); |
|
| 198 | + if ($index !== NULL) { |
|
| 199 | + $this->getCell($i, $index)->$function(); |
|
| 200 | + } |
|
| 198 | 201 | } |
| 199 | 202 | return $this; |
| 200 | 203 | } |
@@ -225,8 +228,9 @@ discard block |
||
| 225 | 228 | */ |
| 226 | 229 | public function getColCount() { |
| 227 | 230 | $result=0; |
| 228 | - if ($this->count() > 0) |
|
| 229 | - $result=$this->getItem(0)->count(); |
|
| 231 | + if ($this->count() > 0) { |
|
| 232 | + $result=$this->getItem(0)->count(); |
|
| 233 | + } |
|
| 230 | 234 | return $result; |
| 231 | 235 | } |
| 232 | 236 | |
@@ -250,8 +254,9 @@ discard block |
||
| 250 | 254 | |
| 251 | 255 | public function toDelete($rowIndex, $colIndex){ |
| 252 | 256 | $row=$this->getItem($rowIndex); |
| 253 | - if (isset($row) === true) |
|
| 254 | - $row->toDelete($colIndex); |
|
| 257 | + if (isset($row) === true) { |
|
| 258 | + $row->toDelete($colIndex); |
|
| 259 | + } |
|
| 255 | 260 | return $this; |
| 256 | 261 | } |
| 257 | 262 | |
@@ -349,8 +354,9 @@ discard block |
||
| 349 | 354 | foreach ( $rows as $row ) { |
| 350 | 355 | $cell=$row->getItem($colIndex); |
| 351 | 356 | $value=$cell->getContent(); |
| 352 | - if($functionExists) |
|
| 353 | - $value=\call_user_func($function,$value); |
|
| 357 | + if($functionExists) { |
|
| 358 | + $value=\call_user_func($function,$value); |
|
| 359 | + } |
|
| 354 | 360 | if($value!==$identiqual){ |
| 355 | 361 | if($counter>0 && isset($cellToMerge)){ |
| 356 | 362 | $cellToMerge->setRowspan($counter); |
@@ -84,15 +84,17 @@ discard block |
||
| 84 | 84 | |
| 85 | 85 | public function getColspan() { |
| 86 | 86 | $colspan=1; |
| 87 | - if (\array_key_exists("colspan", $this->properties)) |
|
| 88 | - $colspan=$this->getProperty("colspan"); |
|
| 87 | + if (\array_key_exists("colspan", $this->properties)) { |
|
| 88 | + $colspan=$this->getProperty("colspan"); |
|
| 89 | + } |
|
| 89 | 90 | return $colspan; |
| 90 | 91 | } |
| 91 | 92 | |
| 92 | 93 | public function getRowspan() { |
| 93 | 94 | $rowspan=1; |
| 94 | - if (\array_key_exists("rowspan", $this->properties)) |
|
| 95 | - $rowspan=$this->getProperty("rowspan"); |
|
| 95 | + if (\array_key_exists("rowspan", $this->properties)) { |
|
| 96 | + $rowspan=$this->getProperty("rowspan"); |
|
| 97 | + } |
|
| 96 | 98 | return $rowspan; |
| 97 | 99 | } |
| 98 | 100 | |
@@ -129,8 +131,9 @@ discard block |
||
| 129 | 131 | } |
| 130 | 132 | |
| 131 | 133 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
| 132 | - if(!$this->_deleted) |
|
| 133 | - return parent::compile(); |
|
| 134 | + if(!$this->_deleted) { |
|
| 135 | + return parent::compile(); |
|
| 136 | + } |
|
| 134 | 137 | return; |
| 135 | 138 | } |
| 136 | 139 | } |