@@ -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 | } |
@@ -283,6 +306,10 @@ discard block |
||
283 | 306 | return null; |
284 | 307 | } |
285 | 308 | |
309 | + /** |
|
310 | + * @param string $propertyName |
|
311 | + * @param string $value |
|
312 | + */ |
|
286 | 313 | protected function getElementByPropertyValue($propertyName,$value, $elements) { |
287 | 314 | if (is_array($elements)) { |
288 | 315 | $flag=false; |
@@ -17,9 +17,9 @@ discard block |
||
17 | 17 | use BaseHtmlEventsTrait; |
18 | 18 | protected $_template; |
19 | 19 | protected $tagName; |
20 | - protected $properties=array (); |
|
21 | - protected $_wrapBefore=array (); |
|
22 | - protected $_wrapAfter=array (); |
|
20 | + protected $properties=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,26 +212,26 @@ discard block |
||
212 | 212 | } |
213 | 213 | |
214 | 214 | public function fromArray($array) { |
215 | - foreach ( $this as $key => $value ) { |
|
216 | - if(array_key_exists($key, $array)===true) |
|
217 | - $this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array); |
|
215 | + foreach ($this as $key => $value) { |
|
216 | + if (array_key_exists($key, $array)===true) |
|
217 | + $this->_callSetter("set".ucfirst($key), $key, $array[$key], $array); |
|
218 | 218 | } |
219 | - foreach ( $array as $key => $value ) { |
|
220 | - if($this->_callSetter($key, $key, $value, $array)===false){ |
|
221 | - $this->_callSetter("set" . ucfirst($key), $key, $value, $array); |
|
219 | + foreach ($array as $key => $value) { |
|
220 | + if ($this->_callSetter($key, $key, $value, $array)===false) { |
|
221 | + $this->_callSetter("set".ucfirst($key), $key, $value, $array); |
|
222 | 222 | } |
223 | 223 | } |
224 | 224 | return $array; |
225 | 225 | } |
226 | 226 | |
227 | - private function _callSetter($setter,$key,$value,&$array){ |
|
227 | + private function _callSetter($setter, $key, $value, &$array) { |
|
228 | 228 | $result=false; |
229 | 229 | if (method_exists($this, $setter) && !JString::startswith($key, "_")) { |
230 | 230 | try { |
231 | 231 | $this->$setter($value); |
232 | 232 | unset($array[$key]); |
233 | 233 | $result=true; |
234 | - } catch ( \Exception $e ) { |
|
234 | + }catch (\Exception $e) { |
|
235 | 235 | $result=false; |
236 | 236 | } |
237 | 237 | } |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | |
241 | 241 | public function fromDatabaseObjects($objects, $function) { |
242 | 242 | if (isset($objects)) { |
243 | - foreach ( $objects as $object ) { |
|
243 | + foreach ($objects as $object) { |
|
244 | 244 | $this->fromDatabaseObject($object, $function); |
245 | 245 | } |
246 | 246 | } |
@@ -264,33 +264,33 @@ discard block |
||
264 | 264 | if (is_array($elements)) { |
265 | 265 | $flag=false; |
266 | 266 | $index=0; |
267 | - while ( !$flag && $index < sizeof($elements) ) { |
|
267 | + while (!$flag && $index<sizeof($elements)) { |
|
268 | 268 | if ($elements[$index] instanceof BaseHtml) |
269 | - $flag=($elements[$index]->getIdentifier() === $identifier); |
|
269 | + $flag=($elements[$index]->getIdentifier()===$identifier); |
|
270 | 270 | $index++; |
271 | 271 | } |
272 | - if ($flag === true) |
|
273 | - return $elements[$index - 1]; |
|
272 | + if ($flag===true) |
|
273 | + return $elements[$index-1]; |
|
274 | 274 | } elseif ($elements instanceof BaseHtml) { |
275 | - if ($elements->getIdentifier() === $identifier) |
|
275 | + if ($elements->getIdentifier()===$identifier) |
|
276 | 276 | return $elements; |
277 | 277 | } |
278 | 278 | return null; |
279 | 279 | } |
280 | 280 | |
281 | - protected function getElementByPropertyValue($propertyName,$value, $elements) { |
|
281 | + protected function getElementByPropertyValue($propertyName, $value, $elements) { |
|
282 | 282 | if (is_array($elements)) { |
283 | 283 | $flag=false; |
284 | 284 | $index=0; |
285 | - while ( !$flag && $index < sizeof($elements) ) { |
|
285 | + while (!$flag && $index<sizeof($elements)) { |
|
286 | 286 | if ($elements[$index] instanceof BaseHtml) |
287 | - $flag=($elements[$index]->propertyContains($propertyName, $value) === true); |
|
287 | + $flag=($elements[$index]->propertyContains($propertyName, $value)===true); |
|
288 | 288 | $index++; |
289 | 289 | } |
290 | - if ($flag === true) |
|
291 | - return $elements[$index - 1]; |
|
290 | + if ($flag===true) |
|
291 | + return $elements[$index-1]; |
|
292 | 292 | } elseif ($elements instanceof BaseHtml) { |
293 | - if ($elements->propertyContains($propertyName, $value) === true) |
|
293 | + if ($elements->propertyContains($propertyName, $value)===true) |
|
294 | 294 | return $elements; |
295 | 295 | } |
296 | 296 | return null; |
@@ -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 | } |
@@ -213,8 +218,9 @@ discard block |
||
213 | 218 | |
214 | 219 | public function fromArray($array) { |
215 | 220 | foreach ( $this as $key => $value ) { |
216 | - if(array_key_exists($key, $array)===true) |
|
217 | - $this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array); |
|
221 | + if(array_key_exists($key, $array)===true) { |
|
222 | + $this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array); |
|
223 | + } |
|
218 | 224 | } |
219 | 225 | foreach ( $array as $key => $value ) { |
220 | 226 | if($this->_callSetter($key, $key, $value, $array)===false){ |
@@ -265,15 +271,18 @@ discard block |
||
265 | 271 | $flag=false; |
266 | 272 | $index=0; |
267 | 273 | while ( !$flag && $index < sizeof($elements) ) { |
268 | - if ($elements[$index] instanceof BaseHtml) |
|
269 | - $flag=($elements[$index]->getIdentifier() === $identifier); |
|
274 | + if ($elements[$index] instanceof BaseHtml) { |
|
275 | + $flag=($elements[$index]->getIdentifier() === $identifier); |
|
276 | + } |
|
270 | 277 | $index++; |
271 | 278 | } |
272 | - if ($flag === true) |
|
273 | - return $elements[$index - 1]; |
|
279 | + if ($flag === true) { |
|
280 | + return $elements[$index - 1]; |
|
281 | + } |
|
274 | 282 | } elseif ($elements instanceof BaseHtml) { |
275 | - if ($elements->getIdentifier() === $identifier) |
|
276 | - return $elements; |
|
283 | + if ($elements->getIdentifier() === $identifier) { |
|
284 | + return $elements; |
|
285 | + } |
|
277 | 286 | } |
278 | 287 | return null; |
279 | 288 | } |
@@ -283,15 +292,18 @@ discard block |
||
283 | 292 | $flag=false; |
284 | 293 | $index=0; |
285 | 294 | while ( !$flag && $index < sizeof($elements) ) { |
286 | - if ($elements[$index] instanceof BaseHtml) |
|
287 | - $flag=($elements[$index]->propertyContains($propertyName, $value) === true); |
|
295 | + if ($elements[$index] instanceof BaseHtml) { |
|
296 | + $flag=($elements[$index]->propertyContains($propertyName, $value) === true); |
|
297 | + } |
|
288 | 298 | $index++; |
289 | 299 | } |
290 | - if ($flag === true) |
|
291 | - return $elements[$index - 1]; |
|
300 | + if ($flag === true) { |
|
301 | + return $elements[$index - 1]; |
|
302 | + } |
|
292 | 303 | } elseif ($elements instanceof BaseHtml) { |
293 | - if ($elements->propertyContains($propertyName, $value) === true) |
|
294 | - return $elements; |
|
304 | + if ($elements->propertyContains($propertyName, $value) === true) { |
|
305 | + return $elements; |
|
306 | + } |
|
295 | 307 | } |
296 | 308 | return null; |
297 | 309 | } |
@@ -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 | /** |
@@ -34,21 +34,21 @@ discard block |
||
34 | 34 | protected $_toolbarPosition; |
35 | 35 | |
36 | 36 | |
37 | - public function __construct($identifier,$model,$modelInstance=NULL) { |
|
37 | + public function __construct($identifier, $model, $modelInstance=NULL) { |
|
38 | 38 | parent::__construct($identifier); |
39 | 39 | $this->_template="%wrapContentBefore%%content%%wrapContentAfter%"; |
40 | 40 | $this->setModel($model); |
41 | - if(isset($modelInstance)); |
|
41 | + if (isset($modelInstance)); |
|
42 | 42 | $this->show($modelInstance); |
43 | 43 | } |
44 | 44 | |
45 | - protected function _getFieldIdentifier($prefix){ |
|
45 | + protected function _getFieldIdentifier($prefix) { |
|
46 | 46 | return $this->identifier."-{$prefix}-".$this->_instanceViewer->getIdentifier(); |
47 | 47 | } |
48 | 48 | |
49 | - abstract protected function _setToolbarPosition($table,$captions=NULL); |
|
49 | + abstract protected function _setToolbarPosition($table, $captions=NULL); |
|
50 | 50 | |
51 | - public function show($modelInstance){ |
|
51 | + public function show($modelInstance) { |
|
52 | 52 | $this->_modelInstance=$modelInstance; |
53 | 53 | } |
54 | 54 | |
@@ -72,42 +72,42 @@ discard block |
||
72 | 72 | |
73 | 73 | public abstract function getHtmlComponent(); |
74 | 74 | |
75 | - public function setColor($color){ |
|
75 | + public function setColor($color) { |
|
76 | 76 | return $this->getHtmlComponent()->setColor($color); |
77 | 77 | } |
78 | 78 | |
79 | 79 | |
80 | - public function setCaptions($captions){ |
|
80 | + public function setCaptions($captions) { |
|
81 | 81 | $this->_instanceViewer->setCaptions($captions); |
82 | 82 | return $this; |
83 | 83 | } |
84 | 84 | |
85 | - public function setFields($fields){ |
|
85 | + public function setFields($fields) { |
|
86 | 86 | $this->_instanceViewer->setVisibleProperties($fields); |
87 | 87 | return $this; |
88 | 88 | } |
89 | 89 | |
90 | - public function addField($field){ |
|
90 | + public function addField($field) { |
|
91 | 91 | $this->_instanceViewer->addField($field); |
92 | 92 | return $this; |
93 | 93 | } |
94 | 94 | |
95 | - public function insertField($index,$field){ |
|
95 | + public function insertField($index, $field) { |
|
96 | 96 | $this->_instanceViewer->insertField($index, $field); |
97 | 97 | return $this; |
98 | 98 | } |
99 | 99 | |
100 | - public function insertInField($index,$field){ |
|
100 | + public function insertInField($index, $field) { |
|
101 | 101 | $this->_instanceViewer->insertInField($index, $field); |
102 | 102 | return $this; |
103 | 103 | } |
104 | 104 | |
105 | - public function setValueFunction($index,$callback){ |
|
105 | + public function setValueFunction($index, $callback) { |
|
106 | 106 | $this->_instanceViewer->setValueFunction($index, $callback); |
107 | 107 | return $this; |
108 | 108 | } |
109 | 109 | |
110 | - public function setIdentifierFunction($callback){ |
|
110 | + public function setIdentifierFunction($callback) { |
|
111 | 111 | $this->_instanceViewer->setIdentifierFunction($callback); |
112 | 112 | return $this; |
113 | 113 | } |
@@ -115,8 +115,8 @@ discard block |
||
115 | 115 | /** |
116 | 116 | * @return \Ajax\semantic\html\collections\menus\HtmlMenu |
117 | 117 | */ |
118 | - public function getToolbar(){ |
|
119 | - if(isset($this->_toolbar)===false){ |
|
118 | + public function getToolbar() { |
|
119 | + if (isset($this->_toolbar)===false) { |
|
120 | 120 | $this->_toolbar=new HtmlMenu("toolbar-".$this->identifier); |
121 | 121 | //$this->_toolbar->setSecondary(); |
122 | 122 | } |
@@ -129,57 +129,57 @@ discard block |
||
129 | 129 | * @param callable $callback function to call on $element |
130 | 130 | * @return \Ajax\common\html\HtmlDoubleElement |
131 | 131 | */ |
132 | - public function addInToolbar($element,$callback=NULL){ |
|
132 | + public function addInToolbar($element, $callback=NULL) { |
|
133 | 133 | $tb=$this->getToolbar(); |
134 | - if(isset($callback)){ |
|
135 | - if(\is_callable($callback)){ |
|
134 | + if (isset($callback)) { |
|
135 | + if (\is_callable($callback)) { |
|
136 | 136 | $callback($element); |
137 | 137 | } |
138 | 138 | } |
139 | 139 | return $tb->addItem($element); |
140 | 140 | } |
141 | 141 | |
142 | - public function addItemInToolbar($caption,$icon=NULL,$callback=NULL){ |
|
143 | - $result=$this->addInToolbar($caption,$callback); |
|
144 | - if(isset($icon)) |
|
142 | + public function addItemInToolbar($caption, $icon=NULL, $callback=NULL) { |
|
143 | + $result=$this->addInToolbar($caption, $callback); |
|
144 | + if (isset($icon)) |
|
145 | 145 | $result->addIcon($icon); |
146 | 146 | return $result; |
147 | 147 | } |
148 | 148 | |
149 | - public function addItemsInToolbar(array $items,$callback=NULL){ |
|
150 | - if(JArray::isAssociative($items)){ |
|
151 | - foreach ($items as $icon=>$item){ |
|
152 | - $this->addItemInToolbar($item,$icon,$callback); |
|
149 | + public function addItemsInToolbar(array $items, $callback=NULL) { |
|
150 | + if (JArray::isAssociative($items)) { |
|
151 | + foreach ($items as $icon=>$item) { |
|
152 | + $this->addItemInToolbar($item, $icon, $callback); |
|
153 | 153 | } |
154 | - }else{ |
|
155 | - foreach ($items as $item){ |
|
156 | - $this->addItemInToolbar($item,null,$callback); |
|
154 | + } else { |
|
155 | + foreach ($items as $item) { |
|
156 | + $this->addItemInToolbar($item, null, $callback); |
|
157 | 157 | } |
158 | 158 | } |
159 | 159 | return $this; |
160 | 160 | } |
161 | 161 | |
162 | - public function addDropdownInToolbar($value,$items=NULL,$callback=NULL){ |
|
162 | + public function addDropdownInToolbar($value, $items=NULL, $callback=NULL) { |
|
163 | 163 | $dd=$value; |
164 | 164 | if (\is_string($value)) { |
165 | - $dd=new HtmlDropdown("dropdown-". $this->identifier."-".$value, $value, $items); |
|
165 | + $dd=new HtmlDropdown("dropdown-".$this->identifier."-".$value, $value, $items); |
|
166 | 166 | } |
167 | - return $this->addInToolbar($dd,$callback); |
|
167 | + return $this->addInToolbar($dd, $callback); |
|
168 | 168 | } |
169 | 169 | |
170 | - public function addButtonInToolbar($caption,$callback=NULL){ |
|
171 | - $bt=new HtmlButton("",$caption); |
|
172 | - return $this->addInToolbar($bt,$callback); |
|
170 | + public function addButtonInToolbar($caption, $callback=NULL) { |
|
171 | + $bt=new HtmlButton("", $caption); |
|
172 | + return $this->addInToolbar($bt, $callback); |
|
173 | 173 | } |
174 | 174 | |
175 | - public function addButtonsInToolbar(array $captions,$asIcon=false,$callback=NULL){ |
|
176 | - $bts=new HtmlButtonGroups("",$captions,$asIcon); |
|
177 | - return $this->addInToolbar($bts,$callback); |
|
175 | + public function addButtonsInToolbar(array $captions, $asIcon=false, $callback=NULL) { |
|
176 | + $bts=new HtmlButtonGroups("", $captions, $asIcon); |
|
177 | + return $this->addInToolbar($bts, $callback); |
|
178 | 178 | } |
179 | 179 | |
180 | - public function addLabelledIconButtonInToolbar($caption,$icon,$before=true,$labeled=false){ |
|
181 | - $bt=new HtmlButton("",$caption); |
|
182 | - $bt->addIcon($icon,$before,$labeled); |
|
180 | + public function addLabelledIconButtonInToolbar($caption, $icon, $before=true, $labeled=false) { |
|
181 | + $bt=new HtmlButton("", $caption); |
|
182 | + $bt->addIcon($icon, $before, $labeled); |
|
183 | 183 | return $this->addInToolbar($bt); |
184 | 184 | } |
185 | 185 |
@@ -141,8 +141,9 @@ discard block |
||
141 | 141 | |
142 | 142 | public function addItemInToolbar($caption,$icon=NULL,$callback=NULL){ |
143 | 143 | $result=$this->addInToolbar($caption,$callback); |
144 | - if(isset($icon)) |
|
145 | - $result->addIcon($icon); |
|
144 | + if(isset($icon)) { |
|
145 | + $result->addIcon($icon); |
|
146 | + } |
|
146 | 147 | return $result; |
147 | 148 | } |
148 | 149 | |
@@ -151,7 +152,7 @@ discard block |
||
151 | 152 | foreach ($items as $icon=>$item){ |
152 | 153 | $this->addItemInToolbar($item,$icon,$callback); |
153 | 154 | } |
154 | - }else{ |
|
155 | + } else{ |
|
155 | 156 | foreach ($items as $item){ |
156 | 157 | $this->addItemInToolbar($item,null,$callback); |
157 | 158 | } |
@@ -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 |
@@ -15,16 +15,16 @@ discard block |
||
15 | 15 | * @license Apache 2 http://www.apache.org/licenses/ |
16 | 16 | **/ |
17 | 17 | class Jquery { |
18 | - use JqueryEventsTrait,JqueryAjaxTrait,JqueryActionsTrait; |
|
18 | + use JqueryEventsTrait, JqueryAjaxTrait, JqueryActionsTrait; |
|
19 | 19 | protected $_ui; |
20 | 20 | protected $_bootstrap; |
21 | 21 | protected $_semantic; |
22 | - protected $jquery_code_for_compile=array (); |
|
22 | + protected $jquery_code_for_compile=array(); |
|
23 | 23 | protected $jsUtils; |
24 | 24 | protected $params; |
25 | 25 | |
26 | - protected $jquery_events=array ( |
|
27 | - "bind","blur","change","click","dblclick","delegate","die","error","focus","focusin","focusout","hover","keydown","keypress","keyup","live","load","mousedown","mousseenter","mouseleave","mousemove","mouseout","mouseover","mouseup","off","on","one","ready","resize","scroll","select","submit","toggle","trigger","triggerHandler","undind","undelegate","unload" |
|
26 | + protected $jquery_events=array( |
|
27 | + "bind", "blur", "change", "click", "dblclick", "delegate", "die", "error", "focus", "focusin", "focusout", "hover", "keydown", "keypress", "keyup", "live", "load", "mousedown", "mousseenter", "mouseleave", "mousemove", "mouseout", "mouseover", "mouseup", "off", "on", "one", "ready", "resize", "scroll", "select", "submit", "toggle", "trigger", "triggerHandler", "undind", "undelegate", "unload" |
|
28 | 28 | ); |
29 | 29 | |
30 | 30 | public function ui($ui=NULL) { |
@@ -48,9 +48,9 @@ discard block |
||
48 | 48 | return $this->_semantic; |
49 | 49 | } |
50 | 50 | |
51 | - public function __construct($params,$jsUtils) { |
|
51 | + public function __construct($params, $jsUtils) { |
|
52 | 52 | $this->params=array(); |
53 | - foreach ( $params as $key => $val ) { |
|
53 | + foreach ($params as $key => $val) { |
|
54 | 54 | $this->params[$key]=$params[$key]; |
55 | 55 | } |
56 | 56 | $this->jsUtils=$jsUtils; |
@@ -114,12 +114,12 @@ discard block |
||
114 | 114 | */ |
115 | 115 | public function _output($array_js='') { |
116 | 116 | if (!is_array($array_js)) { |
117 | - $array_js=array ( |
|
117 | + $array_js=array( |
|
118 | 118 | $array_js |
119 | 119 | ); |
120 | 120 | } |
121 | 121 | |
122 | - foreach ( $array_js as $js ) { |
|
122 | + foreach ($array_js as $js) { |
|
123 | 123 | $this->jquery_code_for_compile[]="\t$js\n"; |
124 | 124 | } |
125 | 125 | } |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | * @param string $param |
132 | 132 | * @param boolean $immediatly delayed if false |
133 | 133 | */ |
134 | - public function _genericCallValue($jQueryCall,$element='this', $param="", $immediatly=false) { |
|
134 | + public function _genericCallValue($jQueryCall, $element='this', $param="", $immediatly=false) { |
|
135 | 135 | $element=Javascript::prep_element($element); |
136 | 136 | if (isset($param)) { |
137 | 137 | $param=Javascript::prep_value($param); |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | * @param boolean $immediatly delayed if false |
151 | 151 | * @return string |
152 | 152 | */ |
153 | - public function _genericCallElement($jQueryCall,$to='this', $element, $immediatly=false) { |
|
153 | + public function _genericCallElement($jQueryCall, $to='this', $element, $immediatly=false) { |
|
154 | 154 | $to=Javascript::prep_element($to); |
155 | 155 | $element=Javascript::prep_element($element); |
156 | 156 | $str="$({$to}).{$jQueryCall}({$element});"; |
@@ -168,8 +168,8 @@ discard block |
||
168 | 168 | */ |
169 | 169 | public function sortable($element, $options=array()) { |
170 | 170 | if (count($options)>0) { |
171 | - $sort_options=array (); |
|
172 | - foreach ( $options as $k => $v ) { |
|
171 | + $sort_options=array(); |
|
172 | + foreach ($options as $k => $v) { |
|
173 | 173 | $sort_options[]="\n\t\t".$k.': '.$v.""; |
174 | 174 | } |
175 | 175 | $sort_options=implode(",", $sort_options); |
@@ -201,7 +201,7 @@ discard block |
||
201 | 201 | * @param boolean $stopPropagation Prevents the event from bubbling up the DOM tree, preventing any parent handlers from being notified of the event. |
202 | 202 | * @return string |
203 | 203 | */ |
204 | - public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true) { |
|
204 | + public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true) { |
|
205 | 205 | if (is_array($js)) { |
206 | 206 | $js=implode("\n\t\t", $js); |
207 | 207 | } |
@@ -215,7 +215,7 @@ discard block |
||
215 | 215 | $event="\n\t$(".Javascript::prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n"; |
216 | 216 | else |
217 | 217 | $event="\n\t$(".Javascript::prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n"; |
218 | - if($immediatly) |
|
218 | + if ($immediatly) |
|
219 | 219 | $this->jquery_code_for_compile[]=$event; |
220 | 220 | return $event; |
221 | 221 | } |
@@ -247,18 +247,18 @@ discard block |
||
247 | 247 | $script.='});'; |
248 | 248 | |
249 | 249 | $this->jquery_code_for_compile=array(); |
250 | - if($this->params["debug"]==false){ |
|
250 | + if ($this->params["debug"]==false) { |
|
251 | 251 | $script=$this->minify($script); |
252 | 252 | } |
253 | 253 | $output=($script_tags===FALSE) ? $script : $this->inline($script); |
254 | 254 | |
255 | - if ($view!==NULL){ |
|
256 | - $this->jsUtils->createScriptVariable($view,$view_var, $output); |
|
255 | + if ($view!==NULL) { |
|
256 | + $this->jsUtils->createScriptVariable($view, $view_var, $output); |
|
257 | 257 | } |
258 | 258 | return $output; |
259 | 259 | } |
260 | 260 | |
261 | - private function _compileLibrary($library){ |
|
261 | + private function _compileLibrary($library) { |
|
262 | 262 | if ($library!=NULL) { |
263 | 263 | if ($library->isAutoCompile()) { |
264 | 264 | $library->compile(true); |
@@ -276,7 +276,7 @@ discard block |
||
276 | 276 | * @return void |
277 | 277 | */ |
278 | 278 | public function _clear_compile() { |
279 | - $this->jquery_code_for_compile=array (); |
|
279 | + $this->jquery_code_for_compile=array(); |
|
280 | 280 | } |
281 | 281 | |
282 | 282 | /** |
@@ -285,18 +285,18 @@ discard block |
||
285 | 285 | */ |
286 | 286 | public function _document_ready($js) { |
287 | 287 | if (!is_array($js)) { |
288 | - $js=array ( |
|
288 | + $js=array( |
|
289 | 289 | $js |
290 | 290 | ); |
291 | 291 | } |
292 | 292 | |
293 | - foreach ( $js as $script ) { |
|
293 | + foreach ($js as $script) { |
|
294 | 294 | $this->jquery_code_for_compile[]=$script; |
295 | 295 | } |
296 | 296 | } |
297 | 297 | |
298 | 298 | private function minify($input) { |
299 | - if(trim($input) === "") return $input; |
|
299 | + if (trim($input)==="") return $input; |
|
300 | 300 | return preg_replace( |
301 | 301 | array( |
302 | 302 | // Remove comment(s) |
@@ -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) |
@@ -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,10 +49,10 @@ 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; |
@@ -61,15 +61,15 @@ discard block |
||
61 | 61 | public function addEventsOnRun(JsUtils $js=NULL) { |
62 | 62 | $this->_eventsOnCreate($js); |
63 | 63 | if (isset($this->_bsComponent)) { |
64 | - foreach ( $this->_events as $event => $jsCode ) { |
|
64 | + foreach ($this->_events as $event => $jsCode) { |
|
65 | 65 | $code=$jsCode; |
66 | 66 | if (is_array($jsCode)) { |
67 | 67 | $code=""; |
68 | - foreach ( $jsCode as $jsC ) { |
|
68 | + foreach ($jsCode as $jsC) { |
|
69 | 69 | if ($jsC instanceof AjaxCall) { |
70 | - $code.="\n" . $jsC->compile($js); |
|
70 | + $code.="\n".$jsC->compile($js); |
|
71 | 71 | } else { |
72 | - $code.="\n" . $jsC; |
|
72 | + $code.="\n".$jsC; |
|
73 | 73 | } |
74 | 74 | } |
75 | 75 | } elseif ($jsCode instanceof AjaxCall) { |
@@ -77,24 +77,24 @@ discard block |
||
77 | 77 | } |
78 | 78 | $this->_bsComponent->addEvent($event, $code); |
79 | 79 | } |
80 | - $this->_events=array (); |
|
80 | + $this->_events=array(); |
|
81 | 81 | } |
82 | 82 | } |
83 | 83 | |
84 | - protected function _eventsOnCreate(JsUtils $js=NULL){ |
|
85 | - if(isset($this->_events["_create"])){ |
|
84 | + protected function _eventsOnCreate(JsUtils $js=NULL) { |
|
85 | + if (isset($this->_events["_create"])) { |
|
86 | 86 | $create=$this->_events["_create"]; |
87 | - if(\is_array($create)){ |
|
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 | unset($this->_events["_create"]); |
93 | 93 | } |
94 | 94 | } |
95 | 95 | |
96 | 96 | public function _ajaxOn($operation, $event, $url, $responseElement="", $parameters=array()) { |
97 | - $params=array ("url" => $url,"responseElement" => $responseElement ); |
|
97 | + $params=array("url" => $url, "responseElement" => $responseElement); |
|
98 | 98 | $params=array_merge($params, $parameters); |
99 | 99 | $this->_addEvent($event, new AjaxCall($operation, $params)); |
100 | 100 | return $this; |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | } |
128 | 128 | |
129 | 129 | public function jsDoJquery($jqueryCall, $param="") { |
130 | - return "$('#" . $this->identifier . "')." . $jqueryCall . "(" . Javascript::prep_value($param) . ");"; |
|
130 | + return "$('#".$this->identifier."').".$jqueryCall."(".Javascript::prep_value($param).");"; |
|
131 | 131 | } |
132 | 132 | |
133 | 133 | 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; |
@@ -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 | } |
@@ -16,163 +16,163 @@ discard block |
||
16 | 16 | |
17 | 17 | public static $index=0; |
18 | 18 | |
19 | - public function __construct($identifier,$instance=NULL,$captions=NULL){ |
|
19 | + public function __construct($identifier, $instance=NULL, $captions=NULL) { |
|
20 | 20 | $this->widgetIdentifier=$identifier; |
21 | 21 | $this->values=[]; |
22 | 22 | $this->afterCompile=[]; |
23 | - if(isset($instance)) |
|
23 | + if (isset($instance)) |
|
24 | 24 | $this->setInstance($instance); |
25 | 25 | $this->setCaptions($captions); |
26 | 26 | $this->captionCallback=NULL; |
27 | 27 | } |
28 | 28 | |
29 | - public function getValues(){ |
|
29 | + public function getValues() { |
|
30 | 30 | $values=[]; |
31 | 31 | $index=0; |
32 | 32 | $count=$this->count(); |
33 | - while($index<$count){ |
|
33 | + while ($index<$count) { |
|
34 | 34 | $values[]=$this->getValue($index++); |
35 | 35 | } |
36 | 36 | return $values; |
37 | 37 | } |
38 | 38 | |
39 | - public function getIdentifier(){ |
|
39 | + public function getIdentifier() { |
|
40 | 40 | $value=self::$index; |
41 | - if(isset($this->values["identifier"])) |
|
42 | - $value=$this->values["identifier"](self::$index,$this->instance); |
|
41 | + if (isset($this->values["identifier"])) |
|
42 | + $value=$this->values["identifier"](self::$index, $this->instance); |
|
43 | 43 | return $value; |
44 | 44 | } |
45 | 45 | |
46 | - public function getValue($index){ |
|
46 | + public function getValue($index) { |
|
47 | 47 | $property=$this->properties[$index]; |
48 | 48 | return $this->_getValue($property, $index); |
49 | 49 | } |
50 | 50 | |
51 | - protected function _beforeAddProperty($index,&$field){ |
|
51 | + protected function _beforeAddProperty($index, &$field) { |
|
52 | 52 | |
53 | 53 | } |
54 | 54 | |
55 | - protected function _getDefaultValue($name,$value,$index){ |
|
55 | + protected function _getDefaultValue($name, $value, $index) { |
|
56 | 56 | return $value; |
57 | 57 | } |
58 | 58 | |
59 | - protected function _getValue($property,$index){ |
|
60 | - if($property instanceof \ReflectionProperty){ |
|
59 | + protected function _getValue($property, $index) { |
|
60 | + if ($property instanceof \ReflectionProperty) { |
|
61 | 61 | $property->setAccessible(true); |
62 | 62 | $value=$property->getValue($this->instance); |
63 | - if(isset($this->values[$index])){ |
|
64 | - $value= $this->values[$index]($value,$this->instance,$index); |
|
65 | - }else{ |
|
66 | - $value=$this->_getDefaultValue($property->getName(),$value, $index); |
|
63 | + if (isset($this->values[$index])) { |
|
64 | + $value=$this->values[$index]($value, $this->instance, $index); |
|
65 | + } else { |
|
66 | + $value=$this->_getDefaultValue($property->getName(), $value, $index); |
|
67 | 67 | } |
68 | - }else{ |
|
69 | - if(\is_callable($property)) |
|
68 | + } else { |
|
69 | + if (\is_callable($property)) |
|
70 | 70 | $value=$property($this->instance); |
71 | - elseif(\is_array($property)){ |
|
72 | - $values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property); |
|
71 | + elseif (\is_array($property)) { |
|
72 | + $values=\array_map(function($v) use ($index){return $this->_getValue($v, $index); }, $property); |
|
73 | 73 | $value=\implode("", $values); |
74 | - }else{ |
|
75 | - if(isset($this->values[$index])){ |
|
76 | - $value= $this->values[$index]($property,$this->instance,$index); |
|
77 | - }else{ |
|
74 | + } else { |
|
75 | + if (isset($this->values[$index])) { |
|
76 | + $value=$this->values[$index]($property, $this->instance, $index); |
|
77 | + } else { |
|
78 | 78 | $value=$property; |
79 | 79 | } |
80 | 80 | } |
81 | 81 | } |
82 | - if(isset($this->afterCompile[$index])){ |
|
83 | - if(\is_callable($this->afterCompile[$index])){ |
|
84 | - $this->afterCompile[$index]($value,$this->instance,$index); |
|
82 | + if (isset($this->afterCompile[$index])) { |
|
83 | + if (\is_callable($this->afterCompile[$index])) { |
|
84 | + $this->afterCompile[$index]($value, $this->instance, $index); |
|
85 | 85 | } |
86 | 86 | } |
87 | 87 | return $value; |
88 | 88 | } |
89 | 89 | |
90 | - public function insertField($index,$field){ |
|
91 | - array_splice( $this->visibleProperties, $index, 0, $field ); |
|
90 | + public function insertField($index, $field) { |
|
91 | + array_splice($this->visibleProperties, $index, 0, $field); |
|
92 | 92 | return $this; |
93 | 93 | } |
94 | 94 | |
95 | - public function insertInField($index,$field){ |
|
95 | + public function insertInField($index, $field) { |
|
96 | 96 | $vb=$this->visibleProperties; |
97 | - if(isset($vb[$index])){ |
|
98 | - if(\is_array($vb[$index])){ |
|
97 | + if (isset($vb[$index])) { |
|
98 | + if (\is_array($vb[$index])) { |
|
99 | 99 | $this->visibleProperties[$index][]=$field; |
100 | - }else{ |
|
101 | - $this->visibleProperties[$index]=[$vb[$index],$field]; |
|
100 | + } else { |
|
101 | + $this->visibleProperties[$index]=[$vb[$index], $field]; |
|
102 | 102 | } |
103 | - }else{ |
|
103 | + } else { |
|
104 | 104 | return $this->insertField($index, $field); |
105 | 105 | } |
106 | 106 | return $this; |
107 | 107 | } |
108 | 108 | |
109 | - public function addField($field){ |
|
109 | + public function addField($field) { |
|
110 | 110 | $this->visibleProperties[]=$field; |
111 | 111 | return $this; |
112 | 112 | } |
113 | 113 | |
114 | - public function count(){ |
|
114 | + public function count() { |
|
115 | 115 | return \sizeof($this->properties); |
116 | 116 | } |
117 | 117 | |
118 | - public function visiblePropertiesCount(){ |
|
118 | + public function visiblePropertiesCount() { |
|
119 | 119 | return \sizeof($this->visibleProperties); |
120 | 120 | } |
121 | 121 | |
122 | - public function getProperty($index){ |
|
122 | + public function getProperty($index) { |
|
123 | 123 | return $this->properties[$index]; |
124 | 124 | } |
125 | 125 | |
126 | - protected function showableProperty(\ReflectionProperty $rProperty){ |
|
127 | - return JString::startswith($rProperty->getName(),"_")===false; |
|
126 | + protected function showableProperty(\ReflectionProperty $rProperty) { |
|
127 | + return JString::startswith($rProperty->getName(), "_")===false; |
|
128 | 128 | } |
129 | 129 | |
130 | 130 | public function setInstance($instance) { |
131 | - if(\is_string($instance)){ |
|
131 | + if (\is_string($instance)) { |
|
132 | 132 | $instance=new $instance(); |
133 | 133 | } |
134 | 134 | $this->instance=$instance; |
135 | 135 | $this->properties=[]; |
136 | 136 | $this->reflect=new \ReflectionClass($instance); |
137 | - if(\sizeof($this->visibleProperties)===0){ |
|
137 | + if (\sizeof($this->visibleProperties)===0) { |
|
138 | 138 | $this->properties=$this->getDefaultProperties(); |
139 | - }else{ |
|
140 | - foreach ($this->visibleProperties as $property){ |
|
139 | + } else { |
|
140 | + foreach ($this->visibleProperties as $property) { |
|
141 | 141 | $this->setInstanceProperty($property); |
142 | 142 | } |
143 | 143 | } |
144 | 144 | return $this; |
145 | 145 | } |
146 | 146 | |
147 | - private function setInstanceProperty($property){ |
|
148 | - if(\is_callable($property)){ |
|
147 | + private function setInstanceProperty($property) { |
|
148 | + if (\is_callable($property)) { |
|
149 | 149 | $this->properties[]=$property; |
150 | - }elseif(\is_string($property)){ |
|
151 | - try{ |
|
150 | + }elseif (\is_string($property)) { |
|
151 | + try { |
|
152 | 152 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
153 | 153 | $rProperty=$this->reflect->getProperty($property); |
154 | 154 | $this->properties[]=$rProperty; |
155 | - }catch(\Exception $e){ |
|
155 | + }catch (\Exception $e) { |
|
156 | 156 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
157 | 157 | $this->properties[]=$property; |
158 | 158 | } |
159 | - }elseif(\is_int($property)){ |
|
159 | + }elseif (\is_int($property)) { |
|
160 | 160 | $props=$this->getDefaultProperties(); |
161 | - if(isset($props[$property])) |
|
161 | + if (isset($props[$property])) |
|
162 | 162 | $this->properties[]=$props[$property]; |
163 | 163 | else |
164 | 164 | $this->properties[]=$property; |
165 | - }else{ |
|
165 | + } else { |
|
166 | 166 | $this->properties[]=$property; |
167 | 167 | } |
168 | 168 | } |
169 | 169 | |
170 | - protected function getDefaultProperties(){ |
|
170 | + protected function getDefaultProperties() { |
|
171 | 171 | $result=[]; |
172 | 172 | $properties=$this->reflect->getProperties(); |
173 | - foreach ($properties as $property){ |
|
173 | + foreach ($properties as $property) { |
|
174 | 174 | $showable=$this->showableProperty($property); |
175 | - if($showable!==false){ |
|
175 | + if ($showable!==false) { |
|
176 | 176 | $result[]=$property; |
177 | 177 | } |
178 | 178 | } |
@@ -184,12 +184,12 @@ discard block |
||
184 | 184 | return $this; |
185 | 185 | } |
186 | 186 | |
187 | - public function setValueFunction($index,$callback){ |
|
187 | + public function setValueFunction($index, $callback) { |
|
188 | 188 | $this->values[$index]=$callback; |
189 | 189 | return $this; |
190 | 190 | } |
191 | 191 | |
192 | - public function setIdentifierFunction($callback){ |
|
192 | + public function setIdentifierFunction($callback) { |
|
193 | 193 | $this->values["identifier"]=$callback; |
194 | 194 | return $this; |
195 | 195 | } |
@@ -202,41 +202,41 @@ discard block |
||
202 | 202 | return $this->properties; |
203 | 203 | } |
204 | 204 | |
205 | - public function getCaption($index){ |
|
206 | - if(isset($this->captions[$index])){ |
|
205 | + public function getCaption($index) { |
|
206 | + if (isset($this->captions[$index])) { |
|
207 | 207 | return $this->captions[$index]; |
208 | 208 | } |
209 | - if($this->properties[$index] instanceof \ReflectionProperty) |
|
209 | + if ($this->properties[$index] instanceof \ReflectionProperty) |
|
210 | 210 | return $this->properties[$index]->getName(); |
211 | - elseif(\is_callable($this->properties[$index])) |
|
211 | + elseif (\is_callable($this->properties[$index])) |
|
212 | 212 | return ""; |
213 | 213 | else |
214 | 214 | return $this->properties[$index]; |
215 | 215 | } |
216 | 216 | |
217 | - public function getCaptions(){ |
|
218 | - if(isset($this->captions)){ |
|
219 | - $captions= $this->captions; |
|
220 | - for($i=\sizeof($captions);$i<$this->count();$i++){ |
|
217 | + public function getCaptions() { |
|
218 | + if (isset($this->captions)) { |
|
219 | + $captions=$this->captions; |
|
220 | + for ($i=\sizeof($captions); $i<$this->count(); $i++) { |
|
221 | 221 | $captions[]=""; |
222 | 222 | } |
223 | - }else{ |
|
223 | + } else { |
|
224 | 224 | $captions=[]; |
225 | 225 | $index=0; |
226 | 226 | $count=$this->count(); |
227 | - while($index<$count){ |
|
227 | + while ($index<$count) { |
|
228 | 228 | $captions[]=$this->getCaption($index++); |
229 | 229 | } |
230 | 230 | } |
231 | - if(isset($this->captionCallback) && \is_callable($this->captionCallback)){ |
|
231 | + if (isset($this->captionCallback) && \is_callable($this->captionCallback)) { |
|
232 | 232 | $callback=$this->captionCallback; |
233 | - $callback($captions,$this->instance); |
|
233 | + $callback($captions, $this->instance); |
|
234 | 234 | } |
235 | 235 | return $captions; |
236 | 236 | } |
237 | 237 | |
238 | - public function setCaption($index,$caption){ |
|
239 | - if(isset($this->captions)===false) |
|
238 | + public function setCaption($index, $caption) { |
|
239 | + if (isset($this->captions)===false) |
|
240 | 240 | $this->captions=[]; |
241 | 241 | $this->captions[$index]=$caption; |
242 | 242 | return $this; |
@@ -254,7 +254,7 @@ discard block |
||
254 | 254 | * @param callable $callback function called after the field compilation |
255 | 255 | * @return \Ajax\semantic\widgets\datatable\InstanceViewer |
256 | 256 | */ |
257 | - public function afterCompile($index,$callback){ |
|
257 | + public function afterCompile($index, $callback) { |
|
258 | 258 | $this->afterCompile[$index]=$callback; |
259 | 259 | return $this; |
260 | 260 | } |
@@ -20,8 +20,9 @@ discard block |
||
20 | 20 | $this->widgetIdentifier=$identifier; |
21 | 21 | $this->values=[]; |
22 | 22 | $this->afterCompile=[]; |
23 | - if(isset($instance)) |
|
24 | - $this->setInstance($instance); |
|
23 | + if(isset($instance)) { |
|
24 | + $this->setInstance($instance); |
|
25 | + } |
|
25 | 26 | $this->setCaptions($captions); |
26 | 27 | $this->captionCallback=NULL; |
27 | 28 | } |
@@ -38,8 +39,9 @@ discard block |
||
38 | 39 | |
39 | 40 | public function getIdentifier(){ |
40 | 41 | $value=self::$index; |
41 | - if(isset($this->values["identifier"])) |
|
42 | - $value=$this->values["identifier"](self::$index,$this->instance); |
|
42 | + if(isset($this->values["identifier"])) { |
|
43 | + $value=$this->values["identifier"](self::$index,$this->instance); |
|
44 | + } |
|
43 | 45 | return $value; |
44 | 46 | } |
45 | 47 | |
@@ -62,19 +64,19 @@ discard block |
||
62 | 64 | $value=$property->getValue($this->instance); |
63 | 65 | if(isset($this->values[$index])){ |
64 | 66 | $value= $this->values[$index]($value,$this->instance,$index); |
65 | - }else{ |
|
67 | + } else{ |
|
66 | 68 | $value=$this->_getDefaultValue($property->getName(),$value, $index); |
67 | 69 | } |
68 | - }else{ |
|
69 | - if(\is_callable($property)) |
|
70 | - $value=$property($this->instance); |
|
71 | - elseif(\is_array($property)){ |
|
70 | + } else{ |
|
71 | + if(\is_callable($property)) { |
|
72 | + $value=$property($this->instance); |
|
73 | + } elseif(\is_array($property)){ |
|
72 | 74 | $values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property); |
73 | 75 | $value=\implode("", $values); |
74 | - }else{ |
|
76 | + } else{ |
|
75 | 77 | if(isset($this->values[$index])){ |
76 | 78 | $value= $this->values[$index]($property,$this->instance,$index); |
77 | - }else{ |
|
79 | + } else{ |
|
78 | 80 | $value=$property; |
79 | 81 | } |
80 | 82 | } |
@@ -97,10 +99,10 @@ discard block |
||
97 | 99 | if(isset($vb[$index])){ |
98 | 100 | if(\is_array($vb[$index])){ |
99 | 101 | $this->visibleProperties[$index][]=$field; |
100 | - }else{ |
|
102 | + } else{ |
|
101 | 103 | $this->visibleProperties[$index]=[$vb[$index],$field]; |
102 | 104 | } |
103 | - }else{ |
|
105 | + } else{ |
|
104 | 106 | return $this->insertField($index, $field); |
105 | 107 | } |
106 | 108 | return $this; |
@@ -136,7 +138,7 @@ discard block |
||
136 | 138 | $this->reflect=new \ReflectionClass($instance); |
137 | 139 | if(\sizeof($this->visibleProperties)===0){ |
138 | 140 | $this->properties=$this->getDefaultProperties(); |
139 | - }else{ |
|
141 | + } else{ |
|
140 | 142 | foreach ($this->visibleProperties as $property){ |
141 | 143 | $this->setInstanceProperty($property); |
142 | 144 | } |
@@ -147,22 +149,23 @@ discard block |
||
147 | 149 | private function setInstanceProperty($property){ |
148 | 150 | if(\is_callable($property)){ |
149 | 151 | $this->properties[]=$property; |
150 | - }elseif(\is_string($property)){ |
|
152 | + } elseif(\is_string($property)){ |
|
151 | 153 | try{ |
152 | 154 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
153 | 155 | $rProperty=$this->reflect->getProperty($property); |
154 | 156 | $this->properties[]=$rProperty; |
155 | - }catch(\Exception $e){ |
|
157 | + } catch(\Exception $e){ |
|
156 | 158 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
157 | 159 | $this->properties[]=$property; |
158 | 160 | } |
159 | - }elseif(\is_int($property)){ |
|
161 | + } elseif(\is_int($property)){ |
|
160 | 162 | $props=$this->getDefaultProperties(); |
161 | - if(isset($props[$property])) |
|
162 | - $this->properties[]=$props[$property]; |
|
163 | - else |
|
164 | - $this->properties[]=$property; |
|
165 | - }else{ |
|
163 | + if(isset($props[$property])) { |
|
164 | + $this->properties[]=$props[$property]; |
|
165 | + } else { |
|
166 | + $this->properties[]=$property; |
|
167 | + } |
|
168 | + } else{ |
|
166 | 169 | $this->properties[]=$property; |
167 | 170 | } |
168 | 171 | } |
@@ -206,12 +209,13 @@ discard block |
||
206 | 209 | if(isset($this->captions[$index])){ |
207 | 210 | return $this->captions[$index]; |
208 | 211 | } |
209 | - if($this->properties[$index] instanceof \ReflectionProperty) |
|
210 | - return $this->properties[$index]->getName(); |
|
211 | - elseif(\is_callable($this->properties[$index])) |
|
212 | - return ""; |
|
213 | - else |
|
214 | - return $this->properties[$index]; |
|
212 | + if($this->properties[$index] instanceof \ReflectionProperty) { |
|
213 | + return $this->properties[$index]->getName(); |
|
214 | + } elseif(\is_callable($this->properties[$index])) { |
|
215 | + return ""; |
|
216 | + } else { |
|
217 | + return $this->properties[$index]; |
|
218 | + } |
|
215 | 219 | } |
216 | 220 | |
217 | 221 | public function getCaptions(){ |
@@ -220,7 +224,7 @@ discard block |
||
220 | 224 | for($i=\sizeof($captions);$i<$this->count();$i++){ |
221 | 225 | $captions[]=""; |
222 | 226 | } |
223 | - }else{ |
|
227 | + } else{ |
|
224 | 228 | $captions=[]; |
225 | 229 | $index=0; |
226 | 230 | $count=$this->count(); |
@@ -236,8 +240,9 @@ discard block |
||
236 | 240 | } |
237 | 241 | |
238 | 242 | public function setCaption($index,$caption){ |
239 | - if(isset($this->captions)===false) |
|
240 | - $this->captions=[]; |
|
243 | + if(isset($this->captions)===false) { |
|
244 | + $this->captions=[]; |
|
245 | + } |
|
241 | 246 | $this->captions[$index]=$caption; |
242 | 247 | return $this; |
243 | 248 | } |
@@ -4,7 +4,7 @@ |
||
4 | 4 | |
5 | 5 | trait HtmlLinkTrait { |
6 | 6 | |
7 | - abstract public function setProperty($name,$value); |
|
7 | + abstract public function setProperty($name, $value); |
|
8 | 8 | abstract public function getProperty($name); |
9 | 9 | |
10 | 10 | public function setHref($value) { |
@@ -14,8 +14,8 @@ |
||
14 | 14 | */ |
15 | 15 | public function setAttachment($toElement, $side=Side::BOTH) { |
16 | 16 | if (isset($toElement)) { |
17 | - $toElement->addToPropertyCtrl("class", "attached", array ("attached" )); |
|
17 | + $toElement->addToPropertyCtrl("class", "attached", array("attached")); |
|
18 | 18 | } |
19 | - return $this->addToPropertyCtrl("class", $side . " attached", Side::getConstantValues("attached")); |
|
19 | + return $this->addToPropertyCtrl("class", $side." attached", Side::getConstantValues("attached")); |
|
20 | 20 | } |
21 | 21 | } |
22 | 22 | \ No newline at end of file |