@@ -43,15 +43,16 @@ |
||
43 | 43 | } |
44 | 44 | |
45 | 45 | public function addRule($type,$prompt=NULL,$value=NULL){ |
46 | - if($type instanceof Rule) |
|
47 | - $this->rules[]=$type; |
|
48 | - else if(\is_array($type)){ |
|
46 | + if($type instanceof Rule) { |
|
47 | + $this->rules[]=$type; |
|
48 | + } else if(\is_array($type)){ |
|
49 | 49 | $value=JArray::getValue($type, "value", 2); |
50 | 50 | $prompt=JArray::getValue($type, "prompt", 1); |
51 | 51 | $type=JArray::getValue($type, "type", 0); |
52 | 52 | $this->rules[]=new Rule($type,$prompt,$value); |
53 | - }else |
|
54 | - $this->rules[]=new Rule($type,$prompt,$value); |
|
53 | + } else { |
|
54 | + $this->rules[]=new Rule($type,$prompt,$value); |
|
55 | + } |
|
55 | 56 | } |
56 | 57 | |
57 | 58 | public function jsonSerialize(){ |
@@ -55,10 +55,12 @@ discard block |
||
55 | 55 | |
56 | 56 | public function jsonSerialize() { |
57 | 57 | $result= ["type"=>$this->type]; |
58 | - if(isset($this->prompt)) |
|
59 | - $result["prompt"]=$this->prompt; |
|
60 | - if(isset($this->value)) |
|
61 | - $result["value"]=$this->value; |
|
58 | + if(isset($this->prompt)) { |
|
59 | + $result["prompt"]=$this->prompt; |
|
60 | + } |
|
61 | + if(isset($this->value)) { |
|
62 | + $result["value"]=$this->value; |
|
63 | + } |
|
62 | 64 | return $result; |
63 | 65 | } |
64 | 66 | |
@@ -90,8 +92,9 @@ discard block |
||
90 | 92 | * @return \Ajax\semantic\components\validation\Rule |
91 | 93 | */ |
92 | 94 | public static function integer($min=NULL,$max=NULL,$prompt=NULL){ |
93 | - if(\is_int($min) && \is_int($max)) |
|
94 | - return new Rule("integer[{$min}..{$max}]",$prompt); |
|
95 | + if(\is_int($min) && \is_int($max)) { |
|
96 | + return new Rule("integer[{$min}..{$max}]",$prompt); |
|
97 | + } |
|
95 | 98 | return new Rule("integer",$prompt); |
96 | 99 | } |
97 | 100 |
@@ -47,8 +47,9 @@ discard block |
||
47 | 47 | */ |
48 | 48 | public function addHeader($title, $niveau=1, $dividing=true) { |
49 | 49 | $header=new HtmlHeader("", $niveau, $title); |
50 | - if ($dividing) |
|
51 | - $header->setDividing(); |
|
50 | + if ($dividing) { |
|
51 | + $header->setDividing(); |
|
52 | + } |
|
52 | 53 | return $this->addItem($header); |
53 | 54 | } |
54 | 55 | |
@@ -69,14 +70,16 @@ discard block |
||
69 | 70 | if (\is_string($end)) { |
70 | 71 | $label=$end; |
71 | 72 | \array_pop($fields); |
72 | - } else |
|
73 | - $label=NULL; |
|
73 | + } else { |
|
74 | + $label=NULL; |
|
75 | + } |
|
74 | 76 | } |
75 | 77 | $this->_fields=\array_merge($this->_fields, $fields); |
76 | 78 | $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count(), $fields); |
77 | 79 | } |
78 | - if (isset($label)) |
|
79 | - $fields=new HtmlFormField("", $fields, $label); |
|
80 | + if (isset($label)) { |
|
81 | + $fields=new HtmlFormField("", $fields, $label); |
|
82 | + } |
|
80 | 83 | } else { |
81 | 84 | $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count()); |
82 | 85 | } |
@@ -145,12 +148,15 @@ discard block |
||
145 | 148 | */ |
146 | 149 | public function addMessage($identifier, $content, $header=NULL, $icon=NULL, $type=NULL) { |
147 | 150 | $message=new HtmlMessage($identifier, $content); |
148 | - if (isset($header)) |
|
149 | - $message->addHeader($header); |
|
150 | - if (isset($icon)) |
|
151 | - $message->setIcon($icon); |
|
152 | - if (isset($type)) |
|
153 | - $message->setStyle($type); |
|
151 | + if (isset($header)) { |
|
152 | + $message->addHeader($header); |
|
153 | + } |
|
154 | + if (isset($icon)) { |
|
155 | + $message->setIcon($icon); |
|
156 | + } |
|
157 | + if (isset($type)) { |
|
158 | + $message->setStyle($type); |
|
159 | + } |
|
154 | 160 | return $this->addItem($message); |
155 | 161 | } |
156 | 162 | |
@@ -169,15 +175,17 @@ discard block |
||
169 | 175 | public function run(JsUtils $js) { |
170 | 176 | $compo=NULL; |
171 | 177 | foreach ($this->_fields as $field){ |
172 | - if($field instanceof HtmlFormField) |
|
173 | - $compo=$this->addCompoValidation($js, $compo, $field); |
|
178 | + if($field instanceof HtmlFormField) { |
|
179 | + $compo=$this->addCompoValidation($js, $compo, $field); |
|
180 | + } |
|
174 | 181 | } |
175 | 182 | foreach ($this->content as $field){ |
176 | 183 | if($field instanceof HtmlFormFields){ |
177 | 184 | $items=$field->getItems(); |
178 | 185 | foreach ($items as $_field){ |
179 | - if($_field instanceof HtmlFormField) |
|
180 | - $compo=$this->addCompoValidation($js, $compo, $_field); |
|
186 | + if($_field instanceof HtmlFormField) { |
|
187 | + $compo=$this->addCompoValidation($js, $compo, $_field); |
|
188 | + } |
|
181 | 189 | } |
182 | 190 | } |
183 | 191 | } |
@@ -230,8 +238,9 @@ discard block |
||
230 | 238 | |
231 | 239 | public function addSubmit($identifier,$value,$CssStyle=NULL,$url=NULL,$responseElement=NULL){ |
232 | 240 | $bt=$this->addButton($identifier, $value,$CssStyle); |
233 | - if(isset($url) && isset($responseElement)) |
|
234 | - $this->submitOnClick($identifier, $url, $responseElement); |
|
241 | + if(isset($url) && isset($responseElement)) { |
|
242 | + $this->submitOnClick($identifier, $url, $responseElement); |
|
243 | + } |
|
235 | 244 | return $bt; |
236 | 245 | } |
237 | 246 |
@@ -44,8 +44,9 @@ |
||
44 | 44 | $actionO=$action; |
45 | 45 | if (\is_object($action) === false) { |
46 | 46 | $actionO=new HtmlButton("action-" . $this->identifier, $action); |
47 | - if (isset($icon)) |
|
48 | - $actionO->addIcon($icon, true, $labeled); |
|
47 | + if (isset($icon)) { |
|
48 | + $actionO->addIcon($icon, true, $labeled); |
|
49 | + } |
|
49 | 50 | } |
50 | 51 | $this->addToProperty("class", $direction . " action"); |
51 | 52 | $this->addContent($actionO, \strstr($direction, Direction::LEFT) !== false); |
@@ -10,15 +10,17 @@ |
||
10 | 10 | use TextFieldsTrait,FieldTrait; |
11 | 11 | |
12 | 12 | public function __construct($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL) { |
13 | - if(!isset($placeholder) && $type==="text") |
|
14 | - $placeholder=$label; |
|
13 | + if(!isset($placeholder) && $type==="text") { |
|
14 | + $placeholder=$label; |
|
15 | + } |
|
15 | 16 | parent::__construct("field-".$identifier, new HtmlInput($identifier,$type,$value,$placeholder), $label); |
16 | 17 | } |
17 | 18 | |
18 | 19 | public function getDataField(){ |
19 | 20 | $field= $this->getField(); |
20 | - if($field instanceof HtmlInput) |
|
21 | - $field=$field->getField(); |
|
21 | + if($field instanceof HtmlInput) { |
|
22 | + $field=$field->getField(); |
|
23 | + } |
|
22 | 24 | return $field; |
23 | 25 | } |
24 | 26 | } |
25 | 27 | \ No newline at end of file |
@@ -18,11 +18,12 @@ |
||
18 | 18 | if(\is_array($value)){ |
19 | 19 | $itemO=new HtmlFormInput(JArray::getDefaultValue($value, "id",""),JArray::getDefaultValue($value, "label",null),JArray::getDefaultValue($value, "type", "text"),JArray::getDefaultValue($value, "value",""),JArray::getDefaultValue($value, "placeholder",JArray::getDefaultValue($value, "label",null))); |
20 | 20 | return $itemO; |
21 | - }elseif(\is_object($value)){ |
|
21 | + } elseif(\is_object($value)){ |
|
22 | 22 | $itemO=new HtmlFormField("field-".$this->identifier, $value); |
23 | 23 | return $itemO; |
24 | - }else |
|
25 | - return new HtmlFormInput($value); |
|
24 | + } else { |
|
25 | + return new HtmlFormInput($value); |
|
26 | + } |
|
26 | 27 | } |
27 | 28 | |
28 | 29 | protected function createCondition($value){ |
@@ -43,8 +43,9 @@ discard block |
||
43 | 43 | |
44 | 44 | public function getDataField(){ |
45 | 45 | $field= $this->getField(); |
46 | - if($field instanceof AbstractCheckbox) |
|
47 | - $field=$field->getField(); |
|
46 | + if($field instanceof AbstractCheckbox) { |
|
47 | + $field=$field->getField(); |
|
48 | + } |
|
48 | 49 | return $field; |
49 | 50 | } |
50 | 51 | |
@@ -56,7 +57,7 @@ discard block |
||
56 | 57 | public function setChecked($value=true){ |
57 | 58 | if($value===true){ |
58 | 59 | $this->getDataField()->setProperty("checked", "checked"); |
59 | - }else{ |
|
60 | + } else{ |
|
60 | 61 | $this->getDataField()->removeProperty("checked"); |
61 | 62 | } |
62 | 63 | return $this; |
@@ -13,14 +13,15 @@ discard block |
||
13 | 13 | $field=new \Ajax\common\html\html5\HtmlInput($identifier, $inputType, $value); |
14 | 14 | $field->setProperty("name", $name); |
15 | 15 | $this->setField($field); |
16 | - if (isset($label)) |
|
17 | - $this->setLabel($label); |
|
16 | + if (isset($label)) { |
|
17 | + $this->setLabel($label); |
|
18 | + } |
|
18 | 19 | } |
19 | 20 | |
20 | 21 | public function setChecked($value=true){ |
21 | 22 | if($value===true){ |
22 | 23 | $this->getField()->setProperty("checked", "checked"); |
23 | - }else{ |
|
24 | + } else{ |
|
24 | 25 | $this->getField()->removeProperty("checked"); |
25 | 26 | } |
26 | 27 | return $this; |
@@ -49,8 +50,9 @@ discard block |
||
49 | 50 | * @return mixed |
50 | 51 | */ |
51 | 52 | public function getLabel() { |
52 | - if (\array_key_exists("label", $this->content)) |
|
53 | - return $this->content["label"]; |
|
53 | + if (\array_key_exists("label", $this->content)) { |
|
54 | + return $this->content["label"]; |
|
55 | + } |
|
54 | 56 | } |
55 | 57 | |
56 | 58 | /** |
@@ -55,9 +55,9 @@ discard block |
||
55 | 55 | } |
56 | 56 | |
57 | 57 | public function setFocusable($value=true) { |
58 | - if ($value === true) |
|
59 | - $this->setProperty("tabindex", "0"); |
|
60 | - else { |
|
58 | + if ($value === true) { |
|
59 | + $this->setProperty("tabindex", "0"); |
|
60 | + } else { |
|
61 | 61 | $this->removeProperty("tabindex"); |
62 | 62 | } |
63 | 63 | return $this; |
@@ -175,8 +175,9 @@ discard block |
||
175 | 175 | } |
176 | 176 | |
177 | 177 | public static function social($identifier, $social, $value=NULL) { |
178 | - if ($value === NULL) |
|
179 | - $value=\ucfirst($social); |
|
178 | + if ($value === NULL) { |
|
179 | + $value=\ucfirst($social); |
|
180 | + } |
|
180 | 181 | $return=new HtmlButton($identifier, $value); |
181 | 182 | $return->addIcon($social); |
182 | 183 | return $return->addToPropertyCtrl("class", $social, Social::getConstants()); |