Skip to content

Commit edf19e8

Browse files
committed
Scrut. optimization
1 parent 7030227 commit edf19e8

File tree

15 files changed

+40
-18
lines changed

15 files changed

+40
-18
lines changed

Ajax/common/Widget.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use Ajax\semantic\html\collections\menus\HtmlMenu;
99
use Ajax\semantic\widgets\base\FieldAsTrait;
1010
use Ajax\semantic\html\elements\HtmlButtonGroups;
11+
use Ajax\semantic\widgets\base\InstanceViewer;
1112

1213
abstract class Widget extends HtmlDoubleElement {
1314
use FieldAsTrait;

Ajax/common/html/HtmlCollection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ protected function getItemToAdd($item){
4949

5050
/**
5151
* adds and returns an item
52-
* @param HtmlDoubleElement|string $item
52+
* @param HtmlDoubleElement|string|array $item
5353
* @return \Ajax\common\html\HtmlDoubleElement
5454
*/
5555
public function addItem($item){

Ajax/semantic/html/base/traits/MenuItemTrait.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@
66
use Ajax\semantic\html\elements\HtmlInput;
77
use Ajax\semantic\html\base\constants\Direction;
88

9+
/**
10+
* @author jc
11+
* @property string $identifier
12+
* @property mixed $content
13+
* @property string $tagName
14+
*/
915
trait MenuItemTrait {
1016

1117
public function setContent($content){

Ajax/semantic/html/collections/form/traits/CheckboxTrait.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
use Ajax\semantic\html\base\constants\CheckboxType;
66
use Ajax\semantic\html\modules\checkbox\AbstractCheckbox;
77

8+
/**
9+
* @author jc
10+
* @property mixed $content
11+
*/
812
trait CheckboxTrait {
913

1014
public abstract function addToPropertyCtrl($name, $value, $typeCtrl);

Ajax/semantic/html/collections/form/traits/FieldTrait.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77
use Ajax\semantic\html\base\constants\Direction;
88
use Ajax\semantic\html\base\constants\State;
99

10+
/**
11+
* @author jc
12+
* @property boolean $_hasIcon
13+
* @property string $identifier
14+
*/
1015
trait FieldTrait {
1116

1217
abstract public function addToProperty($name, $value, $separator=" ");

Ajax/semantic/html/collections/form/traits/FieldsTrait.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
use Ajax\semantic\html\collections\form\HtmlFormRadio;
1111
use Ajax\semantic\html\collections\form\HtmlFormField;
1212

13+
/**
14+
* @author jc
15+
* @property string $identifier
16+
*/
1317
trait FieldsTrait {
1418
public abstract function addFields($fields=NULL,$label=NULL);
1519
public abstract function addItem($item);

Ajax/semantic/html/content/HtmlMenuItem.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ protected function initContent($content){
2424
$desc=@$content["description"];
2525
}
2626
if(isset($icon)===true){
27-
$this->setIcon($icon);
27+
$this->addIcon($icon);
2828
}
2929
if(isset($title)===true){
3030
$this->setTitle($title,$desc);

Ajax/semantic/html/content/InternalPopup.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@
55
use Ajax\JsUtils;
66
use Ajax\service\JString;
77
use Ajax\semantic\html\base\HtmlSemDoubleElement;
8+
89
class InternalPopup {
910
protected $title;
1011
protected $content;
1112
protected $html;
1213
protected $variation;
1314
protected $params;
1415
protected $semElement;
16+
1517
public function __construct($semElement,$title="",$content="",$variation=NULL,$params=array()){
1618
$this->semElement=$semElement;
1719
$this->title=$title;
@@ -46,9 +48,11 @@ public function compile(JsUtils $js=NULL){
4648
\array_walk($html, function(&$item) use($js){
4749
if($item instanceof HtmlSemDoubleElement){
4850
$comp=$item->compile($js);
49-
$bs=$item->run($js);
50-
if(isset($bs))
51-
$this->params['onShow']=$bs->getScript();
51+
if(isset($js)){
52+
$bs=$item->run($js);
53+
if(isset($bs))
54+
$this->params['onShow']=$bs->getScript();
55+
}
5256
$item=$comp;
5357
}
5458
});

Ajax/semantic/html/content/table/HtmlTableContent.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,6 @@ public function setRowCount($rowCount, $colCount) {
3737
for($i=$count; $i < $rowCount; $i++) {
3838
$this->addItem($colCount);
3939
}
40-
/*
41-
* for($i=0; $i < $rowCount; $i++) {
42-
* $item=$this->content[$i];
43-
* $item->setTdTagName($this->_tdTagNames[$this->tagName]);
44-
* $this->content[$i]->setColCount($colCount);
45-
* }
46-
*/
4740
return $this;
4841
}
4942

Ajax/semantic/html/elements/HtmlButton.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public function asSubmit() {
9999
/**
100100
* Add and return a button label
101101
* @param string $caption
102-
* @param string $before
102+
* @param boolean $before
103103
* @param string $icon
104104
* @return \Ajax\semantic\html\elements\HtmlLabel
105105
*/

0 commit comments

Comments
 (0)