@@ -109,15 +109,18 @@ discard block |
||
| 109 | 109 | $flag=false; |
| 110 | 110 | $index=0; |
| 111 | 111 | while ( !$flag && $index < sizeof($elements) ) { |
| 112 | - if ($elements[$index] instanceof BaseHtml) |
|
| 113 | - $flag=($callback($elements[$index])); |
|
| 112 | + if ($elements[$index] instanceof BaseHtml) { |
|
| 113 | + $flag=($callback($elements[$index])); |
|
| 114 | + } |
|
| 114 | 115 | $index++; |
| 115 | 116 | } |
| 116 | - if ($flag === true) |
|
| 117 | - return $elements[$index - 1]; |
|
| 117 | + if ($flag === true) { |
|
| 118 | + return $elements[$index - 1]; |
|
| 119 | + } |
|
| 118 | 120 | } elseif ($elements instanceof BaseHtml) { |
| 119 | - if ($callback($elements)) |
|
| 120 | - return $elements; |
|
| 121 | + if ($callback($elements)) { |
|
| 122 | + return $elements; |
|
| 123 | + } |
|
| 121 | 124 | } |
| 122 | 125 | return null; |
| 123 | 126 | } |
@@ -143,8 +146,9 @@ discard block |
||
| 143 | 146 | |
| 144 | 147 | public function fromArray($array) { |
| 145 | 148 | foreach ( $this as $key => $value ) { |
| 146 | - if(array_key_exists($key, $array)===true) |
|
| 147 | - $this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array); |
|
| 149 | + if(array_key_exists($key, $array)===true) { |
|
| 150 | + $this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array); |
|
| 151 | + } |
|
| 148 | 152 | } |
| 149 | 153 | foreach ( $array as $key => $value ) { |
| 150 | 154 | if($this->_callSetter($key, $key, $value, $array)===false){ |
@@ -213,11 +217,11 @@ discard block |
||
| 213 | 217 | if(\strstr($result, "%{$key}%")!==false){ |
| 214 | 218 | if (\is_array($value)) { |
| 215 | 219 | $v=PropertyWrapper::wrap($value, $js,$view); |
| 216 | - }elseif($value instanceof \stdClass){ |
|
| 220 | + } elseif($value instanceof \stdClass){ |
|
| 217 | 221 | $v=\print_r($value,true); |
| 218 | - }elseif ($value instanceof BaseHtml){ |
|
| 222 | + } elseif ($value instanceof BaseHtml){ |
|
| 219 | 223 | $v=$value->compile($js,$view); |
| 220 | - }else{ |
|
| 224 | + } else{ |
|
| 221 | 225 | $v=$value; |
| 222 | 226 | } |
| 223 | 227 | $result=str_replace("%{$key}%", $v, $result); |
@@ -345,8 +345,9 @@ discard block |
||
| 345 | 345 | $result= $this->getBody()->_addRow($result); |
| 346 | 346 | } |
| 347 | 347 | if(isset($this->_afterCompileEvents["onNewRow"])){ |
| 348 | - if(\is_callable($this->_afterCompileEvents["onNewRow"])) |
|
| 349 | - $this->_afterCompileEvents["onNewRow"]($result,$object); |
|
| 348 | + if(\is_callable($this->_afterCompileEvents["onNewRow"])) { |
|
| 349 | + $this->_afterCompileEvents["onNewRow"]($result,$object); |
|
| 350 | + } |
|
| 350 | 351 | } |
| 351 | 352 | return $result; |
| 352 | 353 | } |
@@ -375,8 +376,9 @@ discard block |
||
| 375 | 376 | } |
| 376 | 377 | } |
| 377 | 378 | $result= parent::run($js); |
| 378 | - if(isset($this->_footer)) |
|
| 379 | - $this->_footer->run($js); |
|
| 379 | + if(isset($this->_footer)) { |
|
| 380 | + $this->_footer->run($js); |
|
| 381 | + } |
|
| 380 | 382 | $this->_runned=true; |
| 381 | 383 | return $result; |
| 382 | 384 | } |
@@ -417,8 +419,9 @@ discard block |
||
| 417 | 419 | |
| 418 | 420 | public function setColWidth($colIndex,$width){ |
| 419 | 421 | $part=$this->_getFirstPart(); |
| 420 | - if($part!==null && $part->count()>0) |
|
| 421 | - $part->getCell(0, $colIndex)->setWidth($width); |
|
| 422 | + if($part!==null && $part->count()>0) { |
|
| 423 | + $part->getCell(0, $colIndex)->setWidth($width); |
|
| 424 | + } |
|
| 422 | 425 | return $this; |
| 423 | 426 | } |
| 424 | 427 | |
@@ -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,7 +131,8 @@ discard block |
||
| 129 | 131 | } |
| 130 | 132 | |
| 131 | 133 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
| 132 | - if(!$this->_deleted) |
|
| 133 | - return parent::compile($js,$view); |
|
| 134 | + if(!$this->_deleted) { |
|
| 135 | + return parent::compile($js,$view); |
|
| 136 | + } |
|
| 134 | 137 | } |
| 135 | 138 | } |
@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | foreach ($items as $k=>$v){ |
| 25 | 25 | $this->addItem([$k,$v]); |
| 26 | 26 | } |
| 27 | - }else{ |
|
| 27 | + } else{ |
|
| 28 | 28 | foreach ($items as $item){ |
| 29 | 29 | $this->addItem($item); |
| 30 | 30 | } |
@@ -80,9 +80,9 @@ discard block |
||
| 80 | 80 | * @return \Ajax\common\html\HtmlDoubleElement |
| 81 | 81 | */ |
| 82 | 82 | public function getItem($index) { |
| 83 | - if (is_int($index)&& isset($this->content[$index])) |
|
| 84 | - return $this->content[$index]; |
|
| 85 | - else { |
|
| 83 | + if (is_int($index)&& isset($this->content[$index])) { |
|
| 84 | + return $this->content[$index]; |
|
| 85 | + } else { |
|
| 86 | 86 | $elm=$this->getElementById($index, $this->content); |
| 87 | 87 | return $elm; |
| 88 | 88 | } |
@@ -144,10 +144,11 @@ discard block |
||
| 144 | 144 | $i=0; |
| 145 | 145 | foreach ($properties as $k=>$v){ |
| 146 | 146 | $c=$this->content[$i++]; |
| 147 | - if(isset($c)) |
|
| 148 | - $c->setProperty($k,$v); |
|
| 149 | - else |
|
| 150 | - return $this; |
|
| 147 | + if(isset($c)) { |
|
| 148 | + $c->setProperty($k,$v); |
|
| 149 | + } else { |
|
| 150 | + return $this; |
|
| 151 | + } |
|
| 151 | 152 | } |
| 152 | 153 | return $this; |
| 153 | 154 | } |
@@ -165,8 +166,7 @@ discard block |
||
| 165 | 166 | foreach ($values as $i=>$value){ |
| 166 | 167 | if(isset($this->content[$i])){ |
| 167 | 168 | $this->content[$i]->setProperty($property,$value); |
| 168 | - } |
|
| 169 | - else{ |
|
| 169 | + } else{ |
|
| 170 | 170 | return $this; |
| 171 | 171 | } |
| 172 | 172 | } |
@@ -186,8 +186,7 @@ discard block |
||
| 186 | 186 | foreach ($values as $i=>$value){ |
| 187 | 187 | if(isset($this->content[$i])){ |
| 188 | 188 | $this->content[$i++]->addToProperty($property,$value); |
| 189 | - } |
|
| 190 | - else{ |
|
| 189 | + } else{ |
|
| 191 | 190 | return $this; |
| 192 | 191 | } |
| 193 | 192 | } |
@@ -216,8 +215,9 @@ discard block |
||
| 216 | 215 | foreach ( $this->content as $index=>$item ) { |
| 217 | 216 | if($item instanceof HtmlDoubleElement){ |
| 218 | 217 | $href=""; |
| 219 | - if(isset($hrefs[$index])) |
|
| 220 | - $href=$hrefs[$index]; |
|
| 218 | + if(isset($hrefs[$index])) { |
|
| 219 | + $href=$hrefs[$index]; |
|
| 220 | + } |
|
| 221 | 221 | $item->asLink($href,$target); |
| 222 | 222 | } |
| 223 | 223 | } |
@@ -33,8 +33,9 @@ discard block |
||
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | public function getProperty($name) { |
| 36 | - if (array_key_exists($name, $this->_self->properties)) |
|
| 37 | - return $this->_self->properties[$name]; |
|
| 36 | + if (array_key_exists($name, $this->_self->properties)) { |
|
| 37 | + return $this->_self->properties[$name]; |
|
| 38 | + } |
|
| 38 | 39 | } |
| 39 | 40 | |
| 40 | 41 | /** |
@@ -76,8 +77,9 @@ discard block |
||
| 76 | 77 | } |
| 77 | 78 | |
| 78 | 79 | protected function addToPropertyUnique($name, $value, $typeCtrl) { |
| 79 | - if (is_string($typeCtrl) && @class_exists($typeCtrl, true)) |
|
| 80 | - $typeCtrl=$typeCtrl::getConstants(); |
|
| 80 | + if (is_string($typeCtrl) && @class_exists($typeCtrl, true)) { |
|
| 81 | + $typeCtrl=$typeCtrl::getConstants(); |
|
| 82 | + } |
|
| 81 | 83 | if (\is_array($typeCtrl)) { |
| 82 | 84 | $this->_self->removeOldValues($this->_self->properties[$name], $typeCtrl); |
| 83 | 85 | } |
@@ -96,8 +98,9 @@ discard block |
||
| 96 | 98 | } |
| 97 | 99 | |
| 98 | 100 | public function removeProperty($name) { |
| 99 | - if (\array_key_exists($name, $this->_self->properties)) |
|
| 100 | - unset($this->_self->properties[$name]); |
|
| 101 | + if (\array_key_exists($name, $this->_self->properties)) { |
|
| 102 | + unset($this->_self->properties[$name]); |
|
| 103 | + } |
|
| 101 | 104 | return $this; |
| 102 | 105 | } |
| 103 | 106 | |
@@ -110,8 +113,9 @@ discard block |
||
| 110 | 113 | } |
| 111 | 114 | |
| 112 | 115 | protected function setPropertyCtrl($name, $value, $typeCtrl) { |
| 113 | - if ($this->_self->ctrl($name, $value, $typeCtrl) === true) |
|
| 114 | - return $this->_self->setProperty($name, $value); |
|
| 116 | + if ($this->_self->ctrl($name, $value, $typeCtrl) === true) { |
|
| 117 | + return $this->_self->setProperty($name, $value); |
|
| 118 | + } |
|
| 115 | 119 | return $this; |
| 116 | 120 | } |
| 117 | 121 | |
@@ -64,8 +64,9 @@ |
||
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | public static function doubleBackSlashes($value){ |
| 67 | - if(is_string($value)) |
|
| 68 | - return str_replace("\\", "\\\\", $value); |
|
| 67 | + if(is_string($value)) { |
|
| 68 | + return str_replace("\\", "\\\\", $value); |
|
| 69 | + } |
|
| 69 | 70 | return $value; |
| 70 | 71 | } |
| 71 | 72 | |
@@ -29,8 +29,9 @@ discard block |
||
| 29 | 29 | $callback=", function(){\n{$callback}\n}"; |
| 30 | 30 | } |
| 31 | 31 | $str="$({$element}).{$action}({$speed}{$callback});"; |
| 32 | - if ($immediatly) |
|
| 33 | - $this->jquery_code_for_compile[]=$str; |
|
| 32 | + if ($immediatly) { |
|
| 33 | + $this->jquery_code_for_compile[]=$str; |
|
| 34 | + } |
|
| 34 | 35 | return $str; |
| 35 | 36 | } |
| 36 | 37 | /** |
@@ -62,10 +63,12 @@ discard block |
||
| 62 | 63 | if (isset($param)) { |
| 63 | 64 | $param=Javascript::prep_value($param); |
| 64 | 65 | $str="$({$element}).{$jQueryCall}({$param});"; |
| 65 | - } else |
|
| 66 | - $str="$({$element}).{$jQueryCall}();"; |
|
| 67 | - if ($immediatly) |
|
| 68 | - $this->jquery_code_for_compile[]=$str; |
|
| 66 | + } else { |
|
| 67 | + $str="$({$element}).{$jQueryCall}();"; |
|
| 68 | + } |
|
| 69 | + if ($immediatly) { |
|
| 70 | + $this->jquery_code_for_compile[]=$str; |
|
| 71 | + } |
|
| 69 | 72 | return $str; |
| 70 | 73 | } |
| 71 | 74 | |
@@ -81,8 +84,9 @@ discard block |
||
| 81 | 84 | $to=Javascript::prep_element($to); |
| 82 | 85 | $element=Javascript::prep_element($element); |
| 83 | 86 | $str="$({$to}).{$jQueryCall}({$element});"; |
| 84 | - if ($immediatly) |
|
| 85 | - $this->jquery_code_for_compile[]=$str; |
|
| 87 | + if ($immediatly) { |
|
| 88 | + $this->jquery_code_for_compile[]=$str; |
|
| 89 | + } |
|
| 86 | 90 | return $str; |
| 87 | 91 | } |
| 88 | 92 | /** |
@@ -131,10 +135,12 @@ discard block |
||
| 131 | 135 | if (isset($value)) { |
| 132 | 136 | $value=Javascript::prep_value($value); |
| 133 | 137 | $str="$({$element}).attr(\"$attributeName\",{$value});"; |
| 134 | - } else |
|
| 135 | - $str="$({$element}).attr(\"$attributeName\");"; |
|
| 136 | - if ($immediatly) |
|
| 137 | - $this->jquery_code_for_compile[]=$str; |
|
| 138 | + } else { |
|
| 139 | + $str="$({$element}).attr(\"$attributeName\");"; |
|
| 140 | + } |
|
| 141 | + if ($immediatly) { |
|
| 142 | + $this->jquery_code_for_compile[]=$str; |
|
| 143 | + } |
|
| 138 | 144 | return $str; |
| 139 | 145 | } |
| 140 | 146 | |
@@ -190,8 +196,9 @@ discard block |
||
| 190 | 196 | |
| 191 | 197 | $str="$({$element}).animate({\n$animations\n\t\t}".$speed.$extra.");"; |
| 192 | 198 | |
| 193 | - if ($immediatly) |
|
| 194 | - $this->jquery_code_for_compile[]=$str; |
|
| 199 | + if ($immediatly) { |
|
| 200 | + $this->jquery_code_for_compile[]=$str; |
|
| 201 | + } |
|
| 195 | 202 | return $str; |
| 196 | 203 | } |
| 197 | 204 | |
@@ -342,8 +349,9 @@ discard block |
||
| 342 | 349 | $element=Javascript::prep_element($element); |
| 343 | 350 | $str="$({$element}).trigger(\"$event\");"; |
| 344 | 351 | |
| 345 | - if ($immediatly) |
|
| 346 | - $this->jquery_code_for_compile[]=$str; |
|
| 352 | + if ($immediatly) { |
|
| 353 | + $this->jquery_code_for_compile[]=$str; |
|
| 354 | + } |
|
| 347 | 355 | return $str; |
| 348 | 356 | } |
| 349 | 357 | |
@@ -405,8 +413,9 @@ discard block |
||
| 405 | 413 | $str.="else{".$jsCodeIfFalse."}"; |
| 406 | 414 | } |
| 407 | 415 | |
| 408 | - if ($immediatly) |
|
| 409 | - $this->jquery_code_for_compile[]=$str; |
|
| 416 | + if ($immediatly) { |
|
| 417 | + $this->jquery_code_for_compile[]=$str; |
|
| 418 | + } |
|
| 410 | 419 | return $str; |
| 411 | 420 | } |
| 412 | 421 | |
@@ -422,11 +431,13 @@ discard block |
||
| 422 | 431 | private function _doJQuery($element, $jqueryCall, $param="", $jsCallback="", $immediatly=false) { |
| 423 | 432 | $param=Javascript::prep_value($param); |
| 424 | 433 | $callback=""; |
| 425 | - if ($jsCallback!="") |
|
| 426 | - $callback=", function(event){\n{$jsCallback}\n}"; |
|
| 434 | + if ($jsCallback!="") { |
|
| 435 | + $callback=", function(event){\n{$jsCallback}\n}"; |
|
| 436 | + } |
|
| 427 | 437 | $script="$(".Javascript::prep_element($element).").".$jqueryCall."(".$param.$callback.");\n"; |
| 428 | - if ($immediatly) |
|
| 429 | - $this->jquery_code_for_compile[]=$script; |
|
| 438 | + if ($immediatly) { |
|
| 439 | + $this->jquery_code_for_compile[]=$script; |
|
| 440 | + } |
|
| 430 | 441 | return $script; |
| 431 | 442 | } |
| 432 | 443 | |
@@ -497,8 +508,9 @@ discard block |
||
| 497 | 508 | */ |
| 498 | 509 | public function exec($js, $immediatly=false) { |
| 499 | 510 | $script=$js."\n"; |
| 500 | - if ($immediatly) |
|
| 501 | - $this->jquery_code_for_compile[]=$script; |
|
| 511 | + if ($immediatly) { |
|
| 512 | + $this->jquery_code_for_compile[]=$script; |
|
| 513 | + } |
|
| 502 | 514 | return $script; |
| 503 | 515 | } |
| 504 | 516 | |
@@ -579,7 +591,7 @@ discard block |
||
| 579 | 591 | } |
| 580 | 592 | if(isset($globalName)){ |
| 581 | 593 | $script="if(window.{$globalName}){clearInterval(window.{$globalName});}\nwindow.{$globalName}=setInterval({$jsCode},{$time});"; |
| 582 | - }else{ |
|
| 594 | + } else{ |
|
| 583 | 595 | $script="setInterval({$jsCode},{$time});"; |
| 584 | 596 | } |
| 585 | 597 | return $this->exec($script,$immediatly); |
@@ -59,8 +59,9 @@ |
||
| 59 | 59 | $callback.=$js->trigger("#".$id." [name='selection[]']","change",false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js)); |
| 60 | 60 | $callback.=$this->_generatePaginationScript($id); |
| 61 | 61 | if(isset($this->_urls["refresh"])){ |
| 62 | - if(isset($menu)) |
|
| 63 | - $js->jsonArrayOn("click", "#".$menu->getIdentifier()." a","#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"],"post",["params"=>"{'p':$(this).attr('data-page'),'_model':'".JString::doubleBackSlashes($this->_model)."'}","jsCallback"=>$callback]); |
|
| 62 | + if(isset($menu)) { |
|
| 63 | + $js->jsonArrayOn("click", "#".$menu->getIdentifier()." a","#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"],"post",["params"=>"{'p':$(this).attr('data-page'),'_model':'".JString::doubleBackSlashes($this->_model)."'}","jsCallback"=>$callback]); |
|
| 64 | + } |
|
| 64 | 65 | } |
| 65 | 66 | } |
| 66 | 67 | |
@@ -29,15 +29,17 @@ discard block |
||
| 29 | 29 | |
| 30 | 30 | public function addContent($content,$before=false) { |
| 31 | 31 | if (!\is_array($this->content)) { |
| 32 | - if(isset($this->content)) |
|
| 33 | - $this->content=array ($this->content); |
|
| 34 | - else |
|
| 35 | - $this->content=array(); |
|
| 32 | + if(isset($this->content)) { |
|
| 33 | + $this->content=array ($this->content); |
|
| 34 | + } else { |
|
| 35 | + $this->content=array(); |
|
| 36 | + } |
|
| 37 | + } |
|
| 38 | + if($before) { |
|
| 39 | + array_unshift($this->content,$content); |
|
| 40 | + } else { |
|
| 41 | + $this->content []=$content; |
|
| 36 | 42 | } |
| 37 | - if($before) |
|
| 38 | - array_unshift($this->content,$content); |
|
| 39 | - else |
|
| 40 | - $this->content []=$content; |
|
| 41 | 43 | return $this; |
| 42 | 44 | } |
| 43 | 45 | |
@@ -75,9 +77,9 @@ discard block |
||
| 75 | 77 | $instances=[]; |
| 76 | 78 | if($content instanceof $class){ |
| 77 | 79 | $instances[]=$content; |
| 78 | - }elseif($content instanceof HtmlDoubleElement){ |
|
| 80 | + } elseif($content instanceof HtmlDoubleElement){ |
|
| 79 | 81 | $instances=\array_merge($instances,$content->getContentInstances($class)); |
| 80 | - }elseif (\is_array($content)){ |
|
| 82 | + } elseif (\is_array($content)){ |
|
| 81 | 83 | foreach ($content as $element){ |
| 82 | 84 | $instances=\array_merge($instances,$this->_getContentInstances($class, $element)); |
| 83 | 85 | } |
@@ -90,10 +92,12 @@ discard block |
||
| 90 | 92 | * @return HtmlDoubleElement |
| 91 | 93 | */ |
| 92 | 94 | public function asLink($href=NULL,$target=NULL) { |
| 93 | - if (isset($href)) |
|
| 94 | - $this->setProperty("href", $href); |
|
| 95 | - if(isset($target)) |
|
| 96 | - $this->setProperty("target", $target); |
|
| 95 | + if (isset($href)) { |
|
| 96 | + $this->setProperty("href", $href); |
|
| 97 | + } |
|
| 98 | + if(isset($target)) { |
|
| 99 | + $this->setProperty("target", $target); |
|
| 100 | + } |
|
| 97 | 101 | return $this->setTagName("a"); |
| 98 | 102 | } |
| 99 | 103 | |