@@ -128,12 +128,20 @@ |
||
128 | 128 | $this->content[$this->_toolbarPosition]=$this->_toolbar; |
129 | 129 | } |
130 | 130 | |
131 | + /** |
|
132 | + * @param integer $index |
|
133 | + * @param string $title |
|
134 | + */ |
|
131 | 135 | public function addDividerBefore($index,$title){ |
132 | 136 | $index=$this->_getIndex($index); |
133 | 137 | $this->_instanceViewer->addHeaderDividerBefore($index, $title); |
134 | 138 | return $this; |
135 | 139 | } |
136 | 140 | |
141 | + /** |
|
142 | + * @param string $index |
|
143 | + * @param string $contentAfter |
|
144 | + */ |
|
137 | 145 | public function addWrapper($index,$contentBefore,$contentAfter=null){ |
138 | 146 | $index=$this->_getIndex($index); |
139 | 147 | $this->_instanceViewer->addWrapper($index, $contentBefore,$contentAfter); |
@@ -19,64 +19,64 @@ discard block |
||
19 | 19 | class DataForm extends Widget { |
20 | 20 | |
21 | 21 | public function __construct($identifier, $modelInstance=NULL) { |
22 | - parent::__construct($identifier, null,$modelInstance); |
|
22 | + parent::__construct($identifier, null, $modelInstance); |
|
23 | 23 | $this->_form=new HtmlForm($identifier); |
24 | 24 | $this->_init(new FormInstanceViewer($identifier), "form", $this->_form, true); |
25 | 25 | } |
26 | 26 | |
27 | - protected function _getFieldIdentifier($prefix,$name=""){ |
|
27 | + protected function _getFieldIdentifier($prefix, $name="") { |
|
28 | 28 | return $this->identifier."-{$name}-".$this->_instanceViewer->getIdentifier(); |
29 | 29 | } |
30 | 30 | |
31 | - public function compile(JsUtils $js=NULL,&$view=NULL){ |
|
32 | - if(!$this->_generated){ |
|
31 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
32 | + if (!$this->_generated) { |
|
33 | 33 | $this->_instanceViewer->setInstance($this->_modelInstance); |
34 | 34 | |
35 | 35 | $form=$this->content["form"]; |
36 | 36 | $this->_generateContent($form); |
37 | 37 | |
38 | - if(isset($this->_toolbar)){ |
|
38 | + if (isset($this->_toolbar)) { |
|
39 | 39 | $this->_setToolbarPosition($form); |
40 | 40 | } |
41 | - $this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"form",PositionInTable::AFTERTABLE]); |
|
41 | + $this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "form", PositionInTable::AFTERTABLE]); |
|
42 | 42 | $this->_generated=true; |
43 | 43 | } |
44 | - return parent::compile($js,$view); |
|
44 | + return parent::compile($js, $view); |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | /** |
48 | 48 | * @param HtmlForm $form |
49 | 49 | */ |
50 | - protected function _generateContent($form){ |
|
51 | - $values= $this->_instanceViewer->getValues(); |
|
50 | + protected function _generateContent($form) { |
|
51 | + $values=$this->_instanceViewer->getValues(); |
|
52 | 52 | $count=$this->_instanceViewer->count(); |
53 | 53 | $separators=$this->_instanceViewer->getSeparators(); |
54 | 54 | $headers=$this->_instanceViewer->getHeaders(); |
55 | 55 | $wrappers=$this->_instanceViewer->getWrappers(); |
56 | 56 | \sort($separators); |
57 | 57 | $size=\sizeof($separators); |
58 | - if($size===1){ |
|
59 | - foreach ($values as $v){ |
|
58 | + if ($size===1) { |
|
59 | + foreach ($values as $v) { |
|
60 | 60 | $form->addField($v); |
61 | 61 | } |
62 | - }else{ |
|
62 | + } else { |
|
63 | 63 | $separators[]=$count; |
64 | - for($i=0;$i<$size;$i++){ |
|
64 | + for ($i=0; $i<$size; $i++) { |
|
65 | 65 | $wrapper=null; |
66 | - $fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]); |
|
67 | - if(isset($headers[$separators[$i]+1])) |
|
68 | - $form->addHeader($headers[$separators[$i]+1],4,true); |
|
69 | - if(isset($wrappers[$separators[$i]+1])){ |
|
66 | + $fields=\array_slice($values, $separators[$i]+1, $separators[$i+1]-$separators[$i]); |
|
67 | + if (isset($headers[$separators[$i]+1])) |
|
68 | + $form->addHeader($headers[$separators[$i]+1], 4, true); |
|
69 | + if (isset($wrappers[$separators[$i]+1])) { |
|
70 | 70 | $wrapper=$wrappers[$separators[$i]+1]; |
71 | 71 | } |
72 | 72 | //TODO check why $fields is empty |
73 | - if(\sizeof($fields)===1){ |
|
73 | + if (\sizeof($fields)===1) { |
|
74 | 74 | $added=$form->addField($fields[0]); |
75 | - }elseif(\sizeof($fields)>1){ |
|
75 | + }elseif (\sizeof($fields)>1) { |
|
76 | 76 | $added=$form->addFields($fields); |
77 | 77 | } |
78 | - if(isset($wrapper)) |
|
79 | - $added->wrap($wrapper[0],$wrapper[1]); |
|
78 | + if (isset($wrapper)) |
|
79 | + $added->wrap($wrapper[0], $wrapper[1]); |
|
80 | 80 | } |
81 | 81 | } |
82 | 82 | } |
@@ -85,11 +85,11 @@ discard block |
||
85 | 85 | * {@inheritDoc} |
86 | 86 | * @see \Ajax\common\Widget::getForm() |
87 | 87 | */ |
88 | - public function getForm(){ |
|
88 | + public function getForm() { |
|
89 | 89 | return $this->content["form"]; |
90 | 90 | } |
91 | 91 | |
92 | - public function addSeparatorAfter($fieldNum){ |
|
92 | + public function addSeparatorAfter($fieldNum) { |
|
93 | 93 | $fieldNum=$this->_getIndex($fieldNum); |
94 | 94 | $this->_instanceViewer->addSeparatorAfter($fieldNum); |
95 | 95 | return $this; |
@@ -104,12 +104,12 @@ discard block |
||
104 | 104 | return $this; |
105 | 105 | } |
106 | 106 | |
107 | - public function fieldAsReset($index,$cssStyle=NULL,$attributes=NULL){ |
|
108 | - return $this->_fieldAs(function($id,$name,$value,$caption) use ($cssStyle){ |
|
109 | - $button=new HtmlButton($id,$value,$cssStyle); |
|
107 | + public function fieldAsReset($index, $cssStyle=NULL, $attributes=NULL) { |
|
108 | + return $this->_fieldAs(function($id, $name, $value, $caption) use ($cssStyle){ |
|
109 | + $button=new HtmlButton($id, $value, $cssStyle); |
|
110 | 110 | $button->setProperty("type", "reset"); |
111 | 111 | return $button; |
112 | - }, $index,$attributes); |
|
112 | + }, $index, $attributes); |
|
113 | 113 | } |
114 | 114 | |
115 | 115 | /** |
@@ -128,19 +128,19 @@ discard block |
||
128 | 128 | $this->content[$this->_toolbarPosition]=$this->_toolbar; |
129 | 129 | } |
130 | 130 | |
131 | - public function addDividerBefore($index,$title){ |
|
131 | + public function addDividerBefore($index, $title) { |
|
132 | 132 | $index=$this->_getIndex($index); |
133 | 133 | $this->_instanceViewer->addHeaderDividerBefore($index, $title); |
134 | 134 | return $this; |
135 | 135 | } |
136 | 136 | |
137 | - public function addWrapper($index,$contentBefore,$contentAfter=null){ |
|
137 | + public function addWrapper($index, $contentBefore, $contentAfter=null) { |
|
138 | 138 | $index=$this->_getIndex($index); |
139 | - $this->_instanceViewer->addWrapper($index, $contentBefore,$contentAfter); |
|
139 | + $this->_instanceViewer->addWrapper($index, $contentBefore, $contentAfter); |
|
140 | 140 | return $this; |
141 | 141 | } |
142 | 142 | |
143 | - public function run(JsUtils $js){ |
|
143 | + public function run(JsUtils $js) { |
|
144 | 144 | return parent::run($js); |
145 | 145 | } |
146 | 146 | } |
147 | 147 | \ No newline at end of file |
@@ -59,24 +59,26 @@ |
||
59 | 59 | foreach ($values as $v){ |
60 | 60 | $form->addField($v); |
61 | 61 | } |
62 | - }else{ |
|
62 | + } else{ |
|
63 | 63 | $separators[]=$count; |
64 | 64 | for($i=0;$i<$size;$i++){ |
65 | 65 | $wrapper=null; |
66 | 66 | $fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]); |
67 | - if(isset($headers[$separators[$i]+1])) |
|
68 | - $form->addHeader($headers[$separators[$i]+1],4,true); |
|
67 | + if(isset($headers[$separators[$i]+1])) { |
|
68 | + $form->addHeader($headers[$separators[$i]+1],4,true); |
|
69 | + } |
|
69 | 70 | if(isset($wrappers[$separators[$i]+1])){ |
70 | 71 | $wrapper=$wrappers[$separators[$i]+1]; |
71 | 72 | } |
72 | 73 | //TODO check why $fields is empty |
73 | 74 | if(\sizeof($fields)===1){ |
74 | 75 | $added=$form->addField($fields[0]); |
75 | - }elseif(\sizeof($fields)>1){ |
|
76 | + } elseif(\sizeof($fields)>1){ |
|
76 | 77 | $added=$form->addFields($fields); |
77 | 78 | } |
78 | - if(isset($wrapper)) |
|
79 | - $added->wrap($wrapper[0],$wrapper[1]); |
|
79 | + if(isset($wrapper)) { |
|
80 | + $added->wrap($wrapper[0],$wrapper[1]); |
|
81 | + } |
|
80 | 82 | } |
81 | 83 | } |
82 | 84 | } |
@@ -10,50 +10,50 @@ |
||
10 | 10 | * @param string $identifier |
11 | 11 | * @param object $modelInstance |
12 | 12 | */ |
13 | - public function __construct($identifier,$modelInstance=null,$fieldsOrder=[],$fieldsDefinition=[],$fields=[],$captions=[],$separators=[]) { |
|
14 | - parent::__construct($identifier,$modelInstance,$fieldsOrder,$fieldsDefinition,$fields,$captions,$separators); |
|
13 | + public function __construct($identifier, $modelInstance=null, $fieldsOrder=[], $fieldsDefinition=[], $fields=[], $captions=[], $separators=[]) { |
|
14 | + parent::__construct($identifier, $modelInstance, $fieldsOrder, $fieldsDefinition, $fields, $captions, $separators); |
|
15 | 15 | } |
16 | 16 | |
17 | - protected function getDefaultModelInstance(){ |
|
17 | + protected function getDefaultModelInstance() { |
|
18 | 18 | return new UserModel(); |
19 | 19 | } |
20 | 20 | |
21 | - public static function regular($identifier,$modelInstance=null){ |
|
22 | - return new FormLogin($identifier,$modelInstance, |
|
23 | - ["message","login","password","remember","forget","submit","error"], |
|
24 | - ["message"=>[["icon"=>"sign in"]],"input0"=>[["rules"=>"empty"]],"input1"=>[["inputType"=>"password","rules"=>"empty"]],"checkbox","link","submit"=>["green fluid"],"message2"=>[["error"=>true]]], |
|
25 | - ["Connection","login","password","remember","forget","submit","error"], |
|
26 | - ["Please enter login and password to connect","Login","Password","Remember me.","Forgot your password?","Connection"], |
|
27 | - [0,2,4,5,6]); |
|
21 | + public static function regular($identifier, $modelInstance=null) { |
|
22 | + return new FormLogin($identifier, $modelInstance, |
|
23 | + ["message", "login", "password", "remember", "forget", "submit", "error"], |
|
24 | + ["message"=>[["icon"=>"sign in"]], "input0"=>[["rules"=>"empty"]], "input1"=>[["inputType"=>"password", "rules"=>"empty"]], "checkbox", "link", "submit"=>["green fluid"], "message2"=>[["error"=>true]]], |
|
25 | + ["Connection", "login", "password", "remember", "forget", "submit", "error"], |
|
26 | + ["Please enter login and password to connect", "Login", "Password", "Remember me.", "Forgot your password?", "Connection"], |
|
27 | + [0, 2, 4, 5, 6]); |
|
28 | 28 | } |
29 | 29 | |
30 | - public static function smallInline($identifier,$modelInstance=null){ |
|
31 | - $result=new FormLogin($identifier,$modelInstance, |
|
32 | - ["login","password","submit"], |
|
33 | - ["input0"=>[["rules"=>"empty"]],"input1"=>[["inputType"=>"password","rules"=>"empty"]],"submit"=>["green basic"]], |
|
34 | - ["login","password","submit"], |
|
35 | - ["","","Connection"], |
|
30 | + public static function smallInline($identifier, $modelInstance=null) { |
|
31 | + $result=new FormLogin($identifier, $modelInstance, |
|
32 | + ["login", "password", "submit"], |
|
33 | + ["input0"=>[["rules"=>"empty"]], "input1"=>[["inputType"=>"password", "rules"=>"empty"]], "submit"=>["green basic"]], |
|
34 | + ["login", "password", "submit"], |
|
35 | + ["", "", "Connection"], |
|
36 | 36 | [2]); |
37 | 37 | $result->addDividerBefore(0, "Connection"); |
38 | 38 | return $result; |
39 | 39 | } |
40 | 40 | |
41 | - public static function small($identifier,$modelInstance=null){ |
|
42 | - $result=new FormLogin($identifier,$modelInstance, |
|
43 | - ["login","password","submit"], |
|
44 | - ["input0"=>[["rules"=>"empty"]],"input1"=>[["inputType"=>"password","rules"=>"empty"]],"submit"=>["green basic"]], |
|
45 | - ["login","password","submit"], |
|
46 | - ["Login","Password","Connection"], |
|
47 | - [1,2]); |
|
41 | + public static function small($identifier, $modelInstance=null) { |
|
42 | + $result=new FormLogin($identifier, $modelInstance, |
|
43 | + ["login", "password", "submit"], |
|
44 | + ["input0"=>[["rules"=>"empty"]], "input1"=>[["inputType"=>"password", "rules"=>"empty"]], "submit"=>["green basic"]], |
|
45 | + ["login", "password", "submit"], |
|
46 | + ["Login", "Password", "Connection"], |
|
47 | + [1, 2]); |
|
48 | 48 | $result->addDividerBefore(0, "Connection"); |
49 | 49 | return $result; |
50 | 50 | } |
51 | 51 | |
52 | - public static function attachedSegment($identifier,$modelInstance=null){ |
|
53 | - $result=self::regular($identifier,$modelInstance); |
|
54 | - $result->fieldAsMessage("message",["icon"=>"sign in","attached"=>true]); |
|
55 | - $result->addWrapper("message",null,"<div class='ui attached segment'>"); |
|
56 | - $result->addWrapper("error", null,"</div>"); |
|
52 | + public static function attachedSegment($identifier, $modelInstance=null) { |
|
53 | + $result=self::regular($identifier, $modelInstance); |
|
54 | + $result->fieldAsMessage("message", ["icon"=>"sign in", "attached"=>true]); |
|
55 | + $result->addWrapper("message", null, "<div class='ui attached segment'>"); |
|
56 | + $result->addWrapper("error", null, "</div>"); |
|
57 | 57 | return $result; |
58 | 58 | } |
59 | 59 | } |
60 | 60 | \ No newline at end of file |
@@ -15,7 +15,7 @@ |
||
15 | 15 | class HtmlFormCheckbox extends HtmlFormField { |
16 | 16 | use CheckboxTrait; |
17 | 17 | public function __construct($identifier, $label=NULL, $value=NULL, $type=NULL) { |
18 | - parent::__construct("field-".$identifier, new HtmlCheckbox($identifier,$label,$value,$type)); |
|
18 | + parent::__construct("field-".$identifier, new HtmlCheckbox($identifier, $label, $value, $type)); |
|
19 | 19 | $this->_identifier=$identifier; |
20 | 20 | } |
21 | 21 |
@@ -8,17 +8,17 @@ |
||
8 | 8 | class HtmlFormInput extends HtmlFormField { |
9 | 9 | use TextFieldsTrait; |
10 | 10 | |
11 | - public function __construct($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL) { |
|
12 | - if(!isset($placeholder) && $type==="text") |
|
11 | + public function __construct($identifier, $label=NULL, $type="text", $value=NULL, $placeholder=NULL) { |
|
12 | + if (!isset($placeholder) && $type==="text") |
|
13 | 13 | $placeholder=$label; |
14 | - parent::__construct("field-".$identifier, new HtmlInput($identifier,$type,$value,$placeholder), $label); |
|
14 | + parent::__construct("field-".$identifier, new HtmlInput($identifier, $type, $value, $placeholder), $label); |
|
15 | 15 | $this->_identifier=$identifier; |
16 | 16 | } |
17 | 17 | |
18 | - public function getDataField(){ |
|
19 | - $field= $this->getField(); |
|
18 | + public function getDataField() { |
|
19 | + $field=$this->getField(); |
|
20 | 20 | //TODO check getField |
21 | - if($field instanceof HtmlInput) |
|
21 | + if ($field instanceof HtmlInput) |
|
22 | 22 | $field=$field->getDataField(); |
23 | 23 | return $field; |
24 | 24 | } |
@@ -9,8 +9,9 @@ discard block |
||
9 | 9 | use TextFieldsTrait; |
10 | 10 | |
11 | 11 | public function __construct($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL) { |
12 | - if(!isset($placeholder) && $type==="text") |
|
13 | - $placeholder=$label; |
|
12 | + if(!isset($placeholder) && $type==="text") { |
|
13 | + $placeholder=$label; |
|
14 | + } |
|
14 | 15 | parent::__construct("field-".$identifier, new HtmlInput($identifier,$type,$value,$placeholder), $label); |
15 | 16 | $this->_identifier=$identifier; |
16 | 17 | } |
@@ -18,8 +19,9 @@ discard block |
||
18 | 19 | public function getDataField(){ |
19 | 20 | $field= $this->getField(); |
20 | 21 | //TODO check getField |
21 | - if($field instanceof HtmlInput) |
|
22 | - $field=$field->getDataField(); |
|
22 | + if($field instanceof HtmlInput) { |
|
23 | + $field=$field->getDataField(); |
|
24 | + } |
|
23 | 25 | return $field; |
24 | 26 | } |
25 | 27 | } |
26 | 28 | \ No newline at end of file |
@@ -9,10 +9,10 @@ discard block |
||
9 | 9 | class HtmlFormTextarea extends HtmlFormField { |
10 | 10 | use TextFieldsTrait; |
11 | 11 | |
12 | - public function __construct($identifier, $label=NULL,$value=NULL,$placeholder=NULL,$rows=NULL) { |
|
13 | - if(!isset($placeholder)) |
|
12 | + public function __construct($identifier, $label=NULL, $value=NULL, $placeholder=NULL, $rows=NULL) { |
|
13 | + if (!isset($placeholder)) |
|
14 | 14 | $placeholder=$label; |
15 | - parent::__construct("field-".$identifier, new HtmlTextarea($identifier,$value,$placeholder,$rows), $label); |
|
15 | + parent::__construct("field-".$identifier, new HtmlTextarea($identifier, $value, $placeholder, $rows), $label); |
|
16 | 16 | $this->_identifier=$identifier; |
17 | 17 | } |
18 | 18 | |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | * Defines the textarea row count |
21 | 21 | * @param int $count |
22 | 22 | */ |
23 | - public function setRows($count){ |
|
23 | + public function setRows($count) { |
|
24 | 24 | $this->getField()->setRows($count); |
25 | 25 | } |
26 | 26 | |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | return $this->content["field"]; |
29 | 29 | } |
30 | 30 | |
31 | - public function setName($name){ |
|
32 | - $this->getDataField()->setProperty("name",$name); |
|
31 | + public function setName($name) { |
|
32 | + $this->getDataField()->setProperty("name", $name); |
|
33 | 33 | } |
34 | 34 | } |
35 | 35 | \ No newline at end of file |
@@ -10,8 +10,9 @@ |
||
10 | 10 | use TextFieldsTrait; |
11 | 11 | |
12 | 12 | public function __construct($identifier, $label=NULL,$value=NULL,$placeholder=NULL,$rows=NULL) { |
13 | - if(!isset($placeholder)) |
|
14 | - $placeholder=$label; |
|
13 | + if(!isset($placeholder)) { |
|
14 | + $placeholder=$label; |
|
15 | + } |
|
15 | 16 | parent::__construct("field-".$identifier, new HtmlTextarea($identifier,$value,$placeholder,$rows), $label); |
16 | 17 | $this->_identifier=$identifier; |
17 | 18 | } |
@@ -7,26 +7,26 @@ |
||
7 | 7 | |
8 | 8 | class HtmlFormDropdown extends HtmlFormField { |
9 | 9 | |
10 | - public function __construct($identifier,$items=array(), $label=NULL,$value=NULL,$multiple=false,$associative=true) { |
|
11 | - parent::__construct("field-".$identifier, (new HtmlDropdown("dropdown-".$identifier,$value,$items,$associative))->asSelect($identifier,$multiple), $label); |
|
10 | + public function __construct($identifier, $items=array(), $label=NULL, $value=NULL, $multiple=false, $associative=true) { |
|
11 | + parent::__construct("field-".$identifier, (new HtmlDropdown("dropdown-".$identifier, $value, $items, $associative))->asSelect($identifier, $multiple), $label); |
|
12 | 12 | $this->_identifier=$identifier; |
13 | 13 | } |
14 | 14 | |
15 | - public function setItems($items){ |
|
15 | + public function setItems($items) { |
|
16 | 16 | return $this->getField()->setItems($items); |
17 | 17 | } |
18 | - public function addItem($item,$value=NULL,$image=NULL){ |
|
19 | - return $this->getField()->addItem($item,$value,$image); |
|
18 | + public function addItem($item, $value=NULL, $image=NULL) { |
|
19 | + return $this->getField()->addItem($item, $value, $image); |
|
20 | 20 | } |
21 | - public static function multipleDropdown($identifier,$items=array(), $label=NULL,$value=NULL,$associative=true){ |
|
22 | - return new HtmlFormDropdown($identifier,$items,$label,$value,true,$associative); |
|
21 | + public static function multipleDropdown($identifier, $items=array(), $label=NULL, $value=NULL, $associative=true) { |
|
22 | + return new HtmlFormDropdown($identifier, $items, $label, $value, true, $associative); |
|
23 | 23 | } |
24 | 24 | |
25 | - public function getDataField(){ |
|
25 | + public function getDataField() { |
|
26 | 26 | return $this->getField()->getInput(); |
27 | 27 | } |
28 | - public function asSelect($name=NULL,$multiple=false,$selection=true){ |
|
29 | - $this->getField()->asSelect($name,$multiple,$selection); |
|
28 | + public function asSelect($name=NULL, $multiple=false, $selection=true) { |
|
29 | + $this->getField()->asSelect($name, $multiple, $selection); |
|
30 | 30 | return $this; |
31 | 31 | } |
32 | 32 | } |
33 | 33 | \ No newline at end of file |
@@ -10,14 +10,14 @@ discard block |
||
10 | 10 | use Ajax\JsUtils; |
11 | 11 | |
12 | 12 | class HtmlInput extends HtmlSemDoubleElement { |
13 | - use IconTrait,TextFieldsTrait,FieldTrait; |
|
13 | + use IconTrait, TextFieldsTrait, FieldTrait; |
|
14 | 14 | |
15 | 15 | public function __construct($identifier, $type="text", $value="", $placeholder="") { |
16 | - parent::__construct("div-" . $identifier, "div", "ui input"); |
|
16 | + parent::__construct("div-".$identifier, "div", "ui input"); |
|
17 | 17 | $this->_identifier=$identifier; |
18 | - $this->content=[ "field" => new \Ajax\common\html\html5\HtmlInput($identifier, $type, $value, $placeholder) ]; |
|
19 | - $this->_states=[ State::DISABLED,State::FOCUS,State::ERROR ]; |
|
20 | - $this->_variations=[ Variation::TRANSPARENT ]; |
|
18 | + $this->content=["field" => new \Ajax\common\html\html5\HtmlInput($identifier, $type, $value, $placeholder)]; |
|
19 | + $this->_states=[State::DISABLED, State::FOCUS, State::ERROR]; |
|
20 | + $this->_variations=[Variation::TRANSPARENT]; |
|
21 | 21 | } |
22 | 22 | |
23 | 23 | public function getField() { |
@@ -37,11 +37,11 @@ discard block |
||
37 | 37 | |
38 | 38 | public function run(JsUtils $js) { |
39 | 39 | $result=parent::run($js); |
40 | - $result->attach("#" . $this->getDataField()->getIdentifier()); |
|
40 | + $result->attach("#".$this->getDataField()->getIdentifier()); |
|
41 | 41 | return $result; |
42 | 42 | } |
43 | 43 | |
44 | - public function setTransparent(){ |
|
44 | + public function setTransparent() { |
|
45 | 45 | return $this->addToProperty("class", "transparent"); |
46 | 46 | } |
47 | 47 | } |
48 | 48 | \ No newline at end of file |
@@ -7,22 +7,22 @@ |
||
7 | 7 | */ |
8 | 8 | |
9 | 9 | // Get the input |
10 | -$source = file_get_contents($argv[1]); |
|
10 | +$source=file_get_contents($argv[1]); |
|
11 | 11 | |
12 | 12 | // make traits to classes |
13 | -$regexp = '#trait([\s]+[\S]+[\s]*){#'; |
|
14 | -$replace = 'class$1{'; |
|
15 | -$source = preg_replace($regexp, $replace, $source); |
|
13 | +$regexp='#trait([\s]+[\S]+[\s]*){#'; |
|
14 | +$replace='class$1{'; |
|
15 | +$source=preg_replace($regexp, $replace, $source); |
|
16 | 16 | |
17 | 17 | // use traits by extending them (classes that not extending a class) |
18 | -$regexp = '#class([\s]+[\S]+[\s]*)(implements[\s]+[\S]+[\s]*)?{[\s]+use([^;]+);#'; |
|
19 | -$replace = 'class$1 extends $3 $2 {'; |
|
20 | -$source = preg_replace($regexp, $replace, $source); |
|
18 | +$regexp='#class([\s]+[\S]+[\s]*)(implements[\s]+[\S]+[\s]*)?{[\s]+use([^;]+);#'; |
|
19 | +$replace='class$1 extends $3 $2 {'; |
|
20 | +$source=preg_replace($regexp, $replace, $source); |
|
21 | 21 | |
22 | 22 | // use traits by extending them (classes that already extending a class) |
23 | -$regexp = '#class([\s]+[\S]+[\s]+extends[\s]+[\S]+[\s]*)(implements[\s]+[\S]+[\s]*)?{[\s]+use([^;]+);#'; |
|
24 | -$replace = 'class$1, $3 $2{'; |
|
25 | -$source = preg_replace($regexp, $replace, $source); |
|
23 | +$regexp='#class([\s]+[\S]+[\s]+extends[\s]+[\S]+[\s]*)(implements[\s]+[\S]+[\s]*)?{[\s]+use([^;]+);#'; |
|
24 | +$replace='class$1, $3 $2{'; |
|
25 | +$source=preg_replace($regexp, $replace, $source); |
|
26 | 26 | |
27 | 27 | // Output |
28 | 28 | echo $source; |
@@ -14,8 +14,8 @@ discard block |
||
14 | 14 | * @property string $identifier |
15 | 15 | */ |
16 | 16 | trait BaseTrait { |
17 | - protected $_variations=[ ]; |
|
18 | - protected $_states=[ ]; |
|
17 | + protected $_variations=[]; |
|
18 | + protected $_states=[]; |
|
19 | 19 | protected $_baseClass; |
20 | 20 | |
21 | 21 | abstract protected function setPropertyCtrl($name, $value, $typeCtrl); |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | |
29 | 29 | abstract public function setProperty($name, $value); |
30 | 30 | |
31 | - abstract public function addContent($content,$before=false); |
|
31 | + abstract public function addContent($content, $before=false); |
|
32 | 32 | |
33 | 33 | abstract public function onCreate($jsCode); |
34 | 34 | |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | $this->setProperty("class", $this->_baseClass); |
50 | 50 | if (\is_string($variations)) |
51 | 51 | $variations=\explode(" ", $variations); |
52 | - foreach ( $variations as $variation ) { |
|
52 | + foreach ($variations as $variation) { |
|
53 | 53 | $this->addVariation($variation); |
54 | 54 | } |
55 | 55 | return $this; |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | public function addVariations($variations=array()) { |
64 | 64 | if (\is_string($variations)) |
65 | 65 | $variations=\explode(" ", $variations); |
66 | - foreach ( $variations as $variation ) { |
|
66 | + foreach ($variations as $variation) { |
|
67 | 67 | $this->addVariation($variation); |
68 | 68 | } |
69 | 69 | return $this; |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | public function addStates($states=array()) { |
73 | 73 | if (\is_string($states)) |
74 | 74 | $states=\explode(" ", $states); |
75 | - foreach ( $states as $state ) { |
|
75 | + foreach ($states as $state) { |
|
76 | 76 | $this->addState($state); |
77 | 77 | } |
78 | 78 | return $this; |
@@ -82,17 +82,17 @@ discard block |
||
82 | 82 | $this->setProperty("class", $this->_baseClass); |
83 | 83 | if (\is_string($states)) |
84 | 84 | $states=\explode(" ", $states); |
85 | - foreach ( $states as $state ) { |
|
85 | + foreach ($states as $state) { |
|
86 | 86 | $this->addState($state); |
87 | 87 | } |
88 | 88 | return $this; |
89 | 89 | } |
90 | 90 | |
91 | 91 | public function addIcon($icon, $before=true) { |
92 | - return $this->addContent(new HtmlIcon("icon-" . $this->identifier, $icon), $before); |
|
92 | + return $this->addContent(new HtmlIcon("icon-".$this->identifier, $icon), $before); |
|
93 | 93 | } |
94 | 94 | |
95 | - public function addSticky($context="body"){ |
|
95 | + public function addSticky($context="body") { |
|
96 | 96 | $this->onCreate("$('#".$this->identifier."').sticky({ context: '".$context."'});"); |
97 | 97 | return $this; |
98 | 98 | } |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | * @return HtmlSemDoubleElement |
114 | 114 | */ |
115 | 115 | public function setDisabled($disable=true) { |
116 | - if($disable) |
|
116 | + if ($disable) |
|
117 | 117 | $this->addToProperty("class", "disabled"); |
118 | 118 | return $this; |
119 | 119 | } |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | * |
140 | 140 | * @return HtmlSemDoubleElement |
141 | 141 | */ |
142 | - public function asHeader(){ |
|
142 | + public function asHeader() { |
|
143 | 143 | return $this->addToProperty("class", "header"); |
144 | 144 | } |
145 | 145 | |
@@ -147,15 +147,15 @@ discard block |
||
147 | 147 | * show it is currently the active user selection |
148 | 148 | * @return HtmlSemDoubleElement |
149 | 149 | */ |
150 | - public function setActive($value=true){ |
|
151 | - if($value) |
|
150 | + public function setActive($value=true) { |
|
151 | + if ($value) |
|
152 | 152 | $this->addToProperty("class", "active"); |
153 | 153 | return $this; |
154 | 154 | } |
155 | 155 | |
156 | - public function setAttached($value=true){ |
|
157 | - if($value) |
|
158 | - $this->addToPropertyCtrl("class", "attached", array ("attached" )); |
|
156 | + public function setAttached($value=true) { |
|
157 | + if ($value) |
|
158 | + $this->addToPropertyCtrl("class", "attached", array("attached")); |
|
159 | 159 | return $this; |
160 | 160 | } |
161 | 161 | |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | } |
172 | 172 | |
173 | 173 | public function setFloated($direction="right") { |
174 | - return $this->addToPropertyCtrl("class", $direction . " floated", Direction::getConstantValues("floated")); |
|
174 | + return $this->addToPropertyCtrl("class", $direction." floated", Direction::getConstantValues("floated")); |
|
175 | 175 | } |
176 | 176 | |
177 | 177 | public function floatRight() { |
@@ -186,14 +186,14 @@ discard block |
||
186 | 186 | return $this->_baseClass; |
187 | 187 | } |
188 | 188 | |
189 | - protected function addBehavior(&$array,$key,$value,$before="",$after=""){ |
|
190 | - if(\is_string($value)){ |
|
191 | - if(isset($array[$key])){ |
|
189 | + protected function addBehavior(&$array, $key, $value, $before="", $after="") { |
|
190 | + if (\is_string($value)) { |
|
191 | + if (isset($array[$key])) { |
|
192 | 192 | $p=JString::replaceAtFirstAndLast($array[$key], $before, "", $after, ""); |
193 | 193 | $array[$key]=$before.$p.$value.$after; |
194 | - }else |
|
194 | + } else |
|
195 | 195 | $array[$key]=$before.$value.$after; |
196 | - }else |
|
196 | + } else |
|
197 | 197 | $array[$key]=$value; |
198 | 198 | return $this; |
199 | 199 | } |
@@ -47,8 +47,9 @@ discard block |
||
47 | 47 | |
48 | 48 | public function setVariations($variations) { |
49 | 49 | $this->setProperty("class", $this->_baseClass); |
50 | - if (\is_string($variations)) |
|
51 | - $variations=\explode(" ", $variations); |
|
50 | + if (\is_string($variations)) { |
|
51 | + $variations=\explode(" ", $variations); |
|
52 | + } |
|
52 | 53 | foreach ( $variations as $variation ) { |
53 | 54 | $this->addVariation($variation); |
54 | 55 | } |
@@ -61,8 +62,9 @@ discard block |
||
61 | 62 | } |
62 | 63 | |
63 | 64 | public function addVariations($variations=array()) { |
64 | - if (\is_string($variations)) |
|
65 | - $variations=\explode(" ", $variations); |
|
65 | + if (\is_string($variations)) { |
|
66 | + $variations=\explode(" ", $variations); |
|
67 | + } |
|
66 | 68 | foreach ( $variations as $variation ) { |
67 | 69 | $this->addVariation($variation); |
68 | 70 | } |
@@ -70,8 +72,9 @@ discard block |
||
70 | 72 | } |
71 | 73 | |
72 | 74 | public function addStates($states=array()) { |
73 | - if (\is_string($states)) |
|
74 | - $states=\explode(" ", $states); |
|
75 | + if (\is_string($states)) { |
|
76 | + $states=\explode(" ", $states); |
|
77 | + } |
|
75 | 78 | foreach ( $states as $state ) { |
76 | 79 | $this->addState($state); |
77 | 80 | } |
@@ -80,8 +83,9 @@ discard block |
||
80 | 83 | |
81 | 84 | public function setStates($states) { |
82 | 85 | $this->setProperty("class", $this->_baseClass); |
83 | - if (\is_string($states)) |
|
84 | - $states=\explode(" ", $states); |
|
86 | + if (\is_string($states)) { |
|
87 | + $states=\explode(" ", $states); |
|
88 | + } |
|
85 | 89 | foreach ( $states as $state ) { |
86 | 90 | $this->addState($state); |
87 | 91 | } |
@@ -113,8 +117,9 @@ discard block |
||
113 | 117 | * @return HtmlSemDoubleElement |
114 | 118 | */ |
115 | 119 | public function setDisabled($disable=true) { |
116 | - if($disable) |
|
117 | - $this->addToProperty("class", "disabled"); |
|
120 | + if($disable) { |
|
121 | + $this->addToProperty("class", "disabled"); |
|
122 | + } |
|
118 | 123 | return $this; |
119 | 124 | } |
120 | 125 | |
@@ -148,14 +153,16 @@ discard block |
||
148 | 153 | * @return HtmlSemDoubleElement |
149 | 154 | */ |
150 | 155 | public function setActive($value=true){ |
151 | - if($value) |
|
152 | - $this->addToProperty("class", "active"); |
|
156 | + if($value) { |
|
157 | + $this->addToProperty("class", "active"); |
|
158 | + } |
|
153 | 159 | return $this; |
154 | 160 | } |
155 | 161 | |
156 | 162 | public function setAttached($value=true){ |
157 | - if($value) |
|
158 | - $this->addToPropertyCtrl("class", "attached", array ("attached" )); |
|
163 | + if($value) { |
|
164 | + $this->addToPropertyCtrl("class", "attached", array ("attached" )); |
|
165 | + } |
|
159 | 166 | return $this; |
160 | 167 | } |
161 | 168 | |
@@ -191,10 +198,12 @@ discard block |
||
191 | 198 | if(isset($array[$key])){ |
192 | 199 | $p=JString::replaceAtFirstAndLast($array[$key], $before, "", $after, ""); |
193 | 200 | $array[$key]=$before.$p.$value.$after; |
194 | - }else |
|
195 | - $array[$key]=$before.$value.$after; |
|
196 | - }else |
|
197 | - $array[$key]=$value; |
|
201 | + } else { |
|
202 | + $array[$key]=$before.$value.$after; |
|
203 | + } |
|
204 | + } else { |
|
205 | + $array[$key]=$value; |
|
206 | + } |
|
198 | 207 | return $this; |
199 | 208 | } |
200 | 209 | } |
201 | 210 | \ No newline at end of file |