@@ -16,17 +16,17 @@ discard block |
||
16 | 16 | * |
17 | 17 | * @see \Ajax\semantic\widgets\dataform\DataForm::__construct() |
18 | 18 | */ |
19 | - public function __construct($identifier,$modelInstance=null,$fieldsOrder,$fieldsDefinition,$fields=[],$captions=[],$separators=[]) { |
|
20 | - if(!isset($modelInstance)){ |
|
19 | + public function __construct($identifier, $modelInstance=null, $fieldsOrder, $fieldsDefinition, $fields=[], $captions=[], $separators=[]) { |
|
20 | + if (!isset($modelInstance)) { |
|
21 | 21 | $modelInstance=$this->getDefaultModelInstance(); |
22 | 22 | } |
23 | - parent::__construct($identifier,$modelInstance); |
|
24 | - $this->_initForm($fieldsOrder, $fieldsDefinition,$fields,$captions,$separators); |
|
23 | + parent::__construct($identifier, $modelInstance); |
|
24 | + $this->_initForm($fieldsOrder, $fieldsDefinition, $fields, $captions, $separators); |
|
25 | 25 | } |
26 | 26 | |
27 | 27 | abstract protected function getDefaultModelInstance(); |
28 | 28 | |
29 | - protected function _initForm($fieldsOrder,$fieldsDefinition,$fields=[],$captions=[],$separators=[]){ |
|
29 | + protected function _initForm($fieldsOrder, $fieldsDefinition, $fields=[], $captions=[], $separators=[]) { |
|
30 | 30 | $this->_fieldsOrder=$fieldsOrder; |
31 | 31 | $this->setFields($fields); |
32 | 32 | $this->setSeparators($separators); |
@@ -34,26 +34,26 @@ discard block |
||
34 | 34 | $this->setCaptions($captions); |
35 | 35 | } |
36 | 36 | |
37 | - protected function _getIndex($fieldName){ |
|
37 | + protected function _getIndex($fieldName) { |
|
38 | 38 | $index=$fieldName; |
39 | - if(\is_string($fieldName)){ |
|
39 | + if (\is_string($fieldName)) { |
|
40 | 40 | $index=\array_search($fieldName, $this->_fieldsOrder); |
41 | 41 | } |
42 | 42 | return $index; |
43 | 43 | } |
44 | - protected function _fieldAs($elementCallback,&$index,$attributes=NULL,$prefix=null){ |
|
44 | + protected function _fieldAs($elementCallback, &$index, $attributes=NULL, $prefix=null) { |
|
45 | 45 | $index=$this->_getIndex($index); |
46 | - return parent::_fieldAs($elementCallback, $index,$attributes,$prefix); |
|
46 | + return parent::_fieldAs($elementCallback, $index, $attributes, $prefix); |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | |
50 | - public function removeField($fieldName){ |
|
50 | + public function removeField($fieldName) { |
|
51 | 51 | parent::removeField($fieldName); |
52 | - \array_splice($this->_fieldsOrder,$this->_getIndex($fieldName),1); |
|
52 | + \array_splice($this->_fieldsOrder, $this->_getIndex($fieldName), 1); |
|
53 | 53 | return $this; |
54 | 54 | } |
55 | 55 | |
56 | - public function compile(JsUtils $js=NULL,&$view=NULL){ |
|
57 | - return parent::compile($js,$view); |
|
56 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
57 | + return parent::compile($js, $view); |
|
58 | 58 | } |
59 | 59 | } |
60 | 60 | \ No newline at end of file |
@@ -17,17 +17,17 @@ discard block |
||
17 | 17 | $this->createBar(); |
18 | 18 | if (isset($label)) |
19 | 19 | $this->setLabel($label); |
20 | - $this->_states=[ State::SUCCESS,State::WARNING,State::ERROR,State::ACTIVE,State::DISABLED ]; |
|
20 | + $this->_states=[State::SUCCESS, State::WARNING, State::ERROR, State::ACTIVE, State::DISABLED]; |
|
21 | 21 | $this->addToProperty("class", $attributes); |
22 | 22 | } |
23 | 23 | |
24 | 24 | public function setLabel($label) { |
25 | - $this->content["label"]=new HtmlSemDoubleElement("lbl-" . $this->identifier, "div", "label", $label); |
|
25 | + $this->content["label"]=new HtmlSemDoubleElement("lbl-".$this->identifier, "div", "label", $label); |
|
26 | 26 | return $this; |
27 | 27 | } |
28 | 28 | |
29 | 29 | private function createBar() { |
30 | - $bar=new HtmlSemDoubleElement("bar-" . $this->identifier, "div", "bar", new HtmlSemDoubleElement("progress-" . $this->identifier, "div", "progress")); |
|
30 | + $bar=new HtmlSemDoubleElement("bar-".$this->identifier, "div", "bar", new HtmlSemDoubleElement("progress-".$this->identifier, "div", "progress")); |
|
31 | 31 | $this->content["bar"]=$bar; |
32 | 32 | return $this; |
33 | 33 | } |
@@ -63,20 +63,20 @@ discard block |
||
63 | 63 | * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile() |
64 | 64 | */ |
65 | 65 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
66 | - $this->content=JArray::sortAssociative($this->content, [ "bar","label" ]); |
|
66 | + $this->content=JArray::sortAssociative($this->content, ["bar", "label"]); |
|
67 | 67 | return parent::compile($js, $view); |
68 | 68 | } |
69 | 69 | |
70 | 70 | public function jsSetValue($value) { |
71 | - return '$("#' . $this->identifier . '").progress({value:' . $value . '});'; |
|
71 | + return '$("#'.$this->identifier.'").progress({value:'.$value.'});'; |
|
72 | 72 | } |
73 | 73 | |
74 | 74 | public function jsIncValue() { |
75 | - return '$("#' . $this->identifier . '").progress("increment");'; |
|
75 | + return '$("#'.$this->identifier.'").progress("increment");'; |
|
76 | 76 | } |
77 | 77 | |
78 | 78 | public function jsDecValue() { |
79 | - return '$("#' . $this->identifier . '").progress("decrement");'; |
|
79 | + return '$("#'.$this->identifier.'").progress("decrement");'; |
|
80 | 80 | } |
81 | 81 | |
82 | 82 | /** |
@@ -98,12 +98,12 @@ discard block |
||
98 | 98 | $percent=JArray::getDefaultValue($array, "percent", $percent); |
99 | 99 | $ratio=JArray::getDefaultValue($array, "ratio", $ratio); |
100 | 100 | } |
101 | - $this->_params["text"]="%{active : " . \var_export($active, true) . ",error: " . \var_export($error, true) . ",success : " . \var_export($success, true) . ",warning : " . \var_export($warning, true) . ",percent : " . \var_export($percent, true) . ",ratio : " . \var_export($ratio, true) . "}%"; |
|
101 | + $this->_params["text"]="%{active : ".\var_export($active, true).",error: ".\var_export($error, true).",success : ".\var_export($success, true).",warning : ".\var_export($warning, true).",percent : ".\var_export($percent, true).",ratio : ".\var_export($ratio, true)."}%"; |
|
102 | 102 | return $this; |
103 | 103 | } |
104 | 104 | |
105 | 105 | public function onChange($jsCode) { |
106 | - $this->addBehavior($this->_params, "onChange", $jsCode,"%function(percent, value, total){","}%"); |
|
106 | + $this->addBehavior($this->_params, "onChange", $jsCode, "%function(percent, value, total){", "}%"); |
|
107 | 107 | return $this; |
108 | 108 | } |
109 | 109 | |
@@ -112,8 +112,8 @@ discard block |
||
112 | 112 | * @see BaseHtml::run() |
113 | 113 | */ |
114 | 114 | public function run(JsUtils $js) { |
115 | - if (isset($this->_bsComponent) === false) |
|
116 | - $this->_bsComponent=$js->semantic()->progress("#" . $this->identifier, $this->_params); |
|
115 | + if (isset($this->_bsComponent)===false) |
|
116 | + $this->_bsComponent=$js->semantic()->progress("#".$this->identifier, $this->_params); |
|
117 | 117 | $this->addEventsOnRun($js); |
118 | 118 | return $this->_bsComponent; |
119 | 119 | } |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | */ |
22 | 22 | class HtmlForm extends HtmlSemCollection { |
23 | 23 | |
24 | - use FieldsTrait,FormTrait; |
|
24 | + use FieldsTrait, FormTrait; |
|
25 | 25 | /** |
26 | 26 | * @var array |
27 | 27 | */ |
@@ -34,14 +34,14 @@ discard block |
||
34 | 34 | |
35 | 35 | public function __construct($identifier, $elements=array()) { |
36 | 36 | parent::__construct($identifier, "form", "ui form"); |
37 | - $this->_states=[ State::ERROR,State::SUCCESS,State::WARNING,State::DISABLED ]; |
|
37 | + $this->_states=[State::ERROR, State::SUCCESS, State::WARNING, State::DISABLED]; |
|
38 | 38 | $this->setProperty("name", $this->identifier); |
39 | - $this->_fields=array (); |
|
39 | + $this->_fields=array(); |
|
40 | 40 | $this->addItems($elements); |
41 | 41 | $this->_validationParams=[]; |
42 | 42 | } |
43 | 43 | |
44 | - protected function getForm(){ |
|
44 | + protected function getForm() { |
|
45 | 45 | return $this; |
46 | 46 | } |
47 | 47 | |
@@ -62,8 +62,8 @@ discard block |
||
62 | 62 | * @param string $caption |
63 | 63 | * @return \Ajax\semantic\html\collections\form\HtmlForm |
64 | 64 | */ |
65 | - public function addDivider($caption=NULL){ |
|
66 | - return $this->addContent(new HtmlDivider("",$caption)); |
|
65 | + public function addDivider($caption=NULL) { |
|
66 | + return $this->addContent(new HtmlDivider("", $caption)); |
|
67 | 67 | } |
68 | 68 | |
69 | 69 | public function addFields($fields=NULL, $label=NULL) { |
@@ -79,12 +79,12 @@ discard block |
||
79 | 79 | $label=NULL; |
80 | 80 | } |
81 | 81 | $this->_fields=\array_merge($this->_fields, $fields); |
82 | - $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count(), $fields); |
|
82 | + $fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count(), $fields); |
|
83 | 83 | } |
84 | 84 | if (isset($label)) |
85 | 85 | $fields=new HtmlFormField("", $fields, $label); |
86 | 86 | } else { |
87 | - $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count()); |
|
87 | + $fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count()); |
|
88 | 88 | } |
89 | 89 | $this->addItem($fields); |
90 | 90 | return $fields; |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | |
93 | 93 | public function addItem($item) { |
94 | 94 | $item=parent::addItem($item); |
95 | - if (\is_subclass_of($item, HtmlFormField::class) === true) { |
|
95 | + if (\is_subclass_of($item, HtmlFormField::class)===true) { |
|
96 | 96 | $this->_fields[]=$item; |
97 | 97 | } |
98 | 98 | return $item; |
@@ -146,39 +146,39 @@ discard block |
||
146 | 146 | |
147 | 147 | |
148 | 148 | |
149 | - public function compile(JsUtils $js=NULL,&$view=NULL){ |
|
150 | - if(\sizeof($this->_validationParams)>0) |
|
149 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
150 | + if (\sizeof($this->_validationParams)>0) |
|
151 | 151 | $this->setProperty("novalidate", ""); |
152 | - return parent::compile($js,$view); |
|
152 | + return parent::compile($js, $view); |
|
153 | 153 | } |
154 | 154 | |
155 | 155 | public function run(JsUtils $js) { |
156 | - if(isset($js)){ |
|
156 | + if (isset($js)) { |
|
157 | 157 | $compo=$js->semantic()->form("#".$this->identifier); |
158 | - }else{ |
|
158 | + } else { |
|
159 | 159 | $compo=new Form(); |
160 | 160 | $compo->attach("#".$this->identifier); |
161 | 161 | } |
162 | - foreach ($this->_fields as $field){ |
|
163 | - if($field instanceof HtmlFormField){ |
|
162 | + foreach ($this->_fields as $field) { |
|
163 | + if ($field instanceof HtmlFormField) { |
|
164 | 164 | $compo=$this->addCompoValidation($compo, $field); |
165 | 165 | } |
166 | 166 | } |
167 | - foreach ($this->content as $field){ |
|
168 | - if($field instanceof HtmlFormFields){ |
|
167 | + foreach ($this->content as $field) { |
|
168 | + if ($field instanceof HtmlFormFields) { |
|
169 | 169 | $items=$field->getItems(); |
170 | - foreach ($items as $_field){ |
|
171 | - if($_field instanceof HtmlFormField) |
|
170 | + foreach ($items as $_field) { |
|
171 | + if ($_field instanceof HtmlFormField) |
|
172 | 172 | $compo=$this->addCompoValidation($compo, $_field); |
173 | 173 | } |
174 | 174 | } |
175 | 175 | } |
176 | - $this->_runValidationParams($compo,$js); |
|
176 | + $this->_runValidationParams($compo, $js); |
|
177 | 177 | return $this->_bsComponent; |
178 | 178 | } |
179 | 179 | |
180 | - public function addValidationParam($paramName,$paramValue,$before="",$after=""){ |
|
181 | - $this->addBehavior($this->_validationParams, $paramName, $paramValue,$before,$after); |
|
180 | + public function addValidationParam($paramName, $paramValue, $before="", $after="") { |
|
181 | + $this->addBehavior($this->_validationParams, $paramName, $paramValue, $before, $after); |
|
182 | 182 | return $this; |
183 | 183 | } |
184 | 184 | |
@@ -191,7 +191,7 @@ discard block |
||
191 | 191 | return $this->_validationParams; |
192 | 192 | } |
193 | 193 | |
194 | - public function removeValidationParam($param){ |
|
194 | + public function removeValidationParam($param) { |
|
195 | 195 | unset($this->_validationParams[$param]); |
196 | 196 | return $this; |
197 | 197 | } |
@@ -12,28 +12,28 @@ discard block |
||
12 | 12 | * @author jc |
13 | 13 | * |
14 | 14 | */ |
15 | -trait FormTrait{ |
|
15 | +trait FormTrait { |
|
16 | 16 | |
17 | 17 | /** |
18 | 18 | * @return HtmlForm |
19 | 19 | */ |
20 | 20 | abstract protected function getForm(); |
21 | 21 | |
22 | - protected function addCompoValidation($compo,$field){ |
|
22 | + protected function addCompoValidation($compo, $field) { |
|
23 | 23 | $validation=$field->getValidation(); |
24 | - if(isset($validation)){ |
|
24 | + if (isset($validation)) { |
|
25 | 25 | $validation->setIdentifier($field->getDataField()->getIdentifier()); |
26 | 26 | $compo->addFieldValidation($validation); |
27 | 27 | } |
28 | 28 | return $compo; |
29 | 29 | } |
30 | 30 | |
31 | - protected function _runValidationParams(&$compo,JsUtils $js=NULL){ |
|
31 | + protected function _runValidationParams(&$compo, JsUtils $js=NULL) { |
|
32 | 32 | $form=$this->getForm(); |
33 | 33 | $params=$form->getValidationParams(); |
34 | - if(isset($params["_ajaxSubmit"]) && $params["_ajaxSubmit"] instanceof AjaxCall){ |
|
34 | + if (isset($params["_ajaxSubmit"]) && $params["_ajaxSubmit"] instanceof AjaxCall) { |
|
35 | 35 | $compilation=$params["_ajaxSubmit"]->compile($js); |
36 | - $compilation=str_ireplace("\"","%quote%", $compilation); |
|
36 | + $compilation=str_ireplace("\"", "%quote%", $compilation); |
|
37 | 37 | $this->onSuccess($compilation); |
38 | 38 | $form->removeValidationParam("_ajaxSubmit"); |
39 | 39 | } |
@@ -51,14 +51,14 @@ discard block |
||
51 | 51 | return $this; |
52 | 52 | } |
53 | 53 | |
54 | - public function setAttached($value=true){ |
|
54 | + public function setAttached($value=true) { |
|
55 | 55 | $form=$this->getForm(); |
56 | - if($value) |
|
57 | - $form->addToPropertyCtrl("class", "attached", array ("attached" )); |
|
56 | + if ($value) |
|
57 | + $form->addToPropertyCtrl("class", "attached", array("attached")); |
|
58 | 58 | return $form; |
59 | 59 | } |
60 | 60 | |
61 | - public function addErrorMessage(){ |
|
61 | + public function addErrorMessage() { |
|
62 | 62 | return $this->getForm()->addContent((new HtmlMessage(""))->setError()); |
63 | 63 | } |
64 | 64 | |
@@ -73,38 +73,38 @@ discard block |
||
73 | 73 | * @param string $responseElement |
74 | 74 | * @return \Ajax\semantic\html\collections\form\HtmlForm |
75 | 75 | */ |
76 | - public function submitOn($event,$identifier,$url,$responseElement){ |
|
76 | + public function submitOn($event, $identifier, $url, $responseElement) { |
|
77 | 77 | $form=$this->getForm(); |
78 | 78 | $elem=$form->getElementById($identifier, $form->getContent()); |
79 | - if(isset($elem)){ |
|
80 | - $this->_buttonAsSubmit($elem, $event,$url,$responseElement); |
|
79 | + if (isset($elem)) { |
|
80 | + $this->_buttonAsSubmit($elem, $event, $url, $responseElement); |
|
81 | 81 | } |
82 | 82 | return $form; |
83 | 83 | } |
84 | 84 | |
85 | - public function submitOnClick($identifier,$url,$responseElement){ |
|
85 | + public function submitOnClick($identifier, $url, $responseElement) { |
|
86 | 86 | return $this->submitOn("click", $identifier, $url, $responseElement); |
87 | 87 | } |
88 | 88 | |
89 | - public function addSubmit($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL){ |
|
90 | - $bt=$this->getForm()->addButton($identifier, $value,$cssStyle); |
|
91 | - return $this->_buttonAsSubmit($bt, "click",$url,$responseElement); |
|
89 | + public function addSubmit($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL) { |
|
90 | + $bt=$this->getForm()->addButton($identifier, $value, $cssStyle); |
|
91 | + return $this->_buttonAsSubmit($bt, "click", $url, $responseElement); |
|
92 | 92 | } |
93 | 93 | |
94 | - protected function _buttonAsSubmit(HtmlButton &$button,$event,$url,$responseElement=NULL,$parameters=NULL){ |
|
94 | + protected function _buttonAsSubmit(HtmlButton&$button, $event, $url, $responseElement=NULL, $parameters=NULL) { |
|
95 | 95 | $form=$this->getForm(); |
96 | - if(isset($url) && isset($responseElement)){ |
|
97 | - $button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');",true,true); |
|
98 | - $params=["form"=>$form->getIdentifier(),"responseElement"=>$responseElement,"url"=>$url,"stopPropagation"=>true]; |
|
99 | - if(\is_array($parameters)) |
|
100 | - $params=\array_merge($params,$parameters); |
|
96 | + if (isset($url) && isset($responseElement)) { |
|
97 | + $button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');", true, true); |
|
98 | + $params=["form"=>$form->getIdentifier(), "responseElement"=>$responseElement, "url"=>$url, "stopPropagation"=>true]; |
|
99 | + if (\is_array($parameters)) |
|
100 | + $params=\array_merge($params, $parameters); |
|
101 | 101 | $form->addValidationParam("_ajaxSubmit", new AjaxCall("postForm", $params)); |
102 | 102 | } |
103 | 103 | return $button; |
104 | 104 | } |
105 | 105 | |
106 | - public function addReset($identifier,$value,$cssStyle=NULL){ |
|
107 | - $bt=$this->getForm()->addButton($identifier, $value,$cssStyle); |
|
106 | + public function addReset($identifier, $value, $cssStyle=NULL) { |
|
107 | + $bt=$this->getForm()->addButton($identifier, $value, $cssStyle); |
|
108 | 108 | $bt->setProperty("type", "reset"); |
109 | 109 | return $bt; |
110 | 110 | } |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | * @param string $jsCode |
115 | 115 | * @return \Ajax\semantic\html\collections\form\HtmlForm |
116 | 116 | */ |
117 | - public function onValid($jsCode){ |
|
117 | + public function onValid($jsCode) { |
|
118 | 118 | $form=$this->getForm(); |
119 | 119 | $form->addValidationParam("onValid", "%function(){".$jsCode."}%"); |
120 | 120 | return $form; |
@@ -125,9 +125,9 @@ discard block |
||
125 | 125 | * @param string $jsCode can use event and fields parameters |
126 | 126 | * @return HtmlForm |
127 | 127 | */ |
128 | - public function onSuccess($jsCode){ |
|
128 | + public function onSuccess($jsCode) { |
|
129 | 129 | $form=$this->getForm(); |
130 | - $form->addValidationParam("onSuccess", $jsCode,"%function(event,fields){","}%"); |
|
130 | + $form->addValidationParam("onSuccess", $jsCode, "%function(event,fields){", "}%"); |
|
131 | 131 | return $form; |
132 | 132 | } |
133 | 133 | } |
134 | 134 | \ No newline at end of file |
@@ -14,34 +14,34 @@ discard block |
||
14 | 14 | use FieldTrait; |
15 | 15 | protected $_container; |
16 | 16 | protected $_validation; |
17 | - public function __construct($identifier, $field,$label=NULL) { |
|
18 | - parent::__construct($identifier, "div","field"); |
|
17 | + public function __construct($identifier, $field, $label=NULL) { |
|
18 | + parent::__construct($identifier, "div", "field"); |
|
19 | 19 | $this->content=array(); |
20 | - $this->_states=[State::ERROR,State::DISABLED]; |
|
21 | - if(isset($label) && $label!=="") |
|
20 | + $this->_states=[State::ERROR, State::DISABLED]; |
|
21 | + if (isset($label) && $label!=="") |
|
22 | 22 | $this->setLabel($label); |
23 | 23 | $this->setField($field); |
24 | 24 | $this->_validation=NULL; |
25 | 25 | } |
26 | 26 | |
27 | - public function addPointingLabel($label,$pointing=Direction::NONE){ |
|
28 | - $labelO=new HtmlLabel("",$label); |
|
27 | + public function addPointingLabel($label, $pointing=Direction::NONE) { |
|
28 | + $labelO=new HtmlLabel("", $label); |
|
29 | 29 | $labelO->setPointing($pointing); |
30 | - $this->addContent($labelO,$pointing==="below" || $pointing==="right"); |
|
30 | + $this->addContent($labelO, $pointing==="below" || $pointing==="right"); |
|
31 | 31 | return $labelO; |
32 | 32 | } |
33 | 33 | |
34 | - public function setLabel($label){ |
|
34 | + public function setLabel($label) { |
|
35 | 35 | $labelO=$label; |
36 | - if(\is_string($label)){ |
|
37 | - $labelO=new HtmlSemDoubleElement("","label",""); |
|
36 | + if (\is_string($label)) { |
|
37 | + $labelO=new HtmlSemDoubleElement("", "label", ""); |
|
38 | 38 | $labelO->setContent($label); |
39 | - $labelO->setProperty("for", \str_replace("field-", "",$this->identifier)); |
|
39 | + $labelO->setProperty("for", \str_replace("field-", "", $this->identifier)); |
|
40 | 40 | } |
41 | 41 | $this->content["label"]=$labelO; |
42 | 42 | } |
43 | 43 | |
44 | - public function setField($field){ |
|
44 | + public function setField($field) { |
|
45 | 45 | $this->content["field"]=$field; |
46 | 46 | } |
47 | 47 | |
@@ -49,8 +49,8 @@ discard block |
||
49 | 49 | * Returns the label or null |
50 | 50 | * @return mixed |
51 | 51 | */ |
52 | - public function getLabel(){ |
|
53 | - if(\array_key_exists("label", $this->content)) |
|
52 | + public function getLabel() { |
|
53 | + if (\array_key_exists("label", $this->content)) |
|
54 | 54 | return $this->content["label"]; |
55 | 55 | } |
56 | 56 | |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | * Return the field |
59 | 59 | * @return mixed |
60 | 60 | */ |
61 | - public function getField(){ |
|
61 | + public function getField() { |
|
62 | 62 | return $this->content["field"]; |
63 | 63 | } |
64 | 64 | |
@@ -66,14 +66,14 @@ discard block |
||
66 | 66 | * Return the field with data |
67 | 67 | * @return mixed |
68 | 68 | */ |
69 | - public function getDataField(){ |
|
69 | + public function getDataField() { |
|
70 | 70 | return $this->content["field"]; |
71 | 71 | } |
72 | 72 | |
73 | 73 | /** |
74 | 74 | * puts the label before or behind |
75 | 75 | */ |
76 | - public function swapLabel(){ |
|
76 | + public function swapLabel() { |
|
77 | 77 | $label=$this->getLabel(); |
78 | 78 | unset($this->content["label"]); |
79 | 79 | $this->content["label"]=$label; |
@@ -84,31 +84,31 @@ discard block |
||
84 | 84 | * @param int $width |
85 | 85 | * @return \Ajax\semantic\html\collections\form\HtmlFormField |
86 | 86 | */ |
87 | - public function setWidth($width){ |
|
88 | - if(\is_int($width)){ |
|
87 | + public function setWidth($width) { |
|
88 | + if (\is_int($width)) { |
|
89 | 89 | $width=Wide::getConstants()["W".$width]; |
90 | 90 | } |
91 | 91 | $this->addToPropertyCtrl("class", $width, Wide::getConstants()); |
92 | - if(isset($this->_container)){ |
|
92 | + if (isset($this->_container)) { |
|
93 | 93 | $this->_container->setEqualWidth(false); |
94 | 94 | } |
95 | - return $this->addToPropertyCtrl("class", "wide",array("wide")); |
|
95 | + return $this->addToPropertyCtrl("class", "wide", array("wide")); |
|
96 | 96 | } |
97 | 97 | |
98 | 98 | /** |
99 | 99 | * Field displays an error state |
100 | 100 | * @return \Ajax\semantic\html\collections\form\HtmlFormField |
101 | 101 | */ |
102 | - public function setError(){ |
|
102 | + public function setError() { |
|
103 | 103 | return $this->addToProperty("class", "error"); |
104 | 104 | } |
105 | 105 | |
106 | - public function setInline(){ |
|
106 | + public function setInline() { |
|
107 | 107 | return $this->addToProperty("class", "inline"); |
108 | 108 | } |
109 | 109 | |
110 | - public function jsState($state){ |
|
111 | - return $this->jsDoJquery("addClass",$state); |
|
110 | + public function jsState($state) { |
|
111 | + return $this->jsDoJquery("addClass", $state); |
|
112 | 112 | } |
113 | 113 | |
114 | 114 | public function setContainer($_container) { |
@@ -116,39 +116,39 @@ discard block |
||
116 | 116 | return $this; |
117 | 117 | } |
118 | 118 | |
119 | - public function setReadonly(){ |
|
119 | + public function setReadonly() { |
|
120 | 120 | $this->getField()->setProperty("readonly", ""); |
121 | 121 | } |
122 | 122 | |
123 | - public function addRule($type,$prompt=NULL,$value=NULL){ |
|
123 | + public function addRule($type, $prompt=NULL, $value=NULL) { |
|
124 | 124 | $field=$this->getDataField(); |
125 | - if(isset($field)){ |
|
126 | - if(!isset($this->_validation)){ |
|
125 | + if (isset($field)) { |
|
126 | + if (!isset($this->_validation)) { |
|
127 | 127 | $this->_validation=new FieldValidation($field->getIdentifier()); |
128 | 128 | } |
129 | - if($type==="empty"){ |
|
130 | - $this->addToProperty("class","required"); |
|
129 | + if ($type==="empty") { |
|
130 | + $this->addToProperty("class", "required"); |
|
131 | 131 | } |
132 | - $this->_validation->addRule($type,$prompt,$value); |
|
132 | + $this->_validation->addRule($type, $prompt, $value); |
|
133 | 133 | } |
134 | 134 | return $this; |
135 | 135 | } |
136 | 136 | |
137 | - public function addRules(array $rules){ |
|
138 | - foreach ($rules as $rule){ |
|
137 | + public function addRules(array $rules) { |
|
138 | + foreach ($rules as $rule) { |
|
139 | 139 | $this->addRule($rule); |
140 | 140 | } |
141 | 141 | return $this; |
142 | 142 | } |
143 | 143 | |
144 | - public function setRules(array $rules){ |
|
144 | + public function setRules(array $rules) { |
|
145 | 145 | $this->_validation=null; |
146 | 146 | return $this->addRules($rules); |
147 | 147 | } |
148 | 148 | |
149 | - public function addIcon($icon,$direction=Direction::LEFT){ |
|
149 | + public function addIcon($icon, $direction=Direction::LEFT) { |
|
150 | 150 | $field=$this->getField(); |
151 | - return $field->addIcon($icon,$direction); |
|
151 | + return $field->addIcon($icon, $direction); |
|
152 | 152 | } |
153 | 153 | |
154 | 154 | public function getValidation() { |
@@ -30,42 +30,42 @@ discard block |
||
30 | 30 | * @param string|HtmlSemDoubleElement $header |
31 | 31 | * @return \Ajax\semantic\html\collections\HtmlMessage |
32 | 32 | */ |
33 | - public function addHeader($header){ |
|
33 | + public function addHeader($header) { |
|
34 | 34 | $headerO=$header; |
35 | - if(\is_string($header)){ |
|
36 | - $headerO=new HtmlSemDoubleElement("header-".$this->identifier,"div"); |
|
35 | + if (\is_string($header)) { |
|
36 | + $headerO=new HtmlSemDoubleElement("header-".$this->identifier, "div"); |
|
37 | 37 | $headerO->setClass("header"); |
38 | 38 | $headerO->setContent($header); |
39 | 39 | } |
40 | - return $this->addContent($headerO,true); |
|
40 | + return $this->addContent($headerO, true); |
|
41 | 41 | } |
42 | 42 | |
43 | - public function setHeader($header){ |
|
43 | + public function setHeader($header) { |
|
44 | 44 | return $this->addHeader($header); |
45 | 45 | } |
46 | 46 | |
47 | - public function addList($elements,$ordered=false){ |
|
48 | - $list=new HtmlList("list-".$this->identifier,$elements); |
|
47 | + public function addList($elements, $ordered=false) { |
|
48 | + $list=new HtmlList("list-".$this->identifier, $elements); |
|
49 | 49 | $list->setOrdered($ordered); |
50 | 50 | $list->setClass("ui list"); |
51 | 51 | $this->addContent($list); |
52 | 52 | } |
53 | 53 | |
54 | - public function setIcon($icon){ |
|
54 | + public function setIcon($icon) { |
|
55 | 55 | $this->addToProperty("class", "icon"); |
56 | - $this->wrapContent("<div class='content'>","</div>"); |
|
56 | + $this->wrapContent("<div class='content'>", "</div>"); |
|
57 | 57 | $this->icon=new HtmlIcon("icon-".$this->identifier, $icon); |
58 | 58 | return $this; |
59 | 59 | } |
60 | 60 | |
61 | - public function addLoader($loaderIcon="notched circle"){ |
|
61 | + public function addLoader($loaderIcon="notched circle") { |
|
62 | 62 | $this->setIcon($loaderIcon); |
63 | 63 | $this->icon->addToIcon("loading"); |
64 | 64 | return $this; |
65 | 65 | } |
66 | 66 | |
67 | - public function setDismissable($dismiss=true){ |
|
68 | - if($dismiss===true) |
|
67 | + public function setDismissable($dismiss=true) { |
|
68 | + if ($dismiss===true) |
|
69 | 69 | $this->close=new HtmlIcon("close-".$this->identifier, "close"); |
70 | 70 | else |
71 | 71 | $this->close=NULL; |
@@ -76,38 +76,38 @@ discard block |
||
76 | 76 | * {@inheritDoc} |
77 | 77 | * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::run() |
78 | 78 | */ |
79 | - public function run(JsUtils $js){ |
|
79 | + public function run(JsUtils $js) { |
|
80 | 80 | parent::run($js); |
81 | - if(isset($this->close)){ |
|
81 | + if (isset($this->close)) { |
|
82 | 82 | $js->execOn("click", "#".$this->identifier." .close", "$(this).closest('.message').transition('fade')"); |
83 | 83 | } |
84 | 84 | } |
85 | 85 | |
86 | - public function setState($visible=true){ |
|
87 | - $visible=($visible===true)?"visible":"hidden"; |
|
88 | - return $this->addToPropertyCtrl("class", $visible, array("visible","hidden")); |
|
86 | + public function setState($visible=true) { |
|
87 | + $visible=($visible===true) ? "visible" : "hidden"; |
|
88 | + return $this->addToPropertyCtrl("class", $visible, array("visible", "hidden")); |
|
89 | 89 | } |
90 | 90 | |
91 | - public function setVariation($value="floating"){ |
|
92 | - return $this->addToPropertyCtrl("class", $value, array("floating","compact")); |
|
91 | + public function setVariation($value="floating") { |
|
92 | + return $this->addToPropertyCtrl("class", $value, array("floating", "compact")); |
|
93 | 93 | } |
94 | 94 | |
95 | - public function setStyle($style){ |
|
95 | + public function setStyle($style) { |
|
96 | 96 | return $this->addToPropertyCtrl("class", $style, Style::getConstants()); |
97 | 97 | } |
98 | 98 | |
99 | - public function setError(){ |
|
99 | + public function setError() { |
|
100 | 100 | return $this->setStyle("error"); |
101 | 101 | } |
102 | 102 | |
103 | - public function setWarning(){ |
|
103 | + public function setWarning() { |
|
104 | 104 | return $this->setStyle("warning"); |
105 | 105 | } |
106 | 106 | |
107 | - public function setMessage($message){ |
|
108 | - if(\is_array($this->content)){ |
|
107 | + public function setMessage($message) { |
|
108 | + if (\is_array($this->content)) { |
|
109 | 109 | $this->content[\sizeof($this->content)-1]=$message; |
110 | - }else |
|
110 | + } else |
|
111 | 111 | $this->setContent($message); |
112 | 112 | } |
113 | 113 | } |
114 | 114 | \ No newline at end of file |
@@ -11,58 +11,58 @@ discard block |
||
11 | 11 | protected $headers; |
12 | 12 | protected $wrappers; |
13 | 13 | |
14 | - public function __construct($identifier,$instance=NULL, $captions=NULL) { |
|
15 | - parent::__construct($identifier,$instance=NULL, $captions=NULL); |
|
14 | + public function __construct($identifier, $instance=NULL, $captions=NULL) { |
|
15 | + parent::__construct($identifier, $instance=NULL, $captions=NULL); |
|
16 | 16 | $this->separators=[-1]; |
17 | 17 | $this->headers=[]; |
18 | 18 | $this->wrappers=[]; |
19 | - $this->defaultValueFunction=function($name,$value,$index){ |
|
19 | + $this->defaultValueFunction=function($name, $value, $index) { |
|
20 | 20 | $caption=$this->getCaption($index); |
21 | - $input=new HtmlFormInput($this->widgetIdentifier."-".$name,$caption,"text",$value); |
|
21 | + $input=new HtmlFormInput($this->widgetIdentifier."-".$name, $caption, "text", $value); |
|
22 | 22 | $input->setName($name); |
23 | 23 | return $input; |
24 | 24 | }; |
25 | 25 | } |
26 | 26 | |
27 | - protected function _beforeAddProperty($index,&$field){ |
|
28 | - if(JString::endswith($field, "\n")===true){ |
|
27 | + protected function _beforeAddProperty($index, &$field) { |
|
28 | + if (JString::endswith($field, "\n")===true) { |
|
29 | 29 | $this->addSeparatorAfter($index); |
30 | 30 | } |
31 | - if($index>1 && JString::startswith($field, "\n")===true){ |
|
31 | + if ($index>1 && JString::startswith($field, "\n")===true) { |
|
32 | 32 | $this->addSeparatorAfter($index-1); |
33 | 33 | } |
34 | 34 | $field=\str_replace("\n", "", $field); |
35 | - if(($header=$this->hasHeader($field))!==false){ |
|
35 | + if (($header=$this->hasHeader($field))!==false) { |
|
36 | 36 | $this->addHeaderDividerBefore($index, $header); |
37 | 37 | } |
38 | 38 | } |
39 | 39 | |
40 | - protected function hasHeader(&$field){ |
|
41 | - $matches=[];$result=false; |
|
42 | - if(\preg_match('/\{(.*?)\}/s', $field, $matches)===1){ |
|
40 | + protected function hasHeader(&$field) { |
|
41 | + $matches=[]; $result=false; |
|
42 | + if (\preg_match('/\{(.*?)\}/s', $field, $matches)===1) { |
|
43 | 43 | $result=$matches[1]; |
44 | - $field=\str_replace("{".$result."}","", $field); |
|
44 | + $field=\str_replace("{".$result."}", "", $field); |
|
45 | 45 | } |
46 | 46 | return $result; |
47 | 47 | } |
48 | 48 | |
49 | 49 | |
50 | 50 | |
51 | - public function addSeparatorAfter($fieldNum){ |
|
52 | - if(\array_search($fieldNum, $this->separators)===false) |
|
51 | + public function addSeparatorAfter($fieldNum) { |
|
52 | + if (\array_search($fieldNum, $this->separators)===false) |
|
53 | 53 | $this->separators[]=$fieldNum; |
54 | 54 | return $this; |
55 | 55 | } |
56 | 56 | |
57 | - public function addHeaderDividerBefore($fieldNum,$header){ |
|
57 | + public function addHeaderDividerBefore($fieldNum, $header) { |
|
58 | 58 | $this->headers[$fieldNum]=$header; |
59 | - if($fieldNum>0) |
|
59 | + if ($fieldNum>0) |
|
60 | 60 | $this->addSeparatorAfter($fieldNum-1); |
61 | 61 | return $this; |
62 | 62 | } |
63 | 63 | |
64 | - public function addWrapper($fieldNum,$contentBefore,$contentAfter=null){ |
|
65 | - $this->wrappers[$fieldNum]=[$contentBefore,$contentAfter]; |
|
64 | + public function addWrapper($fieldNum, $contentBefore, $contentAfter=null) { |
|
65 | + $this->wrappers[$fieldNum]=[$contentBefore, $contentAfter]; |
|
66 | 66 | return $this; |
67 | 67 | } |
68 | 68 | |
@@ -70,15 +70,15 @@ discard block |
||
70 | 70 | return $this->separators; |
71 | 71 | } |
72 | 72 | |
73 | - public function removeSeparator($index){ |
|
74 | - \array_splice($this->separators,$index,1); |
|
73 | + public function removeSeparator($index) { |
|
74 | + \array_splice($this->separators, $index, 1); |
|
75 | 75 | } |
76 | 76 | |
77 | - public function removeField($index){ |
|
77 | + public function removeField($index) { |
|
78 | 78 | parent::removeField($index); |
79 | 79 | $pos=\array_search($index, $this->separators); |
80 | - if($pos!==false){ |
|
81 | - for($i=$pos+1;$i<\sizeof($this->separators);$i++){ |
|
80 | + if ($pos!==false) { |
|
81 | + for ($i=$pos+1; $i<\sizeof($this->separators); $i++) { |
|
82 | 82 | $this->separators[$i]--; |
83 | 83 | } |
84 | 84 | \array_splice($this->separators, $pos, 1); |
@@ -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,11 +15,11 @@ discard block |
||
15 | 15 | * @version 1.3 |
16 | 16 | */ |
17 | 17 | abstract class BaseHtml extends BaseWidget { |
18 | - use BaseHtmlEventsTrait,BaseHtmlPropertiesTrait; |
|
18 | + use BaseHtmlEventsTrait, BaseHtmlPropertiesTrait; |
|
19 | 19 | protected $_template; |
20 | 20 | protected $tagName; |
21 | - protected $_wrapBefore=array (); |
|
22 | - protected $_wrapAfter=array (); |
|
21 | + protected $_wrapBefore=array(); |
|
22 | + protected $_wrapAfter=array(); |
|
23 | 23 | protected $_bsComponent; |
24 | 24 | |
25 | 25 | /** |
@@ -29,14 +29,14 @@ discard block |
||
29 | 29 | */ |
30 | 30 | abstract public function run(JsUtils $js); |
31 | 31 | |
32 | - private function _callSetter($setter,$key,$value,&$array){ |
|
32 | + private function _callSetter($setter, $key, $value, &$array) { |
|
33 | 33 | $result=false; |
34 | 34 | if (method_exists($this, $setter) && !JString::startswith($key, "_")) { |
35 | 35 | try { |
36 | 36 | $this->$setter($value); |
37 | 37 | unset($array[$key]); |
38 | 38 | $result=true; |
39 | - } catch ( \Exception $e ) { |
|
39 | + }catch (\Exception $e) { |
|
40 | 40 | $result=false; |
41 | 41 | } |
42 | 42 | } |
@@ -44,17 +44,17 @@ discard block |
||
44 | 44 | } |
45 | 45 | |
46 | 46 | protected function getTemplate(JsUtils $js=NULL) { |
47 | - return PropertyWrapper::wrap($this->_wrapBefore, $js) . $this->_template . PropertyWrapper::wrap($this->_wrapAfter, $js); |
|
47 | + return PropertyWrapper::wrap($this->_wrapBefore, $js).$this->_template.PropertyWrapper::wrap($this->_wrapAfter, $js); |
|
48 | 48 | } |
49 | 49 | |
50 | 50 | protected function ctrl($name, $value, $typeCtrl) { |
51 | 51 | if (\is_array($typeCtrl)) { |
52 | - if (array_search($value, $typeCtrl) === false) { |
|
53 | - throw new \Exception("La valeur passée `" . $value . "` à la propriété `" . $name . "` ne fait pas partie des valeurs possibles : {" . implode(",", $typeCtrl) . "}"); |
|
52 | + if (array_search($value, $typeCtrl)===false) { |
|
53 | + throw new \Exception("La valeur passée `".$value."` à la propriété `".$name."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}"); |
|
54 | 54 | } |
55 | 55 | } else { |
56 | 56 | if (!$typeCtrl($value)) { |
57 | - throw new \Exception("La fonction " . $typeCtrl . " a retourné faux pour l'affectation de la propriété " . $name); |
|
57 | + throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$name); |
|
58 | 58 | } |
59 | 59 | } |
60 | 60 | return true; |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | |
64 | 64 | |
65 | 65 | protected function setMemberCtrl(&$name, $value, $typeCtrl) { |
66 | - if ($this->ctrl($name, $value, $typeCtrl) === true) { |
|
66 | + if ($this->ctrl($name, $value, $typeCtrl)===true) { |
|
67 | 67 | return $name=$value; |
68 | 68 | } |
69 | 69 | return $this; |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | protected function addToMemberUnique(&$name, $value, $typeCtrl, $separator=" ") { |
73 | 73 | if (\is_array($typeCtrl)) { |
74 | 74 | $this->removeOldValues($name, $typeCtrl); |
75 | - $name.=$separator . $value; |
|
75 | + $name.=$separator.$value; |
|
76 | 76 | } |
77 | 77 | return $this; |
78 | 78 | } |
@@ -80,17 +80,17 @@ discard block |
||
80 | 80 | |
81 | 81 | |
82 | 82 | protected function addToMemberCtrl(&$name, $value, $typeCtrl, $separator=" ") { |
83 | - if ($this->ctrl($name, $value, $typeCtrl) === true) { |
|
83 | + if ($this->ctrl($name, $value, $typeCtrl)===true) { |
|
84 | 84 | if (\is_array($typeCtrl)) { |
85 | 85 | $this->removeOldValues($name, $typeCtrl); |
86 | 86 | } |
87 | - $name.=$separator . $value; |
|
87 | + $name.=$separator.$value; |
|
88 | 88 | } |
89 | 89 | return $this; |
90 | 90 | } |
91 | 91 | |
92 | 92 | protected function addToMember(&$name, $value, $separator=" ") { |
93 | - $name=str_ireplace($value, "", $name) . $separator . $value; |
|
93 | + $name=str_ireplace($value, "", $name).$separator.$value; |
|
94 | 94 | return $this; |
95 | 95 | } |
96 | 96 | |
@@ -101,17 +101,17 @@ discard block |
||
101 | 101 | $oldValue=trim($oldValue); |
102 | 102 | } |
103 | 103 | |
104 | - protected function _getElementBy($callback,$elements){ |
|
104 | + protected function _getElementBy($callback, $elements) { |
|
105 | 105 | if (\is_array($elements)) { |
106 | 106 | $flag=false; |
107 | 107 | $index=0; |
108 | - while ( !$flag && $index < sizeof($elements) ) { |
|
108 | + while (!$flag && $index<sizeof($elements)) { |
|
109 | 109 | if ($elements[$index] instanceof BaseHtml) |
110 | 110 | $flag=($callback($elements[$index])); |
111 | 111 | $index++; |
112 | 112 | } |
113 | - if ($flag === true) |
|
114 | - return $elements[$index - 1]; |
|
113 | + if ($flag===true) |
|
114 | + return $elements[$index-1]; |
|
115 | 115 | } elseif ($elements instanceof BaseHtml) { |
116 | 116 | if ($callback($elements)) |
117 | 117 | return $elements; |
@@ -139,13 +139,13 @@ discard block |
||
139 | 139 | } |
140 | 140 | |
141 | 141 | public function fromArray($array) { |
142 | - foreach ( $this as $key => $value ) { |
|
143 | - if(array_key_exists($key, $array)===true) |
|
144 | - $this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array); |
|
142 | + foreach ($this as $key => $value) { |
|
143 | + if (array_key_exists($key, $array)===true) |
|
144 | + $this->_callSetter("set".ucfirst($key), $key, $array[$key], $array); |
|
145 | 145 | } |
146 | - foreach ( $array as $key => $value ) { |
|
147 | - if($this->_callSetter($key, $key, $value, $array)===false){ |
|
148 | - $this->_callSetter("set" . ucfirst($key), $key, $value, $array); |
|
146 | + foreach ($array as $key => $value) { |
|
147 | + if ($this->_callSetter($key, $key, $value, $array)===false) { |
|
148 | + $this->_callSetter("set".ucfirst($key), $key, $value, $array); |
|
149 | 149 | } |
150 | 150 | } |
151 | 151 | return $array; |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | |
154 | 154 | public function fromDatabaseObjects($objects, $function) { |
155 | 155 | if (isset($objects)) { |
156 | - foreach ( $objects as $object ) { |
|
156 | + foreach ($objects as $object) { |
|
157 | 157 | $this->fromDatabaseObject($object, $function); |
158 | 158 | } |
159 | 159 | } |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | |
175 | 175 | |
176 | 176 | public function getElementById($identifier, $elements) { |
177 | - return $this->_getElementBy(function($element) use ($identifier){return $element->getIdentifier()===$identifier;}, $elements); |
|
177 | + return $this->_getElementBy(function($element) use ($identifier){return $element->getIdentifier()===$identifier; }, $elements); |
|
178 | 178 | } |
179 | 179 | |
180 | 180 | public function getBsComponent() { |
@@ -188,19 +188,19 @@ discard block |
||
188 | 188 | |
189 | 189 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
190 | 190 | $result=$this->getTemplate($js); |
191 | - foreach ( $this as $key => $value ) { |
|
192 | - if (JString::startswith($key, "_") === false && $key !== "events") { |
|
191 | + foreach ($this as $key => $value) { |
|
192 | + if (JString::startswith($key, "_")===false && $key!=="events") { |
|
193 | 193 | if (\is_array($value)) { |
194 | 194 | $v=PropertyWrapper::wrap($value, $js); |
195 | 195 | } else { |
196 | 196 | $v=$value; |
197 | 197 | } |
198 | - $result=str_ireplace("%" . $key . "%", $v, $result); |
|
198 | + $result=str_ireplace("%".$key."%", $v, $result); |
|
199 | 199 | } |
200 | 200 | } |
201 | 201 | if (isset($js)===true) { |
202 | 202 | $this->run($js); |
203 | - if (isset($view) === true) { |
|
203 | + if (isset($view)===true) { |
|
204 | 204 | $js->addViewElement($this->_identifier, $result, $view); |
205 | 205 | } |
206 | 206 | } |