@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | * @param string $event |
22 | 22 | * @param boolean $multiple |
23 | 23 | */ |
24 | - public function __construct($table,$class="active",$event="click",$multiple=false){ |
|
24 | + public function __construct($table, $class="active", $event="click", $multiple=false) { |
|
25 | 25 | $this->table=$table; |
26 | 26 | $this->class=$class; |
27 | 27 | $this->event=$event; |
@@ -55,12 +55,12 @@ discard block |
||
55 | 55 | return $this; |
56 | 56 | } |
57 | 57 | |
58 | - public function run(){ |
|
58 | + public function run() { |
|
59 | 59 | $multiple=""; |
60 | - if(!$this->multiple){ |
|
60 | + if (!$this->multiple) { |
|
61 | 61 | $multiple="$(this).closest('tbody').children('tr').removeClass('".$this->class."');"; |
62 | 62 | } |
63 | - $this->table->onRow($this->event, $multiple."$(this).toggleClass('".$this->class."');".$this->table->jsTrigger("activeRowChange","[this]"),false,false); |
|
63 | + $this->table->onRow($this->event, $multiple."$(this).toggleClass('".$this->class."');".$this->table->jsTrigger("activeRowChange", "[this]"), false, false); |
|
64 | 64 | } |
65 | 65 | |
66 | 66 | } |
@@ -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 |
@@ -31,10 +31,10 @@ discard block |
||
31 | 31 | |
32 | 32 | public function __construct($identifier, $rowCount, $colCount) { |
33 | 33 | parent::__construct($identifier, "table", "ui table"); |
34 | - $this->content=array (); |
|
34 | + $this->content=array(); |
|
35 | 35 | $this->setRowCount($rowCount, $colCount); |
36 | - $this->_variations=[ Variation::CELLED,Variation::PADDED,Variation::COMPACT ]; |
|
37 | - $this->_compileParts=["thead","tbody","tfoot"]; |
|
36 | + $this->_variations=[Variation::CELLED, Variation::PADDED, Variation::COMPACT]; |
|
37 | + $this->_compileParts=["thead", "tbody", "tfoot"]; |
|
38 | 38 | $this->_afterCompileEvents=[]; |
39 | 39 | } |
40 | 40 | |
@@ -44,17 +44,17 @@ discard block |
||
44 | 44 | * @return HtmlTableContent |
45 | 45 | */ |
46 | 46 | public function getPart($key) { |
47 | - if (\array_key_exists($key, $this->content) === false) { |
|
47 | + if (\array_key_exists($key, $this->content)===false) { |
|
48 | 48 | $this->content[$key]=new HtmlTableContent("", $key); |
49 | - if ($key !== "tbody") { |
|
49 | + if ($key!=="tbody") { |
|
50 | 50 | $this->content[$key]->setRowCount(1, $this->_colCount); |
51 | 51 | } |
52 | 52 | } |
53 | 53 | return $this->content[$key]; |
54 | 54 | } |
55 | 55 | |
56 | - protected function _getFirstPart(){ |
|
57 | - if(isset($this->content["thead"])){ |
|
56 | + protected function _getFirstPart() { |
|
57 | + if (isset($this->content["thead"])) { |
|
58 | 58 | return $this->content["thead"]; |
59 | 59 | } |
60 | 60 | return $this->content["tbody"]; |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | * @return boolean |
100 | 100 | */ |
101 | 101 | public function hasPart($key) { |
102 | - return \array_key_exists($key, $this->content) === true; |
|
102 | + return \array_key_exists($key, $this->content)===true; |
|
103 | 103 | } |
104 | 104 | |
105 | 105 | /** |
@@ -259,8 +259,8 @@ discard block |
||
259 | 259 | return $this->colAlign($colIndex, "colLeftFromRight"); |
260 | 260 | } |
261 | 261 | |
262 | - public function setColAlignment($colIndex,$alignment){ |
|
263 | - switch ($alignment){ |
|
262 | + public function setColAlignment($colIndex, $alignment) { |
|
263 | + switch ($alignment) { |
|
264 | 264 | case TextAlignment::LEFT: |
265 | 265 | $function="colLeft"; |
266 | 266 | break; |
@@ -280,8 +280,8 @@ discard block |
||
280 | 280 | return $this; |
281 | 281 | } |
282 | 282 | |
283 | - public function setColAlignmentFromRight($colIndex,$alignment){ |
|
284 | - switch ($alignment){ |
|
283 | + public function setColAlignmentFromRight($colIndex, $alignment) { |
|
284 | + switch ($alignment) { |
|
285 | 285 | case TextAlignment::LEFT: |
286 | 286 | $function="colLeftFromRight"; |
287 | 287 | break; |
@@ -303,7 +303,7 @@ discard block |
||
303 | 303 | |
304 | 304 | private function colAlign($colIndex, $function) { |
305 | 305 | if (\is_array($colIndex)) { |
306 | - foreach ( $colIndex as $cIndex ) { |
|
306 | + foreach ($colIndex as $cIndex) { |
|
307 | 307 | $this->colAlign($cIndex, $function); |
308 | 308 | } |
309 | 309 | } else { |
@@ -364,7 +364,7 @@ discard block |
||
364 | 364 | * @see HtmlSemDoubleElement::compile() |
365 | 365 | */ |
366 | 366 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
367 | - if(\sizeof($this->_compileParts)<3){ |
|
367 | + if (\sizeof($this->_compileParts)<3) { |
|
368 | 368 | $this->_template="%content%"; |
369 | 369 | $this->refresh($js); |
370 | 370 | } |
@@ -373,9 +373,9 @@ discard block |
||
373 | 373 | } |
374 | 374 | |
375 | 375 | protected function compile_once(JsUtils $js=NULL, &$view=NULL) { |
376 | - parent::compile_once($js,$view); |
|
376 | + parent::compile_once($js, $view); |
|
377 | 377 | if ($this->propertyContains("class", "sortable")) { |
378 | - $this->addEvent("execute", "$('#" . $this->identifier . "').tablesort().data('tablesort').sort($('th.default-sort'));"); |
|
378 | + $this->addEvent("execute", "$('#".$this->identifier."').tablesort().data('tablesort').sort($('th.default-sort'));"); |
|
379 | 379 | } |
380 | 380 | } |
381 | 381 | |
@@ -388,13 +388,13 @@ discard block |
||
388 | 388 | public function fromDatabaseObject($object, $function) { |
389 | 389 | $result=$function($object); |
390 | 390 | if (\is_array($result)) { |
391 | - $result= $this->addRow($function($object)); |
|
391 | + $result=$this->addRow($function($object)); |
|
392 | 392 | } else { |
393 | - $result= $this->getBody()->_addRow($result); |
|
393 | + $result=$this->getBody()->_addRow($result); |
|
394 | 394 | } |
395 | - if(isset($this->_afterCompileEvents["onNewRow"])){ |
|
396 | - if(\is_callable($this->_afterCompileEvents["onNewRow"])) |
|
397 | - $this->_afterCompileEvents["onNewRow"]($result,$object); |
|
395 | + if (isset($this->_afterCompileEvents["onNewRow"])) { |
|
396 | + if (\is_callable($this->_afterCompileEvents["onNewRow"])) |
|
397 | + $this->_afterCompileEvents["onNewRow"]($result, $object); |
|
398 | 398 | } |
399 | 399 | return $result; |
400 | 400 | } |
@@ -409,26 +409,26 @@ discard block |
||
409 | 409 | return $this; |
410 | 410 | } |
411 | 411 | |
412 | - public function refreshTR(){ |
|
412 | + public function refreshTR() { |
|
413 | 413 | $this->setCompileParts(); |
414 | 414 | $this->getPart("tbody")->refreshTR(); |
415 | 415 | } |
416 | 416 | |
417 | - public function refresh($js){ |
|
417 | + public function refresh($js) { |
|
418 | 418 | $this->_footer=$this->getFooter(); |
419 | - if(isset($js)){ |
|
420 | - $js->exec('$("#'.$this->identifier.' tfoot").replaceWith("'.\addslashes($this->_footer).'");',true); |
|
419 | + if (isset($js)) { |
|
420 | + $js->exec('$("#'.$this->identifier.' tfoot").replaceWith("'.\addslashes($this->_footer).'");', true); |
|
421 | 421 | } |
422 | 422 | } |
423 | 423 | |
424 | - public function run(JsUtils $js){ |
|
425 | - if(!$this->_runned){ |
|
426 | - if(isset($this->_activeRowSelector)){ |
|
424 | + public function run(JsUtils $js) { |
|
425 | + if (!$this->_runned) { |
|
426 | + if (isset($this->_activeRowSelector)) { |
|
427 | 427 | $this->_activeRowSelector->run(); |
428 | 428 | } |
429 | 429 | } |
430 | - $result= parent::run($js); |
|
431 | - if(isset($this->_footer)) |
|
430 | + $result=parent::run($js); |
|
431 | + if (isset($this->_footer)) |
|
432 | 432 | $this->_footer->run($js); |
433 | 433 | $this->_runned=true; |
434 | 434 | return $result; |
@@ -452,47 +452,47 @@ discard block |
||
452 | 452 | * @param boolean $multiple |
453 | 453 | * @return HtmlTable |
454 | 454 | */ |
455 | - public function setActiveRowSelector($class="active",$event="click",$multiple=false){ |
|
456 | - $this->_activeRowSelector=new ActiveRow($this,$class,$event,$multiple); |
|
455 | + public function setActiveRowSelector($class="active", $event="click", $multiple=false) { |
|
456 | + $this->_activeRowSelector=new ActiveRow($this, $class, $event, $multiple); |
|
457 | 457 | return $this; |
458 | 458 | } |
459 | 459 | |
460 | - public function hideColumn($colIndex){ |
|
461 | - if(isset($this->content["thead"])){ |
|
460 | + public function hideColumn($colIndex) { |
|
461 | + if (isset($this->content["thead"])) { |
|
462 | 462 | $this->content["thead"]->hideColumn($colIndex); |
463 | 463 | } |
464 | 464 | $this->content["tbody"]->hideColumn($colIndex); |
465 | - if(isset($this->content["tfoot"])){ |
|
465 | + if (isset($this->content["tfoot"])) { |
|
466 | 466 | $this->content["tfoot"]->hideColumn($colIndex); |
467 | 467 | } |
468 | 468 | return $this; |
469 | 469 | } |
470 | 470 | |
471 | - public function setColWidth($colIndex,$width){ |
|
471 | + public function setColWidth($colIndex, $width) { |
|
472 | 472 | $part=$this->_getFirstPart(); |
473 | - if($part!==null && $part->count()>0) |
|
473 | + if ($part!==null && $part->count()>0) |
|
474 | 474 | $part->getCell(0, $colIndex)->setWidth($width); |
475 | 475 | return $this; |
476 | 476 | } |
477 | 477 | |
478 | - public function setColWidths($widths){ |
|
478 | + public function setColWidths($widths) { |
|
479 | 479 | $part=$this->_getFirstPart(); |
480 | - if($part!==null && $part->count()>0){ |
|
480 | + if ($part!==null && $part->count()>0) { |
|
481 | 481 | $count=$part->getColCount(); |
482 | - if(!\is_array($widths)){ |
|
482 | + if (!\is_array($widths)) { |
|
483 | 483 | $widths=\array_fill(0, $count, $widths); |
484 | 484 | } |
485 | - $max=\min(\sizeof($widths),$count); |
|
486 | - for($i=0;$i<$max;$i++){ |
|
485 | + $max=\min(\sizeof($widths), $count); |
|
486 | + for ($i=0; $i<$max; $i++) { |
|
487 | 487 | $part->getCell(0, $i)->setWidth($widths[$i]); |
488 | 488 | } |
489 | 489 | } |
490 | 490 | return $this; |
491 | 491 | } |
492 | 492 | |
493 | - public function mergeIdentiqualValues($colIndex,$function="strip_tags"){ |
|
493 | + public function mergeIdentiqualValues($colIndex, $function="strip_tags") { |
|
494 | 494 | $body=$this->getBody(); |
495 | - $body->mergeIdentiqualValues($colIndex,$function); |
|
495 | + $body->mergeIdentiqualValues($colIndex, $function); |
|
496 | 496 | return $this; |
497 | 497 | } |
498 | 498 | /** |
@@ -506,16 +506,16 @@ discard block |
||
506 | 506 | * @param mixed $_innerScript |
507 | 507 | */ |
508 | 508 | public function setInnerScript($_innerScript) { |
509 | - $this->_innerScript = $_innerScript; |
|
509 | + $this->_innerScript=$_innerScript; |
|
510 | 510 | } |
511 | 511 | |
512 | - public function onActiveRowChange($jsCode){ |
|
513 | - $this->on("activeRowChange",$jsCode); |
|
512 | + public function onActiveRowChange($jsCode) { |
|
513 | + $this->on("activeRowChange", $jsCode); |
|
514 | 514 | return $this; |
515 | 515 | } |
516 | 516 | |
517 | - public function addMergeRow($colCount,$value=null){ |
|
518 | - return $this->getBody()->addMergeRow($colCount,$value); |
|
517 | + public function addMergeRow($colCount, $value=null) { |
|
518 | + return $this->getBody()->addMergeRow($colCount, $value); |
|
519 | 519 | } |
520 | 520 | |
521 | 521 | } |
@@ -6,32 +6,32 @@ discard block |
||
6 | 6 | |
7 | 7 | use Ajax\semantic\html\elements\HtmlIcon; |
8 | 8 | |
9 | -class HtmlPaginationMenu extends HtmlMenu{ |
|
9 | +class HtmlPaginationMenu extends HtmlMenu { |
|
10 | 10 | private $_page; |
11 | 11 | private $_pages; |
12 | 12 | private $_max; |
13 | - public function __construct( $identifier, $items=array() ){ |
|
14 | - parent::__construct( $identifier,$items); |
|
13 | + public function __construct($identifier, $items=array()) { |
|
14 | + parent::__construct($identifier, $items); |
|
15 | 15 | $this->_pages=$items; |
16 | 16 | } |
17 | 17 | /** |
18 | 18 | * {@inheritDoc} |
19 | 19 | * @see \Ajax\common\html\BaseHtml::compile() |
20 | 20 | */ |
21 | - public function compile(JsUtils $js=NULL,&$view=NULL){ |
|
21 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
22 | 22 | $max=$this->_max; |
23 | - if(!$this->_compiled){ |
|
24 | - foreach ($this->content as $item){ |
|
23 | + if (!$this->_compiled) { |
|
24 | + foreach ($this->content as $item) { |
|
25 | 25 | $item->addClass("pageNum"); |
26 | 26 | } |
27 | - $this->insertItem(new HtmlIcon("", "left chevron"))->setProperty("data-page", \max([1,$this->_page-1]))->addToProperty("class","_firstPage no-active"); |
|
28 | - $this->addItem(new HtmlIcon("", "right chevron"))->setProperty("data-page", \min([$max,$this->_page+1]))->setProperty("data-max", $max)->addToProperty("class","_lastPage no-active"); |
|
27 | + $this->insertItem(new HtmlIcon("", "left chevron"))->setProperty("data-page", \max([1, $this->_page-1]))->addToProperty("class", "_firstPage no-active"); |
|
28 | + $this->addItem(new HtmlIcon("", "right chevron"))->setProperty("data-page", \min([$max, $this->_page+1]))->setProperty("data-max", $max)->addToProperty("class", "_lastPage no-active"); |
|
29 | 29 | $this->asPagination(); |
30 | 30 | } |
31 | - return parent::compile($js,$view); |
|
31 | + return parent::compile($js, $view); |
|
32 | 32 | } |
33 | 33 | |
34 | - public function setActivePage($page){ |
|
34 | + public function setActivePage($page) { |
|
35 | 35 | $index=$page-$this->_pages[0]; |
36 | 36 | $this->setActiveItem($index); |
37 | 37 | $this->_page=$page; |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | * @param mixed $_max |
46 | 46 | */ |
47 | 47 | public function setMax($_max) { |
48 | - $this->_max = $_max; |
|
48 | + $this->_max=$_max; |
|
49 | 49 | } |
50 | 50 | |
51 | 51 |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | use Ajax\JsUtils; |
13 | 13 | |
14 | 14 | class HtmlTD extends HtmlSemDoubleElement { |
15 | - use TextAlignmentTrait,TableElementTrait; |
|
15 | + use TextAlignmentTrait, TableElementTrait; |
|
16 | 16 | private $_container; |
17 | 17 | private $_row; |
18 | 18 | private $_col; |
@@ -28,8 +28,8 @@ discard block |
||
28 | 28 | */ |
29 | 29 | public function __construct($identifier, $content=NULL, $tagName="td") { |
30 | 30 | parent::__construct($identifier, $tagName, "", $content); |
31 | - $this->_variations=[ Variation::COLLAPSING ]; |
|
32 | - $this->_states=[ State::ACTIVE,State::POSITIVE,State::NEGATIVE,State::WARNING,State::ERROR,State::DISABLED ]; |
|
31 | + $this->_variations=[Variation::COLLAPSING]; |
|
32 | + $this->_states=[State::ACTIVE, State::POSITIVE, State::NEGATIVE, State::WARNING, State::ERROR, State::DISABLED]; |
|
33 | 33 | } |
34 | 34 | |
35 | 35 | public function setContainer($container, $row, $col) { |
@@ -49,8 +49,8 @@ discard block |
||
49 | 49 | } |
50 | 50 | |
51 | 51 | public function setRowspan($rowspan) { |
52 | - $to=min($this->_container->count(), $this->_row + $rowspan - 1); |
|
53 | - for($i=$to; $i > $this->_row; $i--) { |
|
52 | + $to=min($this->_container->count(), $this->_row+$rowspan-1); |
|
53 | + for ($i=$to; $i>$this->_row; $i--) { |
|
54 | 54 | $this->_container->toDelete($i, $this->_col); |
55 | 55 | } |
56 | 56 | $this->setProperty("rowspan", $rowspan); |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | } |
59 | 59 | |
60 | 60 | public function mergeRow() { |
61 | - if(!$this->_rowMerged){ |
|
61 | + if (!$this->_rowMerged) { |
|
62 | 62 | $this->_rowMerged=true; |
63 | 63 | return $this->setRowspan($this->_container->count()); |
64 | 64 | } |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | } |
67 | 67 | |
68 | 68 | public function mergeCol() { |
69 | - if(!$this->_colMerged){ |
|
69 | + if (!$this->_colMerged) { |
|
70 | 70 | $this->_colMerged=true; |
71 | 71 | return $this->setColspan($this->_container->getRow($this->_row)->count()); |
72 | 72 | } |
@@ -74,9 +74,9 @@ discard block |
||
74 | 74 | } |
75 | 75 | |
76 | 76 | public function setColspan($colspan) { |
77 | - $to=min($this->_container->getRow($this->_row)->count(), $this->_col + $colspan - 1); |
|
78 | - for($i=$to; $i > $this->_col; $i--) { |
|
79 | - $this->_container->delete($this->_row, $this->_col + 1); |
|
77 | + $to=min($this->_container->getRow($this->_row)->count(), $this->_col+$colspan-1); |
|
78 | + for ($i=$to; $i>$this->_col; $i--) { |
|
79 | + $this->_container->delete($this->_row, $this->_col+1); |
|
80 | 80 | } |
81 | 81 | $this->setProperty("colspan", $colspan); |
82 | 82 | return $this->_container; |
@@ -115,21 +115,21 @@ discard block |
||
115 | 115 | return $this->addToProperty("class", "selectable"); |
116 | 116 | } |
117 | 117 | |
118 | - public function setWidth($width){ |
|
118 | + public function setWidth($width) { |
|
119 | 119 | if (\is_int($width)) { |
120 | - $width=Wide::getConstants()["W" . $width]; |
|
120 | + $width=Wide::getConstants()["W".$width]; |
|
121 | 121 | } |
122 | 122 | $this->addToPropertyCtrl("class", $width, Wide::getConstants()); |
123 | - return $this->addToPropertyCtrl("class", "wide", array ("wide" )); |
|
123 | + return $this->addToPropertyCtrl("class", "wide", array("wide")); |
|
124 | 124 | } |
125 | 125 | |
126 | - public function toDelete(){ |
|
126 | + public function toDelete() { |
|
127 | 127 | $this->_deleted=true; |
128 | 128 | return $this; |
129 | 129 | } |
130 | 130 | |
131 | 131 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
132 | - if(!$this->_deleted) |
|
133 | - return parent::compile($js,$view); |
|
132 | + if (!$this->_deleted) |
|
133 | + return parent::compile($js, $view); |
|
134 | 134 | } |
135 | 135 | } |
@@ -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 | } |
@@ -14,44 +14,44 @@ discard block |
||
14 | 14 | */ |
15 | 15 | abstract class HtmlCollection extends HtmlDoubleElement { |
16 | 16 | |
17 | - public function __construct($identifier,$tagName="div"){ |
|
18 | - parent::__construct($identifier,$tagName); |
|
17 | + public function __construct($identifier, $tagName="div") { |
|
18 | + parent::__construct($identifier, $tagName); |
|
19 | 19 | $this->content=array(); |
20 | 20 | } |
21 | 21 | |
22 | - public function addItems($items){ |
|
23 | - if(JArray::isAssociative($items)){ |
|
24 | - foreach ($items as $k=>$v){ |
|
25 | - $this->addItem([$k,$v]); |
|
22 | + public function addItems($items) { |
|
23 | + if (JArray::isAssociative($items)) { |
|
24 | + foreach ($items as $k=>$v) { |
|
25 | + $this->addItem([$k, $v]); |
|
26 | 26 | } |
27 | - }else{ |
|
28 | - foreach ($items as $item){ |
|
27 | + } else { |
|
28 | + foreach ($items as $item) { |
|
29 | 29 | $this->addItem($item); |
30 | 30 | } |
31 | 31 | } |
32 | 32 | return $this; |
33 | 33 | } |
34 | 34 | |
35 | - public function setItems($items){ |
|
35 | + public function setItems($items) { |
|
36 | 36 | $this->content=$items; |
37 | 37 | return $this; |
38 | 38 | } |
39 | 39 | |
40 | - public function getItems(){ |
|
40 | + public function getItems() { |
|
41 | 41 | return $this->content; |
42 | 42 | } |
43 | 43 | |
44 | - protected function getItemToAdd($item){ |
|
44 | + protected function getItemToAdd($item) { |
|
45 | 45 | $itemO=$item; |
46 | - if($this->createCondition($item)===true){ |
|
46 | + if ($this->createCondition($item)===true) { |
|
47 | 47 | $itemO=$this->createItem($item); |
48 | 48 | } |
49 | 49 | return $itemO; |
50 | 50 | } |
51 | 51 | |
52 | - protected function setItemIdentifier($item,$classname,$index){ |
|
53 | - if($item instanceof BaseWidget){ |
|
54 | - if(JString::isNull($item->getIdentifier())){ |
|
52 | + protected function setItemIdentifier($item, $classname, $index) { |
|
53 | + if ($item instanceof BaseWidget) { |
|
54 | + if (JString::isNull($item->getIdentifier())) { |
|
55 | 55 | $item->setIdentifier($classname."-".$this->identifier."-".$index); |
56 | 56 | } |
57 | 57 | } |
@@ -62,15 +62,15 @@ discard block |
||
62 | 62 | * @param HtmlDoubleElement|string|array $item |
63 | 63 | * @return \Ajax\common\html\HtmlDoubleElement |
64 | 64 | */ |
65 | - public function addItem($item){ |
|
65 | + public function addItem($item) { |
|
66 | 66 | $itemO=$this->getItemToAdd($item); |
67 | 67 | $this->addContent($itemO); |
68 | 68 | return $itemO; |
69 | 69 | } |
70 | 70 | |
71 | - public function insertItem($item,$position=0){ |
|
71 | + public function insertItem($item, $position=0) { |
|
72 | 72 | $itemO=$this->getItemToAdd($item); |
73 | - \array_splice( $this->content, $position, 0, array($itemO)); |
|
73 | + \array_splice($this->content, $position, 0, array($itemO)); |
|
74 | 74 | return $itemO; |
75 | 75 | } |
76 | 76 | |
@@ -80,7 +80,7 @@ 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])) |
|
83 | + if (is_int($index) && isset($this->content[$index])) |
|
84 | 84 | return $this->content[$index]; |
85 | 85 | else { |
86 | 86 | $elm=$this->getElementById($index, $this->content); |
@@ -93,11 +93,11 @@ discard block |
||
93 | 93 | return $this; |
94 | 94 | } |
95 | 95 | |
96 | - public function removeItem($index){ |
|
96 | + public function removeItem($index) { |
|
97 | 97 | return array_splice($this->content, $index, 1); |
98 | 98 | } |
99 | 99 | |
100 | - public function count(){ |
|
100 | + public function count() { |
|
101 | 101 | return \sizeof($this->content); |
102 | 102 | } |
103 | 103 | |
@@ -108,8 +108,8 @@ discard block |
||
108 | 108 | return $this->addItem($function($object)); |
109 | 109 | } |
110 | 110 | |
111 | - public function apply($callBack){ |
|
112 | - foreach ($this->content as $item){ |
|
111 | + public function apply($callBack) { |
|
112 | + foreach ($this->content as $item) { |
|
113 | 113 | $callBack($item); |
114 | 114 | } |
115 | 115 | return $this; |
@@ -129,23 +129,23 @@ discard block |
||
129 | 129 | */ |
130 | 130 | abstract protected function createItem($value); |
131 | 131 | |
132 | - protected function createCondition($value){ |
|
132 | + protected function createCondition($value) { |
|
133 | 133 | return \is_object($value)===false; |
134 | 134 | } |
135 | 135 | |
136 | - protected function contentAs($tagName){ |
|
137 | - foreach ($this->content as $item){ |
|
136 | + protected function contentAs($tagName) { |
|
137 | + foreach ($this->content as $item) { |
|
138 | 138 | $item->setTagName($tagName); |
139 | 139 | } |
140 | 140 | return $this; |
141 | 141 | } |
142 | 142 | |
143 | - public function setProperties($properties){ |
|
143 | + public function setProperties($properties) { |
|
144 | 144 | $i=0; |
145 | - foreach ($properties as $k=>$v){ |
|
145 | + foreach ($properties as $k=>$v) { |
|
146 | 146 | $c=$this->content[$i++]; |
147 | - if(isset($c)) |
|
148 | - $c->setProperty($k,$v); |
|
147 | + if (isset($c)) |
|
148 | + $c->setProperty($k, $v); |
|
149 | 149 | else |
150 | 150 | return $this; |
151 | 151 | } |
@@ -158,15 +158,15 @@ discard block |
||
158 | 158 | * @param array|mixed $values |
159 | 159 | * @return $this |
160 | 160 | */ |
161 | - public function setPropertyValues($property,$values){ |
|
162 | - if(\is_array($values)===false){ |
|
163 | - $values=\array_fill(0, $this->count(),$values); |
|
161 | + public function setPropertyValues($property, $values) { |
|
162 | + if (\is_array($values)===false) { |
|
163 | + $values=\array_fill(0, $this->count(), $values); |
|
164 | 164 | } |
165 | - foreach ($values as $i=>$value){ |
|
166 | - if(isset($this->content[$i])){ |
|
167 | - $this->content[$i]->setProperty($property,$value); |
|
165 | + foreach ($values as $i=>$value) { |
|
166 | + if (isset($this->content[$i])) { |
|
167 | + $this->content[$i]->setProperty($property, $value); |
|
168 | 168 | } |
169 | - else{ |
|
169 | + else { |
|
170 | 170 | return $this; |
171 | 171 | } |
172 | 172 | } |
@@ -179,15 +179,15 @@ discard block |
||
179 | 179 | * @param array|mixed $values |
180 | 180 | * @return $this |
181 | 181 | */ |
182 | - public function addPropertyValues($property,$values){ |
|
183 | - if(\is_array($values)===false){ |
|
184 | - $values=\array_fill(0, $this->count(),$values); |
|
182 | + public function addPropertyValues($property, $values) { |
|
183 | + if (\is_array($values)===false) { |
|
184 | + $values=\array_fill(0, $this->count(), $values); |
|
185 | 185 | } |
186 | - foreach ($values as $i=>$value){ |
|
187 | - if(isset($this->content[$i])){ |
|
188 | - $this->content[$i++]->addToProperty($property,$value); |
|
186 | + foreach ($values as $i=>$value) { |
|
187 | + if (isset($this->content[$i])) { |
|
188 | + $this->content[$i++]->addToProperty($property, $value); |
|
189 | 189 | } |
190 | - else{ |
|
190 | + else { |
|
191 | 191 | return $this; |
192 | 192 | } |
193 | 193 | } |
@@ -197,13 +197,13 @@ discard block |
||
197 | 197 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
198 | 198 | $index=0; |
199 | 199 | $classname=\strtolower(JReflection::shortClassName($this)); |
200 | - foreach ($this->content as $item){ |
|
201 | - $this->setItemIdentifier($item,$classname,$index++); |
|
200 | + foreach ($this->content as $item) { |
|
201 | + $this->setItemIdentifier($item, $classname, $index++); |
|
202 | 202 | } |
203 | - return parent::compile($js,$view); |
|
203 | + return parent::compile($js, $view); |
|
204 | 204 | } |
205 | 205 | |
206 | - public function getItemById($identifier){ |
|
206 | + public function getItemById($identifier) { |
|
207 | 207 | return $this->getElementById($identifier, $this->content); |
208 | 208 | } |
209 | 209 | |
@@ -212,13 +212,13 @@ discard block |
||
212 | 212 | * @param string $target |
213 | 213 | * @return HtmlCollection |
214 | 214 | */ |
215 | - public function asLinks($hrefs=[],$target=NUll) { |
|
216 | - foreach ( $this->content as $index=>$item ) { |
|
217 | - if($item instanceof HtmlDoubleElement){ |
|
215 | + public function asLinks($hrefs=[], $target=NUll) { |
|
216 | + foreach ($this->content as $index=>$item) { |
|
217 | + if ($item instanceof HtmlDoubleElement) { |
|
218 | 218 | $href=""; |
219 | - if(isset($hrefs[$index])) |
|
219 | + if (isset($hrefs[$index])) |
|
220 | 220 | $href=$hrefs[$index]; |
221 | - $item->asLink($href,$target); |
|
221 | + $item->asLink($href, $target); |
|
222 | 222 | } |
223 | 223 | } |
224 | 224 | return $this; |
@@ -230,8 +230,8 @@ discard block |
||
230 | 230 | * @param int $length If length is omitted, removes everything from offset to the end of the array. If length is specified and is positive, then that many elements will be removed. If length is specified and is negative then the end of the removed portion will be that many elements from the end of the array. If length is specified and is zero, no elements will be removed. Tip: to remove everything from offset to the end of the array when replacement is also specified, use count($input) for length. |
231 | 231 | * @return $this |
232 | 232 | */ |
233 | - public function splice($offset,$length=null){ |
|
234 | - $this->content=array_slice($this->content, $offset,$length); |
|
233 | + public function splice($offset, $length=null) { |
|
234 | + $this->content=array_slice($this->content, $offset, $length); |
|
235 | 235 | return $this; |
236 | 236 | } |
237 | 237 | } |
@@ -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 | } |
@@ -8,12 +8,12 @@ discard block |
||
8 | 8 | * @author jc |
9 | 9 | * @property BaseWidget $_self |
10 | 10 | */ |
11 | -trait BaseHtmlPropertiesTrait{ |
|
11 | +trait BaseHtmlPropertiesTrait { |
|
12 | 12 | |
13 | - protected $properties=array (); |
|
13 | + protected $properties=array(); |
|
14 | 14 | abstract protected function ctrl($name, $value, $typeCtrl); |
15 | 15 | abstract protected function removeOldValues(&$oldValue, $allValues); |
16 | - abstract protected function _getElementBy($callback,$elements); |
|
16 | + abstract protected function _getElementBy($callback, $elements); |
|
17 | 17 | public function getProperties() { |
18 | 18 | return $this->_self->properties; |
19 | 19 | } |
@@ -45,14 +45,14 @@ discard block |
||
45 | 45 | */ |
46 | 46 | public function addToProperty($name, $value, $separator=" ") { |
47 | 47 | if (\is_array($value)) { |
48 | - foreach ( $value as $v ) { |
|
48 | + foreach ($value as $v) { |
|
49 | 49 | $this->_self->addToProperty($name, $v, $separator); |
50 | 50 | } |
51 | - } else if ($value !== "" && $this->_self->propertyContains($name, $value) === false) { |
|
52 | - if(isset($this->_self->properties[$name])){ |
|
51 | + } else if ($value!=="" && $this->_self->propertyContains($name, $value)===false) { |
|
52 | + if (isset($this->_self->properties[$name])) { |
|
53 | 53 | $v=$this->_self->properties[$name]; |
54 | - if (isset($v) && $v !== ""){ |
|
55 | - $value=$v . $separator . $value; |
|
54 | + if (isset($v) && $v!=="") { |
|
55 | + $value=$v.$separator.$value; |
|
56 | 56 | } |
57 | 57 | } |
58 | 58 | return $this->_self->setProperty($name, $value); |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | } |
90 | 90 | |
91 | 91 | public function addToPropertyCtrlCheck($name, $value, $typeCtrl) { |
92 | - if ($this->_self->ctrl($name, $value, $typeCtrl) === true) { |
|
92 | + if ($this->_self->ctrl($name, $value, $typeCtrl)===true) { |
|
93 | 93 | return $this->_self->addToProperty($name, $value); |
94 | 94 | } |
95 | 95 | return $this; |
@@ -110,12 +110,12 @@ discard block |
||
110 | 110 | } |
111 | 111 | |
112 | 112 | protected function setPropertyCtrl($name, $value, $typeCtrl) { |
113 | - if ($this->_self->ctrl($name, $value, $typeCtrl) === true) |
|
113 | + if ($this->_self->ctrl($name, $value, $typeCtrl)===true) |
|
114 | 114 | return $this->_self->setProperty($name, $value); |
115 | 115 | return $this; |
116 | 116 | } |
117 | 117 | |
118 | - protected function getElementByPropertyValue($propertyName,$value, $elements) { |
|
119 | - return $this->_self->_getElementBy(function(BaseHtml $element) use ($propertyName,$value){return $element->propertyContains($propertyName, $value) === true;}, $elements); |
|
118 | + protected function getElementByPropertyValue($propertyName, $value, $elements) { |
|
119 | + return $this->_self->_getElementBy(function(BaseHtml $element) use ($propertyName, $value){return $element->propertyContains($propertyName, $value)===true; }, $elements); |
|
120 | 120 | } |
121 | 121 | } |
@@ -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 |
@@ -19,8 +19,8 @@ discard block |
||
19 | 19 | * @param array $instances |
20 | 20 | * @return DataTable |
21 | 21 | */ |
22 | - public function dataTable($identifier,$model, $instances=null){ |
|
23 | - return $this->addHtmlComponent(new DataTable($identifier,$model,$instances)); |
|
22 | + public function dataTable($identifier, $model, $instances=null) { |
|
23 | + return $this->addHtmlComponent(new DataTable($identifier, $model, $instances)); |
|
24 | 24 | } |
25 | 25 | |
26 | 26 | /** |
@@ -29,8 +29,8 @@ discard block |
||
29 | 29 | * @param array $instances |
30 | 30 | * @return JsonDataTable |
31 | 31 | */ |
32 | - public function jsonDataTable($identifier,$model, $instances=null){ |
|
33 | - return $this->addHtmlComponent(new JsonDataTable($identifier,$model,$instances)); |
|
32 | + public function jsonDataTable($identifier, $model, $instances=null) { |
|
33 | + return $this->addHtmlComponent(new JsonDataTable($identifier, $model, $instances)); |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | /** |
@@ -38,8 +38,8 @@ discard block |
||
38 | 38 | * @param object $instance |
39 | 39 | * @return DataElement |
40 | 40 | */ |
41 | - public function dataElement($identifier, $instance=null){ |
|
42 | - return $this->addHtmlComponent(new DataElement($identifier,$instance)); |
|
41 | + public function dataElement($identifier, $instance=null) { |
|
42 | + return $this->addHtmlComponent(new DataElement($identifier, $instance)); |
|
43 | 43 | } |
44 | 44 | |
45 | 45 | /** |
@@ -47,8 +47,8 @@ discard block |
||
47 | 47 | * @param object $instance |
48 | 48 | * @return DataForm |
49 | 49 | */ |
50 | - public function dataForm($identifier, $instance){ |
|
51 | - return $this->addHtmlComponent(new DataForm($identifier,$instance)); |
|
50 | + public function dataForm($identifier, $instance) { |
|
51 | + return $this->addHtmlComponent(new DataForm($identifier, $instance)); |
|
52 | 52 | } |
53 | 53 | |
54 | 54 | /** |
@@ -56,8 +56,8 @@ discard block |
||
56 | 56 | * @param object $instance |
57 | 57 | * @return FormLogin |
58 | 58 | */ |
59 | - public function defaultLogin($identifier,$instance=null){ |
|
60 | - return $this->addHtmlComponent(FormLogin::regular($identifier,$instance)); |
|
59 | + public function defaultLogin($identifier, $instance=null) { |
|
60 | + return $this->addHtmlComponent(FormLogin::regular($identifier, $instance)); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | /** |
@@ -65,8 +65,8 @@ discard block |
||
65 | 65 | * @param object $instance |
66 | 66 | * @return FormLogin |
67 | 67 | */ |
68 | - public function smallLogin($identifier,$instance=null){ |
|
69 | - return $this->addHtmlComponent(FormLogin::small($identifier,$instance)); |
|
68 | + public function smallLogin($identifier, $instance=null) { |
|
69 | + return $this->addHtmlComponent(FormLogin::small($identifier, $instance)); |
|
70 | 70 | } |
71 | 71 | |
72 | 72 | /** |
@@ -74,8 +74,8 @@ discard block |
||
74 | 74 | * @param object $instance |
75 | 75 | * @return FormLogin |
76 | 76 | */ |
77 | - public function segmentedLogin($identifier,$instance=null){ |
|
78 | - return $this->addHtmlComponent(FormLogin::attachedSegment($identifier,$instance)); |
|
77 | + public function segmentedLogin($identifier, $instance=null) { |
|
78 | + return $this->addHtmlComponent(FormLogin::attachedSegment($identifier, $instance)); |
|
79 | 79 | } |
80 | 80 | |
81 | 81 | /** |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | * @param object $instance |
84 | 84 | * @return FormAccount |
85 | 85 | */ |
86 | - public function defaultAccount($identifier,$instance=null){ |
|
87 | - return $this->addHtmlComponent(FormAccount::regular($identifier,$instance)); |
|
86 | + public function defaultAccount($identifier, $instance=null) { |
|
87 | + return $this->addHtmlComponent(FormAccount::regular($identifier, $instance)); |
|
88 | 88 | } |
89 | 89 | } |
@@ -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 |
@@ -2,69 +2,69 @@ |
||
2 | 2 | namespace Ajax\service; |
3 | 3 | class JString { |
4 | 4 | |
5 | - public static function contains($hay,$needle){ |
|
6 | - return strpos($hay, "$needle") !== false; |
|
5 | + public static function contains($hay, $needle) { |
|
6 | + return strpos($hay, "$needle")!==false; |
|
7 | 7 | } |
8 | 8 | public static function startswith($hay, $needle) { |
9 | - return substr($hay, 0, strlen($needle)) === $needle; |
|
9 | + return substr($hay, 0, strlen($needle))===$needle; |
|
10 | 10 | } |
11 | 11 | |
12 | 12 | public static function endswith($hay, $needle) { |
13 | - return substr($hay, -strlen($needle)) === $needle; |
|
13 | + return substr($hay, -strlen($needle))===$needle; |
|
14 | 14 | } |
15 | 15 | |
16 | - public static function isNull($s){ |
|
16 | + public static function isNull($s) { |
|
17 | 17 | return (!isset($s) || NULL===$s || ""===$s); |
18 | 18 | } |
19 | - public static function isNotNull($s){ |
|
19 | + public static function isNotNull($s) { |
|
20 | 20 | return (isset($s) && NULL!==$s && ""!==$s); |
21 | 21 | } |
22 | 22 | |
23 | - public static function isBoolean($value){ |
|
23 | + public static function isBoolean($value) { |
|
24 | 24 | return \is_bool($value) || $value==1 || $value==0; |
25 | 25 | } |
26 | 26 | |
27 | - public static function isBooleanTrue($value){ |
|
27 | + public static function isBooleanTrue($value) { |
|
28 | 28 | return $value==1 || $value; |
29 | 29 | } |
30 | 30 | |
31 | - public static function isBooleanFalse($value){ |
|
31 | + public static function isBooleanFalse($value) { |
|
32 | 32 | return $value==0 || !$value; |
33 | 33 | } |
34 | 34 | |
35 | - public static function camelCaseToSeparated($input,$separator=" "){ |
|
35 | + public static function camelCaseToSeparated($input, $separator=" ") { |
|
36 | 36 | return strtolower(preg_replace('/(?<!^)[A-Z]/', $separator.'$0', $input)); |
37 | 37 | } |
38 | 38 | |
39 | - public static function replaceAtFirst($subject,$from, $to){ |
|
40 | - $from = '/\A'.preg_quote($from, '/').'/'; |
|
39 | + public static function replaceAtFirst($subject, $from, $to) { |
|
40 | + $from='/\A'.preg_quote($from, '/').'/'; |
|
41 | 41 | return \preg_replace($from, $to, $subject, 1); |
42 | 42 | } |
43 | 43 | |
44 | - public static function replaceAtLast($subject,$from, $to){ |
|
45 | - $from = '/'.preg_quote($from, '/').'\z/'; |
|
44 | + public static function replaceAtLast($subject, $from, $to) { |
|
45 | + $from='/'.preg_quote($from, '/').'\z/'; |
|
46 | 46 | return \preg_replace($from, $to, $subject, 1); |
47 | 47 | } |
48 | 48 | |
49 | - public static function replaceAtFirstAndLast($subject,$fromFirst,$toFirst,$fromLast,$toLast){ |
|
49 | + public static function replaceAtFirstAndLast($subject, $fromFirst, $toFirst, $fromLast, $toLast) { |
|
50 | 50 | $s=self::replaceAtFirst($subject, $fromFirst, $toFirst); |
51 | 51 | return self::replaceAtLast($s, $fromLast, $toLast); |
52 | 52 | } |
53 | 53 | |
54 | - public static function getValueBetween(&$str,$before="{{",$after="}}"){ |
|
54 | + public static function getValueBetween(&$str, $before="{{", $after="}}") { |
|
55 | 55 | $matches=[]; |
56 | 56 | $result=null; |
57 | 57 | $_before=\preg_quote($before); |
58 | 58 | $_after=\preg_quote($after); |
59 | - if(\preg_match('/'.$_before.'(.*?)'.$_after.'/s', $str, $matches)===1){ |
|
59 | + if (\preg_match('/'.$_before.'(.*?)'.$_after.'/s', $str, $matches)===1) { |
|
60 | 60 | $result=$matches[1]; |
61 | - $str=\str_replace($before.$result.$after,"", $str); |
|
61 | + $str=\str_replace($before.$result.$after, "", $str); |
|
62 | 62 | } |
63 | 63 | return $result; |
64 | 64 | } |
65 | 65 | |
66 | - public static function doubleBackSlashes($value){ |
|
67 | - if(is_string($value)) |
|
66 | + public static function doubleBackSlashes($value) { |
|
67 | + if (is_string($value)) |
|
68 | 68 | return str_replace("\\", "\\\\", $value); |
69 | 69 | return $value; |
70 | 70 | } |
@@ -22,25 +22,25 @@ discard block |
||
22 | 22 | $this->_rowClass="_json _element"; |
23 | 23 | } |
24 | 24 | |
25 | - protected function _generateContent($table){ |
|
25 | + protected function _generateContent($table) { |
|
26 | 26 | $this->_addRowModel($table); |
27 | 27 | parent::_generateContent($table); |
28 | 28 | } |
29 | 29 | |
30 | - protected function _addRowModel($table){ |
|
30 | + protected function _addRowModel($table) { |
|
31 | 31 | $fields=$this->_instanceViewer->getSimpleProperties(); |
32 | - $row=$this->_createRow($table, $this->_modelClass,$fields); |
|
33 | - $row->setProperty("style","display:none;"); |
|
32 | + $row=$this->_createRow($table, $this->_modelClass, $fields); |
|
33 | + $row->setProperty("style", "display:none;"); |
|
34 | 34 | $table->getBody()->_addRow($row); |
35 | 35 | } |
36 | 36 | |
37 | - protected function _createRow($table,$rowClass,$fields){ |
|
37 | + protected function _createRow($table, $rowClass, $fields) { |
|
38 | 38 | $object=JReflection::jsonObject($this->_model); |
39 | - if(isset($this->_rowModelCallback)){ |
|
39 | + if (isset($this->_rowModelCallback)) { |
|
40 | 40 | $callback=$this->_rowModelCallback; |
41 | 41 | $callback($object); |
42 | 42 | } |
43 | - $row=$this->_generateRow($object, $fields,$table,"_jsonArrayChecked"); |
|
43 | + $row=$this->_generateRow($object, $fields, $table, "_jsonArrayChecked"); |
|
44 | 44 | $row->setClass($rowClass." _element"); |
45 | 45 | return $row; |
46 | 46 | } |
@@ -49,24 +49,24 @@ discard block |
||
49 | 49 | * {@inheritDoc} |
50 | 50 | * @see DataTable::_associatePaginationBehavior() |
51 | 51 | */ |
52 | - protected function _associatePaginationBehavior(JsUtils $js=NULL,$offset=null){ |
|
52 | + protected function _associatePaginationBehavior(JsUtils $js=NULL, $offset=null) { |
|
53 | 53 | $callback=null; |
54 | 54 | $menu=$this->_pagination->getMenu(); |
55 | 55 | |
56 | - if(isset($js)){ |
|
56 | + if (isset($js)) { |
|
57 | 57 | $id=$this->identifier; |
58 | 58 | $callback=$js->getScript($offset).$this->getHtmlComponent()->getInnerScript(); |
59 | - $callback.=$js->trigger("#".$id." [name='selection[]']","change",false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js)); |
|
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 | - 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]); |
|
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]); |
|
64 | 64 | } |
65 | 65 | } |
66 | 66 | |
67 | 67 | } |
68 | 68 | |
69 | - protected function _generatePaginationScript($id){ |
|
69 | + protected function _generatePaginationScript($id) { |
|
70 | 70 | return ";var page=parseInt($(self).attr('data-page')) || 1;var pages_visibles=$('#pagination-{$id} .item').length-2; |
71 | 71 | var lastPage=$('#pagination-{$id} ._lastPage'); |
72 | 72 | var middle= Math.ceil((pages_visibles-1)/ 2); |
@@ -86,16 +86,16 @@ discard block |
||
86 | 86 | lastPage.attr('data-page',Math.min(lastPage.attr('data-max'),page+1)); |
87 | 87 | $('#{$id}').trigger('pageChange');$('#{$id}').trigger('activeRowChange');$('#pagination-{$id}').show();"; |
88 | 88 | } |
89 | - protected function _compileSearchFieldBehavior(JsUtils $js=NULL){ |
|
89 | + protected function _compileSearchFieldBehavior(JsUtils $js=NULL) { |
|
90 | 90 | |
91 | 91 | } |
92 | - protected function _associateSearchFieldBehavior(JsUtils $js=NULL,$offset=null){ |
|
93 | - if(isset($this->_searchField) && isset($js) && isset($this->_urls["refresh"])){ |
|
92 | + protected function _associateSearchFieldBehavior(JsUtils $js=NULL, $offset=null) { |
|
93 | + if (isset($this->_searchField) && isset($js) && isset($this->_urls["refresh"])) { |
|
94 | 94 | $id=$this->identifier; |
95 | 95 | $callback=$js->getScript($offset).$this->getHtmlComponent()->getInnerScript(); |
96 | - $callback.=$js->trigger("#".$id." [name='selection[]']","change",false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js)); |
|
96 | + $callback.=$js->trigger("#".$id." [name='selection[]']", "change", false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js)); |
|
97 | 97 | $callback.="$('#pagination-{$id}').hide();$('#".$this->identifier."').trigger('searchTerminate',[$(self).val()]);"; |
98 | - $js->jsonArrayOn("change", "#".$this->_searchField->getDataField()->getIdentifier(),"#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"],"post",["params"=>"{'s':$(self).val(),'_model':'".JString::doubleBackSlashes($this->_model)."'}","jsCallback"=>$callback]); |
|
98 | + $js->jsonArrayOn("change", "#".$this->_searchField->getDataField()->getIdentifier(), "#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"], "post", ["params"=>"{'s':$(self).val(),'_model':'".JString::doubleBackSlashes($this->_model)."'}", "jsCallback"=>$callback]); |
|
99 | 99 | } |
100 | 100 | } |
101 | 101 | |
@@ -109,29 +109,29 @@ discard block |
||
109 | 109 | * @param string $jsCallback |
110 | 110 | * @return AjaxCall |
111 | 111 | */ |
112 | - public function jsJsonArray($url, $method="get", $params="{}", $jsCallback=NULL,$parameters=[]){ |
|
113 | - $parameters=\array_merge($parameters,["modelSelector"=>"#".$this->_identifier." tr.".$this->_modelClass,"url"=>$url,"method"=>$method,"params"=>$params,"jsCallback"=>$jsCallback]); |
|
112 | + public function jsJsonArray($url, $method="get", $params="{}", $jsCallback=NULL, $parameters=[]) { |
|
113 | + $parameters=\array_merge($parameters, ["modelSelector"=>"#".$this->_identifier." tr.".$this->_modelClass, "url"=>$url, "method"=>$method, "params"=>$params, "jsCallback"=>$jsCallback]); |
|
114 | 114 | return new AjaxCall("jsonArray", $parameters); |
115 | 115 | } |
116 | 116 | |
117 | - public function jsClear(){ |
|
117 | + public function jsClear() { |
|
118 | 118 | return "$('#{$this->identifier} tbody').find('._json').remove();"; |
119 | 119 | } |
120 | 120 | |
121 | - public function clearOn(BaseHtml $element,$event, $stopPropagation=false, $preventDefault=false){ |
|
122 | - return $element->addEvent($event, $this->jsClear(),$stopPropagation,$preventDefault); |
|
121 | + public function clearOn(BaseHtml $element, $event, $stopPropagation=false, $preventDefault=false) { |
|
122 | + return $element->addEvent($event, $this->jsClear(), $stopPropagation, $preventDefault); |
|
123 | 123 | } |
124 | 124 | |
125 | - public function clearOnClick(BaseHtml $element,$stopPropagation=false, $preventDefault=false){ |
|
126 | - return $this->clearOn($element, "click",$stopPropagation,$preventDefault); |
|
125 | + public function clearOnClick(BaseHtml $element, $stopPropagation=false, $preventDefault=false) { |
|
126 | + return $this->clearOn($element, "click", $stopPropagation, $preventDefault); |
|
127 | 127 | } |
128 | 128 | |
129 | - public function jsonArrayOn(BaseHtml $element,$event,$url, $method="get", $params="{}", $jsCallback=NULL,$parameters=[]){ |
|
130 | - return $element->_addEvent($event, $this->jsJsonArray($url,$method,$params,$jsCallback,$parameters)); |
|
129 | + public function jsonArrayOn(BaseHtml $element, $event, $url, $method="get", $params="{}", $jsCallback=NULL, $parameters=[]) { |
|
130 | + return $element->_addEvent($event, $this->jsJsonArray($url, $method, $params, $jsCallback, $parameters)); |
|
131 | 131 | } |
132 | 132 | |
133 | - public function jsonArrayOnClick(BaseHtml $element,$url, $method="get", $params="{}", $jsCallback=NULL,$parameters=[]){ |
|
134 | - return $this->jsonArrayOn($element, "click", $url,$method,$params,$jsCallback,$parameters); |
|
133 | + public function jsonArrayOnClick(BaseHtml $element, $url, $method="get", $params="{}", $jsCallback=NULL, $parameters=[]) { |
|
134 | + return $this->jsonArrayOn($element, "click", $url, $method, $params, $jsCallback, $parameters); |
|
135 | 135 | } |
136 | 136 | |
137 | 137 | /** |
@@ -142,8 +142,8 @@ discard block |
||
142 | 142 | * @param number $pages_visibles The number of visible pages in the Pagination component |
143 | 143 | * @return DataTable |
144 | 144 | */ |
145 | - public function paginate($page,$total_rowcount,$items_per_page=10,$pages_visibles=null){ |
|
146 | - return parent::paginate($page, $total_rowcount,$items_per_page,$pages_visibles); |
|
145 | + public function paginate($page, $total_rowcount, $items_per_page=10, $pages_visibles=null) { |
|
146 | + return parent::paginate($page, $total_rowcount, $items_per_page, $pages_visibles); |
|
147 | 147 | } |
148 | 148 | |
149 | 149 | public function setRowModelCallback($_rowModelCallback) { |
@@ -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 |