@@ -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()); |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | if(isset($value)){ |
| 33 | 33 | if($value instanceof HtmlSemDoubleElement){ |
| 34 | 34 | $text=$value; |
| 35 | - }else{ |
|
| 35 | + } else{ |
|
| 36 | 36 | $text=new HtmlSemDoubleElement("text-".$this->identifier,"div"); |
| 37 | 37 | $text->setClass("text"); |
| 38 | 38 | $this->setValue($value); |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | } |
| 106 | 106 | if(!$item instanceof HtmlDropdownItem){ |
| 107 | 107 | $itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items),$item,$value,$image,$description); |
| 108 | - }elseif($itemO instanceof HtmlDropdownItem){ |
|
| 108 | + } elseif($itemO instanceof HtmlDropdownItem){ |
|
| 109 | 109 | $this->addToProperty("class", "vertical"); |
| 110 | 110 | } |
| 111 | 111 | return $itemO; |
@@ -119,8 +119,9 @@ discard block |
||
| 119 | 119 | } |
| 120 | 120 | |
| 121 | 121 | public function addInput($name){ |
| 122 | - if(!isset($name)) |
|
| 123 | - $name="input-".$this->identifier; |
|
| 122 | + if(!isset($name)) { |
|
| 123 | + $name="input-".$this->identifier; |
|
| 124 | + } |
|
| 124 | 125 | $this->setAction("activate"); |
| 125 | 126 | $this->input=new HtmlInput($name,"hidden"); |
| 126 | 127 | } |
@@ -177,7 +178,7 @@ discard block |
||
| 177 | 178 | foreach ($items as $k=>$v){ |
| 178 | 179 | $this->addItem($v)->setData($k); |
| 179 | 180 | } |
| 180 | - }else{ |
|
| 181 | + } else{ |
|
| 181 | 182 | foreach ($items as $item){ |
| 182 | 183 | $this->addItem($item); |
| 183 | 184 | } |
@@ -201,7 +202,7 @@ discard block |
||
| 201 | 202 | if($dropdown===false){ |
| 202 | 203 | $this->_template=include dirname(__FILE__).'/../templates/tplDropdownMenu.php'; |
| 203 | 204 | $dropdown="menu"; |
| 204 | - }else{ |
|
| 205 | + } else{ |
|
| 205 | 206 | $dropdown="dropdown"; |
| 206 | 207 | $this->mClass="menu"; |
| 207 | 208 | } |
@@ -222,20 +223,24 @@ discard block |
||
| 222 | 223 | |
| 223 | 224 | public function asButton($floating=false){ |
| 224 | 225 | $this->removeArrow(); |
| 225 | - if($floating) |
|
| 226 | - $this->addToProperty("class", "floating"); |
|
| 226 | + if($floating) { |
|
| 227 | + $this->addToProperty("class", "floating"); |
|
| 228 | + } |
|
| 227 | 229 | $this->removePropertyValue("class", "selection"); |
| 228 | 230 | return $this->addToProperty("class", "button"); |
| 229 | 231 | } |
| 230 | 232 | |
| 231 | 233 | public function asSelect($name=NULL,$multiple=false,$selection=true){ |
| 232 | - if(isset($name)) |
|
| 233 | - $this->addInput($name); |
|
| 234 | - if($multiple) |
|
| 235 | - $this->addToProperty("class", "multiple"); |
|
| 234 | + if(isset($name)) { |
|
| 235 | + $this->addInput($name); |
|
| 236 | + } |
|
| 237 | + if($multiple) { |
|
| 238 | + $this->addToProperty("class", "multiple"); |
|
| 239 | + } |
|
| 236 | 240 | if ($selection){ |
| 237 | - if($this->propertyContains("class", "button")===false) |
|
| 238 | - $this->addToPropertyCtrl("class", "selection",array("selection")); |
|
| 241 | + if($this->propertyContains("class", "button")===false) { |
|
| 242 | + $this->addToPropertyCtrl("class", "selection",array("selection")); |
|
| 243 | + } |
|
| 239 | 244 | } |
| 240 | 245 | return $this; |
| 241 | 246 | } |
@@ -246,8 +251,9 @@ discard block |
||
| 246 | 251 | } |
| 247 | 252 | |
| 248 | 253 | public function setSelect($name=NULL,$multiple=false){ |
| 249 | - if(!isset($name)) |
|
| 250 | - $name="select-".$this->identifier; |
|
| 254 | + if(!isset($name)) { |
|
| 255 | + $name="select-".$this->identifier; |
|
| 256 | + } |
|
| 251 | 257 | $this->input=null; |
| 252 | 258 | if($multiple){ |
| 253 | 259 | $this->setProperty("multiple", true); |
@@ -283,12 +289,13 @@ discard block |
||
| 283 | 289 | $value=$this->value; |
| 284 | 290 | if(isset($this->input) && isset($value)){ |
| 285 | 291 | $this->input->setProperty("value", $value); |
| 286 | - }else{ |
|
| 292 | + } else{ |
|
| 287 | 293 | $this->setProperty("value", $value); |
| 288 | 294 | } |
| 289 | 295 | $textElement=$this->getElementById("text-".$this->identifier, $this->content); |
| 290 | - if(isset($textElement)) |
|
| 291 | - $textElement->setContent($value); |
|
| 296 | + if(isset($textElement)) { |
|
| 297 | + $textElement->setContent($value); |
|
| 298 | + } |
|
| 292 | 299 | return $this; |
| 293 | 300 | } |
| 294 | 301 | |
@@ -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 | } |