@@ -5,7 +5,7 @@ discard block |
||
5 | 5 | use Ajax\semantic\html\collections\HtmlMessage; |
6 | 6 | use Ajax\service\AjaxCall; |
7 | 7 | |
8 | -trait FormTrait{ |
|
8 | +trait FormTrait { |
|
9 | 9 | /** |
10 | 10 | * @return HtmlForm |
11 | 11 | */ |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | return $this->getForm()->addToProperty("class", "loading"); |
16 | 16 | } |
17 | 17 | |
18 | - public function addErrorMessage(){ |
|
18 | + public function addErrorMessage() { |
|
19 | 19 | return $this->getForm()->addContent((new HtmlMessage(""))->setError()); |
20 | 20 | } |
21 | 21 | |
@@ -30,35 +30,35 @@ discard block |
||
30 | 30 | * @param string $responseElement |
31 | 31 | * @return \Ajax\semantic\html\collections\form\HtmlForm |
32 | 32 | */ |
33 | - public function submitOn($event,$identifier,$url,$responseElement){ |
|
33 | + public function submitOn($event, $identifier, $url, $responseElement) { |
|
34 | 34 | $form=$this->getForm(); |
35 | 35 | $elem=$form->getElementById($identifier, $form->getContent()); |
36 | - if(isset($elem)){ |
|
37 | - $this->_buttonAsSubmit($elem, $event,$url,$responseElement); |
|
36 | + if (isset($elem)) { |
|
37 | + $this->_buttonAsSubmit($elem, $event, $url, $responseElement); |
|
38 | 38 | } |
39 | 39 | return $form; |
40 | 40 | } |
41 | 41 | |
42 | - public function submitOnClick($identifier,$url,$responseElement){ |
|
42 | + public function submitOnClick($identifier, $url, $responseElement) { |
|
43 | 43 | return $this->submitOn("click", $identifier, $url, $responseElement); |
44 | 44 | } |
45 | 45 | |
46 | - public function addSubmit($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL){ |
|
47 | - $bt=$this->getForm()->addButton($identifier, $value,$cssStyle); |
|
48 | - return $this->_buttonAsSubmit($bt, "click",$url,$responseElement); |
|
46 | + public function addSubmit($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL) { |
|
47 | + $bt=$this->getForm()->addButton($identifier, $value, $cssStyle); |
|
48 | + return $this->_buttonAsSubmit($bt, "click", $url, $responseElement); |
|
49 | 49 | } |
50 | 50 | |
51 | - protected function _buttonAsSubmit(&$button,$event,$url,$responseElement=NULL){ |
|
51 | + protected function _buttonAsSubmit(&$button, $event, $url, $responseElement=NULL) { |
|
52 | 52 | $form=$this->getForm(); |
53 | - if(isset($url) && isset($responseElement)){ |
|
53 | + if (isset($url) && isset($responseElement)) { |
|
54 | 54 | $button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');"); |
55 | - $form->addValidationParam("_ajaxSubmit", new AjaxCall("postForm", ["form"=>$form->getIdentifier(),"responseElement"=>$responseElement,"url"=>$url])); |
|
55 | + $form->addValidationParam("_ajaxSubmit", new AjaxCall("postForm", ["form"=>$form->getIdentifier(), "responseElement"=>$responseElement, "url"=>$url])); |
|
56 | 56 | } |
57 | 57 | return $button; |
58 | 58 | } |
59 | 59 | |
60 | - public function addReset($identifier,$value,$cssStyle=NULL){ |
|
61 | - $bt=$this->getForm()->addButton($identifier, $value,$cssStyle); |
|
60 | + public function addReset($identifier, $value, $cssStyle=NULL) { |
|
61 | + $bt=$this->getForm()->addButton($identifier, $value, $cssStyle); |
|
62 | 62 | $bt->setProperty("type", "reset"); |
63 | 63 | return $bt; |
64 | 64 | } |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | * @param string $jsCode |
69 | 69 | * @return \Ajax\semantic\html\collections\form\HtmlForm |
70 | 70 | */ |
71 | - public function onValid($jsCode){ |
|
71 | + public function onValid($jsCode) { |
|
72 | 72 | $form=$this->getForm(); |
73 | 73 | $form->addValidationParam("onValid", "%function(){".$jsCode."}%"); |
74 | 74 | return $form; |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | * @param string $jsCode can use event and fields parameters |
80 | 80 | * @return HtmlForm |
81 | 81 | */ |
82 | - public function onSuccess($jsCode){ |
|
82 | + public function onSuccess($jsCode) { |
|
83 | 83 | $form=$this->getForm(); |
84 | 84 | $form->addValidationParam("onSuccess", "%function(evt,fields){".$jsCode."}%"); |
85 | 85 | return $form; |
@@ -23,6 +23,10 @@ discard block |
||
23 | 23 | private $_footer; |
24 | 24 | private $_afterCompileEvents; |
25 | 25 | |
26 | + /** |
|
27 | + * @param integer $rowCount |
|
28 | + * @param integer $colCount |
|
29 | + */ |
|
26 | 30 | public function __construct($identifier, $rowCount, $colCount) { |
27 | 31 | parent::__construct($identifier, "table", "ui table"); |
28 | 32 | $this->content=array (); |
@@ -112,7 +116,7 @@ discard block |
||
112 | 116 | /** |
113 | 117 | * Retuns the row at $rowIndex |
114 | 118 | * @param int $rowIndex |
115 | - * @return \Ajax\semantic\html\content\HtmlTR |
|
119 | + * @return \Ajax\common\html\HtmlDoubleElement |
|
116 | 120 | */ |
117 | 121 | public function getRow($rowIndex) { |
118 | 122 | return $this->getBody()->getRow($rowIndex); |
@@ -154,7 +158,7 @@ discard block |
||
154 | 158 | * Sets values to the col at index $colIndex |
155 | 159 | * @param int $colIndex |
156 | 160 | * @param array $values |
157 | - * @return \Ajax\semantic\html\collections\HtmlTable |
|
161 | + * @return HtmlTable |
|
158 | 162 | */ |
159 | 163 | public function setColValues($colIndex, $values=array()) { |
160 | 164 | $this->getBody()->setColValues($colIndex, $values); |
@@ -165,7 +169,7 @@ discard block |
||
165 | 169 | * Sets values to the row at index $rowIndex |
166 | 170 | * @param int $rowIndex |
167 | 171 | * @param array $values |
168 | - * @return \Ajax\semantic\html\collections\HtmlTable |
|
172 | + * @return HtmlTable |
|
169 | 173 | */ |
170 | 174 | public function setRowValues($rowIndex, $values=array()) { |
171 | 175 | $this->getBody()->setRowValues($rowIndex, $values); |
@@ -188,6 +192,9 @@ discard block |
||
188 | 192 | return $this->colAlign($colIndex, "colLeft"); |
189 | 193 | } |
190 | 194 | |
195 | + /** |
|
196 | + * @param string $function |
|
197 | + */ |
|
191 | 198 | private function colAlign($colIndex, $function) { |
192 | 199 | if (\is_array($colIndex)) { |
193 | 200 | foreach ( $colIndex as $cIndex ) { |
@@ -263,7 +270,7 @@ discard block |
||
263 | 270 | |
264 | 271 | /** |
265 | 272 | * @param array $parts |
266 | - * @return \Ajax\semantic\html\collections\HtmlTable |
|
273 | + * @return HtmlTable |
|
267 | 274 | */ |
268 | 275 | public function setCompileParts($parts=["tbody"]) { |
269 | 276 | $this->_compileParts=$parts; |
@@ -286,7 +293,7 @@ discard block |
||
286 | 293 | * The callback function called after the insertion of each row when fromDatabaseObjects is called |
287 | 294 | * callback function takes the parameters $row : the row inserted and $object: the instance of model used |
288 | 295 | * @param callable $callback |
289 | - * @return \Ajax\semantic\html\collections\HtmlTable |
|
296 | + * @return HtmlTable |
|
290 | 297 | */ |
291 | 298 | public function onNewRow($callback) { |
292 | 299 | $this->_afterCompileEvents["onNewRow"]=$callback; |
@@ -5,7 +5,6 @@ |
||
5 | 5 | use Ajax\semantic\html\base\HtmlSemDoubleElement; |
6 | 6 | use Ajax\JsUtils; |
7 | 7 | use Ajax\service\JArray; |
8 | - |
|
9 | 8 | use Ajax\semantic\html\base\constants\State; |
10 | 9 | |
11 | 10 | class HtmlProgress extends HtmlSemDoubleElement { |
@@ -25,10 +25,10 @@ discard block |
||
25 | 25 | |
26 | 26 | public function __construct($identifier, $rowCount, $colCount) { |
27 | 27 | parent::__construct($identifier, "table", "ui table"); |
28 | - $this->content=array (); |
|
28 | + $this->content=array(); |
|
29 | 29 | $this->setRowCount($rowCount, $colCount); |
30 | - $this->_variations=[ Variation::CELLED,Variation::PADDED,Variation::COMPACT ]; |
|
31 | - $this->_compileParts=["thead","tbody","tfoot"]; |
|
30 | + $this->_variations=[Variation::CELLED, Variation::PADDED, Variation::COMPACT]; |
|
31 | + $this->_compileParts=["thead", "tbody", "tfoot"]; |
|
32 | 32 | $this->_afterCompileEvents=[]; |
33 | 33 | } |
34 | 34 | |
@@ -46,9 +46,9 @@ discard block |
||
46 | 46 | * @return HtmlTableContent |
47 | 47 | */ |
48 | 48 | public function getPart($key) { |
49 | - if (\array_key_exists($key, $this->content) === false) { |
|
49 | + if (\array_key_exists($key, $this->content)===false) { |
|
50 | 50 | $this->content[$key]=new HtmlTableContent("", $key); |
51 | - if ($key !== "tbody") { |
|
51 | + if ($key!=="tbody") { |
|
52 | 52 | $this->content[$key]->setRowCount(1, $this->_colCount); |
53 | 53 | } |
54 | 54 | } |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | * @return boolean |
86 | 86 | */ |
87 | 87 | public function hasPart($key) { |
88 | - return \array_key_exists($key, $this->content) === true; |
|
88 | + return \array_key_exists($key, $this->content)===true; |
|
89 | 89 | } |
90 | 90 | |
91 | 91 | /** |
@@ -190,7 +190,7 @@ discard block |
||
190 | 190 | |
191 | 191 | private function colAlign($colIndex, $function) { |
192 | 192 | if (\is_array($colIndex)) { |
193 | - foreach ( $colIndex as $cIndex ) { |
|
193 | + foreach ($colIndex as $cIndex) { |
|
194 | 194 | $this->colAlign($cIndex, $function); |
195 | 195 | } |
196 | 196 | } else { |
@@ -229,12 +229,12 @@ discard block |
||
229 | 229 | * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile() |
230 | 230 | */ |
231 | 231 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
232 | - if(\sizeof($this->_compileParts)<3){ |
|
232 | + if (\sizeof($this->_compileParts)<3) { |
|
233 | 233 | $this->_template="%content%"; |
234 | 234 | $this->refresh(); |
235 | - }else{ |
|
235 | + } else { |
|
236 | 236 | if ($this->propertyContains("class", "sortable")) { |
237 | - $this->addEvent("execute", "$('#" . $this->identifier . "').tablesort();"); |
|
237 | + $this->addEvent("execute", "$('#".$this->identifier."').tablesort();"); |
|
238 | 238 | } |
239 | 239 | } |
240 | 240 | $this->content=JArray::sortAssociative($this->content, $this->_compileParts); |
@@ -250,13 +250,13 @@ discard block |
||
250 | 250 | public function fromDatabaseObject($object, $function) { |
251 | 251 | $result=$function($object); |
252 | 252 | if (\is_array($result)) { |
253 | - $result= $this->addRow($function($object)); |
|
253 | + $result=$this->addRow($function($object)); |
|
254 | 254 | } else { |
255 | - $result= $this->getBody()->_addRow($result); |
|
255 | + $result=$this->getBody()->_addRow($result); |
|
256 | 256 | } |
257 | - if(isset($this->_afterCompileEvents["onNewRow"])){ |
|
258 | - if(\is_callable($this->_afterCompileEvents["onNewRow"])) |
|
259 | - $this->_afterCompileEvents["onNewRow"]($result,$object); |
|
257 | + if (isset($this->_afterCompileEvents["onNewRow"])) { |
|
258 | + if (\is_callable($this->_afterCompileEvents["onNewRow"])) |
|
259 | + $this->_afterCompileEvents["onNewRow"]($result, $object); |
|
260 | 260 | } |
261 | 261 | return $result; |
262 | 262 | } |
@@ -270,14 +270,14 @@ discard block |
||
270 | 270 | return $this; |
271 | 271 | } |
272 | 272 | |
273 | - public function refresh(){ |
|
273 | + public function refresh() { |
|
274 | 274 | $this->_footer=$this->getFooter(); |
275 | 275 | $this->addEvent("execute", '$("#'.$this->identifier.' tfoot").replaceWith("'.\addslashes($this->_footer).'");'); |
276 | 276 | } |
277 | 277 | |
278 | - public function run(JsUtils $js){ |
|
279 | - $result= parent::run($js); |
|
280 | - if(isset($this->_footer)) |
|
278 | + public function run(JsUtils $js) { |
|
279 | + $result=parent::run($js); |
|
280 | + if (isset($this->_footer)) |
|
281 | 281 | $this->_footer->run($js); |
282 | 282 | return $result; |
283 | 283 | } |
@@ -232,7 +232,7 @@ discard block |
||
232 | 232 | if(\sizeof($this->_compileParts)<3){ |
233 | 233 | $this->_template="%content%"; |
234 | 234 | $this->refresh(); |
235 | - }else{ |
|
235 | + } else{ |
|
236 | 236 | if ($this->propertyContains("class", "sortable")) { |
237 | 237 | $this->addEvent("execute", "$('#" . $this->identifier . "').tablesort();"); |
238 | 238 | } |
@@ -255,8 +255,9 @@ discard block |
||
255 | 255 | $result= $this->getBody()->_addRow($result); |
256 | 256 | } |
257 | 257 | if(isset($this->_afterCompileEvents["onNewRow"])){ |
258 | - if(\is_callable($this->_afterCompileEvents["onNewRow"])) |
|
259 | - $this->_afterCompileEvents["onNewRow"]($result,$object); |
|
258 | + if(\is_callable($this->_afterCompileEvents["onNewRow"])) { |
|
259 | + $this->_afterCompileEvents["onNewRow"]($result,$object); |
|
260 | + } |
|
260 | 261 | } |
261 | 262 | return $result; |
262 | 263 | } |
@@ -277,8 +278,9 @@ discard block |
||
277 | 278 | |
278 | 279 | public function run(JsUtils $js){ |
279 | 280 | $result= parent::run($js); |
280 | - if(isset($this->_footer)) |
|
281 | - $this->_footer->run($js); |
|
281 | + if(isset($this->_footer)) { |
|
282 | + $this->_footer->run($js); |
|
283 | + } |
|
282 | 284 | return $result; |
283 | 285 | } |
284 | 286 |
@@ -1,13 +1,13 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | namespace Ajax\semantic\html\collections\table\traits; |
3 | 3 | |
4 | -trait TableTrait{ |
|
4 | +trait TableTrait { |
|
5 | 5 | /** |
6 | 6 | * @return HtmlTable |
7 | 7 | */ |
8 | 8 | abstract protected function getTable(); |
9 | 9 | |
10 | - protected function addToPropertyTable($property,$value){ |
|
10 | + protected function addToPropertyTable($property, $value) { |
|
11 | 11 | return $this->getTable()->addToProperty($property, $value); |
12 | 12 | } |
13 | 13 | |
@@ -18,8 +18,8 @@ discard block |
||
18 | 18 | public function setBasic($very=false) { |
19 | 19 | $table=$this->getTable(); |
20 | 20 | if ($very) |
21 | - $table->addToPropertyCtrl("class", "very", array ("very" )); |
|
22 | - return $table->addToPropertyCtrl("class", "basic", array ("basic" )); |
|
21 | + $table->addToPropertyCtrl("class", "very", array("very")); |
|
22 | + return $table->addToPropertyCtrl("class", "basic", array("basic")); |
|
23 | 23 | } |
24 | 24 | |
25 | 25 | public function setCollapsing() { |
@@ -17,8 +17,9 @@ |
||
17 | 17 | |
18 | 18 | public function setBasic($very=false) { |
19 | 19 | $table=$this->getTable(); |
20 | - if ($very) |
|
21 | - $table->addToPropertyCtrl("class", "very", array ("very" )); |
|
20 | + if ($very) { |
|
21 | + $table->addToPropertyCtrl("class", "very", array ("very" )); |
|
22 | + } |
|
22 | 23 | return $table->addToPropertyCtrl("class", "basic", array ("basic" )); |
23 | 24 | } |
24 | 25 |
@@ -5,7 +5,7 @@ discard block |
||
5 | 5 | class JArray { |
6 | 6 | |
7 | 7 | public static function isAssociative($array) { |
8 | - return (array_values($array) !== $array); |
|
8 | + return (array_values($array)!==$array); |
|
9 | 9 | // return (array_keys($array)!==range(0, count($array)-1)); |
10 | 10 | } |
11 | 11 | |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | return $array[$key]; |
15 | 15 | } |
16 | 16 | $values=array_values($array); |
17 | - if ($pos < sizeof($values)) |
|
17 | + if ($pos<sizeof($values)) |
|
18 | 18 | return $values[$pos]; |
19 | 19 | } |
20 | 20 | |
@@ -22,12 +22,12 @@ discard block |
||
22 | 22 | $result=NULL; |
23 | 23 | if (array_key_exists($key, $array)) { |
24 | 24 | $result=$array[$key]; |
25 | - if ($condition($result) === true) |
|
25 | + if ($condition($result)===true) |
|
26 | 26 | return $result; |
27 | 27 | } |
28 | 28 | $values=array_values($array); |
29 | - foreach ( $values as $val ) { |
|
30 | - if ($condition($val) === true) |
|
29 | + foreach ($values as $val) { |
|
30 | + if ($condition($val)===true) |
|
31 | 31 | return $val; |
32 | 32 | } |
33 | 33 | return $result; |
@@ -44,11 +44,11 @@ discard block |
||
44 | 44 | $result=""; |
45 | 45 | if (\is_array($glue)) { |
46 | 46 | $size=\sizeof($pieces); |
47 | - if ($size > 0) { |
|
48 | - for($i=0; $i < $size - 1; $i++) { |
|
49 | - $result.=$pieces[$i] . @$glue[$i]; |
|
47 | + if ($size>0) { |
|
48 | + for ($i=0; $i<$size-1; $i++) { |
|
49 | + $result.=$pieces[$i].@$glue[$i]; |
|
50 | 50 | } |
51 | - $result.=$pieces[$size - 1]; |
|
51 | + $result.=$pieces[$size-1]; |
|
52 | 52 | } |
53 | 53 | } else { |
54 | 54 | $result=\implode($glue, $pieces); |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | |
59 | 59 | public static function dimension($array) { |
60 | 60 | if (is_array(reset($array))) { |
61 | - $return=self::dimension(reset($array)) + 1; |
|
61 | + $return=self::dimension(reset($array))+1; |
|
62 | 62 | } else { |
63 | 63 | $return=1; |
64 | 64 | } |
@@ -66,8 +66,8 @@ discard block |
||
66 | 66 | } |
67 | 67 | |
68 | 68 | public static function sortAssociative($array, $sortedKeys=array()) { |
69 | - $newArray=array (); |
|
70 | - foreach ( $sortedKeys as $key ) { |
|
69 | + $newArray=array(); |
|
70 | + foreach ($sortedKeys as $key) { |
|
71 | 71 | if (\array_key_exists($key, $array)) { |
72 | 72 | $newArray[$key]=$array[$key]; |
73 | 73 | } |
@@ -75,27 +75,27 @@ discard block |
||
75 | 75 | return $newArray; |
76 | 76 | } |
77 | 77 | |
78 | - public static function modelArray($objects,$identifierFunction=NULL,$modelFunction=NULL){ |
|
78 | + public static function modelArray($objects, $identifierFunction=NULL, $modelFunction=NULL) { |
|
79 | 79 | $result=[]; |
80 | - if(isset($modelFunction)===false){ |
|
80 | + if (isset($modelFunction)===false) { |
|
81 | 81 | $modelFunction="__toString"; |
82 | 82 | } |
83 | - if(isset($identifierFunction)===false){ |
|
84 | - foreach ($objects as $object){ |
|
83 | + if (isset($identifierFunction)===false) { |
|
84 | + foreach ($objects as $object) { |
|
85 | 85 | $result[]=self::callFunction($object, $modelFunction); |
86 | 86 | } |
87 | - }else{ |
|
88 | - foreach ($objects as $object){ |
|
87 | + } else { |
|
88 | + foreach ($objects as $object) { |
|
89 | 89 | $result[self::callFunction($object, $identifierFunction)]=self::callFunction($object, $modelFunction); |
90 | 90 | } |
91 | 91 | } |
92 | 92 | return $result; |
93 | 93 | } |
94 | 94 | |
95 | - private static function callFunction($object,$callback){ |
|
96 | - if(\is_string($callback)) |
|
97 | - return \call_user_func(array($object, $callback),[]); |
|
98 | - else if (\is_callable($callback)){ |
|
95 | + private static function callFunction($object, $callback) { |
|
96 | + if (\is_string($callback)) |
|
97 | + return \call_user_func(array($object, $callback), []); |
|
98 | + else if (\is_callable($callback)) { |
|
99 | 99 | return $callback($object); |
100 | 100 | } |
101 | 101 | } |
@@ -14,21 +14,24 @@ discard block |
||
14 | 14 | return $array[$key]; |
15 | 15 | } |
16 | 16 | $values=array_values($array); |
17 | - if ($pos < sizeof($values)) |
|
18 | - return $values[$pos]; |
|
17 | + if ($pos < sizeof($values)) { |
|
18 | + return $values[$pos]; |
|
19 | + } |
|
19 | 20 | } |
20 | 21 | |
21 | 22 | public static function getConditionalValue($array, $key, $condition) { |
22 | 23 | $result=NULL; |
23 | 24 | if (array_key_exists($key, $array)) { |
24 | 25 | $result=$array[$key]; |
25 | - if ($condition($result) === true) |
|
26 | - return $result; |
|
26 | + if ($condition($result) === true) { |
|
27 | + return $result; |
|
28 | + } |
|
27 | 29 | } |
28 | 30 | $values=array_values($array); |
29 | 31 | foreach ( $values as $val ) { |
30 | - if ($condition($val) === true) |
|
31 | - return $val; |
|
32 | + if ($condition($val) === true) { |
|
33 | + return $val; |
|
34 | + } |
|
32 | 35 | } |
33 | 36 | return $result; |
34 | 37 | } |
@@ -36,8 +39,9 @@ discard block |
||
36 | 39 | public static function getDefaultValue($array, $key, $default=NULL) { |
37 | 40 | if (array_key_exists($key, $array)) { |
38 | 41 | return $array[$key]; |
39 | - } else |
|
40 | - return $default; |
|
42 | + } else { |
|
43 | + return $default; |
|
44 | + } |
|
41 | 45 | } |
42 | 46 | |
43 | 47 | public static function implode($glue, $pieces) { |
@@ -84,7 +88,7 @@ discard block |
||
84 | 88 | foreach ($objects as $object){ |
85 | 89 | $result[]=self::callFunction($object, $modelFunction); |
86 | 90 | } |
87 | - }else{ |
|
91 | + } else{ |
|
88 | 92 | foreach ($objects as $object){ |
89 | 93 | $result[self::callFunction($object, $identifierFunction)]=self::callFunction($object, $modelFunction); |
90 | 94 | } |
@@ -93,9 +97,9 @@ discard block |
||
93 | 97 | } |
94 | 98 | |
95 | 99 | private static function callFunction($object,$callback){ |
96 | - if(\is_string($callback)) |
|
97 | - return \call_user_func(array($object, $callback),[]); |
|
98 | - else if (\is_callable($callback)){ |
|
100 | + if(\is_string($callback)) { |
|
101 | + return \call_user_func(array($object, $callback),[]); |
|
102 | + } else if (\is_callable($callback)){ |
|
99 | 103 | return $callback($object); |
100 | 104 | } |
101 | 105 | } |
@@ -7,21 +7,21 @@ |
||
7 | 7 | |
8 | 8 | class HtmlFormDropdown extends HtmlFormField { |
9 | 9 | |
10 | - public function __construct($identifier,$items=array(), $label=NULL,$value=NULL,$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=NULL, $multiple=false, $associative=true) { |
|
11 | + parent::__construct("field-".$identifier, (new HtmlDropdown("dropdown-".$identifier, $value, $items, $associative))->asSelect($identifier, $multiple), $label); |
|
12 | 12 | } |
13 | 13 | |
14 | - public function setItems($items){ |
|
14 | + public function setItems($items) { |
|
15 | 15 | return $this->getField()->setItems($items); |
16 | 16 | } |
17 | - public function addItem($item,$value=NULL,$image=NULL){ |
|
18 | - return $this->getField()->addItem($item,$value,$image); |
|
17 | + public function addItem($item, $value=NULL, $image=NULL) { |
|
18 | + return $this->getField()->addItem($item, $value, $image); |
|
19 | 19 | } |
20 | - public static function multipleDropdown($identifier,$items=array(), $label=NULL,$value=NULL,$associative=true){ |
|
21 | - return new HtmlFormDropdown($identifier,$items,$label,$value,true,$associative); |
|
20 | + public static function multipleDropdown($identifier, $items=array(), $label=NULL, $value=NULL, $associative=true) { |
|
21 | + return new HtmlFormDropdown($identifier, $items, $label, $value, true, $associative); |
|
22 | 22 | } |
23 | 23 | |
24 | - public function getDataField(){ |
|
24 | + public function getDataField() { |
|
25 | 25 | return $this->getField()->getInput(); |
26 | 26 | } |
27 | 27 | } |
28 | 28 | \ No newline at end of file |
@@ -14,60 +14,60 @@ |
||
14 | 14 | protected $params; |
15 | 15 | protected $semElement; |
16 | 16 | |
17 | - public function __construct($semElement,$title="",$content="",$variation=NULL,$params=array()){ |
|
17 | + public function __construct($semElement, $title="", $content="", $variation=NULL, $params=array()) { |
|
18 | 18 | $this->semElement=$semElement; |
19 | 19 | $this->title=$title; |
20 | 20 | $this->content=$content; |
21 | - $this->setAttributes($variation,$params); |
|
21 | + $this->setAttributes($variation, $params); |
|
22 | 22 | } |
23 | 23 | |
24 | 24 | public function setHtml($html) { |
25 | - $this->html= $html; |
|
25 | + $this->html=$html; |
|
26 | 26 | return $this; |
27 | 27 | } |
28 | 28 | |
29 | - public function setAttributes($variation=NULL,$params=array()){ |
|
29 | + public function setAttributes($variation=NULL, $params=array()) { |
|
30 | 30 | $this->variation=$variation; |
31 | 31 | $this->params=$params; |
32 | 32 | } |
33 | 33 | |
34 | - public function onShow($jsCode){ |
|
34 | + public function onShow($jsCode) { |
|
35 | 35 | $this->params["onShow"]=$jsCode; |
36 | 36 | } |
37 | 37 | |
38 | - public function compile(JsUtils $js=NULL){ |
|
39 | - if(JString::isNotNull($this->title)){ |
|
38 | + public function compile(JsUtils $js=NULL) { |
|
39 | + if (JString::isNotNull($this->title)) { |
|
40 | 40 | $this->semElement->addToProperty("data-title", $this->title); |
41 | 41 | } |
42 | - if(JString::isNotNull($this->content)){ |
|
42 | + if (JString::isNotNull($this->content)) { |
|
43 | 43 | $this->semElement->addToProperty("data-content", $this->content); |
44 | 44 | } |
45 | - if(JString::isNotNull($this->html)){ |
|
45 | + if (JString::isNotNull($this->html)) { |
|
46 | 46 | $html=$this->html; |
47 | - if(\is_array($html)){ |
|
47 | + if (\is_array($html)) { |
|
48 | 48 | \array_walk($html, function(&$item) use($js){ |
49 | - if($item instanceof HtmlSemDoubleElement){ |
|
49 | + if ($item instanceof HtmlSemDoubleElement) { |
|
50 | 50 | $comp=$item->compile($js); |
51 | - if(isset($js)){ |
|
51 | + if (isset($js)) { |
|
52 | 52 | $bs=$item->run($js); |
53 | - if(isset($bs)) |
|
53 | + if (isset($bs)) |
|
54 | 54 | $this->params['onShow']=$bs->getScript(); |
55 | 55 | } |
56 | 56 | $item=$comp; |
57 | 57 | } |
58 | 58 | }); |
59 | - $html=\implode("",$html); |
|
59 | + $html=\implode("", $html); |
|
60 | 60 | } |
61 | 61 | $html=\str_replace("\"", "'", $html); |
62 | 62 | $this->semElement->addToProperty("data-html", $html); |
63 | 63 | } |
64 | - if(JString::isNotNull($this->variation)){ |
|
64 | + if (JString::isNotNull($this->variation)) { |
|
65 | 65 | $this->semElement->addToProperty("data-variation", $this->variation); |
66 | 66 | } |
67 | 67 | } |
68 | 68 | |
69 | - public function run(JsUtils $js){ |
|
70 | - $js->semantic()->popup("#".$this->semElement->getIdentifier(),$this->params); |
|
69 | + public function run(JsUtils $js) { |
|
70 | + $js->semantic()->popup("#".$this->semElement->getIdentifier(), $this->params); |
|
71 | 71 | } |
72 | 72 | |
73 | 73 | } |
74 | 74 | \ No newline at end of file |
@@ -50,8 +50,9 @@ |
||
50 | 50 | $comp=$item->compile($js); |
51 | 51 | if(isset($js)){ |
52 | 52 | $bs=$item->run($js); |
53 | - if(isset($bs)) |
|
54 | - $this->params['onShow']=$bs->getScript(); |
|
53 | + if(isset($bs)) { |
|
54 | + $this->params['onShow']=$bs->getScript(); |
|
55 | + } |
|
55 | 56 | } |
56 | 57 | $item=$comp; |
57 | 58 | } |
@@ -3,8 +3,8 @@ |
||
3 | 3 | namespace Ajax\service; |
4 | 4 | |
5 | 5 | class Javascript { |
6 | - public static function containsCode($expression){ |
|
7 | - return strrpos($expression, 'this')!==false||strrpos($expression, 'event')!==false||strrpos($expression, 'self')!==false; |
|
6 | + public static function containsCode($expression) { |
|
7 | + return strrpos($expression, 'this')!==false || strrpos($expression, 'event')!==false || strrpos($expression, 'self')!==false; |
|
8 | 8 | } |
9 | 9 | |
10 | 10 | /** |
@@ -10,16 +10,16 @@ discard block |
||
10 | 10 | * @property SimpleExtComponent $_bsComponent |
11 | 11 | * @property string identifier |
12 | 12 | */ |
13 | -trait BaseHtmlEventsTrait{ |
|
13 | +trait BaseHtmlEventsTrait { |
|
14 | 14 | |
15 | - protected $_events=array (); |
|
15 | + protected $_events=array(); |
|
16 | 16 | |
17 | 17 | public function addEvent($event, $jsCode, $stopPropagation=false, $preventDefault=false) { |
18 | - if ($stopPropagation === true) { |
|
19 | - $jsCode="event.stopPropagation();" . $jsCode; |
|
18 | + if ($stopPropagation===true) { |
|
19 | + $jsCode="event.stopPropagation();".$jsCode; |
|
20 | 20 | } |
21 | - if ($preventDefault === true) { |
|
22 | - $jsCode="event.preventDefault();" . $jsCode; |
|
21 | + if ($preventDefault===true) { |
|
22 | + $jsCode="event.preventDefault();".$jsCode; |
|
23 | 23 | } |
24 | 24 | return $this->_addEvent($event, $jsCode); |
25 | 25 | } |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | if (is_array($this->_events[$event])) { |
30 | 30 | $this->_events[$event][]=$jsCode; |
31 | 31 | } else { |
32 | - $this->_events[$event]=array ($this->_events[$event],$jsCode ); |
|
32 | + $this->_events[$event]=array($this->_events[$event], $jsCode); |
|
33 | 33 | } |
34 | 34 | } else { |
35 | 35 | $this->_events[$event]=$jsCode; |
@@ -49,35 +49,35 @@ discard block |
||
49 | 49 | return $this->onClick($jsCode); |
50 | 50 | } |
51 | 51 | |
52 | - public function onCreate($jsCode){ |
|
53 | - if(isset($this->_events["_create"])){ |
|
52 | + public function onCreate($jsCode) { |
|
53 | + if (isset($this->_events["_create"])) { |
|
54 | 54 | $this->_events["_create"][]=$jsCode; |
55 | - }else{ |
|
55 | + } else { |
|
56 | 56 | $this->_events["_create"]=[$jsCode]; |
57 | 57 | } |
58 | 58 | return $this; |
59 | 59 | } |
60 | 60 | |
61 | 61 | public function addEventsOnRun(JsUtils $js) { |
62 | - if(isset($this->_events["_create"])){ |
|
62 | + if (isset($this->_events["_create"])) { |
|
63 | 63 | $create=$this->_events["_create"]; |
64 | - if(\is_array($create)){ |
|
64 | + if (\is_array($create)) { |
|
65 | 65 | $create=\implode("", $create); |
66 | 66 | } |
67 | - if($create!=="") |
|
68 | - $js->exec($create,true); |
|
67 | + if ($create!=="") |
|
68 | + $js->exec($create, true); |
|
69 | 69 | unset($this->_events["_create"]); |
70 | 70 | } |
71 | 71 | if (isset($this->_bsComponent)) { |
72 | - foreach ( $this->_events as $event => $jsCode ) { |
|
72 | + foreach ($this->_events as $event => $jsCode) { |
|
73 | 73 | $code=$jsCode; |
74 | 74 | if (is_array($jsCode)) { |
75 | 75 | $code=""; |
76 | - foreach ( $jsCode as $jsC ) { |
|
76 | + foreach ($jsCode as $jsC) { |
|
77 | 77 | if ($jsC instanceof AjaxCall) { |
78 | - $code.="\n" . $jsC->compile($js); |
|
78 | + $code.="\n".$jsC->compile($js); |
|
79 | 79 | } else { |
80 | - $code.="\n" . $jsC; |
|
80 | + $code.="\n".$jsC; |
|
81 | 81 | } |
82 | 82 | } |
83 | 83 | } elseif ($jsCode instanceof AjaxCall) { |
@@ -85,12 +85,12 @@ discard block |
||
85 | 85 | } |
86 | 86 | $this->_bsComponent->addEvent($event, $code); |
87 | 87 | } |
88 | - $this->_events=array (); |
|
88 | + $this->_events=array(); |
|
89 | 89 | } |
90 | 90 | } |
91 | 91 | |
92 | 92 | public function _ajaxOn($operation, $event, $url, $responseElement="", $parameters=array()) { |
93 | - $params=array ("url" => $url,"responseElement" => $responseElement ); |
|
93 | + $params=array("url" => $url, "responseElement" => $responseElement); |
|
94 | 94 | $params=array_merge($params, $parameters); |
95 | 95 | $this->_addEvent($event, new AjaxCall($operation, $params)); |
96 | 96 | return $this; |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | } |
124 | 124 | |
125 | 125 | public function jsDoJquery($jqueryCall, $param="") { |
126 | - return "$('#" . $this->identifier . "')." . $jqueryCall . "(" . Javascript::prep_value($param) . ");"; |
|
126 | + return "$('#".$this->identifier."').".$jqueryCall."(".Javascript::prep_value($param).");"; |
|
127 | 127 | } |
128 | 128 | |
129 | 129 | public function executeOnRun($jsCode) { |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | public function onCreate($jsCode){ |
53 | 53 | if(isset($this->_events["_create"])){ |
54 | 54 | $this->_events["_create"][]=$jsCode; |
55 | - }else{ |
|
55 | + } else{ |
|
56 | 56 | $this->_events["_create"]=[$jsCode]; |
57 | 57 | } |
58 | 58 | return $this; |
@@ -64,8 +64,9 @@ discard block |
||
64 | 64 | if(\is_array($create)){ |
65 | 65 | $create=\implode("", $create); |
66 | 66 | } |
67 | - if($create!=="") |
|
68 | - $js->exec($create,true); |
|
67 | + if($create!=="") { |
|
68 | + $js->exec($create,true); |
|
69 | + } |
|
69 | 70 | unset($this->_events["_create"]); |
70 | 71 | } |
71 | 72 | if (isset($this->_bsComponent)) { |
@@ -9,11 +9,11 @@ discard block |
||
9 | 9 | use Ajax\common\html\HtmlDoubleElement; |
10 | 10 | use Ajax\semantic\html\base\constants\Side; |
11 | 11 | |
12 | -class HtmlStep extends HtmlSemCollection{ |
|
12 | +class HtmlStep extends HtmlSemCollection { |
|
13 | 13 | protected $_activeStep; |
14 | 14 | |
15 | - public function __construct( $identifier,$steps=array()){ |
|
16 | - parent::__construct( $identifier,"div", "ui steps"); |
|
15 | + public function __construct($identifier, $steps=array()) { |
|
16 | + parent::__construct($identifier, "div", "ui steps"); |
|
17 | 17 | $this->addItems($steps); |
18 | 18 | } |
19 | 19 | |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | * @see \Ajax\common\html\html5\HtmlCollection::createItem() |
24 | 24 | */ |
25 | 25 | protected function createItem($value) { |
26 | - $itemO=new HtmlStepItem("item-".\sizeof($this->content),$value); |
|
26 | + $itemO=new HtmlStepItem("item-".\sizeof($this->content), $value); |
|
27 | 27 | return $itemO; |
28 | 28 | } |
29 | 29 | |
@@ -31,50 +31,50 @@ discard block |
||
31 | 31 | * @param string|array $step |
32 | 32 | * @return HtmlStepItem |
33 | 33 | */ |
34 | - public function addStep($step){ |
|
34 | + public function addStep($step) { |
|
35 | 35 | return $this->addItem($step); |
36 | 36 | } |
37 | 37 | |
38 | - public function setOrdered(){ |
|
38 | + public function setOrdered() { |
|
39 | 39 | return $this->addToProperty("class", "ordered"); |
40 | 40 | } |
41 | 41 | |
42 | - public function isOrdered(){ |
|
42 | + public function isOrdered() { |
|
43 | 43 | return $this->propertyContains("class", "ordered"); |
44 | 44 | } |
45 | 45 | |
46 | - public function setVertical(){ |
|
46 | + public function setVertical() { |
|
47 | 47 | return $this->addToProperty("class", "vertical"); |
48 | 48 | } |
49 | 49 | |
50 | - protected function defineActiveStep(){ |
|
50 | + protected function defineActiveStep() { |
|
51 | 51 | $activestep=$this->_activeStep; |
52 | 52 | $count=$this->count(); |
53 | - if($this->isOrdered()){ |
|
54 | - for($i=0;$i<$count;$i++){ |
|
53 | + if ($this->isOrdered()) { |
|
54 | + for ($i=0; $i<$count; $i++) { |
|
55 | 55 | $step=$this->content[$i]; |
56 | 56 | $step->removeStatus(); |
57 | - if($i<$activestep) |
|
57 | + if ($i<$activestep) |
|
58 | 58 | $step->setCompleted(); |
59 | 59 | elseif ($i===$activestep) |
60 | 60 | $step->setActive(); |
61 | 61 | else |
62 | 62 | $step->setDisabled(); |
63 | 63 | } |
64 | - }else{ |
|
65 | - foreach ($this->content as $step){ |
|
64 | + } else { |
|
65 | + foreach ($this->content as $step) { |
|
66 | 66 | $step->removeStatus(); |
67 | 67 | } |
68 | - if($activestep<$count) |
|
68 | + if ($activestep<$count) |
|
69 | 69 | $this->content[$activestep]->setActive(); |
70 | 70 | } |
71 | 71 | return $this; |
72 | 72 | } |
73 | 73 | |
74 | 74 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
75 | - if(isset($this->_activeStep) && \is_numeric($this->_activeStep)) |
|
75 | + if (isset($this->_activeStep) && \is_numeric($this->_activeStep)) |
|
76 | 76 | $this->defineActiveStep(); |
77 | - return parent::compile($js,$view); |
|
77 | + return parent::compile($js, $view); |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | public function setActiveStep($_activeStep) { |
@@ -82,15 +82,15 @@ discard block |
||
82 | 82 | return $this; |
83 | 83 | } |
84 | 84 | |
85 | - public function setAttached($side="",HtmlDoubleElement $toElement=NULL){ |
|
86 | - if(isset($toElement)){ |
|
87 | - $toElement->addToPropertyCtrl("class", "attached",array("attached")); |
|
85 | + public function setAttached($side="", HtmlDoubleElement $toElement=NULL) { |
|
86 | + if (isset($toElement)) { |
|
87 | + $toElement->addToPropertyCtrl("class", "attached", array("attached")); |
|
88 | 88 | } |
89 | - return $this->addToPropertyCtrl("class", $side." attached",Side::getConstantValues("attached")); |
|
89 | + return $this->addToPropertyCtrl("class", $side." attached", Side::getConstantValues("attached")); |
|
90 | 90 | } |
91 | 91 | |
92 | - public function asLink(){ |
|
93 | - foreach ($this->content as $step){ |
|
92 | + public function asLink() { |
|
93 | + foreach ($this->content as $step) { |
|
94 | 94 | $step->asLink(); |
95 | 95 | } |
96 | 96 | return $this; |
@@ -54,26 +54,29 @@ |
||
54 | 54 | for($i=0;$i<$count;$i++){ |
55 | 55 | $step=$this->content[$i]; |
56 | 56 | $step->removeStatus(); |
57 | - if($i<$activestep) |
|
58 | - $step->setCompleted(); |
|
59 | - elseif ($i===$activestep) |
|
60 | - $step->setActive(); |
|
61 | - else |
|
62 | - $step->setDisabled(); |
|
57 | + if($i<$activestep) { |
|
58 | + $step->setCompleted(); |
|
59 | + } elseif ($i===$activestep) { |
|
60 | + $step->setActive(); |
|
61 | + } else { |
|
62 | + $step->setDisabled(); |
|
63 | + } |
|
63 | 64 | } |
64 | - }else{ |
|
65 | + } else{ |
|
65 | 66 | foreach ($this->content as $step){ |
66 | 67 | $step->removeStatus(); |
67 | 68 | } |
68 | - if($activestep<$count) |
|
69 | - $this->content[$activestep]->setActive(); |
|
69 | + if($activestep<$count) { |
|
70 | + $this->content[$activestep]->setActive(); |
|
71 | + } |
|
70 | 72 | } |
71 | 73 | return $this; |
72 | 74 | } |
73 | 75 | |
74 | 76 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
75 | - if(isset($this->_activeStep) && \is_numeric($this->_activeStep)) |
|
76 | - $this->defineActiveStep(); |
|
77 | + if(isset($this->_activeStep) && \is_numeric($this->_activeStep)) { |
|
78 | + $this->defineActiveStep(); |
|
79 | + } |
|
77 | 80 | return parent::compile($js,$view); |
78 | 81 | } |
79 | 82 |