@@ -13,6 +13,9 @@ |
||
13 | 13 | */ |
14 | 14 | class HtmlIconGroups extends HtmlSemCollection { |
15 | 15 | |
16 | + /** |
|
17 | + * @param string $identifier |
|
18 | + */ |
|
16 | 19 | public function __construct($identifier, $icons=array(), $size="") { |
17 | 20 | parent::__construct($identifier, "i", "icons"); |
18 | 21 | $this->addItems($icons); |
@@ -20,15 +20,15 @@ discard block |
||
20 | 20 | $this->params["fields"]=[]; |
21 | 21 | } |
22 | 22 | |
23 | - public function addField($identifier){ |
|
23 | + public function addField($identifier) { |
|
24 | 24 | $this->params["fields"][$identifier]=new FieldValidation($identifier); |
25 | 25 | } |
26 | 26 | |
27 | - public function setInline($value){ |
|
27 | + public function setInline($value) { |
|
28 | 28 | return $this->setParam("inline", true); |
29 | 29 | } |
30 | 30 | |
31 | - public function setOn($value){ |
|
31 | + public function setOn($value) { |
|
32 | 32 | return $this->setParam("on", $value); |
33 | 33 | } |
34 | 34 | |
@@ -40,33 +40,33 @@ discard block |
||
40 | 40 | * @param mixed $value |
41 | 41 | * @param string|NULL $prompt |
42 | 42 | */ |
43 | - public function addFieldRule($identifier,$type,$prompt=NULL,$value=NULL){ |
|
44 | - if(isset($this->params["fields"][$identifier])===false){ |
|
43 | + public function addFieldRule($identifier, $type, $prompt=NULL, $value=NULL) { |
|
44 | + if (isset($this->params["fields"][$identifier])===false) { |
|
45 | 45 | $this->addField($identifier); |
46 | 46 | } |
47 | - $this->params["fields"][$identifier]->addRule($type,$prompt,$value); |
|
47 | + $this->params["fields"][$identifier]->addRule($type, $prompt, $value); |
|
48 | 48 | } |
49 | 49 | |
50 | 50 | /** |
51 | 51 | * @param FieldValidation $fieldValidation |
52 | 52 | */ |
53 | - public function addFieldValidation($fieldValidation){ |
|
53 | + public function addFieldValidation($fieldValidation) { |
|
54 | 54 | $this->params["fields"][$fieldValidation->getIdentifier()]=$fieldValidation; |
55 | 55 | } |
56 | 56 | |
57 | - public function setJs(JsUtils $js){ |
|
57 | + public function setJs(JsUtils $js) { |
|
58 | 58 | $this->js=$js; |
59 | 59 | } |
60 | 60 | |
61 | 61 | public function getScript() { |
62 | 62 | $allParams=$this->params; |
63 | - $this->jquery_code_for_compile=array (); |
|
63 | + $this->jquery_code_for_compile=array(); |
|
64 | 64 | $this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).{$this->uiName}(".$this->getParamsAsJSON($allParams).");"; |
65 | 65 | $this->compileEvents(); |
66 | 66 | return $this->compileJQueryCode(); |
67 | 67 | } |
68 | 68 | |
69 | - public function onValid($jsCode){ |
|
69 | + public function onValid($jsCode) { |
|
70 | 70 | $this->addComponentEvent("onValid", $jsCode); |
71 | 71 | } |
72 | 72 | } |
73 | 73 | \ No newline at end of file |
@@ -16,10 +16,10 @@ discard block |
||
16 | 16 | abstract class BaseHtml extends BaseWidget { |
17 | 17 | protected $_template; |
18 | 18 | protected $tagName; |
19 | - protected $properties=array (); |
|
20 | - protected $_events=array (); |
|
21 | - protected $_wrapBefore=array (); |
|
22 | - protected $_wrapAfter=array (); |
|
19 | + protected $properties=array(); |
|
20 | + protected $_events=array(); |
|
21 | + protected $_wrapBefore=array(); |
|
22 | + protected $_wrapAfter=array(); |
|
23 | 23 | protected $_bsComponent; |
24 | 24 | |
25 | 25 | public function getBsComponent() { |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | } |
33 | 33 | |
34 | 34 | protected function getTemplate(JsUtils $js=NULL) { |
35 | - return PropertyWrapper::wrap($this->_wrapBefore, $js) . $this->_template . PropertyWrapper::wrap($this->_wrapAfter, $js); |
|
35 | + return PropertyWrapper::wrap($this->_wrapBefore, $js).$this->_template.PropertyWrapper::wrap($this->_wrapAfter, $js); |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | public function getProperties() { |
@@ -56,13 +56,13 @@ discard block |
||
56 | 56 | |
57 | 57 | public function addToProperty($name, $value, $separator=" ") { |
58 | 58 | if (\is_array($value)) { |
59 | - foreach ( $value as $v ) { |
|
59 | + foreach ($value as $v) { |
|
60 | 60 | $this->addToProperty($name, $v, $separator); |
61 | 61 | } |
62 | - } else if ($value !== "" && $this->propertyContains($name, $value) === false) { |
|
62 | + } else if ($value!=="" && $this->propertyContains($name, $value)===false) { |
|
63 | 63 | $v=@$this->properties[$name]; |
64 | - if (isset($v) && $v !== "") |
|
65 | - $v=$v . $separator . $value; |
|
64 | + if (isset($v) && $v!=="") |
|
65 | + $v=$v.$separator.$value; |
|
66 | 66 | else |
67 | 67 | $v=$value; |
68 | 68 | |
@@ -78,19 +78,19 @@ discard block |
||
78 | 78 | |
79 | 79 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
80 | 80 | $result=$this->getTemplate($js); |
81 | - foreach ( $this as $key => $value ) { |
|
82 | - if (JString::startswith($key, "_") === false && $key !== "events") { |
|
81 | + foreach ($this as $key => $value) { |
|
82 | + if (JString::startswith($key, "_")===false && $key!=="events") { |
|
83 | 83 | if (is_array($value)) { |
84 | 84 | $v=PropertyWrapper::wrap($value, $js); |
85 | 85 | } else { |
86 | 86 | $v=$value; |
87 | 87 | } |
88 | - $result=str_ireplace("%" . $key . "%", $v, $result); |
|
88 | + $result=str_ireplace("%".$key."%", $v, $result); |
|
89 | 89 | } |
90 | 90 | } |
91 | 91 | if (isset($js)===true) { |
92 | 92 | $this->run($js); |
93 | - if (isset($view) === true) { |
|
93 | + if (isset($view)===true) { |
|
94 | 94 | $js->addViewElement($this->identifier, $result, $view); |
95 | 95 | } |
96 | 96 | } |
@@ -99,12 +99,12 @@ discard block |
||
99 | 99 | |
100 | 100 | protected function ctrl($name, $value, $typeCtrl) { |
101 | 101 | if (is_array($typeCtrl)) { |
102 | - if (array_search($value, $typeCtrl) === false) { |
|
103 | - throw new \Exception("La valeur passée `" . $value . "` à la propriété `" . $name . "` ne fait pas partie des valeurs possibles : {" . implode(",", $typeCtrl) . "}"); |
|
102 | + if (array_search($value, $typeCtrl)===false) { |
|
103 | + throw new \Exception("La valeur passée `".$value."` à la propriété `".$name."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}"); |
|
104 | 104 | } |
105 | 105 | } else { |
106 | 106 | if (!$typeCtrl($value)) { |
107 | - throw new \Exception("La fonction " . $typeCtrl . " a retourné faux pour l'affectation de la propriété " . $name); |
|
107 | + throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$name); |
|
108 | 108 | } |
109 | 109 | } |
110 | 110 | return true; |
@@ -119,13 +119,13 @@ discard block |
||
119 | 119 | } |
120 | 120 | |
121 | 121 | protected function setPropertyCtrl($name, $value, $typeCtrl) { |
122 | - if ($this->ctrl($name, $value, $typeCtrl) === true) |
|
122 | + if ($this->ctrl($name, $value, $typeCtrl)===true) |
|
123 | 123 | return $this->setProperty($name, $value); |
124 | 124 | return $this; |
125 | 125 | } |
126 | 126 | |
127 | 127 | protected function setMemberCtrl(&$name, $value, $typeCtrl) { |
128 | - if ($this->ctrl($name, $value, $typeCtrl) === true) { |
|
128 | + if ($this->ctrl($name, $value, $typeCtrl)===true) { |
|
129 | 129 | return $name=$value; |
130 | 130 | } |
131 | 131 | return $this; |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | protected function addToMemberUnique(&$name, $value, $typeCtrl, $separator=" ") { |
135 | 135 | if (is_array($typeCtrl)) { |
136 | 136 | $this->removeOldValues($name, $typeCtrl); |
137 | - $name.=$separator . $value; |
|
137 | + $name.=$separator.$value; |
|
138 | 138 | } |
139 | 139 | return $this; |
140 | 140 | } |
@@ -156,17 +156,17 @@ discard block |
||
156 | 156 | } |
157 | 157 | |
158 | 158 | protected function addToMemberCtrl(&$name, $value, $typeCtrl, $separator=" ") { |
159 | - if ($this->ctrl($name, $value, $typeCtrl) === true) { |
|
159 | + if ($this->ctrl($name, $value, $typeCtrl)===true) { |
|
160 | 160 | if (is_array($typeCtrl)) { |
161 | 161 | $this->removeOldValues($name, $typeCtrl); |
162 | 162 | } |
163 | - $name.=$separator . $value; |
|
163 | + $name.=$separator.$value; |
|
164 | 164 | } |
165 | 165 | return $this; |
166 | 166 | } |
167 | 167 | |
168 | 168 | protected function addToMember(&$name, $value, $separator=" ") { |
169 | - $name=str_ireplace($value, "", $name) . $separator . $value; |
|
169 | + $name=str_ireplace($value, "", $name).$separator.$value; |
|
170 | 170 | return $this; |
171 | 171 | } |
172 | 172 | |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | } |
185 | 185 | |
186 | 186 | public function addToPropertyCtrlCheck($name, $value, $typeCtrl) { |
187 | - if ($this->ctrl($name, $value, $typeCtrl) === true) { |
|
187 | + if ($this->ctrl($name, $value, $typeCtrl)===true) { |
|
188 | 188 | return $this->addToProperty($name, $value); |
189 | 189 | } |
190 | 190 | return $this; |
@@ -212,28 +212,28 @@ discard block |
||
212 | 212 | } |
213 | 213 | |
214 | 214 | public function fromArray($array) { |
215 | - foreach ( $this as $key => $value ) { |
|
215 | + foreach ($this as $key => $value) { |
|
216 | 216 | if (array_key_exists($key, $array) && !JString::startswith($key, "_")) { |
217 | - $setter="set" . ucfirst($key); |
|
217 | + $setter="set".ucfirst($key); |
|
218 | 218 | $this->$setter($array[$key]); |
219 | 219 | unset($array[$key]); |
220 | 220 | } |
221 | 221 | } |
222 | - foreach ( $array as $key => $value ) { |
|
222 | + foreach ($array as $key => $value) { |
|
223 | 223 | if (method_exists($this, $key)) { |
224 | 224 | try { |
225 | 225 | $this->$key($value); |
226 | 226 | unset($array[$key]); |
227 | - } catch ( \Exception $e ) { |
|
227 | + }catch (\Exception $e) { |
|
228 | 228 | // Nothing to do |
229 | 229 | } |
230 | 230 | } else { |
231 | - $setter="set" . ucfirst($key); |
|
231 | + $setter="set".ucfirst($key); |
|
232 | 232 | if (method_exists($this, $setter)) { |
233 | 233 | try { |
234 | 234 | $this->$setter($value); |
235 | 235 | unset($array[$key]); |
236 | - } catch ( \Exception $e ) { |
|
236 | + }catch (\Exception $e) { |
|
237 | 237 | // Nothing to do |
238 | 238 | } |
239 | 239 | } |
@@ -244,7 +244,7 @@ discard block |
||
244 | 244 | |
245 | 245 | public function fromDatabaseObjects($objects, $function) { |
246 | 246 | if (isset($objects)) { |
247 | - foreach ( $objects as $object ) { |
|
247 | + foreach ($objects as $object) { |
|
248 | 248 | $this->fromDatabaseObject($object, $function); |
249 | 249 | } |
250 | 250 | } |
@@ -264,11 +264,11 @@ discard block |
||
264 | 264 | } |
265 | 265 | |
266 | 266 | public function addEvent($event, $jsCode, $stopPropagation=false, $preventDefault=false) { |
267 | - if ($stopPropagation === true) { |
|
268 | - $jsCode="event.stopPropagation();" . $jsCode; |
|
267 | + if ($stopPropagation===true) { |
|
268 | + $jsCode="event.stopPropagation();".$jsCode; |
|
269 | 269 | } |
270 | - if ($preventDefault === true) { |
|
271 | - $jsCode="event.preventDefault();" . $jsCode; |
|
270 | + if ($preventDefault===true) { |
|
271 | + $jsCode="event.preventDefault();".$jsCode; |
|
272 | 272 | } |
273 | 273 | return $this->_addEvent($event, $jsCode); |
274 | 274 | } |
@@ -278,7 +278,7 @@ discard block |
||
278 | 278 | if (is_array($this->_events[$event])) { |
279 | 279 | $this->_events[$event][]=$jsCode; |
280 | 280 | } else { |
281 | - $this->_events[$event]=array ($this->_events[$event],$jsCode ); |
|
281 | + $this->_events[$event]=array($this->_events[$event], $jsCode); |
|
282 | 282 | } |
283 | 283 | } else { |
284 | 284 | $this->_events[$event]=$jsCode; |
@@ -298,35 +298,35 @@ discard block |
||
298 | 298 | return $this->onClick($jsCode); |
299 | 299 | } |
300 | 300 | |
301 | - public function onCreate($jsCode){ |
|
302 | - if(isset($this->_events["_create"])){ |
|
301 | + public function onCreate($jsCode) { |
|
302 | + if (isset($this->_events["_create"])) { |
|
303 | 303 | $this->_events["_create"][]=$jsCode; |
304 | - }else{ |
|
304 | + } else { |
|
305 | 305 | $this->_events["_create"]=[$jsCode]; |
306 | 306 | } |
307 | 307 | return $this; |
308 | 308 | } |
309 | 309 | |
310 | 310 | public function addEventsOnRun(JsUtils $js) { |
311 | - if(isset($this->_events["_create"])){ |
|
311 | + if (isset($this->_events["_create"])) { |
|
312 | 312 | $create=$this->_events["_create"]; |
313 | - if(\is_array($create)){ |
|
313 | + if (\is_array($create)) { |
|
314 | 314 | $create=\implode("", $create); |
315 | 315 | } |
316 | - if($create!=="") |
|
317 | - $js->exec($create,true); |
|
316 | + if ($create!=="") |
|
317 | + $js->exec($create, true); |
|
318 | 318 | unset($this->_events["_create"]); |
319 | 319 | } |
320 | 320 | if (isset($this->_bsComponent)) { |
321 | - foreach ( $this->_events as $event => $jsCode ) { |
|
321 | + foreach ($this->_events as $event => $jsCode) { |
|
322 | 322 | $code=$jsCode; |
323 | 323 | if (is_array($jsCode)) { |
324 | 324 | $code=""; |
325 | - foreach ( $jsCode as $jsC ) { |
|
325 | + foreach ($jsCode as $jsC) { |
|
326 | 326 | if ($jsC instanceof AjaxCall) { |
327 | - $code.="\n" . $jsC->compile($js); |
|
327 | + $code.="\n".$jsC->compile($js); |
|
328 | 328 | } else { |
329 | - $code.="\n" . $jsC; |
|
329 | + $code.="\n".$jsC; |
|
330 | 330 | } |
331 | 331 | } |
332 | 332 | } elseif ($jsCode instanceof AjaxCall) { |
@@ -334,12 +334,12 @@ discard block |
||
334 | 334 | } |
335 | 335 | $this->_bsComponent->addEvent($event, $code); |
336 | 336 | } |
337 | - $this->_events=array (); |
|
337 | + $this->_events=array(); |
|
338 | 338 | } |
339 | 339 | } |
340 | 340 | |
341 | 341 | public function _ajaxOn($operation, $event, $url, $responseElement="", $parameters=array()) { |
342 | - $params=array ("url" => $url,"responseElement" => $responseElement ); |
|
342 | + $params=array("url" => $url, "responseElement" => $responseElement); |
|
343 | 343 | $params=array_merge($params, $parameters); |
344 | 344 | $this->_addEvent($event, new AjaxCall($operation, $params)); |
345 | 345 | return $this; |
@@ -375,33 +375,33 @@ discard block |
||
375 | 375 | if (is_array($elements)) { |
376 | 376 | $flag=false; |
377 | 377 | $index=0; |
378 | - while ( !$flag && $index < sizeof($elements) ) { |
|
378 | + while (!$flag && $index<sizeof($elements)) { |
|
379 | 379 | if ($elements[$index] instanceof BaseHtml) |
380 | - $flag=($elements[$index]->getIdentifier() === $identifier); |
|
380 | + $flag=($elements[$index]->getIdentifier()===$identifier); |
|
381 | 381 | $index++; |
382 | 382 | } |
383 | - if ($flag === true) |
|
384 | - return $elements[$index - 1]; |
|
383 | + if ($flag===true) |
|
384 | + return $elements[$index-1]; |
|
385 | 385 | } elseif ($elements instanceof BaseHtml) { |
386 | - if ($elements->getIdentifier() === $identifier) |
|
386 | + if ($elements->getIdentifier()===$identifier) |
|
387 | 387 | return $elements; |
388 | 388 | } |
389 | 389 | return null; |
390 | 390 | } |
391 | 391 | |
392 | - protected function getElementByPropertyValue($propertyName,$value, $elements) { |
|
392 | + protected function getElementByPropertyValue($propertyName, $value, $elements) { |
|
393 | 393 | if (is_array($elements)) { |
394 | 394 | $flag=false; |
395 | 395 | $index=0; |
396 | - while ( !$flag && $index < sizeof($elements) ) { |
|
396 | + while (!$flag && $index<sizeof($elements)) { |
|
397 | 397 | if ($elements[$index] instanceof BaseHtml) |
398 | - $flag=($elements[$index]->propertyContains($propertyName, $value) === true); |
|
398 | + $flag=($elements[$index]->propertyContains($propertyName, $value)===true); |
|
399 | 399 | $index++; |
400 | 400 | } |
401 | - if ($flag === true) |
|
402 | - return $elements[$index - 1]; |
|
401 | + if ($flag===true) |
|
402 | + return $elements[$index-1]; |
|
403 | 403 | } elseif ($elements instanceof BaseHtml) { |
404 | - if ($elements->propertyContains($propertyName, $value) === true) |
|
404 | + if ($elements->propertyContains($propertyName, $value)===true) |
|
405 | 405 | return $elements; |
406 | 406 | } |
407 | 407 | return null; |
@@ -423,14 +423,14 @@ discard block |
||
423 | 423 | if (is_array($value)) { |
424 | 424 | $value=implode(",", $value); |
425 | 425 | } |
426 | - if (strrpos($value, 'this') === false && strrpos($value, 'event') === false) { |
|
427 | - $value='"' . $value . '"'; |
|
426 | + if (strrpos($value, 'this')===false && strrpos($value, 'event')===false) { |
|
427 | + $value='"'.$value.'"'; |
|
428 | 428 | } |
429 | 429 | return $value; |
430 | 430 | } |
431 | 431 | |
432 | 432 | public function jsDoJquery($jqueryCall, $param="") { |
433 | - return "$('#" . $this->identifier . "')." . $jqueryCall . "(" . $this->_prep_value($param) . ");"; |
|
433 | + return "$('#".$this->identifier."').".$jqueryCall."(".$this->_prep_value($param).");"; |
|
434 | 434 | } |
435 | 435 | |
436 | 436 | public function executeOnRun($jsCode) { |
@@ -50,8 +50,9 @@ discard block |
||
50 | 50 | } |
51 | 51 | |
52 | 52 | public function getProperty($name) { |
53 | - if (array_key_exists($name, $this->properties)) |
|
54 | - return $this->properties[$name]; |
|
53 | + if (array_key_exists($name, $this->properties)) { |
|
54 | + return $this->properties[$name]; |
|
55 | + } |
|
55 | 56 | } |
56 | 57 | |
57 | 58 | public function addToProperty($name, $value, $separator=" ") { |
@@ -61,10 +62,11 @@ discard block |
||
61 | 62 | } |
62 | 63 | } else if ($value !== "" && $this->propertyContains($name, $value) === false) { |
63 | 64 | $v=@$this->properties[$name]; |
64 | - if (isset($v) && $v !== "") |
|
65 | - $v=$v . $separator . $value; |
|
66 | - else |
|
67 | - $v=$value; |
|
65 | + if (isset($v) && $v !== "") { |
|
66 | + $v=$v . $separator . $value; |
|
67 | + } else { |
|
68 | + $v=$value; |
|
69 | + } |
|
68 | 70 | |
69 | 71 | return $this->setProperty($name, $v); |
70 | 72 | } |
@@ -119,8 +121,9 @@ discard block |
||
119 | 121 | } |
120 | 122 | |
121 | 123 | protected function setPropertyCtrl($name, $value, $typeCtrl) { |
122 | - if ($this->ctrl($name, $value, $typeCtrl) === true) |
|
123 | - return $this->setProperty($name, $value); |
|
124 | + if ($this->ctrl($name, $value, $typeCtrl) === true) { |
|
125 | + return $this->setProperty($name, $value); |
|
126 | + } |
|
124 | 127 | return $this; |
125 | 128 | } |
126 | 129 | |
@@ -150,8 +153,9 @@ discard block |
||
150 | 153 | } |
151 | 154 | |
152 | 155 | public function removeProperty($name) { |
153 | - if (\array_key_exists($name, $this->properties)) |
|
154 | - unset($this->properties[$name]); |
|
156 | + if (\array_key_exists($name, $this->properties)) { |
|
157 | + unset($this->properties[$name]); |
|
158 | + } |
|
155 | 159 | return $this; |
156 | 160 | } |
157 | 161 | |
@@ -171,8 +175,9 @@ discard block |
||
171 | 175 | } |
172 | 176 | |
173 | 177 | protected function addToPropertyUnique($name, $value, $typeCtrl) { |
174 | - if (@class_exists($typeCtrl, true)) |
|
175 | - $typeCtrl=$typeCtrl::getConstants(); |
|
178 | + if (@class_exists($typeCtrl, true)) { |
|
179 | + $typeCtrl=$typeCtrl::getConstants(); |
|
180 | + } |
|
176 | 181 | if (is_array($typeCtrl)) { |
177 | 182 | $this->removeOldValues($this->properties[$name], $typeCtrl); |
178 | 183 | } |
@@ -301,7 +306,7 @@ discard block |
||
301 | 306 | public function onCreate($jsCode){ |
302 | 307 | if(isset($this->_events["_create"])){ |
303 | 308 | $this->_events["_create"][]=$jsCode; |
304 | - }else{ |
|
309 | + } else{ |
|
305 | 310 | $this->_events["_create"]=[$jsCode]; |
306 | 311 | } |
307 | 312 | return $this; |
@@ -313,8 +318,9 @@ discard block |
||
313 | 318 | if(\is_array($create)){ |
314 | 319 | $create=\implode("", $create); |
315 | 320 | } |
316 | - if($create!=="") |
|
317 | - $js->exec($create,true); |
|
321 | + if($create!=="") { |
|
322 | + $js->exec($create,true); |
|
323 | + } |
|
318 | 324 | unset($this->_events["_create"]); |
319 | 325 | } |
320 | 326 | if (isset($this->_bsComponent)) { |
@@ -376,15 +382,18 @@ discard block |
||
376 | 382 | $flag=false; |
377 | 383 | $index=0; |
378 | 384 | while ( !$flag && $index < sizeof($elements) ) { |
379 | - if ($elements[$index] instanceof BaseHtml) |
|
380 | - $flag=($elements[$index]->getIdentifier() === $identifier); |
|
385 | + if ($elements[$index] instanceof BaseHtml) { |
|
386 | + $flag=($elements[$index]->getIdentifier() === $identifier); |
|
387 | + } |
|
381 | 388 | $index++; |
382 | 389 | } |
383 | - if ($flag === true) |
|
384 | - return $elements[$index - 1]; |
|
390 | + if ($flag === true) { |
|
391 | + return $elements[$index - 1]; |
|
392 | + } |
|
385 | 393 | } elseif ($elements instanceof BaseHtml) { |
386 | - if ($elements->getIdentifier() === $identifier) |
|
387 | - return $elements; |
|
394 | + if ($elements->getIdentifier() === $identifier) { |
|
395 | + return $elements; |
|
396 | + } |
|
388 | 397 | } |
389 | 398 | return null; |
390 | 399 | } |
@@ -394,15 +403,18 @@ discard block |
||
394 | 403 | $flag=false; |
395 | 404 | $index=0; |
396 | 405 | while ( !$flag && $index < sizeof($elements) ) { |
397 | - if ($elements[$index] instanceof BaseHtml) |
|
398 | - $flag=($elements[$index]->propertyContains($propertyName, $value) === true); |
|
406 | + if ($elements[$index] instanceof BaseHtml) { |
|
407 | + $flag=($elements[$index]->propertyContains($propertyName, $value) === true); |
|
408 | + } |
|
399 | 409 | $index++; |
400 | 410 | } |
401 | - if ($flag === true) |
|
402 | - return $elements[$index - 1]; |
|
411 | + if ($flag === true) { |
|
412 | + return $elements[$index - 1]; |
|
413 | + } |
|
403 | 414 | } elseif ($elements instanceof BaseHtml) { |
404 | - if ($elements->propertyContains($propertyName, $value) === true) |
|
405 | - return $elements; |
|
415 | + if ($elements->propertyContains($propertyName, $value) === true) { |
|
416 | + return $elements; |
|
417 | + } |
|
406 | 418 | } |
407 | 419 | return null; |
408 | 420 | } |
@@ -124,6 +124,10 @@ discard block |
||
124 | 124 | return $this; |
125 | 125 | } |
126 | 126 | |
127 | + /** |
|
128 | + * @param string $name |
|
129 | + * @param string[] $typeCtrl |
|
130 | + */ |
|
127 | 131 | protected function setMemberCtrl(&$name, $value, $typeCtrl) { |
128 | 132 | if ($this->ctrl($name, $value, $typeCtrl) === true) { |
129 | 133 | return $name=$value; |
@@ -139,22 +143,35 @@ discard block |
||
139 | 143 | return $this; |
140 | 144 | } |
141 | 145 | |
146 | + /** |
|
147 | + * @param string $name |
|
148 | + */ |
|
142 | 149 | protected function removePropertyValue($name, $value) { |
143 | 150 | $this->properties[$name]=\str_replace($value, "", $this->properties[$name]); |
144 | 151 | return $this; |
145 | 152 | } |
146 | 153 | |
154 | + /** |
|
155 | + * @param string $name |
|
156 | + */ |
|
147 | 157 | protected function removePropertyValues($name, $values) { |
148 | 158 | $this->removeOldValues($this->properties[$name], $values); |
149 | 159 | return $this; |
150 | 160 | } |
151 | 161 | |
162 | + /** |
|
163 | + * @param string $name |
|
164 | + */ |
|
152 | 165 | public function removeProperty($name) { |
153 | 166 | if (\array_key_exists($name, $this->properties)) |
154 | 167 | unset($this->properties[$name]); |
155 | 168 | return $this; |
156 | 169 | } |
157 | 170 | |
171 | + /** |
|
172 | + * @param string $name |
|
173 | + * @param string[] $typeCtrl |
|
174 | + */ |
|
158 | 175 | protected function addToMemberCtrl(&$name, $value, $typeCtrl, $separator=" ") { |
159 | 176 | if ($this->ctrl($name, $value, $typeCtrl) === true) { |
160 | 177 | if (is_array($typeCtrl)) { |
@@ -165,6 +182,9 @@ discard block |
||
165 | 182 | return $this; |
166 | 183 | } |
167 | 184 | |
185 | + /** |
|
186 | + * @param string $name |
|
187 | + */ |
|
168 | 188 | protected function addToMember(&$name, $value, $separator=" ") { |
169 | 189 | $name=str_ireplace($value, "", $name) . $separator . $value; |
170 | 190 | return $this; |
@@ -179,6 +199,9 @@ discard block |
||
179 | 199 | return $this->addToProperty($name, $value); |
180 | 200 | } |
181 | 201 | |
202 | + /** |
|
203 | + * @param string $name |
|
204 | + */ |
|
182 | 205 | public function addToPropertyCtrl($name, $value, $typeCtrl) { |
183 | 206 | return $this->addToPropertyUnique($name, $value, $typeCtrl); |
184 | 207 | } |
@@ -242,6 +265,9 @@ discard block |
||
242 | 265 | return $array; |
243 | 266 | } |
244 | 267 | |
268 | + /** |
|
269 | + * @param \Closure $function |
|
270 | + */ |
|
245 | 271 | public function fromDatabaseObjects($objects, $function) { |
246 | 272 | if (isset($objects)) { |
247 | 273 | foreach ( $objects as $object ) { |
@@ -345,14 +371,23 @@ discard block |
||
345 | 371 | return $this; |
346 | 372 | } |
347 | 373 | |
374 | + /** |
|
375 | + * @param string $event |
|
376 | + */ |
|
348 | 377 | public function getOn($event, $url, $responseElement="", $parameters=array()) { |
349 | 378 | return $this->_ajaxOn("get", $event, $url, $responseElement, $parameters); |
350 | 379 | } |
351 | 380 | |
381 | + /** |
|
382 | + * @param string $url |
|
383 | + */ |
|
352 | 384 | public function getOnClick($url, $responseElement="", $parameters=array()) { |
353 | 385 | return $this->getOn("click", $url, $responseElement, $parameters); |
354 | 386 | } |
355 | 387 | |
388 | + /** |
|
389 | + * @param string $event |
|
390 | + */ |
|
356 | 391 | public function postOn($event, $url, $params="{}", $responseElement="", $parameters=array()) { |
357 | 392 | $parameters["params"]=$params; |
358 | 393 | return $this->_ajaxOn("post", $event, $url, $responseElement, $parameters); |
@@ -362,6 +397,9 @@ discard block |
||
362 | 397 | return $this->postOn("click", $url, $params, $responseElement, $parameters); |
363 | 398 | } |
364 | 399 | |
400 | + /** |
|
401 | + * @param string $event |
|
402 | + */ |
|
365 | 403 | public function postFormOn($event, $url, $form, $responseElement="", $parameters=array()) { |
366 | 404 | $parameters["form"]=$form; |
367 | 405 | return $this->_ajaxOn("postForm", $event, $url, $responseElement, $parameters); |
@@ -389,6 +427,10 @@ discard block |
||
389 | 427 | return null; |
390 | 428 | } |
391 | 429 | |
430 | + /** |
|
431 | + * @param string $propertyName |
|
432 | + * @param string $value |
|
433 | + */ |
|
392 | 434 | protected function getElementByPropertyValue($propertyName,$value, $elements) { |
393 | 435 | if (is_array($elements)) { |
394 | 436 | $flag=false; |
@@ -429,6 +471,9 @@ discard block |
||
429 | 471 | return $value; |
430 | 472 | } |
431 | 473 | |
474 | + /** |
|
475 | + * @param string $jqueryCall |
|
476 | + */ |
|
432 | 477 | public function jsDoJquery($jqueryCall, $param="") { |
433 | 478 | return "$('#" . $this->identifier . "')." . $jqueryCall . "(" . $this->_prep_value($param) . ");"; |
434 | 479 | } |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | * @param int $colCount |
19 | 19 | * @return HtmlTable |
20 | 20 | */ |
21 | - public function htmlTable($identifier, $rowCount, $colCount){ |
|
21 | + public function htmlTable($identifier, $rowCount, $colCount) { |
|
22 | 22 | return $this->addHtmlComponent(new HtmlTable($identifier, $rowCount, $colCount)); |
23 | 23 | } |
24 | 24 | |
@@ -29,9 +29,9 @@ discard block |
||
29 | 29 | * @param $styles string|array|NULL |
30 | 30 | * @return HtmlMessage |
31 | 31 | */ |
32 | - public function htmlMessage($identifier, $content="",$styles=NULL) { |
|
33 | - $msg= $this->addHtmlComponent(new HtmlMessage($identifier, $content)); |
|
34 | - if(isset($msg)) |
|
32 | + public function htmlMessage($identifier, $content="", $styles=NULL) { |
|
33 | + $msg=$this->addHtmlComponent(new HtmlMessage($identifier, $content)); |
|
34 | + if (isset($msg)) |
|
35 | 35 | $msg->setStyle($styles); |
36 | 36 | return $msg; |
37 | 37 | } |
@@ -31,8 +31,9 @@ |
||
31 | 31 | */ |
32 | 32 | public function htmlMessage($identifier, $content="",$styles=NULL) { |
33 | 33 | $msg= $this->addHtmlComponent(new HtmlMessage($identifier, $content)); |
34 | - if(isset($msg)) |
|
35 | - $msg->setStyle($styles); |
|
34 | + if(isset($msg)) { |
|
35 | + $msg->setStyle($styles); |
|
36 | + } |
|
36 | 37 | return $msg; |
37 | 38 | } |
38 | 39 |
@@ -127,8 +127,8 @@ discard block |
||
127 | 127 | * @param string|array $params |
128 | 128 | * @return Modal |
129 | 129 | */ |
130 | - public function modal($attachTo=NULL, $params=NULL,$paramsParts=NULL) { |
|
131 | - $result= $this->addComponent(new Modal($this->js), $attachTo, $params); |
|
130 | + public function modal($attachTo=NULL, $params=NULL, $paramsParts=NULL) { |
|
131 | + $result=$this->addComponent(new Modal($this->js), $attachTo, $params); |
|
132 | 132 | $result->setParamParts($paramsParts); |
133 | 133 | return $result; |
134 | 134 | } |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | * @return Tab |
140 | 140 | */ |
141 | 141 | public function tab($attachTo=NULL, $params=NULL) { |
142 | - $result= $this->addComponent(new Tab($this->js), $attachTo, $params); |
|
142 | + $result=$this->addComponent(new Tab($this->js), $attachTo, $params); |
|
143 | 143 | return $result; |
144 | 144 | } |
145 | 145 | |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | * @return Shape |
150 | 150 | */ |
151 | 151 | public function shape($attachTo=NULL, $params=NULL) { |
152 | - $result= $this->addComponent(new Shape($this->js), $attachTo, $params); |
|
152 | + $result=$this->addComponent(new Shape($this->js), $attachTo, $params); |
|
153 | 153 | return $result; |
154 | 154 | } |
155 | 155 | |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | * @return Form |
160 | 160 | */ |
161 | 161 | public function form($attachTo=NULL, $params=NULL) { |
162 | - $result= $this->addComponent(new Form($this->js), $attachTo, $params); |
|
162 | + $result=$this->addComponent(new Form($this->js), $attachTo, $params); |
|
163 | 163 | return $result; |
164 | 164 | } |
165 | 165 |
@@ -12,9 +12,9 @@ discard block |
||
12 | 12 | $this->paramParts=array(); |
13 | 13 | } |
14 | 14 | |
15 | - protected function generateParamParts(){ |
|
15 | + protected function generateParamParts() { |
|
16 | 16 | $results=[]; |
17 | - foreach ($this->paramParts as $paramPart){ |
|
17 | + foreach ($this->paramParts as $paramPart) { |
|
18 | 18 | $results[]="{$this->uiName}(".\implode(",", $paramPart).")"; |
19 | 19 | } |
20 | 20 | return \implode(".", $results); |
@@ -22,9 +22,9 @@ discard block |
||
22 | 22 | |
23 | 23 | public function getScript() { |
24 | 24 | $allParams=$this->params; |
25 | - $this->jquery_code_for_compile=array (); |
|
25 | + $this->jquery_code_for_compile=array(); |
|
26 | 26 | $paramParts=""; |
27 | - if(\sizeof($this->paramParts)>0){ |
|
27 | + if (\sizeof($this->paramParts)>0) { |
|
28 | 28 | $paramParts=".".$this->generateParamParts(); |
29 | 29 | } |
30 | 30 | $this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).{$this->uiName}(".$this->getParamsAsJSON($allParams).")".$paramParts.";"; |
@@ -37,8 +37,8 @@ discard block |
||
37 | 37 | return $this; |
38 | 38 | } |
39 | 39 | |
40 | - public function addComponentEvent($event,$jsCode){ |
|
41 | - $jsCode=str_ireplace("\"","%quote%", $jsCode); |
|
40 | + public function addComponentEvent($event, $jsCode) { |
|
41 | + $jsCode=str_ireplace("\"", "%quote%", $jsCode); |
|
42 | 42 | return $this->setParam($event, "%function(){".$jsCode."}%"); |
43 | 43 | } |
44 | 44 |
@@ -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 | } |
@@ -42,20 +42,20 @@ discard block |
||
42 | 42 | return $this->rules; |
43 | 43 | } |
44 | 44 | |
45 | - public function addRule($type,$prompt=NULL,$value=NULL){ |
|
46 | - if($type instanceof Rule) |
|
45 | + public function addRule($type, $prompt=NULL, $value=NULL) { |
|
46 | + if ($type instanceof Rule) |
|
47 | 47 | $this->rules[]=$type; |
48 | - else if(\is_array($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 | - $this->rules[]=new Rule($type,$prompt,$value); |
|
53 | - }else |
|
54 | - $this->rules[]=new Rule($type,$prompt,$value); |
|
52 | + $this->rules[]=new Rule($type, $prompt, $value); |
|
53 | + } else |
|
54 | + $this->rules[]=new Rule($type, $prompt, $value); |
|
55 | 55 | } |
56 | 56 | |
57 | - public function jsonSerialize(){ |
|
58 | - return ["identifier"=>$this->identifier,"rules"=>$this->rules]; |
|
57 | + public function jsonSerialize() { |
|
58 | + return ["identifier"=>$this->identifier, "rules"=>$this->rules]; |
|
59 | 59 | } |
60 | 60 | |
61 | 61 | public function setDepends($depends) { |
@@ -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(){ |
@@ -5,7 +5,7 @@ discard block |
||
5 | 5 | * @version 1.001 |
6 | 6 | * Generates a JSON Rule for the validation of a field |
7 | 7 | */ |
8 | -class Rule implements \JsonSerializable{ |
|
8 | +class Rule implements \JsonSerializable { |
|
9 | 9 | /** |
10 | 10 | * @var string |
11 | 11 | */ |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | */ |
21 | 21 | private $value; |
22 | 22 | |
23 | - public function __construct($type,$prompt=NULL,$value=NULL){ |
|
23 | + public function __construct($type, $prompt=NULL, $value=NULL) { |
|
24 | 24 | $this->type=$type; |
25 | 25 | $this->prompt=$prompt; |
26 | 26 | $this->value=$value; |
@@ -54,10 +54,10 @@ discard block |
||
54 | 54 | } |
55 | 55 | |
56 | 56 | public function jsonSerialize() { |
57 | - $result= ["type"=>$this->type]; |
|
58 | - if(isset($this->prompt)) |
|
57 | + $result=["type"=>$this->type]; |
|
58 | + if (isset($this->prompt)) |
|
59 | 59 | $result["prompt"]=$this->prompt; |
60 | - if(isset($this->value)) |
|
60 | + if (isset($this->value)) |
|
61 | 61 | $result["value"]=$this->value; |
62 | 62 | return $result; |
63 | 63 | } |
@@ -68,8 +68,8 @@ discard block |
||
68 | 68 | * @param string $prompt |
69 | 69 | * @return \Ajax\semantic\components\validation\Rule |
70 | 70 | */ |
71 | - public static function match($name,$prompt=NULL){ |
|
72 | - return new Rule("match[".$name."]",$prompt); |
|
71 | + public static function match($name, $prompt=NULL) { |
|
72 | + return new Rule("match[".$name."]", $prompt); |
|
73 | 73 | } |
74 | 74 | |
75 | 75 | /** |
@@ -78,8 +78,8 @@ discard block |
||
78 | 78 | * @param string $prompt |
79 | 79 | * @return \Ajax\semantic\components\validation\Rule |
80 | 80 | */ |
81 | - public static function different($name,$prompt=NULL){ |
|
82 | - return new Rule("different[".$name."]",$prompt); |
|
81 | + public static function different($name, $prompt=NULL) { |
|
82 | + return new Rule("different[".$name."]", $prompt); |
|
83 | 83 | } |
84 | 84 | |
85 | 85 | /** |
@@ -89,78 +89,78 @@ discard block |
||
89 | 89 | * @param string $prompt |
90 | 90 | * @return \Ajax\semantic\components\validation\Rule |
91 | 91 | */ |
92 | - 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 | - return new Rule("integer",$prompt); |
|
92 | + 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 | + return new Rule("integer", $prompt); |
|
96 | 96 | } |
97 | 97 | |
98 | - public static function decimal($prompt=NULL){ |
|
99 | - return new Rule("decimal",$prompt); |
|
98 | + public static function decimal($prompt=NULL) { |
|
99 | + return new Rule("decimal", $prompt); |
|
100 | 100 | } |
101 | 101 | |
102 | - public static function number($prompt=NULL){ |
|
103 | - return new Rule("number",$prompt); |
|
102 | + public static function number($prompt=NULL) { |
|
103 | + return new Rule("number", $prompt); |
|
104 | 104 | } |
105 | 105 | |
106 | - public static function is($value,$prompt=NULL){ |
|
107 | - return new Rule("is[".$value."]",$prompt); |
|
106 | + public static function is($value, $prompt=NULL) { |
|
107 | + return new Rule("is[".$value."]", $prompt); |
|
108 | 108 | } |
109 | 109 | |
110 | - public static function isExactly($value,$prompt=NULL){ |
|
111 | - return new Rule("isExactly[".$value."]",$prompt); |
|
110 | + public static function isExactly($value, $prompt=NULL) { |
|
111 | + return new Rule("isExactly[".$value."]", $prompt); |
|
112 | 112 | } |
113 | 113 | |
114 | - public static function not($value,$prompt=NULL){ |
|
115 | - return new Rule("not[".$value."]",$prompt); |
|
114 | + public static function not($value, $prompt=NULL) { |
|
115 | + return new Rule("not[".$value."]", $prompt); |
|
116 | 116 | } |
117 | 117 | |
118 | - public static function notExactly($value,$prompt=NULL){ |
|
119 | - return new Rule("notExactly[".$value."]",$prompt); |
|
118 | + public static function notExactly($value, $prompt=NULL) { |
|
119 | + return new Rule("notExactly[".$value."]", $prompt); |
|
120 | 120 | } |
121 | 121 | |
122 | - public static function contains($value,$prompt=NULL){ |
|
123 | - return new Rule("contains[".$value."]",$prompt); |
|
122 | + public static function contains($value, $prompt=NULL) { |
|
123 | + return new Rule("contains[".$value."]", $prompt); |
|
124 | 124 | } |
125 | 125 | |
126 | - public static function containsExactly($value,$prompt=NULL){ |
|
127 | - return new Rule("containsExactly[".$value."]",$prompt); |
|
126 | + public static function containsExactly($value, $prompt=NULL) { |
|
127 | + return new Rule("containsExactly[".$value."]", $prompt); |
|
128 | 128 | } |
129 | 129 | |
130 | - public static function doesntContain($value,$prompt=NULL){ |
|
131 | - return new Rule("doesntContain[".$value."]",$prompt); |
|
130 | + public static function doesntContain($value, $prompt=NULL) { |
|
131 | + return new Rule("doesntContain[".$value."]", $prompt); |
|
132 | 132 | } |
133 | 133 | |
134 | - public static function doesntContainExactly($value,$prompt=NULL){ |
|
135 | - return new Rule("doesntContainExactly[".$value."]",$prompt); |
|
134 | + public static function doesntContainExactly($value, $prompt=NULL) { |
|
135 | + return new Rule("doesntContainExactly[".$value."]", $prompt); |
|
136 | 136 | } |
137 | 137 | |
138 | - public static function minCount($value,$prompt=NULL){ |
|
139 | - return new Rule("minCount[".$value."]",$prompt); |
|
138 | + public static function minCount($value, $prompt=NULL) { |
|
139 | + return new Rule("minCount[".$value."]", $prompt); |
|
140 | 140 | } |
141 | 141 | |
142 | - public static function maxCount($value,$prompt=NULL){ |
|
143 | - return new Rule("maxCount[".$value."]",$prompt); |
|
142 | + public static function maxCount($value, $prompt=NULL) { |
|
143 | + return new Rule("maxCount[".$value."]", $prompt); |
|
144 | 144 | } |
145 | 145 | |
146 | - public static function exactCount($value,$prompt=NULL){ |
|
147 | - return new Rule("exactCount[".$value."]",$prompt); |
|
146 | + public static function exactCount($value, $prompt=NULL) { |
|
147 | + return new Rule("exactCount[".$value."]", $prompt); |
|
148 | 148 | } |
149 | 149 | |
150 | - public static function email($prompt=NULL){ |
|
151 | - return new Rule("email",$prompt); |
|
150 | + public static function email($prompt=NULL) { |
|
151 | + return new Rule("email", $prompt); |
|
152 | 152 | } |
153 | 153 | |
154 | - public static function url($prompt=NULL){ |
|
155 | - return new Rule("url",$prompt); |
|
154 | + public static function url($prompt=NULL) { |
|
155 | + return new Rule("url", $prompt); |
|
156 | 156 | } |
157 | 157 | |
158 | - public static function regExp($value,$prompt=NULL){ |
|
159 | - return new Rule("regExp",$prompt,$value); |
|
158 | + public static function regExp($value, $prompt=NULL) { |
|
159 | + return new Rule("regExp", $prompt, $value); |
|
160 | 160 | } |
161 | 161 | |
162 | - public static function custom($name,$jsFunction){ |
|
163 | - return "$.fn.form.settings.rules.".$name." =".$jsFunction ; |
|
162 | + public static function custom($name, $jsFunction) { |
|
163 | + return "$.fn.form.settings.rules.".$name." =".$jsFunction; |
|
164 | 164 | } |
165 | 165 | |
166 | 166 | } |
167 | 167 | \ No newline at end of file |
@@ -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 |
@@ -32,9 +32,9 @@ discard block |
||
32 | 32 | |
33 | 33 | public function __construct($identifier, $elements=array()) { |
34 | 34 | parent::__construct($identifier, "form", "ui form"); |
35 | - $this->_states=[ State::ERROR,State::SUCCESS,State::WARNING,State::DISABLED ]; |
|
35 | + $this->_states=[State::ERROR, State::SUCCESS, State::WARNING, State::DISABLED]; |
|
36 | 36 | $this->setProperty("name", $this->identifier); |
37 | - $this->_fields=array (); |
|
37 | + $this->_fields=array(); |
|
38 | 38 | $this->_validationParams=[]; |
39 | 39 | $this->addItems($elements); |
40 | 40 | } |
@@ -56,14 +56,14 @@ discard block |
||
56 | 56 | * @param string $caption |
57 | 57 | * @return \Ajax\semantic\html\collections\form\HtmlForm |
58 | 58 | */ |
59 | - public function addDivider($caption=NULL){ |
|
60 | - return $this->addContent(new HtmlDivider("",$caption)); |
|
59 | + public function addDivider($caption=NULL) { |
|
60 | + return $this->addContent(new HtmlDivider("", $caption)); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | public function addFields($fields=NULL, $label=NULL) { |
64 | 64 | if (isset($fields)) { |
65 | 65 | if (!$fields instanceof HtmlFormFields) { |
66 | - if (\is_array($fields) === false) { |
|
66 | + if (\is_array($fields)===false) { |
|
67 | 67 | $fields=\func_get_args(); |
68 | 68 | $end=\end($fields); |
69 | 69 | if (\is_string($end)) { |
@@ -73,12 +73,12 @@ discard block |
||
73 | 73 | $label=NULL; |
74 | 74 | } |
75 | 75 | $this->_fields=\array_merge($this->_fields, $fields); |
76 | - $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count(), $fields); |
|
76 | + $fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count(), $fields); |
|
77 | 77 | } |
78 | 78 | if (isset($label)) |
79 | 79 | $fields=new HtmlFormField("", $fields, $label); |
80 | 80 | } else { |
81 | - $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count()); |
|
81 | + $fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count()); |
|
82 | 82 | } |
83 | 83 | $this->addItem($fields); |
84 | 84 | return $fields; |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | |
87 | 87 | public function addItem($item) { |
88 | 88 | $item=parent::addItem($item); |
89 | - if (\is_subclass_of($item, HtmlFormField::class) === true) { |
|
89 | + if (\is_subclass_of($item, HtmlFormField::class)===true) { |
|
90 | 90 | $this->_fields[]=$item; |
91 | 91 | } |
92 | 92 | return $item; |
@@ -138,10 +138,10 @@ discard block |
||
138 | 138 | return $this->addItem($message); |
139 | 139 | } |
140 | 140 | |
141 | - private function addCompoValidation($js,$compo,$field){ |
|
141 | + private function addCompoValidation($js, $compo, $field) { |
|
142 | 142 | $validation=$field->getValidation(); |
143 | - if(isset($validation)){ |
|
144 | - if(isset($compo)===false){ |
|
143 | + if (isset($validation)) { |
|
144 | + if (isset($compo)===false) { |
|
145 | 145 | $compo=$js->semantic()->form("#".$this->identifier); |
146 | 146 | } |
147 | 147 | $validation->setIdentifier($field->getDataField()->getIdentifier()); |
@@ -152,26 +152,26 @@ discard block |
||
152 | 152 | |
153 | 153 | public function run(JsUtils $js) { |
154 | 154 | $compo=NULL; |
155 | - foreach ($this->_fields as $field){ |
|
156 | - if($field instanceof HtmlFormField) |
|
155 | + foreach ($this->_fields as $field) { |
|
156 | + if ($field instanceof HtmlFormField) |
|
157 | 157 | $compo=$this->addCompoValidation($js, $compo, $field); |
158 | 158 | } |
159 | - foreach ($this->content as $field){ |
|
160 | - if($field instanceof HtmlFormFields){ |
|
159 | + foreach ($this->content as $field) { |
|
160 | + if ($field instanceof HtmlFormFields) { |
|
161 | 161 | $items=$field->getItems(); |
162 | - foreach ($items as $_field){ |
|
163 | - if($_field instanceof HtmlFormField) |
|
162 | + foreach ($items as $_field) { |
|
163 | + if ($_field instanceof HtmlFormField) |
|
164 | 164 | $compo=$this->addCompoValidation($js, $compo, $_field); |
165 | 165 | } |
166 | 166 | } |
167 | 167 | } |
168 | - if(isset($compo)===false){ |
|
168 | + if (isset($compo)===false) { |
|
169 | 169 | return parent::run($js); |
170 | 170 | } |
171 | - if(isset($this->_validationParams["_ajaxSubmit"])){ |
|
172 | - if($this->_validationParams["_ajaxSubmit"] instanceof AjaxCall){ |
|
171 | + if (isset($this->_validationParams["_ajaxSubmit"])) { |
|
172 | + if ($this->_validationParams["_ajaxSubmit"] instanceof AjaxCall) { |
|
173 | 173 | $compilation=$this->_validationParams["_ajaxSubmit"]->compile($js); |
174 | - $compilation=str_ireplace("\"","%quote%", $compilation); |
|
174 | + $compilation=str_ireplace("\"", "%quote%", $compilation); |
|
175 | 175 | $this->onSuccess($compilation); |
176 | 176 | unset($this->_validationParams["_ajaxSubmit"]); |
177 | 177 | } |
@@ -186,7 +186,7 @@ discard block |
||
186 | 186 | return $this->addToProperty("class", "loading"); |
187 | 187 | } |
188 | 188 | |
189 | - public function addErrorMessage(){ |
|
189 | + public function addErrorMessage() { |
|
190 | 190 | return $this->addContent((new HtmlMessage(""))->setError()); |
191 | 191 | } |
192 | 192 | |
@@ -199,22 +199,22 @@ discard block |
||
199 | 199 | return $this; |
200 | 200 | } |
201 | 201 | |
202 | - public function submitOn($event,$identifier,$url,$responseElement){ |
|
202 | + public function submitOn($event, $identifier, $url, $responseElement) { |
|
203 | 203 | $elem=$this->getElementById($identifier, $this->content); |
204 | - if(isset($elem)){ |
|
204 | + if (isset($elem)) { |
|
205 | 205 | $elem->addEvent($event, "$('#".$this->identifier."').form('validate form');"); |
206 | - $this->_validationParams["_ajaxSubmit"]=new AjaxCall("postForm", ["form"=>$this->identifier,"responseElement"=>$responseElement,"url"=>$url]); |
|
206 | + $this->_validationParams["_ajaxSubmit"]=new AjaxCall("postForm", ["form"=>$this->identifier, "responseElement"=>$responseElement, "url"=>$url]); |
|
207 | 207 | } |
208 | 208 | return $this; |
209 | 209 | } |
210 | 210 | |
211 | - public function submitOnClick($identifier,$url,$responseElement){ |
|
211 | + public function submitOnClick($identifier, $url, $responseElement) { |
|
212 | 212 | return $this->submitOn("click", $identifier, $url, $responseElement); |
213 | 213 | } |
214 | 214 | |
215 | - public function addSubmit($identifier,$value,$CssStyle=NULL,$url=NULL,$responseElement=NULL){ |
|
216 | - $bt=$this->addButton($identifier, $value,$CssStyle); |
|
217 | - if(isset($url) && isset($responseElement)) |
|
215 | + public function addSubmit($identifier, $value, $CssStyle=NULL, $url=NULL, $responseElement=NULL) { |
|
216 | + $bt=$this->addButton($identifier, $value, $CssStyle); |
|
217 | + if (isset($url) && isset($responseElement)) |
|
218 | 218 | $this->submitOnClick($identifier, $url, $responseElement); |
219 | 219 | return $bt; |
220 | 220 | } |
@@ -224,7 +224,7 @@ discard block |
||
224 | 224 | * @param string $jsCode |
225 | 225 | * @return \Ajax\semantic\html\collections\form\HtmlForm |
226 | 226 | */ |
227 | - public function onValid($jsCode){ |
|
227 | + public function onValid($jsCode) { |
|
228 | 228 | $this->_validationParams["onValid"]="%function(){".$jsCode."}%"; |
229 | 229 | return $this; |
230 | 230 | } |
@@ -234,7 +234,7 @@ discard block |
||
234 | 234 | * @param string $jsCode can use event and fields parameters |
235 | 235 | * @return HtmlForm |
236 | 236 | */ |
237 | - public function onSuccess($jsCode){ |
|
237 | + public function onSuccess($jsCode) { |
|
238 | 238 | $this->_validationParams["onSuccess"]="%function(evt,fields){".$jsCode."}%"; |
239 | 239 | return $this; |
240 | 240 | } |
@@ -6,6 +6,9 @@ |
||
6 | 6 | |
7 | 7 | trait CheckboxTrait { |
8 | 8 | |
9 | + /** |
|
10 | + * @param string $name |
|
11 | + */ |
|
9 | 12 | public abstract function addToPropertyCtrl($name, $value, $typeCtrl); |
10 | 13 | |
11 | 14 | public function setType($checkboxType) { |
@@ -11,51 +11,51 @@ |
||
11 | 11 | |
12 | 12 | public abstract function addToProperty($name, $value, $separator=" "); |
13 | 13 | public abstract function addLabel($caption, $style="label-default", $leftSeparator=" "); |
14 | - public abstract function addContent($content,$before=false); |
|
14 | + public abstract function addContent($content, $before=false); |
|
15 | 15 | public function setFocus() { |
16 | 16 | $this->addToProperty("class", State::FOCUS); |
17 | 17 | } |
18 | 18 | |
19 | 19 | public function addLoading() { |
20 | - if ($this->_hasIcon === false) { |
|
20 | + if ($this->_hasIcon===false) { |
|
21 | 21 | throw new \Exception("Input must have an icon for showing a loader, use addIcon before"); |
22 | 22 | } |
23 | 23 | return $this->addToProperty("class", State::LOADING); |
24 | 24 | } |
25 | 25 | |
26 | 26 | public function labeled($label, $direction=Direction::LEFT, $icon=NULL) { |
27 | - $labelO=$this->addLabel($label,$direction===Direction::LEFT,$icon); |
|
28 | - $this->addToProperty("class", $direction . " labeled"); |
|
27 | + $labelO=$this->addLabel($label, $direction===Direction::LEFT, $icon); |
|
28 | + $this->addToProperty("class", $direction." labeled"); |
|
29 | 29 | return $labelO; |
30 | 30 | } |
31 | 31 | |
32 | 32 | public function labeledToCorner($icon, $direction=Direction::LEFT) { |
33 | - return $this->labeled("", $direction . " corner", $icon)->toCorner($direction); |
|
33 | + return $this->labeled("", $direction." corner", $icon)->toCorner($direction); |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | public function addAction($action, $direction=Direction::RIGHT, $icon=NULL, $labeled=false) { |
37 | 37 | $actionO=$action; |
38 | - if (\is_object($action) === false) { |
|
39 | - $actionO=new HtmlButton("action-" . $this->identifier, $action); |
|
38 | + if (\is_object($action)===false) { |
|
39 | + $actionO=new HtmlButton("action-".$this->identifier, $action); |
|
40 | 40 | if (isset($icon)) |
41 | 41 | $actionO->addIcon($icon, true, $labeled); |
42 | 42 | } |
43 | - $this->addToProperty("class", $direction . " action"); |
|
44 | - $this->addContent($actionO, \strstr($direction, Direction::LEFT) !== false); |
|
43 | + $this->addToProperty("class", $direction." action"); |
|
44 | + $this->addContent($actionO, \strstr($direction, Direction::LEFT)!==false); |
|
45 | 45 | return $actionO; |
46 | 46 | } |
47 | 47 | |
48 | - public function addDropdown($label="", $items=array(),$direction=Direction::RIGHT){ |
|
49 | - $labelO=new HtmlDropdown("dd-".$this->identifier,$label,$items); |
|
50 | - $labelO->asSelect("select-".$this->identifier,false,true); |
|
51 | - return $this->labeled($labelO,$direction); |
|
48 | + public function addDropdown($label="", $items=array(), $direction=Direction::RIGHT) { |
|
49 | + $labelO=new HtmlDropdown("dd-".$this->identifier, $label, $items); |
|
50 | + $labelO->asSelect("select-".$this->identifier, false, true); |
|
51 | + return $this->labeled($labelO, $direction); |
|
52 | 52 | } |
53 | 53 | |
54 | 54 | public function setTransparent() { |
55 | 55 | return $this->addToProperty("class", "transparent"); |
56 | 56 | } |
57 | 57 | |
58 | - public function setReadonly(){ |
|
58 | + public function setReadonly() { |
|
59 | 59 | $this->getField()->setProperty("readonly", ""); |
60 | 60 | } |
61 | 61 |
@@ -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); |