@@ -36,11 +36,11 @@ discard block |
||
36 | 36 | } |
37 | 37 | |
38 | 38 | public function asSegment() { |
39 | - return $this->addToPropertyCtrl("class", "segment", array ("segment" )); |
|
39 | + return $this->addToPropertyCtrl("class", "segment", array("segment")); |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | public function asContainer() { |
43 | - return $this->addToPropertyCtrl("class", "container", array ("container" )); |
|
43 | + return $this->addToPropertyCtrl("class", "container", array("container")); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | /** |
@@ -48,9 +48,9 @@ discard block |
||
48 | 48 | * @param int $wide |
49 | 49 | */ |
50 | 50 | public function setWide($wide) { |
51 | - $wide=Wide::getConstants()["W" . $wide]; |
|
51 | + $wide=Wide::getConstants()["W".$wide]; |
|
52 | 52 | $this->addToPropertyCtrl("class", $wide, Wide::getConstants()); |
53 | - return $this->addToPropertyCtrl("class", "column", array ("column" )); |
|
53 | + return $this->addToPropertyCtrl("class", "column", array("column")); |
|
54 | 54 | } |
55 | 55 | |
56 | 56 | /** |
@@ -68,9 +68,9 @@ discard block |
||
68 | 68 | * @return mixed |
69 | 69 | */ |
70 | 70 | public function addRow($colsCount=NULL) { |
71 | - $rowCount=$this->rowCount() + 1; |
|
71 | + $rowCount=$this->rowCount()+1; |
|
72 | 72 | $this->setRowsCount($rowCount, $colsCount, true); |
73 | - return $this->content[$rowCount - 1]; |
|
73 | + return $this->content[$rowCount-1]; |
|
74 | 74 | } |
75 | 75 | |
76 | 76 | /** |
@@ -79,10 +79,10 @@ discard block |
||
79 | 79 | * @return mixed|\Ajax\semantic\html\collections\HtmlGrid |
80 | 80 | */ |
81 | 81 | public function addCol($width=NULL) { |
82 | - $colCount=$this->colCount() + 1; |
|
82 | + $colCount=$this->colCount()+1; |
|
83 | 83 | $this->setColsCount($colCount, true, $width); |
84 | 84 | if ($this->hasOnlyCols($this->count())) |
85 | - return $this->content[$colCount - 1]; |
|
85 | + return $this->content[$colCount-1]; |
|
86 | 86 | return $this; |
87 | 87 | } |
88 | 88 | |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | * @return \Ajax\semantic\html\collections\HtmlGrid |
93 | 93 | */ |
94 | 94 | public function addCols($sizes=array()) { |
95 | - foreach ( $sizes as $size ) { |
|
95 | + foreach ($sizes as $size) { |
|
96 | 96 | $this->addCol($size); |
97 | 97 | } |
98 | 98 | return $this; |
@@ -106,19 +106,19 @@ discard block |
||
106 | 106 | */ |
107 | 107 | public function setRowsCount($rowsCount, $colsCount=NULL, $force=false) { |
108 | 108 | $count=$this->count(); |
109 | - if ($rowsCount < 2 && $force === false) { |
|
110 | - for($i=$count; $i < $colsCount; $i++) { |
|
111 | - $this->addItem(new HtmlGridCol("col-" . $this->identifier . "-" . $i)); |
|
109 | + if ($rowsCount<2 && $force===false) { |
|
110 | + for ($i=$count; $i<$colsCount; $i++) { |
|
111 | + $this->addItem(new HtmlGridCol("col-".$this->identifier."-".$i)); |
|
112 | 112 | } |
113 | - } else { |
|
113 | + }else { |
|
114 | 114 | if ($this->hasOnlyCols($count)) { |
115 | 115 | $tmpContent=$this->content; |
116 | 116 | $item=$this->addItem($colsCount); |
117 | 117 | $item->setContent($tmpContent); |
118 | - $this->content=array (); |
|
118 | + $this->content=array(); |
|
119 | 119 | $count=1; |
120 | 120 | } |
121 | - for($i=$count; $i < $rowsCount; $i++) { |
|
121 | + for ($i=$count; $i<$rowsCount; $i++) { |
|
122 | 122 | $this->addItem($colsCount); |
123 | 123 | } |
124 | 124 | } |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | } |
127 | 127 | |
128 | 128 | protected function hasOnlyCols($count) { |
129 | - return $count > 0 && $this->content[0] instanceof HtmlGridCol; |
|
129 | + return $count>0 && $this->content[0] instanceof HtmlGridCol; |
|
130 | 130 | } |
131 | 131 | |
132 | 132 | /** |
@@ -140,14 +140,14 @@ discard block |
||
140 | 140 | if (isset($width)==false) { |
141 | 141 | $this->setWide($numCols); |
142 | 142 | } |
143 | - if ($toCreate == true) { |
|
143 | + if ($toCreate==true) { |
|
144 | 144 | $count=$this->count(); |
145 | - if ($count == 0 || $this->hasOnlyCols($count)) { |
|
146 | - for($i=$count; $i < $numCols; $i++) { |
|
147 | - $this->addItem(new HtmlGridCol("col-" . $this->identifier . "-" . $i, $width)); |
|
145 | + if ($count==0 || $this->hasOnlyCols($count)) { |
|
146 | + for ($i=$count; $i<$numCols; $i++) { |
|
147 | + $this->addItem(new HtmlGridCol("col-".$this->identifier."-".$i, $width)); |
|
148 | 148 | } |
149 | - } else { |
|
150 | - for($i=0; $i < $count; $i++) { |
|
149 | + }else { |
|
150 | + for ($i=0; $i<$count; $i++) { |
|
151 | 151 | $this->getItem($i)->setColsCount($numCols); |
152 | 152 | } |
153 | 153 | } |
@@ -183,7 +183,7 @@ discard block |
||
183 | 183 | $count=$this->count(); |
184 | 184 | if ($this->hasOnlyCols($count)) |
185 | 185 | return $count; |
186 | - if ($count > 0) |
|
186 | + if ($count>0) |
|
187 | 187 | return $this->getItem(0)->count(); |
188 | 188 | return 0; |
189 | 189 | } |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | * @return \Ajax\semantic\html\collections\HtmlGridCol |
196 | 196 | */ |
197 | 197 | public function getCell($row, $col) { |
198 | - if ($row < 2 && $this->hasOnlyCols($this->count())) |
|
198 | + if ($row<2 && $this->hasOnlyCols($this->count())) |
|
199 | 199 | return $this->getItem($col); |
200 | 200 | $row=$this->getItem($row); |
201 | 201 | if (isset($row)) { |
@@ -210,8 +210,8 @@ discard block |
||
210 | 210 | * @return \Ajax\semantic\html\collections\HtmlGrid |
211 | 211 | */ |
212 | 212 | public function setDivided($vertically=false) { |
213 | - $value=($vertically === true) ? "vertically divided" : "divided"; |
|
214 | - return $this->addToPropertyCtrl("class", $value, array ("divided" )); |
|
213 | + $value=($vertically===true) ? "vertically divided" : "divided"; |
|
214 | + return $this->addToPropertyCtrl("class", $value, array("divided")); |
|
215 | 215 | } |
216 | 216 | |
217 | 217 | /** |
@@ -220,15 +220,15 @@ discard block |
||
220 | 220 | * @return \Ajax\semantic\html\collections\HtmlGrid |
221 | 221 | */ |
222 | 222 | public function setCelled($internally=false) { |
223 | - $value=($internally === true) ? "internally celled" : "celled"; |
|
224 | - return $this->addToPropertyCtrl("class", $value, array ("celled","internally celled" )); |
|
223 | + $value=($internally===true) ? "internally celled" : "celled"; |
|
224 | + return $this->addToPropertyCtrl("class", $value, array("celled", "internally celled")); |
|
225 | 225 | } |
226 | 226 | |
227 | 227 | /** |
228 | 228 | * A grid can have its columns centered |
229 | 229 | */ |
230 | 230 | public function setCentered() { |
231 | - return $this->addToPropertyCtrl("class", "centered", array ("centered" )); |
|
231 | + return $this->addToPropertyCtrl("class", "centered", array("centered")); |
|
232 | 232 | } |
233 | 233 | |
234 | 234 | /** |
@@ -246,7 +246,7 @@ discard block |
||
246 | 246 | */ |
247 | 247 | public function setPadded($value=NULL) { |
248 | 248 | if (isset($value)) |
249 | - $this->addToPropertyCtrl("class", $value, array ("vertically","horizontally" )); |
|
249 | + $this->addToPropertyCtrl("class", $value, array("vertically", "horizontally")); |
|
250 | 250 | return $this->addToProperty("class", "padded"); |
251 | 251 | } |
252 | 252 | |
@@ -256,12 +256,12 @@ discard block |
||
256 | 256 | * @return \Ajax\semantic\html\collections\HtmlGrid |
257 | 257 | */ |
258 | 258 | public function setRelaxed($very=false) { |
259 | - $value=($very === true) ? "very relaxed" : "relaxed"; |
|
260 | - return $this->addToPropertyCtrl("class", $value, array ("relaxed","very relaxed" )); |
|
259 | + $value=($very===true) ? "very relaxed" : "relaxed"; |
|
260 | + return $this->addToPropertyCtrl("class", $value, array("relaxed", "very relaxed")); |
|
261 | 261 | } |
262 | 262 | |
263 | 263 | public function setVerticalAlignment($value=VerticalAlignment::MIDDLE) { |
264 | - return $this->addToPropertyCtrl("class", $value . " aligned", VerticalAlignment::getConstantValues("aligned")); |
|
264 | + return $this->addToPropertyCtrl("class", $value." aligned", VerticalAlignment::getConstantValues("aligned")); |
|
265 | 265 | } |
266 | 266 | |
267 | 267 | /** |
@@ -271,9 +271,9 @@ discard block |
||
271 | 271 | * @see \Ajax\common\html\HtmlCollection::createItem() |
272 | 272 | */ |
273 | 273 | protected function createItem($value) { |
274 | - if ($this->_createCols === false) |
|
274 | + if ($this->_createCols===false) |
|
275 | 275 | $value=null; |
276 | - $item=new HtmlGridRow($this->identifier . "-row-" . ($this->count() + 1), $value, $this->_colSizing, $this->_implicitRows); |
|
276 | + $item=new HtmlGridRow($this->identifier."-row-".($this->count()+1), $value, $this->_colSizing, $this->_implicitRows); |
|
277 | 277 | return $item; |
278 | 278 | } |
279 | 279 | |
@@ -283,15 +283,15 @@ discard block |
||
283 | 283 | */ |
284 | 284 | public function setValues($values, $force=true) { |
285 | 285 | $count=$this->count(); |
286 | - if ($this->_createCols === false || $force === true) { |
|
287 | - for($i=$count; $i < \sizeof($values); $i++) { |
|
286 | + if ($this->_createCols===false || $force===true) { |
|
287 | + for ($i=$count; $i<\sizeof($values); $i++) { |
|
288 | 288 | $colSize=\sizeof($values[$i]); |
289 | - $this->addItem(new HtmlGridRow($this->identifier . "-row-" . ($this->count() + 1), $colSize, $this->_colSizing, $this->_implicitRows)); |
|
289 | + $this->addItem(new HtmlGridRow($this->identifier."-row-".($this->count()+1), $colSize, $this->_colSizing, $this->_implicitRows)); |
|
290 | 290 | } |
291 | 291 | } |
292 | - $count=\min(array ($this->count(),\sizeof($values) )); |
|
293 | - for($i=0; $i < $count; $i++) { |
|
294 | - $this->content[$i]->setValues($values[$i], $this->_createCols === false); |
|
292 | + $count=\min(array($this->count(), \sizeof($values))); |
|
293 | + for ($i=0; $i<$count; $i++) { |
|
294 | + $this->content[$i]->setValues($values[$i], $this->_createCols===false); |
|
295 | 295 | } |
296 | 296 | } |
297 | 297 |
@@ -18,12 +18,12 @@ discard block |
||
18 | 18 | * @version 1.001 |
19 | 19 | */ |
20 | 20 | class HtmlSegment extends HtmlSemDoubleElement { |
21 | - use AttachedTrait,TextAlignmentTrait; |
|
21 | + use AttachedTrait, TextAlignmentTrait; |
|
22 | 22 | |
23 | 23 | public function __construct($identifier, $content="") { |
24 | 24 | parent::__construct($identifier, "div", "ui segment"); |
25 | - $this->_variations=\array_merge($this->_variations, [ Variation::PADDED,Variation::COMPACT ]); |
|
26 | - $this->_states=\array_merge($this->_states, [ State::LOADING ]); |
|
25 | + $this->_variations=\array_merge($this->_variations, [Variation::PADDED, Variation::COMPACT]); |
|
26 | + $this->_states=\array_merge($this->_states, [State::LOADING]); |
|
27 | 27 | $this->content=$content; |
28 | 28 | } |
29 | 29 | |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | } |
38 | 38 | |
39 | 39 | public function setSens($sens="vertical") { |
40 | - return $this->addToPropertyCtrl("class", $sens, array ("vertical","horizontal" )); |
|
40 | + return $this->addToPropertyCtrl("class", $sens, array("vertical", "horizontal")); |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | public function setEmphasis($value=Emphasis::SECONDARY) { |
@@ -61,11 +61,11 @@ discard block |
||
61 | 61 | } |
62 | 62 | |
63 | 63 | public function asContainer() { |
64 | - return $this->addToPropertyCtrl("class", "container", array ("container" )); |
|
64 | + return $this->addToPropertyCtrl("class", "container", array("container")); |
|
65 | 65 | } |
66 | 66 | |
67 | - public function addGrid($numRows=1, $numCols=NULL){ |
|
68 | - $grid=new HtmlGrid("Grid-".$this->identifier,$numRows,$numCols); |
|
67 | + public function addGrid($numRows=1, $numCols=NULL) { |
|
68 | + $grid=new HtmlGrid("Grid-".$this->identifier, $numRows, $numCols); |
|
69 | 69 | $this->content=$grid; |
70 | 70 | return $grid; |
71 | 71 | } |
@@ -13,11 +13,11 @@ |
||
13 | 13 | class HtmlContainer extends HtmlSemDoubleElement { |
14 | 14 | use TextAlignmentTrait; |
15 | 15 | public function __construct($identifier, $content="") { |
16 | - parent::__construct($identifier, "div","ui container"); |
|
16 | + parent::__construct($identifier, "div", "ui container"); |
|
17 | 17 | $this->content=$content; |
18 | 18 | } |
19 | 19 | |
20 | - public function asText(){ |
|
20 | + public function asText() { |
|
21 | 21 | return $this->addToProperty("class", "text"); |
22 | 22 | } |
23 | 23 | } |
24 | 24 | \ No newline at end of file |
@@ -12,8 +12,8 @@ discard block |
||
12 | 12 | private static $constCacheArray=NULL; |
13 | 13 | |
14 | 14 | public static function getConstants() { |
15 | - if (self::$constCacheArray == NULL) { |
|
16 | - self::$constCacheArray=[ ]; |
|
15 | + if (self::$constCacheArray==NULL) { |
|
16 | + self::$constCacheArray=[]; |
|
17 | 17 | } |
18 | 18 | $calledClass=get_called_class(); |
19 | 19 | if (!array_key_exists($calledClass, self::$constCacheArray)) { |
@@ -23,16 +23,16 @@ discard block |
||
23 | 23 | return self::$constCacheArray[$calledClass]; |
24 | 24 | } |
25 | 25 | |
26 | - public static function getConstantValues($postFix="",$prefixBefore=false) { |
|
27 | - if ($postFix == "") |
|
26 | + public static function getConstantValues($postFix="", $prefixBefore=false) { |
|
27 | + if ($postFix=="") |
|
28 | 28 | return \array_values(self::getConstants()); |
29 | 29 | else { |
30 | - if($prefixBefore===false){ |
|
31 | - return \array_map(function ($elem) use($postFix) { |
|
32 | - return $elem . " " . $postFix; |
|
30 | + if ($prefixBefore===false) { |
|
31 | + return \array_map(function($elem) use($postFix) { |
|
32 | + return $elem." ".$postFix; |
|
33 | 33 | }, \array_values(self::getConstants())); |
34 | - }else{ |
|
35 | - return \array_map(function ($elem) use($postFix) { |
|
34 | + }else { |
|
35 | + return \array_map(function($elem) use($postFix) { |
|
36 | 36 | return $postFix." ".$elem; |
37 | 37 | }, \array_values(self::getConstants())); |
38 | 38 | } |
@@ -7,7 +7,7 @@ discard block |
||
7 | 7 | |
8 | 8 | class HtmlInput extends HtmlSingleElement { |
9 | 9 | |
10 | - public function __construct($identifier,$type="text",$value=NULL,$placeholder=NULL) { |
|
10 | + public function __construct($identifier, $type="text", $value=NULL, $placeholder=NULL) { |
|
11 | 11 | parent::__construct($identifier, "input"); |
12 | 12 | $this->setProperty("name", $identifier); |
13 | 13 | $this->setValue($value); |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | } |
17 | 17 | |
18 | 18 | public function setValue($value) { |
19 | - if(isset($value)) |
|
19 | + if (isset($value)) |
|
20 | 20 | $this->setProperty("value", $value); |
21 | 21 | return $this; |
22 | 22 | } |
@@ -25,12 +25,12 @@ discard block |
||
25 | 25 | return $this->setProperty("type", $value); |
26 | 26 | } |
27 | 27 | |
28 | - public function setPlaceholder($value){ |
|
29 | - if(JString::isNull($value)){ |
|
30 | - if(JString::isNotNull($this->identifier)) |
|
28 | + public function setPlaceholder($value) { |
|
29 | + if (JString::isNull($value)) { |
|
30 | + if (JString::isNotNull($this->identifier)) |
|
31 | 31 | $value=\ucfirst($this->identifier); |
32 | 32 | } |
33 | - if(JString::isNotNull($value)) |
|
33 | + if (JString::isNotNull($value)) |
|
34 | 34 | $this->setProperty("placeholder", $value); |
35 | 35 | return $this; |
36 | 36 | } |
@@ -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 | - } else { |
|
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 | - } else { |
|
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 | - } else { |
|
231 | - $setter="set" . ucfirst($key); |
|
230 | + }else { |
|
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 | } |
@@ -277,10 +277,10 @@ discard block |
||
277 | 277 | if (array_key_exists($event, $this->_events)) { |
278 | 278 | if (is_array($this->_events[$event])) { |
279 | 279 | $this->_events[$event][]=$jsCode; |
280 | - } else { |
|
281 | - $this->_events[$event]=array ($this->_events[$event],$jsCode ); |
|
280 | + }else { |
|
281 | + $this->_events[$event]=array($this->_events[$event], $jsCode); |
|
282 | 282 | } |
283 | - } else { |
|
283 | + }else { |
|
284 | 284 | $this->_events[$event]=$jsCode; |
285 | 285 | } |
286 | 286 | return $this; |
@@ -300,15 +300,15 @@ discard block |
||
300 | 300 | |
301 | 301 | public function addEventsOnRun(JsUtils $js) { |
302 | 302 | if (isset($this->_bsComponent)) { |
303 | - foreach ( $this->_events as $event => $jsCode ) { |
|
303 | + foreach ($this->_events as $event => $jsCode) { |
|
304 | 304 | $code=$jsCode; |
305 | 305 | if (is_array($jsCode)) { |
306 | 306 | $code=""; |
307 | - foreach ( $jsCode as $jsC ) { |
|
307 | + foreach ($jsCode as $jsC) { |
|
308 | 308 | if ($jsC instanceof AjaxCall) { |
309 | - $code.="\n" . $jsC->compile($js); |
|
310 | - } else { |
|
311 | - $code.="\n" . $jsC; |
|
309 | + $code.="\n".$jsC->compile($js); |
|
310 | + }else { |
|
311 | + $code.="\n".$jsC; |
|
312 | 312 | } |
313 | 313 | } |
314 | 314 | } elseif ($jsCode instanceof AjaxCall) { |
@@ -316,12 +316,12 @@ discard block |
||
316 | 316 | } |
317 | 317 | $this->_bsComponent->addEvent($event, $code); |
318 | 318 | } |
319 | - $this->_events=array (); |
|
319 | + $this->_events=array(); |
|
320 | 320 | } |
321 | 321 | } |
322 | 322 | |
323 | 323 | public function _ajaxOn($operation, $event, $url, $responseElement="", $parameters=array()) { |
324 | - $params=array ("url" => $url,"responseElement" => $responseElement ); |
|
324 | + $params=array("url" => $url, "responseElement" => $responseElement); |
|
325 | 325 | $params=array_merge($params, $parameters); |
326 | 326 | $this->_addEvent($event, new AjaxCall($operation, $params)); |
327 | 327 | return $this; |
@@ -357,33 +357,33 @@ discard block |
||
357 | 357 | if (is_array($elements)) { |
358 | 358 | $flag=false; |
359 | 359 | $index=0; |
360 | - while ( !$flag && $index < sizeof($elements) ) { |
|
360 | + while (!$flag && $index<sizeof($elements)) { |
|
361 | 361 | if ($elements[$index] instanceof BaseHtml) |
362 | - $flag=($elements[$index]->getIdentifier() === $identifier); |
|
362 | + $flag=($elements[$index]->getIdentifier()===$identifier); |
|
363 | 363 | $index++; |
364 | 364 | } |
365 | - if ($flag === true) |
|
366 | - return $elements[$index - 1]; |
|
365 | + if ($flag===true) |
|
366 | + return $elements[$index-1]; |
|
367 | 367 | } elseif ($elements instanceof BaseHtml) { |
368 | - if ($elements->getIdentifier() === $identifier) |
|
368 | + if ($elements->getIdentifier()===$identifier) |
|
369 | 369 | return $elements; |
370 | 370 | } |
371 | 371 | return null; |
372 | 372 | } |
373 | 373 | |
374 | - protected function getElementByPropertyValue($propertyName,$value, $elements) { |
|
374 | + protected function getElementByPropertyValue($propertyName, $value, $elements) { |
|
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]->propertyContains($propertyName, $value) === true); |
|
380 | + $flag=($elements[$index]->propertyContains($propertyName, $value)===true); |
|
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->propertyContains($propertyName, $value) === true) |
|
386 | + if ($elements->propertyContains($propertyName, $value)===true) |
|
387 | 387 | return $elements; |
388 | 388 | } |
389 | 389 | return null; |
@@ -405,14 +405,14 @@ discard block |
||
405 | 405 | if (is_array($value)) { |
406 | 406 | $value=implode(",", $value); |
407 | 407 | } |
408 | - if (strrpos($value, 'this') === false && strrpos($value, 'event') === false) { |
|
409 | - $value='"' . $value . '"'; |
|
408 | + if (strrpos($value, 'this')===false && strrpos($value, 'event')===false) { |
|
409 | + $value='"'.$value.'"'; |
|
410 | 410 | } |
411 | 411 | return $value; |
412 | 412 | } |
413 | 413 | |
414 | 414 | public function jsDoJquery($jqueryCall, $param="") { |
415 | - return "$('#" . $this->identifier . "')." . $jqueryCall . "(" . $this->_prep_value($param) . ");"; |
|
415 | + return "$('#".$this->identifier."').".$jqueryCall."(".$this->_prep_value($param).");"; |
|
416 | 416 | } |
417 | 417 | |
418 | 418 | public function executeOnRun($jsCode) { |
@@ -130,12 +130,12 @@ |
||
130 | 130 | * @param string $tagName |
131 | 131 | * @return HtmlLabel |
132 | 132 | */ |
133 | - public function htmlLabel($identifier, $content="", $icon=NULL,$tagName="div") { |
|
134 | - return $this->addHtmlComponent(new HtmlLabel($identifier, $content,$icon, $tagName)); |
|
133 | + public function htmlLabel($identifier, $content="", $icon=NULL, $tagName="div") { |
|
134 | + return $this->addHtmlComponent(new HtmlLabel($identifier, $content, $icon, $tagName)); |
|
135 | 135 | } |
136 | 136 | |
137 | - public function htmlLabelGroups($identifier,$labels=array(),$attributes=array()){ |
|
138 | - return $this->addHtmlComponent(new HtmlLabelGroups($identifier,$labels,$attributes)); |
|
137 | + public function htmlLabelGroups($identifier, $labels=array(), $attributes=array()) { |
|
138 | + return $this->addHtmlComponent(new HtmlLabelGroups($identifier, $labels, $attributes)); |
|
139 | 139 | } |
140 | 140 | |
141 | 141 | /** |
@@ -15,9 +15,9 @@ discard block |
||
15 | 15 | */ |
16 | 16 | class HtmlLabelGroups extends HtmlSemCollection { |
17 | 17 | |
18 | - public function __construct($identifier,$labels=array(), $attributes=array()) { |
|
18 | + public function __construct($identifier, $labels=array(), $attributes=array()) { |
|
19 | 19 | parent::__construct($identifier, "div", "ui labels"); |
20 | - $this->_states=\array_merge(Size::getConstants(),Color::getConstants(),["tag","circular"]); |
|
20 | + $this->_states=\array_merge(Size::getConstants(), Color::getConstants(), ["tag", "circular"]); |
|
21 | 21 | $this->addItems($labels); |
22 | 22 | $this->setStates($attributes); |
23 | 23 | } |
@@ -31,12 +31,12 @@ discard block |
||
31 | 31 | $icon=JArray::getValue($value, "icon", 1); |
32 | 32 | $tagName=JArray::getValue($value, "tagName", 2); |
33 | 33 | } |
34 | - $labelO=new HtmlLabel("label-" . $this->identifier, $caption,$icon,$tagName); |
|
34 | + $labelO=new HtmlLabel("label-".$this->identifier, $caption, $icon, $tagName); |
|
35 | 35 | return $labelO; |
36 | 36 | } |
37 | 37 | |
38 | 38 | protected function createCondition($value) { |
39 | - return ($value instanceof HtmlLabel) === false; |
|
39 | + return ($value instanceof HtmlLabel)===false; |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | } |
43 | 43 | \ No newline at end of file |
@@ -18,17 +18,17 @@ discard block |
||
18 | 18 | |
19 | 19 | protected function createItem($value) { |
20 | 20 | $count=$this->count(); |
21 | - $item=new HtmlListItem("item-" . $this->identifier . "-" . $count, $value); |
|
21 | + $item=new HtmlListItem("item-".$this->identifier."-".$count, $value); |
|
22 | 22 | return $item; |
23 | 23 | } |
24 | 24 | |
25 | 25 | public function addHeader($niveau, $content) { |
26 | - $header=new HtmlHeader("header-" . $this->identifier, $niveau, $content, "page"); |
|
26 | + $header=new HtmlHeader("header-".$this->identifier, $niveau, $content, "page"); |
|
27 | 27 | $this->wrap($header); |
28 | 28 | return $header; |
29 | 29 | } |
30 | 30 | |
31 | - public function getItemPart($index,$partName="header"){ |
|
31 | + public function getItemPart($index, $partName="header") { |
|
32 | 32 | return $this->getItem($index)->getPart($partName); |
33 | 33 | } |
34 | 34 | |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | } |
38 | 38 | |
39 | 39 | public function asLink() { |
40 | - $this->addToPropertyCtrl("class", "link", array ("link" )); |
|
40 | + $this->addToPropertyCtrl("class", "link", array("link")); |
|
41 | 41 | return $this->contentAs("a"); |
42 | 42 | } |
43 | 43 | |
@@ -60,9 +60,9 @@ discard block |
||
60 | 60 | } |
61 | 61 | |
62 | 62 | public function run(JsUtils $js) { |
63 | - if ($this->_hasCheckedList === true) { |
|
64 | - $jsCode=include dirname(__FILE__) . '/../../components/jsTemplates/tplCheckedList.php'; |
|
65 | - $jsCode=\str_replace("%identifier%", "#" . $this->identifier, $jsCode); |
|
63 | + if ($this->_hasCheckedList===true) { |
|
64 | + $jsCode=include dirname(__FILE__).'/../../components/jsTemplates/tplCheckedList.php'; |
|
65 | + $jsCode=\str_replace("%identifier%", "#".$this->identifier, $jsCode); |
|
66 | 66 | $this->executeOnRun($jsCode); |
67 | 67 | } |
68 | 68 | return parent::run($js); |
@@ -86,28 +86,28 @@ discard block |
||
86 | 86 | |
87 | 87 | public function addCheckedList($items=array(), $masterItem=NULL, $values=array()) { |
88 | 88 | $count=$this->count(); |
89 | - $identifier=$this->identifier . "-" . $count; |
|
89 | + $identifier=$this->identifier."-".$count; |
|
90 | 90 | if (isset($masterItem)) { |
91 | - $masterO=new HtmlFormCheckbox("master-" . $identifier, $masterItem); |
|
91 | + $masterO=new HtmlFormCheckbox("master-".$identifier, $masterItem); |
|
92 | 92 | $masterO->getField()->addToProperty("class", "master"); |
93 | 93 | $masterO->setClass("item"); |
94 | 94 | $this->addItem($masterO); |
95 | 95 | } |
96 | - $fields=array (); |
|
96 | + $fields=array(); |
|
97 | 97 | $i=0; |
98 | - foreach ( $items as $val => $caption ) { |
|
99 | - $itemO=new HtmlFormCheckbox($identifier . "-" . $i++, $caption, $val, "child"); |
|
100 | - if (\array_search($val, $values) !== false) { |
|
98 | + foreach ($items as $val => $caption) { |
|
99 | + $itemO=new HtmlFormCheckbox($identifier."-".$i++, $caption, $val, "child"); |
|
100 | + if (\array_search($val, $values)!==false) { |
|
101 | 101 | $itemO->getField()->getField()->setProperty("checked", ""); |
102 | 102 | } |
103 | 103 | $itemO->setClass("item"); |
104 | 104 | $fields[]=$itemO; |
105 | 105 | } |
106 | - if (isset($masterO) === true) { |
|
106 | + if (isset($masterO)===true) { |
|
107 | 107 | $list=new HtmlList("", $fields); |
108 | 108 | $list->setClass("list"); |
109 | 109 | $masterO->addContent($list); |
110 | - } else { |
|
110 | + }else { |
|
111 | 111 | $this->addList($fields); |
112 | 112 | } |
113 | 113 | $this->_hasCheckedList=true; |