@@ -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 | } |
@@ -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 | } |
@@ -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 |
@@ -136,10 +136,12 @@ discard block |
||
136 | 136 | if (isset($param)) { |
137 | 137 | $param=Javascript::prep_value($param); |
138 | 138 | $str="$({$element}).{$jQueryCall}({$param});"; |
139 | - } else |
|
140 | - $str="$({$element}).{$jQueryCall}();"; |
|
141 | - if ($immediatly) |
|
142 | - $this->jquery_code_for_compile[]=$str; |
|
139 | + } else { |
|
140 | + $str="$({$element}).{$jQueryCall}();"; |
|
141 | + } |
|
142 | + if ($immediatly) { |
|
143 | + $this->jquery_code_for_compile[]=$str; |
|
144 | + } |
|
143 | 145 | return $str; |
144 | 146 | } |
145 | 147 | /** |
@@ -154,8 +156,9 @@ discard block |
||
154 | 156 | $to=Javascript::prep_element($to); |
155 | 157 | $element=Javascript::prep_element($element); |
156 | 158 | $str="$({$to}).{$jQueryCall}({$element});"; |
157 | - if ($immediatly) |
|
158 | - $this->jquery_code_for_compile[]=$str; |
|
159 | + if ($immediatly) { |
|
160 | + $this->jquery_code_for_compile[]=$str; |
|
161 | + } |
|
159 | 162 | return $str; |
160 | 163 | } |
161 | 164 | |
@@ -211,12 +214,14 @@ discard block |
||
211 | 214 | if ($stopPropagation===true) { |
212 | 215 | $js="event.stopPropagation();\n".$js; |
213 | 216 | } |
214 | - if (array_search($event, $this->jquery_events)===false) |
|
215 | - $event="\n\t$(".Javascript::prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n"; |
|
216 | - else |
|
217 | - $event="\n\t$(".Javascript::prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n"; |
|
218 | - if($immediatly) |
|
219 | - $this->jquery_code_for_compile[]=$event; |
|
217 | + if (array_search($event, $this->jquery_events)===false) { |
|
218 | + $event="\n\t$(".Javascript::prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n"; |
|
219 | + } else { |
|
220 | + $event="\n\t$(".Javascript::prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n"; |
|
221 | + } |
|
222 | + if($immediatly) { |
|
223 | + $this->jquery_code_for_compile[]=$event; |
|
224 | + } |
|
220 | 225 | return $event; |
221 | 226 | } |
222 | 227 | |
@@ -296,7 +301,9 @@ discard block |
||
296 | 301 | } |
297 | 302 | |
298 | 303 | private function minify($input) { |
299 | - if(trim($input) === "") return $input; |
|
304 | + if(trim($input) === "") { |
|
305 | + return $input; |
|
306 | + } |
|
300 | 307 | return preg_replace( |
301 | 308 | array( |
302 | 309 | // Remove comment(s) |
@@ -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; |
@@ -87,8 +87,9 @@ discard block |
||
87 | 87 | if(\is_array($create)){ |
88 | 88 | $create=\implode("", $create); |
89 | 89 | } |
90 | - if(isset($js) && $create!=="") |
|
91 | - $js->exec($create,true); |
|
90 | + if(isset($js) && $create!=="") { |
|
91 | + $js->exec($create,true); |
|
92 | + } |
|
92 | 93 | unset($this->_events["_create"]); |
93 | 94 | } |
94 | 95 | } |
@@ -14,8 +14,9 @@ |
||
14 | 14 | } |
15 | 15 | |
16 | 16 | public function asAvatar($caption=NULL) { |
17 | - if (isset($caption)) |
|
18 | - $this->wrap("", $caption); |
|
17 | + if (isset($caption)) { |
|
18 | + $this->wrap("", $caption); |
|
19 | + } |
|
19 | 20 | return $this->addToProperty("class", "avatar"); |
20 | 21 | } |
21 | 22 |
@@ -25,8 +25,9 @@ discard block |
||
25 | 25 | public function asIcon($icon, $title, $subHeader=NULL) { |
26 | 26 | $header=new HtmlHeader("header-" . $this->identifier); |
27 | 27 | $header->asIcon($icon, $title, $subHeader); |
28 | - if ($this->_inverted === false) |
|
29 | - $header->setInverted(); |
|
28 | + if ($this->_inverted === false) { |
|
29 | + $header->setInverted(); |
|
30 | + } |
|
30 | 31 | return $this->setContent($header); |
31 | 32 | } |
32 | 33 | |
@@ -41,14 +42,16 @@ discard block |
||
41 | 42 | } |
42 | 43 | |
43 | 44 | public function run(JsUtils $js) { |
44 | - if ($this->_container instanceof HtmlSingleElement) |
|
45 | - $this->_bsComponent=$js->semantic()->dimmer("#" . $this->_container->getIdentifier(), $this->_params); |
|
45 | + if ($this->_container instanceof HtmlSingleElement) { |
|
46 | + $this->_bsComponent=$js->semantic()->dimmer("#" . $this->_container->getIdentifier(), $this->_params); |
|
47 | + } |
|
46 | 48 | return parent::run($js); |
47 | 49 | } |
48 | 50 | |
49 | 51 | public function jsShow() { |
50 | - if (isset($this->_container)) |
|
51 | - return '$("#.' . $this->_container->getIdentifier() . ').dimmer("show");'; |
|
52 | + if (isset($this->_container)) { |
|
53 | + return '$("#.' . $this->_container->getIdentifier() . ').dimmer("show");'; |
|
54 | + } |
|
52 | 55 | } |
53 | 56 | |
54 | 57 | public function setBlurring() { |
@@ -21,10 +21,12 @@ |
||
21 | 21 | |
22 | 22 | private function createField($placeholder=NULL, $icon=NULL) { |
23 | 23 | $field=new HtmlInput($this->identifier); |
24 | - if (isset($placeholder)) |
|
25 | - $field->setPlaceholder($placeholder); |
|
26 | - if (isset($icon)) |
|
27 | - $field->addIcon($icon, Direction::RIGHT); |
|
24 | + if (isset($placeholder)) { |
|
25 | + $field->setPlaceholder($placeholder); |
|
26 | + } |
|
27 | + if (isset($icon)) { |
|
28 | + $field->addIcon($icon, Direction::RIGHT); |
|
29 | + } |
|
28 | 30 | //TODO check getField |
29 | 31 | $field->getDataField()->setClass("prompt"); |
30 | 32 | $this->content["field"]=$field; |
@@ -12,11 +12,13 @@ discard block |
||
12 | 12 | |
13 | 13 | public function __construct($identifier, $value=NULL, $label=NULL, $attributes=array()) { |
14 | 14 | parent::__construct($identifier, "div", "ui progress"); |
15 | - if (isset($value)) |
|
16 | - $this->setProperty("data-percent", $value); |
|
15 | + if (isset($value)) { |
|
16 | + $this->setProperty("data-percent", $value); |
|
17 | + } |
|
17 | 18 | $this->createBar(); |
18 | - if (isset($label)) |
|
19 | - $this->setLabel($label); |
|
19 | + if (isset($label)) { |
|
20 | + $this->setLabel($label); |
|
21 | + } |
|
20 | 22 | $this->_states=[ State::SUCCESS,State::WARNING,State::ERROR,State::ACTIVE,State::DISABLED ]; |
21 | 23 | $this->addToProperty("class", $attributes); |
22 | 24 | } |
@@ -111,8 +113,9 @@ discard block |
||
111 | 113 | * @see BaseHtml::run() |
112 | 114 | */ |
113 | 115 | public function run(JsUtils $js) { |
114 | - if (isset($this->_bsComponent) === false) |
|
115 | - $this->_bsComponent=$js->semantic()->progress("#" . $this->identifier, $this->_params); |
|
116 | + if (isset($this->_bsComponent) === false) { |
|
117 | + $this->_bsComponent=$js->semantic()->progress("#" . $this->identifier, $this->_params); |
|
118 | + } |
|
116 | 119 | $this->addEventsOnRun($js); |
117 | 120 | return $this->_bsComponent; |
118 | 121 | } |