@@ -14,9 +14,11 @@ |
||
14 | 14 | parent::__construct($identifier, $name,$label,$value,$type); |
15 | 15 | $this->_input->getField()->setProperty("type", "radio"); |
16 | 16 | $this->_input->setClass("ui radio checkbox"); |
17 | - if(isset($name)) |
|
18 | - $this->_input->getField()->setProperty("name", $name); |
|
19 | - if(isset($type)) |
|
20 | - $this->setType($type); |
|
17 | + if(isset($name)) { |
|
18 | + $this->_input->getField()->setProperty("name", $name); |
|
19 | + } |
|
20 | + if(isset($type)) { |
|
21 | + $this->setType($type); |
|
22 | + } |
|
21 | 23 | } |
22 | 24 | } |
23 | 25 | \ No newline at end of file |
@@ -9,8 +9,9 @@ |
||
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 | } |
16 | 17 |
@@ -22,8 +22,9 @@ discard block |
||
22 | 22 | if(\is_array($value)){ |
23 | 23 | $item=new HtmlListItem("item-".$this->identifier."-".$count, $value[0]); |
24 | 24 | $item->addIcon($value[1]); |
25 | - }else |
|
26 | - $item= new HtmlListItem("item-".$this->identifier."-".$count, $value); |
|
25 | + } else { |
|
26 | + $item= new HtmlListItem("item-".$this->identifier."-".$count, $value); |
|
27 | + } |
|
27 | 28 | return $item; |
28 | 29 | } |
29 | 30 | |
@@ -86,7 +87,7 @@ discard block |
||
86 | 87 | $list=new HtmlList("",$fields); |
87 | 88 | $list->setClass("list"); |
88 | 89 | $masterO->addContent($list); |
89 | - }else{ |
|
90 | + } else{ |
|
90 | 91 | $this->addList($fields); |
91 | 92 | } |
92 | 93 | $this->_hasCheckedList=true; |
@@ -29,11 +29,14 @@ discard block |
||
29 | 29 | if(\is_string($end)){ |
30 | 30 | $label=$end; |
31 | 31 | \array_pop($fields); |
32 | - }else $label=NULL; |
|
32 | + } else { |
|
33 | + $label=NULL; |
|
34 | + } |
|
33 | 35 | } |
34 | 36 | } |
35 | - if(isset($label)) |
|
36 | - $this->setLabel($label); |
|
37 | + if(isset($label)) { |
|
38 | + $this->setLabel($label); |
|
39 | + } |
|
37 | 40 | foreach ($fields as $field){ |
38 | 41 | $this->addItem($field); |
39 | 42 | } |
@@ -61,8 +64,9 @@ discard block |
||
61 | 64 | if($this->_equalWidth){ |
62 | 65 | $count=$this->count(); |
63 | 66 | $this->addToProperty("class", Wide::getConstants()["W".$count]." fields"); |
64 | - }else |
|
65 | - $this->addToProperty("class","fields"); |
|
67 | + } else { |
|
68 | + $this->addToProperty("class","fields"); |
|
69 | + } |
|
66 | 70 | return parent::compile($js,$view); |
67 | 71 | } |
68 | 72 | |
@@ -102,8 +106,9 @@ discard block |
||
102 | 106 | $fields[]=$itemO; |
103 | 107 | } |
104 | 108 | $radios=new HtmlFormFields("fields-".$name,$fields); |
105 | - if(isset($label)) |
|
106 | - $radios->setLabel($label)->setProperty("for", $name); |
|
109 | + if(isset($label)) { |
|
110 | + $radios->setLabel($label)->setProperty("for", $name); |
|
111 | + } |
|
107 | 112 | return $radios; |
108 | 113 | } |
109 | 114 | |
@@ -118,8 +123,9 @@ discard block |
||
118 | 123 | $fields[]=$itemO; |
119 | 124 | } |
120 | 125 | $radios=new HtmlFormFields("fields-".$name,$fields); |
121 | - if(isset($label)) |
|
122 | - $radios->setLabel($label)->setProperty("for", $name); |
|
126 | + if(isset($label)) { |
|
127 | + $radios->setLabel($label)->setProperty("for", $name); |
|
128 | + } |
|
123 | 129 | return $radios; |
124 | 130 | } |
125 | 131 |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | $itemO=$item; |
64 | 64 | if(!$item instanceof HtmlDropdownItem){ |
65 | 65 | $itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items),$item,$value,$image); |
66 | - }elseif($itemO instanceof HtmlDropdownItem){ |
|
66 | + } elseif($itemO instanceof HtmlDropdownItem){ |
|
67 | 67 | $this->addToProperty("class", "vertical"); |
68 | 68 | } |
69 | 69 | return $itemO; |
@@ -77,8 +77,9 @@ discard block |
||
77 | 77 | } |
78 | 78 | |
79 | 79 | public function addInput($name){ |
80 | - if(!isset($name)) |
|
81 | - $name="input-".$this->identifier; |
|
80 | + if(!isset($name)) { |
|
81 | + $name="input-".$this->identifier; |
|
82 | + } |
|
82 | 83 | $this->setAction("activate"); |
83 | 84 | $this->input=new HtmlInput($name,"hidden"); |
84 | 85 | } |
@@ -88,7 +89,7 @@ discard block |
||
88 | 89 | foreach ($items as $k=>$v){ |
89 | 90 | $this->addItem($v)->setData($k); |
90 | 91 | } |
91 | - }else{ |
|
92 | + } else{ |
|
92 | 93 | foreach ($items as $item){ |
93 | 94 | $this->addItem($item); |
94 | 95 | } |
@@ -105,7 +106,7 @@ discard block |
||
105 | 106 | if($dropdown===false){ |
106 | 107 | $this->_template=include dirname(__FILE__).'/../templates/tplDropdownMenu.php'; |
107 | 108 | $dropdown="menu"; |
108 | - }else{ |
|
109 | + } else{ |
|
109 | 110 | $dropdown="dropdown"; |
110 | 111 | $this->mClass="menu"; |
111 | 112 | } |
@@ -121,18 +122,22 @@ discard block |
||
121 | 122 | } |
122 | 123 | |
123 | 124 | public function asButton($floating=false){ |
124 | - if($floating) |
|
125 | - $this->addToProperty("class", "floating"); |
|
125 | + if($floating) { |
|
126 | + $this->addToProperty("class", "floating"); |
|
127 | + } |
|
126 | 128 | return $this->addToProperty("class", "button"); |
127 | 129 | } |
128 | 130 | |
129 | 131 | public function asSelect($name=NULL,$multiple=false,$selection=true){ |
130 | - if(isset($name)) |
|
131 | - $this->addInput($name); |
|
132 | - if($multiple) |
|
133 | - $this->addToProperty("class", "multiple"); |
|
134 | - if ($selection) |
|
135 | - $this->addToPropertyCtrl("class", "selection",array("selection")); |
|
132 | + if(isset($name)) { |
|
133 | + $this->addInput($name); |
|
134 | + } |
|
135 | + if($multiple) { |
|
136 | + $this->addToProperty("class", "multiple"); |
|
137 | + } |
|
138 | + if ($selection) { |
|
139 | + $this->addToPropertyCtrl("class", "selection",array("selection")); |
|
140 | + } |
|
136 | 141 | return $this; |
137 | 142 | } |
138 | 143 | |
@@ -142,8 +147,9 @@ discard block |
||
142 | 147 | } |
143 | 148 | |
144 | 149 | public function setSelect($name=NULL,$multiple=false){ |
145 | - if(!isset($name)) |
|
146 | - $name="select-".$this->identifier; |
|
150 | + if(!isset($name)) { |
|
151 | + $name="select-".$this->identifier; |
|
152 | + } |
|
147 | 153 | $this->input=null; |
148 | 154 | if($multiple){ |
149 | 155 | $this->setProperty("multiple", true); |
@@ -174,12 +180,13 @@ discard block |
||
174 | 180 | public function setValue($value){ |
175 | 181 | if(isset($this->input)){ |
176 | 182 | $this->input->setProperty("value", $value); |
177 | - }else{ |
|
183 | + } else{ |
|
178 | 184 | $this->setProperty("value", $value); |
179 | 185 | } |
180 | 186 | $textElement=$this->getElementById("text-".$this->identifier, $this->content); |
181 | - if(isset($textElement)) |
|
182 | - $textElement->setContent($value); |
|
187 | + if(isset($textElement)) { |
|
188 | + $textElement->setContent($value); |
|
189 | + } |
|
183 | 190 | return $this; |
184 | 191 | } |
185 | 192 | |
@@ -189,8 +196,9 @@ discard block |
||
189 | 196 | */ |
190 | 197 | public function run(JsUtils $js) { |
191 | 198 | if($this->propertyContains("class", "simple")===false){ |
192 | - if(isset($this->_bsComponent)===false) |
|
193 | - $this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier,$this->_params); |
|
199 | + if(isset($this->_bsComponent)===false) { |
|
200 | + $this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier,$this->_params); |
|
201 | + } |
|
194 | 202 | $this->addEventsOnRun($js); |
195 | 203 | return $this->_bsComponent; |
196 | 204 | } |
@@ -23,8 +23,9 @@ discard block |
||
23 | 23 | foreach ( $this->events as $event => $jsCode ) { |
24 | 24 | if($event=="execute"){ |
25 | 25 | $this->jquery_code_for_compile []=$jsCode; |
26 | - }else |
|
27 | - $this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).on(\"".$event."\" , function( event, data ) {".$jsCode."});"; |
|
26 | + } else { |
|
27 | + $this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).on(\"".$event."\" , function( event, data ) {".$jsCode."});"; |
|
28 | + } |
|
28 | 29 | } |
29 | 30 | } |
30 | 31 | |
@@ -67,8 +68,9 @@ discard block |
||
67 | 68 | |
68 | 69 | protected function setParamCtrl($key, $value, $typeCtrl) { |
69 | 70 | if (is_array($typeCtrl)) { |
70 | - if (array_search($value, $typeCtrl)===false) |
|
71 | - throw new \Exception("La valeur passée a propriété `".$key."` pour le composant `".$this->uiName."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}"); |
|
71 | + if (array_search($value, $typeCtrl)===false) { |
|
72 | + throw new \Exception("La valeur passée a propriété `".$key."` pour le composant `".$this->uiName."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}"); |
|
73 | + } |
|
72 | 74 | } else { |
73 | 75 | if (!$typeCtrl($value)) { |
74 | 76 | throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$key." au composant ".$this->uiName); |
@@ -14,21 +14,24 @@ discard block |
||
14 | 14 | return $array [$key]; |
15 | 15 | } |
16 | 16 | $values=array_values($array); |
17 | - if ($pos<sizeof($values)) |
|
18 | - return $values [$pos]; |
|
17 | + if ($pos<sizeof($values)) { |
|
18 | + return $values [$pos]; |
|
19 | + } |
|
19 | 20 | } |
20 | 21 | |
21 | 22 | public static function getConditionalValue($array,$key,$condition){ |
22 | 23 | $result=NULL; |
23 | 24 | if (array_key_exists($key, $array)) { |
24 | 25 | $result=$array [$key]; |
25 | - if($condition($result)===true) |
|
26 | - return $result; |
|
26 | + if($condition($result)===true) { |
|
27 | + return $result; |
|
28 | + } |
|
27 | 29 | } |
28 | 30 | $values=array_values($array); |
29 | 31 | foreach ($values as $val){ |
30 | - if($condition($val)===true) |
|
31 | - return $val; |
|
32 | + if($condition($val)===true) { |
|
33 | + return $val; |
|
34 | + } |
|
32 | 35 | } |
33 | 36 | return $result; |
34 | 37 | } |
@@ -36,8 +39,9 @@ discard block |
||
36 | 39 | public static function getDefaultValue($array, $key, $default=NULL) { |
37 | 40 | if (array_key_exists($key, $array)) { |
38 | 41 | return $array [$key]; |
39 | - } else |
|
40 | - return $default; |
|
42 | + } else { |
|
43 | + return $default; |
|
44 | + } |
|
41 | 45 | } |
42 | 46 | |
43 | 47 | public static function implode($glue,$pieces){ |
@@ -50,7 +54,7 @@ discard block |
||
50 | 54 | } |
51 | 55 | $result.=$pieces[$size-1]; |
52 | 56 | } |
53 | - }else{ |
|
57 | + } else{ |
|
54 | 58 | $result=\implode($glue, $pieces); |
55 | 59 | } |
56 | 60 | return $result; |
@@ -23,7 +23,7 @@ |
||
23 | 23 | } |
24 | 24 | if($content instanceof HtmlSemDoubleElement){ |
25 | 25 | $content=new HtmlSemDoubleElement($this->identifier."-".$index,"div","",$content); |
26 | - }elseif ($content instanceof HtmlImg){ |
|
26 | + } elseif ($content instanceof HtmlImg){ |
|
27 | 27 | $this->addToPropertyCtrl("class", "image", array("image")); |
28 | 28 | } |
29 | 29 | $content->addToProperty("class",(($index===0)?"visible":"hidden")." content"); |
@@ -54,26 +54,29 @@ |
||
54 | 54 | for($i=0;$i<$count;$i++){ |
55 | 55 | $step=$this->content[$i]; |
56 | 56 | $step->removeStatus(); |
57 | - if($i<$activestep) |
|
58 | - $step->setCompleted(); |
|
59 | - elseif ($i===$activestep) |
|
60 | - $step->setActive(); |
|
61 | - else |
|
62 | - $step->setDisabled(); |
|
57 | + if($i<$activestep) { |
|
58 | + $step->setCompleted(); |
|
59 | + } elseif ($i===$activestep) { |
|
60 | + $step->setActive(); |
|
61 | + } else { |
|
62 | + $step->setDisabled(); |
|
63 | + } |
|
63 | 64 | } |
64 | - }else{ |
|
65 | + } else{ |
|
65 | 66 | foreach ($this->content as $step){ |
66 | 67 | $step->removeStatus(); |
67 | 68 | } |
68 | - if($activestep<$count) |
|
69 | - $this->content[$activestep]->setActive(); |
|
69 | + if($activestep<$count) { |
|
70 | + $this->content[$activestep]->setActive(); |
|
71 | + } |
|
70 | 72 | } |
71 | 73 | return $this; |
72 | 74 | } |
73 | 75 | |
74 | 76 | public function compile(JsUtils $js=NULL, View $view=NULL) { |
75 | - if(isset($this->_activeStep)===true && \is_numeric($this->_activeStep)) |
|
76 | - $this->defineActiveStep(); |
|
77 | + if(isset($this->_activeStep)===true && \is_numeric($this->_activeStep)) { |
|
78 | + $this->defineActiveStep(); |
|
79 | + } |
|
77 | 80 | return parent::compile($js,$view); |
78 | 81 | } |
79 | 82 |