@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | |
12 | 12 | class HtmlPopup extends HtmlSemDoubleElement { |
13 | 13 | private $_container; |
14 | - public function __construct(BaseHtml $container,$identifier, $content="") { |
|
14 | + public function __construct(BaseHtml $container, $identifier, $content="") { |
|
15 | 15 | parent::__construct($identifier, "div"); |
16 | 16 | $this->_container=$container; |
17 | 17 | $this->setClass("ui popup"); |
@@ -23,9 +23,9 @@ discard block |
||
23 | 23 | * {@inheritDoc} |
24 | 24 | * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::addList() |
25 | 25 | */ |
26 | - public function addList($items=array(),$header=NULL){ |
|
27 | - if(!$this->content instanceof HtmlGrid){ |
|
28 | - $this->content=new HtmlGrid("Grid-".$this->identifier,0); |
|
26 | + public function addList($items=array(), $header=NULL) { |
|
27 | + if (!$this->content instanceof HtmlGrid) { |
|
28 | + $this->content=new HtmlGrid("Grid-".$this->identifier, 0); |
|
29 | 29 | } |
30 | 30 | $grid=$this->content; |
31 | 31 | |
@@ -33,12 +33,12 @@ discard block |
||
33 | 33 | $colCount++; |
34 | 34 | $grid->setColsCount($colCount); |
35 | 35 | |
36 | - $list=new HtmlList("",$items); |
|
36 | + $list=new HtmlList("", $items); |
|
37 | 37 | $list->asLink(); |
38 | - if(isset($header)){ |
|
39 | - $list->addHeader(4,$header); |
|
38 | + if (isset($header)) { |
|
39 | + $list->addHeader(4, $header); |
|
40 | 40 | } |
41 | - $grid->getCell(0,$colCount-1)->setContent($list); |
|
41 | + $grid->getCell(0, $colCount-1)->setContent($list); |
|
42 | 42 | $grid->setDivided()->setRelaxed(true); |
43 | 43 | return $list; |
44 | 44 | } |
@@ -46,14 +46,14 @@ discard block |
||
46 | 46 | /** |
47 | 47 | * A popup can have no maximum width and continue to flow to fit its content |
48 | 48 | */ |
49 | - public function setFlowing(){ |
|
49 | + public function setFlowing() { |
|
50 | 50 | return $this->addToProperty("class", "flowing"); |
51 | 51 | } |
52 | 52 | |
53 | 53 | /** |
54 | 54 | * A popup can provide more basic formatting |
55 | 55 | */ |
56 | - public function setBasic(){ |
|
56 | + public function setBasic() { |
|
57 | 57 | return $this->addToProperty("class", "basic"); |
58 | 58 | } |
59 | 59 | |
@@ -61,23 +61,23 @@ discard block |
||
61 | 61 | * {@inheritDoc} |
62 | 62 | * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::run() |
63 | 63 | */ |
64 | - public function run(JsUtils $js){ |
|
64 | + public function run(JsUtils $js) { |
|
65 | 65 | parent::run($js); |
66 | 66 | $this->_params["popup"]="#".$this->identifier; |
67 | - $js->semantic()->popup("#".$this->_container->getIdentifier(),$this->_params); |
|
67 | + $js->semantic()->popup("#".$this->_container->getIdentifier(), $this->_params); |
|
68 | 68 | } |
69 | 69 | |
70 | - public function setOn($event="click"){ |
|
70 | + public function setOn($event="click") { |
|
71 | 71 | $this->_params["on"]=$event; |
72 | 72 | return $this; |
73 | 73 | } |
74 | 74 | |
75 | - public function setInline($value=true){ |
|
75 | + public function setInline($value=true) { |
|
76 | 76 | $this->_params["inline"]=$value; |
77 | 77 | return $this; |
78 | 78 | } |
79 | 79 | |
80 | - public function setPosition($position){ |
|
80 | + public function setPosition($position) { |
|
81 | 81 | $this->_params["position"]=$position; |
82 | 82 | return $this; |
83 | 83 | } |
@@ -244,6 +244,9 @@ discard block |
||
244 | 244 | return $this; |
245 | 245 | } |
246 | 246 | |
247 | + /** |
|
248 | + * @param callable $callback |
|
249 | + */ |
|
247 | 250 | public function setValueFunction($index,$callback){ |
248 | 251 | $this->values[$index]=$callback; |
249 | 252 | return $this; |
@@ -254,6 +257,9 @@ discard block |
||
254 | 257 | return $this; |
255 | 258 | } |
256 | 259 | |
260 | + /** |
|
261 | + * @param integer $index |
|
262 | + */ |
|
257 | 263 | public static function setIndex($index) { |
258 | 264 | self::$index=$index; |
259 | 265 | } |
@@ -313,7 +319,7 @@ discard block |
||
313 | 319 | * The $callback function can take the following arguments : $field=>the compiled field, $instance : the active instance of the object, $index: the field position |
314 | 320 | * @param int $index postion of the compiled field |
315 | 321 | * @param callable $callback function called after the field compilation |
316 | - * @return \Ajax\semantic\widgets\datatable\InstanceViewer |
|
322 | + * @return InstanceViewer |
|
317 | 323 | */ |
318 | 324 | public function afterCompile($index,$callback){ |
319 | 325 | $this->afterCompile[$index]=$callback; |
@@ -19,221 +19,221 @@ discard block |
||
19 | 19 | |
20 | 20 | public static $index=0; |
21 | 21 | |
22 | - public function __construct($identifier,$instance=NULL,$captions=NULL){ |
|
22 | + public function __construct($identifier, $instance=NULL, $captions=NULL) { |
|
23 | 23 | $this->widgetIdentifier=$identifier; |
24 | 24 | $this->values=[]; |
25 | 25 | $this->afterCompile=[]; |
26 | - if(isset($instance)) |
|
26 | + if (isset($instance)) |
|
27 | 27 | $this->setInstance($instance); |
28 | 28 | $this->setCaptions($captions); |
29 | 29 | $this->captionCallback=NULL; |
30 | - $this->defaultValueFunction=function($name,$value){return $value;}; |
|
30 | + $this->defaultValueFunction=function($name, $value) {return $value; }; |
|
31 | 31 | } |
32 | 32 | |
33 | - public function moveFieldTo($from,$to){ |
|
34 | - if(JArray::moveElementTo($this->visibleProperties, $from, $to)){ |
|
33 | + public function moveFieldTo($from, $to) { |
|
34 | + if (JArray::moveElementTo($this->visibleProperties, $from, $to)) { |
|
35 | 35 | return JArray::moveElementTo($this->values, $from, $to); |
36 | 36 | } |
37 | 37 | return false; |
38 | 38 | } |
39 | 39 | |
40 | - public function swapFields($index1,$index2){ |
|
41 | - if(JArray::swapElements($this->visibleProperties, $index1, $index2)){ |
|
40 | + public function swapFields($index1, $index2) { |
|
41 | + if (JArray::swapElements($this->visibleProperties, $index1, $index2)) { |
|
42 | 42 | return JArray::swapElements($this->values, $index1, $index2); |
43 | 43 | } |
44 | 44 | return false; |
45 | 45 | } |
46 | 46 | |
47 | - public function removeField($index){ |
|
48 | - \array_splice($this->visibleProperties,$index,1); |
|
49 | - \array_splice($this->values,$index,1); |
|
50 | - \array_splice($this->captions,$index,1); |
|
47 | + public function removeField($index) { |
|
48 | + \array_splice($this->visibleProperties, $index, 1); |
|
49 | + \array_splice($this->values, $index, 1); |
|
50 | + \array_splice($this->captions, $index, 1); |
|
51 | 51 | return $this; |
52 | 52 | } |
53 | 53 | |
54 | - public function getValues(){ |
|
54 | + public function getValues() { |
|
55 | 55 | $values=[]; |
56 | 56 | $index=0; |
57 | 57 | $count=$this->count(); |
58 | - while($index<$count){ |
|
58 | + while ($index<$count) { |
|
59 | 59 | $values[]=$this->getValue($index++); |
60 | 60 | } |
61 | 61 | return $values; |
62 | 62 | } |
63 | 63 | |
64 | - public function getIdentifier($index=NULL){ |
|
65 | - if(!isset($index)) |
|
64 | + public function getIdentifier($index=NULL) { |
|
65 | + if (!isset($index)) |
|
66 | 66 | $index=self::$index; |
67 | 67 | $value=$index; |
68 | - if(isset($this->values["identifier"])){ |
|
69 | - if(\is_string($this->values["identifier"])) |
|
68 | + if (isset($this->values["identifier"])) { |
|
69 | + if (\is_string($this->values["identifier"])) |
|
70 | 70 | $value=JReflection::callMethod($this->instance, $this->values["identifier"], []); |
71 | 71 | else |
72 | - $value=$this->values["identifier"]($index,$this->instance); |
|
72 | + $value=$this->values["identifier"]($index, $this->instance); |
|
73 | 73 | } |
74 | 74 | return $value; |
75 | 75 | } |
76 | 76 | |
77 | - public function getValue($index){ |
|
77 | + public function getValue($index) { |
|
78 | 78 | $property=$this->properties[$index]; |
79 | 79 | return $this->_getValue($property, $index); |
80 | 80 | } |
81 | 81 | |
82 | - protected function _beforeAddProperty($index,&$field){ |
|
82 | + protected function _beforeAddProperty($index, &$field) { |
|
83 | 83 | |
84 | 84 | } |
85 | 85 | |
86 | - protected function _getDefaultValue($name,$value,$index){ |
|
86 | + protected function _getDefaultValue($name, $value, $index) { |
|
87 | 87 | $func=$this->defaultValueFunction; |
88 | 88 | //TODO Check bug on index |
89 | - return $func($name,$value,$index,$this->instance); |
|
89 | + return $func($name, $value, $index, $this->instance); |
|
90 | 90 | } |
91 | 91 | |
92 | - protected function _getPropertyValue(\ReflectionProperty $property,$index){ |
|
92 | + protected function _getPropertyValue(\ReflectionProperty $property, $index) { |
|
93 | 93 | $property->setAccessible(true); |
94 | 94 | return $property->getValue($this->instance); |
95 | 95 | } |
96 | 96 | |
97 | - protected function _getValue($property,$index){ |
|
97 | + protected function _getValue($property, $index) { |
|
98 | 98 | $value=null; |
99 | 99 | $propertyName=$property; |
100 | - if($property instanceof \ReflectionProperty){ |
|
100 | + if ($property instanceof \ReflectionProperty) { |
|
101 | 101 | $value=$this->_getPropertyValue($property, $index); |
102 | 102 | $propertyName=$property->getName(); |
103 | - }elseif(\is_callable($property)) |
|
103 | + }elseif (\is_callable($property)) |
|
104 | 104 | $value=$property($this->instance); |
105 | - elseif(\is_array($property)){ |
|
106 | - $values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property); |
|
105 | + elseif (\is_array($property)) { |
|
106 | + $values=\array_map(function($v) use ($index){return $this->_getValue($v, $index); }, $property); |
|
107 | 107 | $value=\implode("", $values); |
108 | - }elseif(\is_string($property)){ |
|
108 | + }elseif (\is_string($property)) { |
|
109 | 109 | $value=$property; |
110 | - if(isset($this->instance->{$property})){ |
|
110 | + if (isset($this->instance->{$property})) { |
|
111 | 111 | $value=$this->instance->{$property}; |
112 | - }elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){ |
|
112 | + }elseif (\method_exists($this->instance, $getter=JReflection::getterName($property))) { |
|
113 | 113 | $value=JReflection::callMethod($this->instance, $getter, []); |
114 | 114 | } |
115 | 115 | } |
116 | 116 | return $this->_postGetValue($index, $propertyName, $value); |
117 | 117 | } |
118 | 118 | |
119 | - protected function _postGetValue($index,$propertyName,$value){ |
|
120 | - if(isset($this->values[$index])){ |
|
121 | - $value= $this->values[$index]($value,$this->instance,$index,self::$index); |
|
122 | - }else{ |
|
123 | - $value=$this->_getDefaultValue($propertyName,$value, $index,self::$index); |
|
119 | + protected function _postGetValue($index, $propertyName, $value) { |
|
120 | + if (isset($this->values[$index])) { |
|
121 | + $value=$this->values[$index]($value, $this->instance, $index, self::$index); |
|
122 | + } else { |
|
123 | + $value=$this->_getDefaultValue($propertyName, $value, $index, self::$index); |
|
124 | 124 | } |
125 | - if(isset($this->afterCompile[$index])){ |
|
126 | - if(\is_callable($this->afterCompile[$index])){ |
|
127 | - $this->afterCompile[$index]($value,$this->instance,self::$index); |
|
125 | + if (isset($this->afterCompile[$index])) { |
|
126 | + if (\is_callable($this->afterCompile[$index])) { |
|
127 | + $this->afterCompile[$index]($value, $this->instance, self::$index); |
|
128 | 128 | } |
129 | 129 | } |
130 | 130 | return $value; |
131 | 131 | } |
132 | 132 | |
133 | - public function insertField($index,$field){ |
|
134 | - array_splice( $this->visibleProperties, $index, 0, $field ); |
|
133 | + public function insertField($index, $field) { |
|
134 | + array_splice($this->visibleProperties, $index, 0, $field); |
|
135 | 135 | return $this; |
136 | 136 | } |
137 | 137 | |
138 | - public function insertInField($index,$field){ |
|
138 | + public function insertInField($index, $field) { |
|
139 | 139 | $vb=$this->visibleProperties; |
140 | - if(isset($vb[$index])){ |
|
141 | - if(\is_array($vb[$index])){ |
|
140 | + if (isset($vb[$index])) { |
|
141 | + if (\is_array($vb[$index])) { |
|
142 | 142 | $this->visibleProperties[$index][]=$field; |
143 | - }else{ |
|
144 | - $this->visibleProperties[$index]=[$vb[$index],$field]; |
|
143 | + } else { |
|
144 | + $this->visibleProperties[$index]=[$vb[$index], $field]; |
|
145 | 145 | } |
146 | - }else{ |
|
146 | + } else { |
|
147 | 147 | return $this->insertField($index, $field); |
148 | 148 | } |
149 | 149 | return $this; |
150 | 150 | } |
151 | 151 | |
152 | - public function addField($field){ |
|
152 | + public function addField($field) { |
|
153 | 153 | $this->visibleProperties[]=$field; |
154 | 154 | return $this; |
155 | 155 | } |
156 | 156 | |
157 | - public function addFields($fields){ |
|
158 | - $this->visibleProperties=\array_merge($this->visibleProperties,$fields); |
|
157 | + public function addFields($fields) { |
|
158 | + $this->visibleProperties=\array_merge($this->visibleProperties, $fields); |
|
159 | 159 | return $this; |
160 | 160 | } |
161 | 161 | |
162 | - public function count(){ |
|
162 | + public function count() { |
|
163 | 163 | return \sizeof($this->properties); |
164 | 164 | } |
165 | 165 | |
166 | - public function visiblePropertiesCount(){ |
|
166 | + public function visiblePropertiesCount() { |
|
167 | 167 | return \sizeof($this->visibleProperties); |
168 | 168 | } |
169 | 169 | |
170 | - public function getProperty($index){ |
|
170 | + public function getProperty($index) { |
|
171 | 171 | return $this->properties[$index]; |
172 | 172 | } |
173 | 173 | |
174 | - public function getFieldName($index){ |
|
174 | + public function getFieldName($index) { |
|
175 | 175 | $property=$this->getProperty($index); |
176 | - if($property instanceof \ReflectionProperty){ |
|
176 | + if ($property instanceof \ReflectionProperty) { |
|
177 | 177 | $result=$property->getName(); |
178 | - }elseif(\is_callable($property)){ |
|
178 | + }elseif (\is_callable($property)) { |
|
179 | 179 | $result=$this->visibleProperties[$index]; |
180 | - }else{ |
|
180 | + } else { |
|
181 | 181 | $result=$property; |
182 | 182 | } |
183 | 183 | return $result; |
184 | 184 | } |
185 | 185 | |
186 | 186 | |
187 | - protected function showableProperty(\ReflectionProperty $rProperty){ |
|
188 | - return JString::startswith($rProperty->getName(),"_")===false; |
|
187 | + protected function showableProperty(\ReflectionProperty $rProperty) { |
|
188 | + return JString::startswith($rProperty->getName(), "_")===false; |
|
189 | 189 | } |
190 | 190 | |
191 | 191 | public function setInstance($instance) { |
192 | - if(\is_string($instance)){ |
|
192 | + if (\is_string($instance)) { |
|
193 | 193 | $instance=new $instance(); |
194 | 194 | } |
195 | 195 | $this->instance=$instance; |
196 | 196 | $this->properties=[]; |
197 | 197 | $this->reflect=new \ReflectionClass($instance); |
198 | - if(\sizeof($this->visibleProperties)===0){ |
|
198 | + if (\sizeof($this->visibleProperties)===0) { |
|
199 | 199 | $this->properties=$this->getDefaultProperties(); |
200 | - }else{ |
|
201 | - foreach ($this->visibleProperties as $property){ |
|
200 | + } else { |
|
201 | + foreach ($this->visibleProperties as $property) { |
|
202 | 202 | $this->setInstanceProperty($property); |
203 | 203 | } |
204 | 204 | } |
205 | 205 | return $this; |
206 | 206 | } |
207 | 207 | |
208 | - private function setInstanceProperty($property){ |
|
209 | - if(\is_callable($property)){ |
|
208 | + private function setInstanceProperty($property) { |
|
209 | + if (\is_callable($property)) { |
|
210 | 210 | $this->properties[]=$property; |
211 | - }elseif(\is_string($property)){ |
|
212 | - try{ |
|
211 | + }elseif (\is_string($property)) { |
|
212 | + try { |
|
213 | 213 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
214 | 214 | $rProperty=$this->reflect->getProperty($property); |
215 | 215 | $this->properties[]=$rProperty; |
216 | - }catch(\Exception $e){ |
|
216 | + }catch (\Exception $e) { |
|
217 | 217 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
218 | 218 | $this->properties[]=$property; |
219 | 219 | } |
220 | - }elseif(\is_int($property)){ |
|
220 | + }elseif (\is_int($property)) { |
|
221 | 221 | $props=$this->getDefaultProperties(); |
222 | - if(isset($props[$property])) |
|
222 | + if (isset($props[$property])) |
|
223 | 223 | $this->properties[]=$props[$property]; |
224 | 224 | else |
225 | 225 | $this->properties[]=$property; |
226 | - }else{ |
|
226 | + } else { |
|
227 | 227 | $this->properties[]=$property; |
228 | 228 | } |
229 | 229 | } |
230 | 230 | |
231 | - protected function getDefaultProperties(){ |
|
231 | + protected function getDefaultProperties() { |
|
232 | 232 | $result=[]; |
233 | 233 | $properties=$this->reflect->getProperties(); |
234 | - foreach ($properties as $property){ |
|
234 | + foreach ($properties as $property) { |
|
235 | 235 | $showable=$this->showableProperty($property); |
236 | - if($showable!==false){ |
|
236 | + if ($showable!==false) { |
|
237 | 237 | $result[]=$property; |
238 | 238 | } |
239 | 239 | } |
@@ -245,12 +245,12 @@ discard block |
||
245 | 245 | return $this; |
246 | 246 | } |
247 | 247 | |
248 | - public function setValueFunction($index,$callback){ |
|
248 | + public function setValueFunction($index, $callback) { |
|
249 | 249 | $this->values[$index]=$callback; |
250 | 250 | return $this; |
251 | 251 | } |
252 | 252 | |
253 | - public function setIdentifierFunction($callback){ |
|
253 | + public function setIdentifierFunction($callback) { |
|
254 | 254 | $this->values["identifier"]=$callback; |
255 | 255 | return $this; |
256 | 256 | } |
@@ -263,42 +263,42 @@ discard block |
||
263 | 263 | return $this->properties; |
264 | 264 | } |
265 | 265 | |
266 | - public function getCaption($index){ |
|
267 | - if(isset($this->captions[$index])){ |
|
266 | + public function getCaption($index) { |
|
267 | + if (isset($this->captions[$index])) { |
|
268 | 268 | return $this->captions[$index]; |
269 | 269 | } |
270 | - if($this->properties[$index] instanceof \ReflectionProperty) |
|
270 | + if ($this->properties[$index] instanceof \ReflectionProperty) |
|
271 | 271 | return $this->properties[$index]->getName(); |
272 | - elseif(\is_callable($this->properties[$index])) |
|
272 | + elseif (\is_callable($this->properties[$index])) |
|
273 | 273 | return ""; |
274 | 274 | else |
275 | 275 | return $this->properties[$index]; |
276 | 276 | } |
277 | 277 | |
278 | - public function getCaptions(){ |
|
278 | + public function getCaptions() { |
|
279 | 279 | $count=$this->count(); |
280 | - if(isset($this->captions)){ |
|
281 | - $captions= \array_values($this->captions); |
|
280 | + if (isset($this->captions)) { |
|
281 | + $captions=\array_values($this->captions); |
|
282 | 282 | $captionsSize=\sizeof($captions); |
283 | - for($i=$captionsSize;$i<$count;$i++){ |
|
283 | + for ($i=$captionsSize; $i<$count; $i++) { |
|
284 | 284 | $captions[]=""; |
285 | 285 | } |
286 | - }else{ |
|
286 | + } else { |
|
287 | 287 | $captions=[]; |
288 | 288 | $index=0; |
289 | - while($index<$count){ |
|
289 | + while ($index<$count) { |
|
290 | 290 | $captions[]=$this->getCaption($index++); |
291 | 291 | } |
292 | 292 | } |
293 | - if(isset($this->captionCallback) && \is_callable($this->captionCallback)){ |
|
293 | + if (isset($this->captionCallback) && \is_callable($this->captionCallback)) { |
|
294 | 294 | $callback=$this->captionCallback; |
295 | - $callback($captions,$this->instance); |
|
295 | + $callback($captions, $this->instance); |
|
296 | 296 | } |
297 | 297 | return $captions; |
298 | 298 | } |
299 | 299 | |
300 | - public function setCaption($index,$caption){ |
|
301 | - if(isset($this->captions)===false) |
|
300 | + public function setCaption($index, $caption) { |
|
301 | + if (isset($this->captions)===false) |
|
302 | 302 | $this->captions=[]; |
303 | 303 | $this->captions[$index]=$caption; |
304 | 304 | return $this; |
@@ -316,7 +316,7 @@ discard block |
||
316 | 316 | * @param callable $callback function called after the field compilation |
317 | 317 | * @return \Ajax\semantic\widgets\datatable\InstanceViewer |
318 | 318 | */ |
319 | - public function afterCompile($index,$callback){ |
|
319 | + public function afterCompile($index, $callback) { |
|
320 | 320 | $this->afterCompile[$index]=$callback; |
321 | 321 | return $this; |
322 | 322 | } |
@@ -23,8 +23,9 @@ discard block |
||
23 | 23 | $this->widgetIdentifier=$identifier; |
24 | 24 | $this->values=[]; |
25 | 25 | $this->afterCompile=[]; |
26 | - if(isset($instance)) |
|
27 | - $this->setInstance($instance); |
|
26 | + if(isset($instance)) { |
|
27 | + $this->setInstance($instance); |
|
28 | + } |
|
28 | 29 | $this->setCaptions($captions); |
29 | 30 | $this->captionCallback=NULL; |
30 | 31 | $this->defaultValueFunction=function($name,$value){return $value;}; |
@@ -62,14 +63,16 @@ discard block |
||
62 | 63 | } |
63 | 64 | |
64 | 65 | public function getIdentifier($index=NULL){ |
65 | - if(!isset($index)) |
|
66 | - $index=self::$index; |
|
66 | + if(!isset($index)) { |
|
67 | + $index=self::$index; |
|
68 | + } |
|
67 | 69 | $value=$index; |
68 | 70 | if(isset($this->values["identifier"])){ |
69 | - if(\is_string($this->values["identifier"])) |
|
70 | - $value=JReflection::callMethod($this->instance, $this->values["identifier"], []); |
|
71 | - else |
|
72 | - $value=$this->values["identifier"]($index,$this->instance); |
|
71 | + if(\is_string($this->values["identifier"])) { |
|
72 | + $value=JReflection::callMethod($this->instance, $this->values["identifier"], []); |
|
73 | + } else { |
|
74 | + $value=$this->values["identifier"]($index,$this->instance); |
|
75 | + } |
|
73 | 76 | } |
74 | 77 | return $value; |
75 | 78 | } |
@@ -100,16 +103,16 @@ discard block |
||
100 | 103 | if($property instanceof \ReflectionProperty){ |
101 | 104 | $value=$this->_getPropertyValue($property, $index); |
102 | 105 | $propertyName=$property->getName(); |
103 | - }elseif(\is_callable($property)) |
|
104 | - $value=$property($this->instance); |
|
105 | - elseif(\is_array($property)){ |
|
106 | + } elseif(\is_callable($property)) { |
|
107 | + $value=$property($this->instance); |
|
108 | + } elseif(\is_array($property)){ |
|
106 | 109 | $values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property); |
107 | 110 | $value=\implode("", $values); |
108 | - }elseif(\is_string($property)){ |
|
111 | + } elseif(\is_string($property)){ |
|
109 | 112 | $value=$property; |
110 | 113 | if(isset($this->instance->{$property})){ |
111 | 114 | $value=$this->instance->{$property}; |
112 | - }elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){ |
|
115 | + } elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){ |
|
113 | 116 | $value=JReflection::callMethod($this->instance, $getter, []); |
114 | 117 | } |
115 | 118 | } |
@@ -119,7 +122,7 @@ discard block |
||
119 | 122 | protected function _postGetValue($index,$propertyName,$value){ |
120 | 123 | if(isset($this->values[$index])){ |
121 | 124 | $value= $this->values[$index]($value,$this->instance,$index,self::$index); |
122 | - }else{ |
|
125 | + } else{ |
|
123 | 126 | $value=$this->_getDefaultValue($propertyName,$value, $index,self::$index); |
124 | 127 | } |
125 | 128 | if(isset($this->afterCompile[$index])){ |
@@ -140,10 +143,10 @@ discard block |
||
140 | 143 | if(isset($vb[$index])){ |
141 | 144 | if(\is_array($vb[$index])){ |
142 | 145 | $this->visibleProperties[$index][]=$field; |
143 | - }else{ |
|
146 | + } else{ |
|
144 | 147 | $this->visibleProperties[$index]=[$vb[$index],$field]; |
145 | 148 | } |
146 | - }else{ |
|
149 | + } else{ |
|
147 | 150 | return $this->insertField($index, $field); |
148 | 151 | } |
149 | 152 | return $this; |
@@ -175,9 +178,9 @@ discard block |
||
175 | 178 | $property=$this->getProperty($index); |
176 | 179 | if($property instanceof \ReflectionProperty){ |
177 | 180 | $result=$property->getName(); |
178 | - }elseif(\is_callable($property)){ |
|
181 | + } elseif(\is_callable($property)){ |
|
179 | 182 | $result=$this->visibleProperties[$index]; |
180 | - }else{ |
|
183 | + } else{ |
|
181 | 184 | $result=$property; |
182 | 185 | } |
183 | 186 | return $result; |
@@ -197,7 +200,7 @@ discard block |
||
197 | 200 | $this->reflect=new \ReflectionClass($instance); |
198 | 201 | if(\sizeof($this->visibleProperties)===0){ |
199 | 202 | $this->properties=$this->getDefaultProperties(); |
200 | - }else{ |
|
203 | + } else{ |
|
201 | 204 | foreach ($this->visibleProperties as $property){ |
202 | 205 | $this->setInstanceProperty($property); |
203 | 206 | } |
@@ -208,22 +211,23 @@ discard block |
||
208 | 211 | private function setInstanceProperty($property){ |
209 | 212 | if(\is_callable($property)){ |
210 | 213 | $this->properties[]=$property; |
211 | - }elseif(\is_string($property)){ |
|
214 | + } elseif(\is_string($property)){ |
|
212 | 215 | try{ |
213 | 216 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
214 | 217 | $rProperty=$this->reflect->getProperty($property); |
215 | 218 | $this->properties[]=$rProperty; |
216 | - }catch(\Exception $e){ |
|
219 | + } catch(\Exception $e){ |
|
217 | 220 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
218 | 221 | $this->properties[]=$property; |
219 | 222 | } |
220 | - }elseif(\is_int($property)){ |
|
223 | + } elseif(\is_int($property)){ |
|
221 | 224 | $props=$this->getDefaultProperties(); |
222 | - if(isset($props[$property])) |
|
223 | - $this->properties[]=$props[$property]; |
|
224 | - else |
|
225 | - $this->properties[]=$property; |
|
226 | - }else{ |
|
225 | + if(isset($props[$property])) { |
|
226 | + $this->properties[]=$props[$property]; |
|
227 | + } else { |
|
228 | + $this->properties[]=$property; |
|
229 | + } |
|
230 | + } else{ |
|
227 | 231 | $this->properties[]=$property; |
228 | 232 | } |
229 | 233 | } |
@@ -267,12 +271,13 @@ discard block |
||
267 | 271 | if(isset($this->captions[$index])){ |
268 | 272 | return $this->captions[$index]; |
269 | 273 | } |
270 | - if($this->properties[$index] instanceof \ReflectionProperty) |
|
271 | - return $this->properties[$index]->getName(); |
|
272 | - elseif(\is_callable($this->properties[$index])) |
|
273 | - return ""; |
|
274 | - else |
|
275 | - return $this->properties[$index]; |
|
274 | + if($this->properties[$index] instanceof \ReflectionProperty) { |
|
275 | + return $this->properties[$index]->getName(); |
|
276 | + } elseif(\is_callable($this->properties[$index])) { |
|
277 | + return ""; |
|
278 | + } else { |
|
279 | + return $this->properties[$index]; |
|
280 | + } |
|
276 | 281 | } |
277 | 282 | |
278 | 283 | public function getCaptions(){ |
@@ -283,7 +288,7 @@ discard block |
||
283 | 288 | for($i=$captionsSize;$i<$count;$i++){ |
284 | 289 | $captions[]=""; |
285 | 290 | } |
286 | - }else{ |
|
291 | + } else{ |
|
287 | 292 | $captions=[]; |
288 | 293 | $index=0; |
289 | 294 | while($index<$count){ |
@@ -298,8 +303,9 @@ discard block |
||
298 | 303 | } |
299 | 304 | |
300 | 305 | public function setCaption($index,$caption){ |
301 | - if(isset($this->captions)===false) |
|
302 | - $this->captions=[]; |
|
306 | + if(isset($this->captions)===false) { |
|
307 | + $this->captions=[]; |
|
308 | + } |
|
303 | 309 | $this->captions[$index]=$caption; |
304 | 310 | return $this; |
305 | 311 | } |
@@ -7,29 +7,29 @@ discard block |
||
7 | 7 | |
8 | 8 | class HtmlFormDropdown extends HtmlFormField { |
9 | 9 | |
10 | - public function __construct($identifier,$items=array(), $label=NULL,$value="",$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="", $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="",$associative=true){ |
|
22 | - return new HtmlFormDropdown($identifier,$items,$label,$value,true,$associative); |
|
21 | + public static function multipleDropdown($identifier, $items=array(), $label=NULL, $value="", $associative=true) { |
|
22 | + return new HtmlFormDropdown($identifier, $items, $label, $value, true, $associative); |
|
23 | 23 | } |
24 | 24 | |
25 | 25 | /** |
26 | 26 | * @return HtmlDropdown |
27 | 27 | */ |
28 | - public function getDataField(){ |
|
28 | + public function getDataField() { |
|
29 | 29 | return $this->getField()->getInput(); |
30 | 30 | } |
31 | - public function asSelect($name=NULL,$multiple=false,$selection=true){ |
|
32 | - $this->getField()->asSelect($name,$multiple,$selection); |
|
31 | + public function asSelect($name=NULL, $multiple=false, $selection=true) { |
|
32 | + $this->getField()->asSelect($name, $multiple, $selection); |
|
33 | 33 | return $this; |
34 | 34 | } |
35 | 35 | |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | * @param boolean $floating |
38 | 38 | * @return HtmlDropdown |
39 | 39 | */ |
40 | - public function asButton($floating=false){ |
|
40 | + public function asButton($floating=false) { |
|
41 | 41 | $field=$this->content["field"]; |
42 | 42 | $label=$this->content["label"]; |
43 | 43 | $field->addContent($label); |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | * @version 1.001 |
16 | 16 | */ |
17 | 17 | class HtmlMessage extends HtmlSemDoubleElement { |
18 | - use AttachedTrait,HasTimeoutTrait; |
|
18 | + use AttachedTrait, HasTimeoutTrait; |
|
19 | 19 | protected $icon; |
20 | 20 | protected $close; |
21 | 21 | |
@@ -32,39 +32,39 @@ discard block |
||
32 | 32 | * @param string|HtmlSemDoubleElement $header |
33 | 33 | * @return \Ajax\semantic\html\collections\HtmlMessage |
34 | 34 | */ |
35 | - public function addHeader($header){ |
|
35 | + public function addHeader($header) { |
|
36 | 36 | $headerO=$header; |
37 | - if(\is_string($header)){ |
|
38 | - $headerO=new HtmlSemDoubleElement("header-".$this->identifier,"div"); |
|
37 | + if (\is_string($header)) { |
|
38 | + $headerO=new HtmlSemDoubleElement("header-".$this->identifier, "div"); |
|
39 | 39 | $headerO->setClass("header"); |
40 | 40 | $headerO->setContent($header); |
41 | 41 | } |
42 | - return $this->addContent($headerO,true); |
|
42 | + return $this->addContent($headerO, true); |
|
43 | 43 | } |
44 | 44 | |
45 | - public function setHeader($header){ |
|
45 | + public function setHeader($header) { |
|
46 | 46 | return $this->addHeader($header); |
47 | 47 | } |
48 | 48 | |
49 | - public function setIcon($icon){ |
|
49 | + public function setIcon($icon) { |
|
50 | 50 | $this->addToProperty("class", "icon"); |
51 | - $this->wrapContent("<div class='content'>","</div>"); |
|
52 | - if(\is_string($icon)){ |
|
51 | + $this->wrapContent("<div class='content'>", "</div>"); |
|
52 | + if (\is_string($icon)) { |
|
53 | 53 | $this->icon=new HtmlIcon("icon-".$this->identifier, $icon); |
54 | - }else{ |
|
54 | + } else { |
|
55 | 55 | $this->icon=$icon; |
56 | 56 | } |
57 | 57 | return $this; |
58 | 58 | } |
59 | 59 | |
60 | - public function addLoader($loaderIcon="notched circle"){ |
|
60 | + public function addLoader($loaderIcon="notched circle") { |
|
61 | 61 | $this->setIcon($loaderIcon); |
62 | 62 | $this->icon->addToIcon("loading"); |
63 | 63 | return $this; |
64 | 64 | } |
65 | 65 | |
66 | - public function setDismissable($dismiss=true){ |
|
67 | - if($dismiss===true) |
|
66 | + public function setDismissable($dismiss=true) { |
|
67 | + if ($dismiss===true) |
|
68 | 68 | $this->close=new HtmlIcon("close-".$this->identifier, "close"); |
69 | 69 | else |
70 | 70 | $this->close=NULL; |
@@ -75,43 +75,43 @@ discard block |
||
75 | 75 | * {@inheritDoc} |
76 | 76 | * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::run() |
77 | 77 | */ |
78 | - public function run(JsUtils $js){ |
|
79 | - if(!isset($this->_bsComponent)){ |
|
80 | - if(isset($this->close)){ |
|
78 | + public function run(JsUtils $js) { |
|
79 | + if (!isset($this->_bsComponent)) { |
|
80 | + if (isset($this->close)) { |
|
81 | 81 | $js->execOn("click", "#".$this->identifier." .close", "$(this).closest('.message').transition({$this->_closeTransition})"); |
82 | 82 | } |
83 | - if(isset($this->_timeout)){ |
|
84 | - $js->exec("setTimeout(function() { $('#{$this->identifier}').transition({$this->_closeTransition}); }, {$this->_timeout});",true); |
|
83 | + if (isset($this->_timeout)) { |
|
84 | + $js->exec("setTimeout(function() { $('#{$this->identifier}').transition({$this->_closeTransition}); }, {$this->_timeout});", true); |
|
85 | 85 | } |
86 | 86 | } |
87 | 87 | return parent::run($js); |
88 | 88 | } |
89 | 89 | |
90 | - public function setState($visible=true){ |
|
91 | - $visible=($visible===true)?"visible":"hidden"; |
|
92 | - return $this->addToPropertyCtrl("class", $visible, array("visible","hidden")); |
|
90 | + public function setState($visible=true) { |
|
91 | + $visible=($visible===true) ? "visible" : "hidden"; |
|
92 | + return $this->addToPropertyCtrl("class", $visible, array("visible", "hidden")); |
|
93 | 93 | } |
94 | 94 | |
95 | - public function setVariation($value="floating"){ |
|
96 | - return $this->addToPropertyCtrl("class", $value, array("floating","compact")); |
|
95 | + public function setVariation($value="floating") { |
|
96 | + return $this->addToPropertyCtrl("class", $value, array("floating", "compact")); |
|
97 | 97 | } |
98 | 98 | |
99 | - public function setStyle($style){ |
|
99 | + public function setStyle($style) { |
|
100 | 100 | return $this->addToPropertyCtrl("class", $style, Style::getConstants()); |
101 | 101 | } |
102 | 102 | |
103 | - public function setError(){ |
|
103 | + public function setError() { |
|
104 | 104 | return $this->setStyle("error"); |
105 | 105 | } |
106 | 106 | |
107 | - public function setWarning(){ |
|
107 | + public function setWarning() { |
|
108 | 108 | return $this->setStyle("warning"); |
109 | 109 | } |
110 | 110 | |
111 | - public function setMessage($message){ |
|
112 | - if(\is_array($this->content)){ |
|
111 | + public function setMessage($message) { |
|
112 | + if (\is_array($this->content)) { |
|
113 | 113 | $this->content[\sizeof($this->content)-1]=$message; |
114 | - }else |
|
114 | + } else |
|
115 | 115 | $this->setContent($message); |
116 | 116 | } |
117 | 117 |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | $this->wrapContent("<div class='content'>","</div>"); |
52 | 52 | if(\is_string($icon)){ |
53 | 53 | $this->icon=new HtmlIcon("icon-".$this->identifier, $icon); |
54 | - }else{ |
|
54 | + } else{ |
|
55 | 55 | $this->icon=$icon; |
56 | 56 | } |
57 | 57 | return $this; |
@@ -64,10 +64,11 @@ discard block |
||
64 | 64 | } |
65 | 65 | |
66 | 66 | public function setDismissable($dismiss=true){ |
67 | - if($dismiss===true) |
|
68 | - $this->close=new HtmlIcon("close-".$this->identifier, "close"); |
|
69 | - else |
|
70 | - $this->close=NULL; |
|
67 | + if($dismiss===true) { |
|
68 | + $this->close=new HtmlIcon("close-".$this->identifier, "close"); |
|
69 | + } else { |
|
70 | + $this->close=NULL; |
|
71 | + } |
|
71 | 72 | return $this; |
72 | 73 | } |
73 | 74 | |
@@ -111,8 +112,9 @@ discard block |
||
111 | 112 | public function setMessage($message){ |
112 | 113 | if(\is_array($this->content)){ |
113 | 114 | $this->content[\sizeof($this->content)-1]=$message; |
114 | - }else |
|
115 | - $this->setContent($message); |
|
115 | + } else { |
|
116 | + $this->setContent($message); |
|
117 | + } |
|
116 | 118 | } |
117 | 119 | |
118 | 120 | } |
@@ -6,8 +6,8 @@ discard block |
||
6 | 6 | public static $preventDefault="\nif(event && event.preventDefault) event.preventDefault();\n"; |
7 | 7 | public static $stopPropagation="\nif(event && event.stopPropagation) event.stopPropagation();\n"; |
8 | 8 | |
9 | - public static function containsCode($expression){ |
|
10 | - return strrpos($expression, 'this')!==false||strrpos($expression, 'event')!==false||strrpos($expression, 'self')!==false; |
|
9 | + public static function containsCode($expression) { |
|
10 | + return strrpos($expression, 'this')!==false || strrpos($expression, 'event')!==false || strrpos($expression, 'self')!==false; |
|
11 | 11 | } |
12 | 12 | |
13 | 13 | /** |
@@ -43,8 +43,8 @@ discard block |
||
43 | 43 | return $value; |
44 | 44 | } |
45 | 45 | |
46 | - public static function prep_jquery_selector($value){ |
|
47 | - if(JString::startswith($value, '$(')===false){ |
|
46 | + public static function prep_jquery_selector($value) { |
|
47 | + if (JString::startswith($value, '$(')===false) { |
|
48 | 48 | return '$('.$value.')'; |
49 | 49 | } |
50 | 50 | return $value; |
@@ -3,26 +3,26 @@ |
||
3 | 3 | use Ajax\semantic\html\base\constants\Transition; |
4 | 4 | |
5 | 5 | class AjaxTransition { |
6 | - public static function none($responseElement,$jqueryDone="html"){ |
|
6 | + public static function none($responseElement, $jqueryDone="html") { |
|
7 | 7 | return $responseElement.".".$jqueryDone."( data )"; |
8 | 8 | } |
9 | 9 | |
10 | - public static function jqFade($responseElement,$jqueryDone="html"){ |
|
10 | + public static function jqFade($responseElement, $jqueryDone="html") { |
|
11 | 11 | return $responseElement.".hide().{$jqueryDone}( data ).fadeIn()"; |
12 | 12 | } |
13 | 13 | |
14 | - public static function jqSlide($responseElement,$jqueryDone="html"){ |
|
14 | + public static function jqSlide($responseElement, $jqueryDone="html") { |
|
15 | 15 | return $responseElement.".hide().{$jqueryDone}( data ).slideDown()"; |
16 | 16 | } |
17 | 17 | |
18 | - public static function random($responseElement,$jqueryDone="html"){ |
|
18 | + public static function random($responseElement, $jqueryDone="html") { |
|
19 | 19 | $transitions=Transition::getConstantValues(); |
20 | - $transition=$transitions[\rand(0,\sizeof($transitions)-1)]; |
|
21 | - return self::__callStatic($transition, [$responseElement,$jqueryDone]); |
|
20 | + $transition=$transitions[\rand(0, \sizeof($transitions)-1)]; |
|
21 | + return self::__callStatic($transition, [$responseElement, $jqueryDone]); |
|
22 | 22 | } |
23 | 23 | |
24 | - public static function __callStatic($name, $arguments){ |
|
25 | - if(\sizeof($arguments)==2){ |
|
24 | + public static function __callStatic($name, $arguments) { |
|
25 | + if (\sizeof($arguments)==2) { |
|
26 | 26 | $responseElement=$arguments[0]; |
27 | 27 | $jqueryDone=$arguments[1]; |
28 | 28 | $name=JString::camelCaseToSeparated($name); |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | */ |
21 | 21 | class HtmlForm extends HtmlSemCollection { |
22 | 22 | |
23 | - use FieldsTrait,FormTrait; |
|
23 | + use FieldsTrait, FormTrait; |
|
24 | 24 | /** |
25 | 25 | * @var array |
26 | 26 | */ |
@@ -33,14 +33,14 @@ discard block |
||
33 | 33 | |
34 | 34 | public function __construct($identifier, $elements=array()) { |
35 | 35 | parent::__construct($identifier, "form", "ui form"); |
36 | - $this->_states=[ State::ERROR,State::SUCCESS,State::WARNING,State::DISABLED ]; |
|
36 | + $this->_states=[State::ERROR, State::SUCCESS, State::WARNING, State::DISABLED]; |
|
37 | 37 | $this->setProperty("name", $this->identifier); |
38 | - $this->_fields=array (); |
|
38 | + $this->_fields=array(); |
|
39 | 39 | $this->addItems($elements); |
40 | 40 | $this->_validationParams=[]; |
41 | 41 | } |
42 | 42 | |
43 | - protected function getForm(){ |
|
43 | + protected function getForm() { |
|
44 | 44 | return $this; |
45 | 45 | } |
46 | 46 | |
@@ -62,8 +62,8 @@ discard block |
||
62 | 62 | * @param string $caption |
63 | 63 | * @return 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 | /** |
@@ -85,13 +85,13 @@ discard block |
||
85 | 85 | $label=NULL; |
86 | 86 | } |
87 | 87 | $this->_fields=\array_merge($this->_fields, $fields); |
88 | - $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count(), $fields); |
|
88 | + $fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count(), $fields); |
|
89 | 89 | } |
90 | - if (isset($label)){ |
|
91 | - $fields->wrap("<div class='field'><label>{$label}</label>","</div>"); |
|
90 | + if (isset($label)) { |
|
91 | + $fields->wrap("<div class='field'><label>{$label}</label>", "</div>"); |
|
92 | 92 | } |
93 | 93 | } else { |
94 | - $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count()); |
|
94 | + $fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count()); |
|
95 | 95 | } |
96 | 96 | $this->addItem($fields); |
97 | 97 | return $fields; |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | |
100 | 100 | public function addItem($item) { |
101 | 101 | $item=parent::addItem($item); |
102 | - if (\is_subclass_of($item, HtmlFormField::class) === true) { |
|
102 | + if (\is_subclass_of($item, HtmlFormField::class)===true) { |
|
103 | 103 | $this->_fields[]=$item; |
104 | 104 | } |
105 | 105 | return $item; |
@@ -157,39 +157,39 @@ discard block |
||
157 | 157 | |
158 | 158 | |
159 | 159 | |
160 | - public function compile(JsUtils $js=NULL,&$view=NULL){ |
|
161 | - if(\sizeof($this->_validationParams)>0) |
|
160 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
161 | + if (\sizeof($this->_validationParams)>0) |
|
162 | 162 | $this->setProperty("novalidate", ""); |
163 | - return parent::compile($js,$view); |
|
163 | + return parent::compile($js, $view); |
|
164 | 164 | } |
165 | 165 | |
166 | 166 | public function run(JsUtils $js) { |
167 | - if(isset($js)){ |
|
167 | + if (isset($js)) { |
|
168 | 168 | $compo=$js->semantic()->form("#".$this->identifier); |
169 | - }else{ |
|
169 | + } else { |
|
170 | 170 | $compo=new Form(); |
171 | 171 | $compo->attach("#".$this->identifier); |
172 | 172 | } |
173 | - foreach ($this->_fields as $field){ |
|
174 | - if($field instanceof HtmlFormField){ |
|
173 | + foreach ($this->_fields as $field) { |
|
174 | + if ($field instanceof HtmlFormField) { |
|
175 | 175 | $compo=$this->addCompoValidation($compo, $field); |
176 | 176 | } |
177 | 177 | } |
178 | - foreach ($this->content as $field){ |
|
179 | - if($field instanceof HtmlFormFields){ |
|
178 | + foreach ($this->content as $field) { |
|
179 | + if ($field instanceof HtmlFormFields) { |
|
180 | 180 | $items=$field->getItems(); |
181 | - foreach ($items as $_field){ |
|
182 | - if($_field instanceof HtmlFormField) |
|
181 | + foreach ($items as $_field) { |
|
182 | + if ($_field instanceof HtmlFormField) |
|
183 | 183 | $compo=$this->addCompoValidation($compo, $_field); |
184 | 184 | } |
185 | 185 | } |
186 | 186 | } |
187 | - $this->_runValidationParams($compo,$js); |
|
187 | + $this->_runValidationParams($compo, $js); |
|
188 | 188 | return $this->_bsComponent; |
189 | 189 | } |
190 | 190 | |
191 | - public function addValidationParam($paramName,$paramValue,$before="",$after=""){ |
|
192 | - $this->addBehavior($this->_validationParams, $paramName, $paramValue,$before,$after); |
|
191 | + public function addValidationParam($paramName, $paramValue, $before="", $after="") { |
|
192 | + $this->addBehavior($this->_validationParams, $paramName, $paramValue, $before, $after); |
|
193 | 193 | return $this; |
194 | 194 | } |
195 | 195 | |
@@ -202,7 +202,7 @@ discard block |
||
202 | 202 | return $this->_validationParams; |
203 | 203 | } |
204 | 204 | |
205 | - public function removeValidationParam($param){ |
|
205 | + public function removeValidationParam($param) { |
|
206 | 206 | unset($this->_validationParams[$param]); |
207 | 207 | return $this; |
208 | 208 | } |
@@ -52,8 +52,9 @@ discard block |
||
52 | 52 | */ |
53 | 53 | public function addHeader($title, $niveau=1, $dividing=true) { |
54 | 54 | $header=new HtmlHeader("", $niveau, $title); |
55 | - if ($dividing) |
|
56 | - $header->setDividing(); |
|
55 | + if ($dividing) { |
|
56 | + $header->setDividing(); |
|
57 | + } |
|
57 | 58 | return $this->addItem($header); |
58 | 59 | } |
59 | 60 | |
@@ -81,8 +82,9 @@ discard block |
||
81 | 82 | if (\is_string($end)) { |
82 | 83 | $label=$end; |
83 | 84 | \array_pop($fields); |
84 | - } else |
|
85 | - $label=NULL; |
|
85 | + } else { |
|
86 | + $label=NULL; |
|
87 | + } |
|
86 | 88 | } |
87 | 89 | $this->_fields=\array_merge($this->_fields, $fields); |
88 | 90 | $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count(), $fields); |
@@ -146,27 +148,31 @@ discard block |
||
146 | 148 | */ |
147 | 149 | public function addMessage($identifier, $content, $header=NULL, $icon=NULL, $type=NULL) { |
148 | 150 | $message=new HtmlMessage($identifier, $content); |
149 | - if (isset($header)) |
|
150 | - $message->addHeader($header); |
|
151 | - if (isset($icon)) |
|
152 | - $message->setIcon($icon); |
|
153 | - if (isset($type)) |
|
154 | - $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 | + } |
|
155 | 160 | return $this->addItem($message); |
156 | 161 | } |
157 | 162 | |
158 | 163 | |
159 | 164 | |
160 | 165 | public function compile(JsUtils $js=NULL,&$view=NULL){ |
161 | - if(\sizeof($this->_validationParams)>0) |
|
162 | - $this->setProperty("novalidate", ""); |
|
166 | + if(\sizeof($this->_validationParams)>0) { |
|
167 | + $this->setProperty("novalidate", ""); |
|
168 | + } |
|
163 | 169 | return parent::compile($js,$view); |
164 | 170 | } |
165 | 171 | |
166 | 172 | public function run(JsUtils $js) { |
167 | 173 | if(isset($js)){ |
168 | 174 | $compo=$js->semantic()->form("#".$this->identifier); |
169 | - }else{ |
|
175 | + } else{ |
|
170 | 176 | $compo=new Form(); |
171 | 177 | $compo->attach("#".$this->identifier); |
172 | 178 | } |
@@ -179,8 +185,9 @@ discard block |
||
179 | 185 | if($field instanceof HtmlFormFields){ |
180 | 186 | $items=$field->getItems(); |
181 | 187 | foreach ($items as $_field){ |
182 | - if($_field instanceof HtmlFormField) |
|
183 | - $compo=$this->addCompoValidation($compo, $_field); |
|
188 | + if($_field instanceof HtmlFormField) { |
|
189 | + $compo=$this->addCompoValidation($compo, $_field); |
|
190 | + } |
|
184 | 191 | } |
185 | 192 | } |
186 | 193 | } |
@@ -7,7 +7,7 @@ discard block |
||
7 | 7 | * @version 1.001 |
8 | 8 | * Generates a JSON field validator |
9 | 9 | */ |
10 | -class FieldValidation implements \JsonSerializable{ |
|
10 | +class FieldValidation implements \JsonSerializable { |
|
11 | 11 | /** |
12 | 12 | * @var string |
13 | 13 | */ |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | |
25 | 25 | protected $optional; |
26 | 26 | |
27 | - public function __construct($identifier){ |
|
27 | + public function __construct($identifier) { |
|
28 | 28 | $this->identifier=$identifier; |
29 | 29 | $this->rules=[]; |
30 | 30 | } |
@@ -48,22 +48,22 @@ discard block |
||
48 | 48 | * @param string $value |
49 | 49 | * @return Rule |
50 | 50 | */ |
51 | - public function addRule($type,$prompt=NULL,$value=NULL){ |
|
52 | - if($type instanceof Rule) |
|
51 | + public function addRule($type, $prompt=NULL, $value=NULL) { |
|
52 | + if ($type instanceof Rule) |
|
53 | 53 | $rule=$type; |
54 | - else if(\is_array($type)){ |
|
54 | + else if (\is_array($type)) { |
|
55 | 55 | $value=JArray::getValue($type, "value", 2); |
56 | 56 | $prompt=JArray::getValue($type, "prompt", 1); |
57 | 57 | $type=JArray::getValue($type, "type", 0); |
58 | - $rule=new Rule($type,$prompt,$value); |
|
59 | - }else |
|
60 | - $rule=new Rule($type,$prompt,$value); |
|
58 | + $rule=new Rule($type, $prompt, $value); |
|
59 | + } else |
|
60 | + $rule=new Rule($type, $prompt, $value); |
|
61 | 61 | $this->rules[]=$rule; |
62 | 62 | return $rule; |
63 | 63 | } |
64 | 64 | |
65 | - public function jsonSerialize(){ |
|
66 | - return ["identifier"=>$this->identifier,"rules"=>$this->rules]; |
|
65 | + public function jsonSerialize() { |
|
66 | + return ["identifier"=>$this->identifier, "rules"=>$this->rules]; |
|
67 | 67 | } |
68 | 68 | |
69 | 69 | public function setDepends($depends) { |
@@ -49,15 +49,16 @@ |
||
49 | 49 | * @return Rule |
50 | 50 | */ |
51 | 51 | public function addRule($type,$prompt=NULL,$value=NULL){ |
52 | - if($type instanceof Rule) |
|
53 | - $rule=$type; |
|
54 | - else if(\is_array($type)){ |
|
52 | + if($type instanceof Rule) { |
|
53 | + $rule=$type; |
|
54 | + } else if(\is_array($type)){ |
|
55 | 55 | $value=JArray::getValue($type, "value", 2); |
56 | 56 | $prompt=JArray::getValue($type, "prompt", 1); |
57 | 57 | $type=JArray::getValue($type, "type", 0); |
58 | 58 | $rule=new Rule($type,$prompt,$value); |
59 | - }else |
|
60 | - $rule=new Rule($type,$prompt,$value); |
|
59 | + } else { |
|
60 | + $rule=new Rule($type,$prompt,$value); |
|
61 | + } |
|
61 | 62 | $this->rules[]=$rule; |
62 | 63 | return $rule; |
63 | 64 | } |
@@ -17,8 +17,8 @@ discard block |
||
17 | 17 | * @param string $action one of "select","auto","activate","combo","nothing","hide" |
18 | 18 | * @return \Ajax\semantic\components\Dropdown |
19 | 19 | */ |
20 | - public function setAction($action){ |
|
21 | - return $this->setParamCtrl("action", $action,array("select","auto","activate","combo","nothing","hide")); |
|
20 | + public function setAction($action) { |
|
21 | + return $this->setParamCtrl("action", $action, array("select", "auto", "activate", "combo", "nothing", "hide")); |
|
22 | 22 | } |
23 | 23 | |
24 | 24 | /** |
@@ -26,15 +26,15 @@ discard block |
||
26 | 26 | * @param string $event Event used to trigger dropdown (Hover, Click, Custom Event) |
27 | 27 | * @return \Ajax\semantic\components\Dropdown |
28 | 28 | */ |
29 | - public function setOn($event){ |
|
29 | + public function setOn($event) { |
|
30 | 30 | return $this->setParam("on", $event); |
31 | 31 | } |
32 | 32 | |
33 | - public function setFullTextSearch($value){ |
|
33 | + public function setFullTextSearch($value) { |
|
34 | 34 | return $this->setParam("fullTextSearch", $value); |
35 | 35 | } |
36 | 36 | |
37 | - public function setShowOnFocus($value){ |
|
37 | + public function setShowOnFocus($value) { |
|
38 | 38 | return $this->setParam("showOnFocus", $value); |
39 | 39 | } |
40 | 40 | } |