@@ -7,19 +7,19 @@ |
||
7 | 7 | |
8 | 8 | use Ajax\semantic\html\elements\HtmlIcon; |
9 | 9 | |
10 | -class HtmlPaginationMenu extends HtmlMenu{ |
|
10 | +class HtmlPaginationMenu extends HtmlMenu { |
|
11 | 11 | |
12 | - public function __construct( $identifier, $items=array() ){ |
|
13 | - parent::__construct( $identifier,$items); |
|
12 | + public function __construct($identifier, $items=array()) { |
|
13 | + parent::__construct($identifier, $items); |
|
14 | 14 | } |
15 | 15 | /** |
16 | 16 | * {@inheritDoc} |
17 | 17 | * @see \Ajax\common\html\BaseHtml::compile() |
18 | 18 | */ |
19 | - public function compile(JsUtils $js=NULL,&$view=NULL){ |
|
19 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
20 | 20 | $this->insertItem(new HtmlIcon("", "left chevron")); |
21 | 21 | $this->addItem(new HtmlIcon("", "right chevron")); |
22 | 22 | $this->asPagination(); |
23 | - return parent::compile($js,$view); |
|
23 | + return parent::compile($js, $view); |
|
24 | 24 | } |
25 | 25 | } |
26 | 26 | \ No newline at end of file |
@@ -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 | } |
@@ -327,14 +350,23 @@ discard block |
||
327 | 350 | return $this; |
328 | 351 | } |
329 | 352 | |
353 | + /** |
|
354 | + * @param string $event |
|
355 | + */ |
|
330 | 356 | public function getOn($event, $url, $responseElement="", $parameters=array()) { |
331 | 357 | return $this->_ajaxOn("get", $event, $url, $responseElement, $parameters); |
332 | 358 | } |
333 | 359 | |
360 | + /** |
|
361 | + * @param string $url |
|
362 | + */ |
|
334 | 363 | public function getOnClick($url, $responseElement="", $parameters=array()) { |
335 | 364 | return $this->getOn("click", $url, $responseElement, $parameters); |
336 | 365 | } |
337 | 366 | |
367 | + /** |
|
368 | + * @param string $event |
|
369 | + */ |
|
338 | 370 | public function postOn($event, $url, $params="{}", $responseElement="", $parameters=array()) { |
339 | 371 | $parameters["params"]=$params; |
340 | 372 | return $this->_ajaxOn("post", $event, $url, $responseElement, $parameters); |
@@ -344,6 +376,9 @@ discard block |
||
344 | 376 | return $this->postOn("click", $url, $params, $responseElement, $parameters); |
345 | 377 | } |
346 | 378 | |
379 | + /** |
|
380 | + * @param string $event |
|
381 | + */ |
|
347 | 382 | public function postFormOn($event, $url, $form, $responseElement="", $parameters=array()) { |
348 | 383 | $parameters["form"]=$form; |
349 | 384 | return $this->_ajaxOn("postForm", $event, $url, $responseElement, $parameters); |
@@ -371,6 +406,10 @@ discard block |
||
371 | 406 | return null; |
372 | 407 | } |
373 | 408 | |
409 | + /** |
|
410 | + * @param string $propertyName |
|
411 | + * @param string $value |
|
412 | + */ |
|
374 | 413 | protected function getElementByPropertyValue($propertyName,$value, $elements) { |
375 | 414 | if (is_array($elements)) { |
376 | 415 | $flag=false; |
@@ -411,6 +450,9 @@ discard block |
||
411 | 450 | return $value; |
412 | 451 | } |
413 | 452 | |
453 | + /** |
|
454 | + * @param string $jqueryCall |
|
455 | + */ |
|
414 | 456 | public function jsDoJquery($jqueryCall, $param="") { |
415 | 457 | return "$('#" . $this->identifier . "')." . $jqueryCall . "(" . $this->_prep_value($param) . ");"; |
416 | 458 | } |
@@ -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) { |
@@ -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 | } |
@@ -358,15 +363,18 @@ discard block |
||
358 | 363 | $flag=false; |
359 | 364 | $index=0; |
360 | 365 | while ( !$flag && $index < sizeof($elements) ) { |
361 | - if ($elements[$index] instanceof BaseHtml) |
|
362 | - $flag=($elements[$index]->getIdentifier() === $identifier); |
|
366 | + if ($elements[$index] instanceof BaseHtml) { |
|
367 | + $flag=($elements[$index]->getIdentifier() === $identifier); |
|
368 | + } |
|
363 | 369 | $index++; |
364 | 370 | } |
365 | - if ($flag === true) |
|
366 | - return $elements[$index - 1]; |
|
371 | + if ($flag === true) { |
|
372 | + return $elements[$index - 1]; |
|
373 | + } |
|
367 | 374 | } elseif ($elements instanceof BaseHtml) { |
368 | - if ($elements->getIdentifier() === $identifier) |
|
369 | - return $elements; |
|
375 | + if ($elements->getIdentifier() === $identifier) { |
|
376 | + return $elements; |
|
377 | + } |
|
370 | 378 | } |
371 | 379 | return null; |
372 | 380 | } |
@@ -376,15 +384,18 @@ discard block |
||
376 | 384 | $flag=false; |
377 | 385 | $index=0; |
378 | 386 | while ( !$flag && $index < sizeof($elements) ) { |
379 | - if ($elements[$index] instanceof BaseHtml) |
|
380 | - $flag=($elements[$index]->propertyContains($propertyName, $value) === true); |
|
387 | + if ($elements[$index] instanceof BaseHtml) { |
|
388 | + $flag=($elements[$index]->propertyContains($propertyName, $value) === true); |
|
389 | + } |
|
381 | 390 | $index++; |
382 | 391 | } |
383 | - if ($flag === true) |
|
384 | - return $elements[$index - 1]; |
|
392 | + if ($flag === true) { |
|
393 | + return $elements[$index - 1]; |
|
394 | + } |
|
385 | 395 | } elseif ($elements instanceof BaseHtml) { |
386 | - if ($elements->propertyContains($propertyName, $value) === true) |
|
387 | - return $elements; |
|
396 | + if ($elements->propertyContains($propertyName, $value) === true) { |
|
397 | + return $elements; |
|
398 | + } |
|
388 | 399 | } |
389 | 400 | return null; |
390 | 401 | } |
@@ -15,22 +15,22 @@ discard block |
||
15 | 15 | class HtmlGridCol extends HtmlBsDoubleElement { |
16 | 16 | private $positions; |
17 | 17 | private $offsets; |
18 | - public function __construct($identifier,$size=CssSize::SIZE_MD,$width=1){ |
|
19 | - parent::__construct($identifier,"div"); |
|
18 | + public function __construct($identifier, $size=CssSize::SIZE_MD, $width=1) { |
|
19 | + parent::__construct($identifier, "div"); |
|
20 | 20 | $this->positions=array(); |
21 | 21 | $this->offsets=array(); |
22 | - $this->addPosition($size,$width); |
|
22 | + $this->addPosition($size, $width); |
|
23 | 23 | } |
24 | - public function addPosition($size=CssSize::SIZE_MD,$width=1){ |
|
24 | + public function addPosition($size=CssSize::SIZE_MD, $width=1) { |
|
25 | 25 | $this->positions[$size]=$width; |
26 | 26 | return $this; |
27 | 27 | } |
28 | - private function _generateClass(){ |
|
28 | + private function _generateClass() { |
|
29 | 29 | $result=array(); |
30 | - foreach ($this->positions as $size=>$width){ |
|
30 | + foreach ($this->positions as $size=>$width) { |
|
31 | 31 | $result[]="col-".$size."-".$width; |
32 | 32 | } |
33 | - foreach ($this->offsets as $size=>$offset){ |
|
33 | + foreach ($this->offsets as $size=>$offset) { |
|
34 | 34 | $result[]="col-".$size."-offset-".$offset; |
35 | 35 | } |
36 | 36 | return implode(" ", $result); |
@@ -38,63 +38,63 @@ discard block |
||
38 | 38 | |
39 | 39 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
40 | 40 | $this->setProperty("class", $this->_generateClass()); |
41 | - return parent::compile($js,$view); |
|
41 | + return parent::compile($js, $view); |
|
42 | 42 | } |
43 | 43 | |
44 | - public function setOffset($size,$offset){ |
|
44 | + public function setOffset($size, $offset) { |
|
45 | 45 | $this->offsets[$size]=$offset; |
46 | 46 | return $this; |
47 | 47 | } |
48 | 48 | |
49 | - public function setOffsetForAll($newOffset){ |
|
50 | - foreach ($this->offsets as &$value){ |
|
49 | + public function setOffsetForAll($newOffset) { |
|
50 | + foreach ($this->offsets as &$value) { |
|
51 | 51 | $value=$newOffset; |
52 | 52 | } |
53 | 53 | unset($value); |
54 | 54 | return $this; |
55 | 55 | } |
56 | 56 | |
57 | - public function setWidthForAll($newWidth){ |
|
58 | - foreach ($this->positions as &$pos){ |
|
57 | + public function setWidthForAll($newWidth) { |
|
58 | + foreach ($this->positions as &$pos) { |
|
59 | 59 | $pos=$newWidth; |
60 | 60 | } |
61 | 61 | unset($pos); |
62 | 62 | return $this; |
63 | 63 | } |
64 | 64 | |
65 | - public function setWidth($size=CssSize::SIZE_MD,$width=1){ |
|
65 | + public function setWidth($size=CssSize::SIZE_MD, $width=1) { |
|
66 | 66 | $this->positions[$size]=$width; |
67 | 67 | return $this; |
68 | 68 | } |
69 | 69 | |
70 | - public function setPosition($size=CssSize::SIZE_MD,$width=1){ |
|
71 | - return $this->addPosition($size,$width); |
|
70 | + public function setPosition($size=CssSize::SIZE_MD, $width=1) { |
|
71 | + return $this->addPosition($size, $width); |
|
72 | 72 | } |
73 | 73 | |
74 | - public function getWidth($size){ |
|
74 | + public function getWidth($size) { |
|
75 | 75 | return @$this->positions[$size]; |
76 | 76 | } |
77 | 77 | |
78 | - public function getOffest($size){ |
|
78 | + public function getOffest($size) { |
|
79 | 79 | return @$this->offsets[$size]; |
80 | 80 | } |
81 | 81 | |
82 | - public function addClear(){ |
|
83 | - $this->wrap("","<div class='clearfix'></div>"); |
|
82 | + public function addClear() { |
|
83 | + $this->wrap("", "<div class='clearfix'></div>"); |
|
84 | 84 | } |
85 | 85 | public function setOffsets($offsets) { |
86 | - $this->offsets = $offsets; |
|
86 | + $this->offsets=$offsets; |
|
87 | 87 | return $this; |
88 | 88 | } |
89 | 89 | |
90 | - public function copy($identifier){ |
|
90 | + public function copy($identifier) { |
|
91 | 91 | $result=new HtmlGridCol($identifier); |
92 | 92 | $result->setPositions($this->positions); |
93 | 93 | $result->setOffsets($this->offsets); |
94 | 94 | return $result; |
95 | 95 | } |
96 | 96 | public function setPositions($positions) { |
97 | - $this->positions = $positions; |
|
97 | + $this->positions=$positions; |
|
98 | 98 | return $this; |
99 | 99 | } |
100 | 100 | public function getOffsets() { |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | parent::__construct($identifier); |
28 | 28 | $this->tagName="ul"; |
29 | 29 | $this->_template='<%tagName% id="%identifier%" class="nav navbar-nav %class%">%elements%</%tagName%>'; |
30 | - $this->elements=array (); |
|
30 | + $this->elements=array(); |
|
31 | 31 | } |
32 | 32 | |
33 | 33 | public function setClass($value) { |
@@ -39,13 +39,13 @@ discard block |
||
39 | 39 | } |
40 | 40 | |
41 | 41 | public function addElement($element) { |
42 | - if($element instanceof HtmlLink){ |
|
42 | + if ($element instanceof HtmlLink) { |
|
43 | 43 | $this->addLink($element); |
44 | - } else if (is_object($element)) { |
|
44 | + }else if (is_object($element)) { |
|
45 | 45 | $this->elements []=$element; |
46 | - } else if (is_array($element)) { |
|
46 | + }else if (is_array($element)) { |
|
47 | 47 | $this->addLink(array_pop($element), array_pop($element)); |
48 | - } else { |
|
48 | + }else { |
|
49 | 49 | $this->addLink($element); |
50 | 50 | } |
51 | 51 | } |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | |
60 | 60 | public function addElements($elements) { |
61 | 61 | if (is_array($elements)) { |
62 | - foreach ( $elements as $key => $element ) { |
|
62 | + foreach ($elements as $key => $element) { |
|
63 | 63 | $iid=$this->getElementsCount()+1; |
64 | 64 | if ($element instanceof HtmlDropdownItem) |
65 | 65 | $this->elements []=$element; |
@@ -70,12 +70,12 @@ discard block |
||
70 | 70 | $dropdown->setBtnCaption($key); |
71 | 71 | $dropdown->setMTagName("li"); |
72 | 72 | $this->addElement($dropdown); |
73 | - } else { |
|
73 | + }else { |
|
74 | 74 | $this->addLink(array_pop($element), array_pop($element)); |
75 | 75 | } |
76 | - } else if (is_object($element)) { |
|
76 | + }else if (is_object($element)) { |
|
77 | 77 | $this->addElement($element); |
78 | - } else if (is_string($element)) { |
|
78 | + }else if (is_string($element)) { |
|
79 | 79 | $this->addLink($element); |
80 | 80 | } |
81 | 81 | // TODO A vérifier |
@@ -87,9 +87,9 @@ discard block |
||
87 | 87 | public function addLink($caption, $href="#") { |
88 | 88 | $iid=$this->getElementsCount()+1; |
89 | 89 | $li=new HtmlBsDoubleElement($this->identifier."-li-".$iid, "li"); |
90 | - if($caption instanceof HtmlLink){ |
|
90 | + if ($caption instanceof HtmlLink) { |
|
91 | 91 | $link=$caption; |
92 | - }else{ |
|
92 | + }else { |
|
93 | 93 | $link=new HtmlLink($this->identifier."-link-".$iid, $href, $caption); |
94 | 94 | } |
95 | 95 | $li->setContent($link); |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | } |
123 | 123 | |
124 | 124 | public function run(JsUtils $js) { |
125 | - foreach ( $this->elements as $element ) { |
|
125 | + foreach ($this->elements as $element) { |
|
126 | 126 | $element->run($js); |
127 | 127 | } |
128 | 128 | } |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | * @param int $index |
144 | 144 | * @return BaseHtml |
145 | 145 | */ |
146 | - public function getElement($index){ |
|
146 | + public function getElement($index) { |
|
147 | 147 | return $this->elements[$index]; |
148 | 148 | } |
149 | 149 | } |
150 | 150 | \ No newline at end of file |
@@ -61,9 +61,9 @@ discard block |
||
61 | 61 | if (is_array($elements)) { |
62 | 62 | foreach ( $elements as $key => $element ) { |
63 | 63 | $iid=$this->getElementsCount()+1; |
64 | - if ($element instanceof HtmlDropdownItem) |
|
65 | - $this->elements []=$element; |
|
66 | - else if (is_array($element)) { |
|
64 | + if ($element instanceof HtmlDropdownItem) { |
|
65 | + $this->elements []=$element; |
|
66 | + } else if (is_array($element)) { |
|
67 | 67 | if (is_string($key)===true) { |
68 | 68 | $dropdown=new HtmlDropdown($this->identifier."-dropdown-".$iid); |
69 | 69 | $dropdown->addItems($element); |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | $li=new HtmlBsDoubleElement($this->identifier."-li-".$iid, "li"); |
90 | 90 | if($caption instanceof HtmlLink){ |
91 | 91 | $link=$caption; |
92 | - }else{ |
|
92 | + } else{ |
|
93 | 93 | $link=new HtmlLink($this->identifier."-link-".$iid, $href, $caption); |
94 | 94 | } |
95 | 95 | $li->setContent($link); |
@@ -41,15 +41,15 @@ discard block |
||
41 | 41 | * @param boolean $autoActive sets the last element's class to <b>active</b> if true |
42 | 42 | * @param function $hrefFunction the function who generates the href elements. default : function($e){return $e->getContent()} |
43 | 43 | */ |
44 | - public function __construct($identifier,$elements=array(),$autoActive=true,$startIndex=0,$hrefFunction=NULL){ |
|
45 | - parent::__construct($identifier,"ol"); |
|
44 | + public function __construct($identifier, $elements=array(), $autoActive=true, $startIndex=0, $hrefFunction=NULL) { |
|
45 | + parent::__construct($identifier, "ol"); |
|
46 | 46 | $this->startIndex=$startIndex; |
47 | 47 | $this->setProperty("class", "breadcrumb"); |
48 | 48 | $this->content=array(); |
49 | 49 | $this->autoActive=$autoActive; |
50 | 50 | $this->absolutePaths; |
51 | - $this->_hrefFunction=function ($e){return $e->getContent();}; |
|
52 | - if(isset($hrefFunction)){ |
|
51 | + $this->_hrefFunction=function($e) {return $e->getContent(); }; |
|
52 | + if (isset($hrefFunction)) { |
|
53 | 53 | $this->_hrefFunction=$hrefFunction; |
54 | 54 | } |
55 | 55 | $this->addElements($elements); |
@@ -60,43 +60,43 @@ discard block |
||
60 | 60 | * @param string $href |
61 | 61 | * @return \Ajax\bootstrap\html\HtmlLink |
62 | 62 | */ |
63 | - public function addElement($element,$href="",$glyph=NULL){ |
|
63 | + public function addElement($element, $href="", $glyph=NULL) { |
|
64 | 64 | $size=sizeof($this->content); |
65 | - if(is_array($element)){ |
|
65 | + if (is_array($element)) { |
|
66 | 66 | $elm=new HtmlLink("lnk-".$this->identifier."-".$size); |
67 | 67 | $elm->fromArray($element); |
68 | - }else if($element instanceof HtmlLink){ |
|
68 | + }else if ($element instanceof HtmlLink) { |
|
69 | 69 | $elm=$element; |
70 | - }else{ |
|
71 | - $elm=new HtmlLink("lnk-".$this->identifier."-".$size,$href,$element); |
|
72 | - if(isset($glyph)){ |
|
70 | + }else { |
|
71 | + $elm=new HtmlLink("lnk-".$this->identifier."-".$size, $href, $element); |
|
72 | + if (isset($glyph)) { |
|
73 | 73 | $elm->wrapContentWithGlyph($glyph); |
74 | 74 | } |
75 | 75 | } |
76 | - $elm->wrap("<li>","</li>"); |
|
76 | + $elm->wrap("<li>", "</li>"); |
|
77 | 77 | $this->content[]=$elm; |
78 | 78 | $elm->setProperty($this->attr, $this->getHref($size)); |
79 | 79 | return $elm; |
80 | 80 | } |
81 | 81 | |
82 | - public function setActive($index=null){ |
|
83 | - if(!isset($index)){ |
|
82 | + public function setActive($index=null) { |
|
83 | + if (!isset($index)) { |
|
84 | 84 | $index=sizeof($this->content)-1; |
85 | 85 | } |
86 | - $li=new HtmlBsDoubleElement("","li"); |
|
86 | + $li=new HtmlBsDoubleElement("", "li"); |
|
87 | 87 | $li->setClass("active"); |
88 | 88 | $li->setContent($this->content[$index]->getContent()); |
89 | 89 | $this->content[$index]=$li; |
90 | 90 | } |
91 | 91 | |
92 | - public function addElements($elements){ |
|
93 | - foreach ( $elements as $element ) { |
|
92 | + public function addElements($elements) { |
|
93 | + foreach ($elements as $element) { |
|
94 | 94 | $this->addElement($element); |
95 | 95 | } |
96 | 96 | return $this; |
97 | 97 | } |
98 | 98 | |
99 | - public function fromArray($array){ |
|
99 | + public function fromArray($array) { |
|
100 | 100 | $array=parent::fromArray($array); |
101 | 101 | $this->addElements($array); |
102 | 102 | return $array; |
@@ -108,14 +108,14 @@ discard block |
||
108 | 108 | * @param string $separator |
109 | 109 | * @return string |
110 | 110 | */ |
111 | - public function getHref($index=null,$separator="/"){ |
|
112 | - if(!isset($index)){ |
|
111 | + public function getHref($index=null, $separator="/") { |
|
112 | + if (!isset($index)) { |
|
113 | 113 | $index=sizeof($this->content); |
114 | 114 | } |
115 | - if($this->absolutePaths===true){ |
|
115 | + if ($this->absolutePaths===true) { |
|
116 | 116 | return $this->_hrefFunction($this->content[$index]); |
117 | - }else{ |
|
118 | - return $this->root.implode($separator, array_slice(array_map(function($e){return $this->_hrefFunction($e);}, $this->content),$this->startIndex,$index+1)); |
|
117 | + }else { |
|
118 | + return $this->root.implode($separator, array_slice(array_map(function($e) {return $this->_hrefFunction($e); }, $this->content), $this->startIndex, $index+1)); |
|
119 | 119 | } |
120 | 120 | } |
121 | 121 | |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | * @see \Ajax\bootstrap\html\BaseHtml::compile() |
125 | 125 | */ |
126 | 126 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
127 | - if($this->autoActive){ |
|
127 | + if ($this->autoActive) { |
|
128 | 128 | $this->setActive(); |
129 | 129 | } |
130 | 130 | return parent::compile($js, $view); |
@@ -142,19 +142,19 @@ discard block |
||
142 | 142 | * @see \Ajax\bootstrap\html\base\BaseHtml::on() |
143 | 143 | */ |
144 | 144 | public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) { |
145 | - foreach ($this->content as $element){ |
|
146 | - $element->on($event,$jsCode,$stopPropagation,$preventDefault); |
|
145 | + foreach ($this->content as $element) { |
|
146 | + $element->on($event, $jsCode, $stopPropagation, $preventDefault); |
|
147 | 147 | } |
148 | 148 | return $this; |
149 | 149 | } |
150 | 150 | |
151 | 151 | public function setAutoActive($autoActive) { |
152 | - $this->autoActive = $autoActive; |
|
152 | + $this->autoActive=$autoActive; |
|
153 | 153 | return $this; |
154 | 154 | } |
155 | 155 | |
156 | 156 | public function _ajaxOn($operation, $event, $url, $responseElement="", $parameters=array()) { |
157 | - foreach ($this->content as $element){ |
|
157 | + foreach ($this->content as $element) { |
|
158 | 158 | $element->_ajaxOn($operation, $event, $url, $responseElement, $parameters); |
159 | 159 | } |
160 | 160 | return $this; |
@@ -166,18 +166,18 @@ discard block |
||
166 | 166 | * @param string $targetSelector the target of the get |
167 | 167 | * @return HtmlBreadcrumbs |
168 | 168 | */ |
169 | - public function autoGetOnClick($targetSelector){ |
|
170 | - return $this->getOnClick($this->root, $targetSelector,array("attr"=>$this->attr)); |
|
169 | + public function autoGetOnClick($targetSelector) { |
|
170 | + return $this->getOnClick($this->root, $targetSelector, array("attr"=>$this->attr)); |
|
171 | 171 | } |
172 | 172 | |
173 | - public function contentAsString(){ |
|
174 | - if($this->autoActive){ |
|
173 | + public function contentAsString() { |
|
174 | + if ($this->autoActive) { |
|
175 | 175 | $this->setActive(); |
176 | 176 | } |
177 | 177 | return parent::contentAsString(); |
178 | 178 | } |
179 | 179 | |
180 | - public function getElement($index){ |
|
180 | + public function getElement($index) { |
|
181 | 181 | return $this->content[$index]; |
182 | 182 | } |
183 | 183 | |
@@ -186,7 +186,7 @@ discard block |
||
186 | 186 | * @param mixed $glyph |
187 | 187 | * @param int $index |
188 | 188 | */ |
189 | - public function addGlyph($glyph,$index=0){ |
|
189 | + public function addGlyph($glyph, $index=0) { |
|
190 | 190 | $elm=$this->getElement($index); |
191 | 191 | return $elm->wrapContentWithGlyph($glyph); |
192 | 192 | } |
@@ -197,7 +197,7 @@ discard block |
||
197 | 197 | * @param Dispatcher $dispatcher the request dispatcher |
198 | 198 | * @return \Ajax\bootstrap\html\HtmlBreadcrumbs |
199 | 199 | */ |
200 | - public function fromDispatcher(JsUtils $js,$dispatcher,$startIndex=0){ |
|
200 | + public function fromDispatcher(JsUtils $js, $dispatcher, $startIndex=0) { |
|
201 | 201 | $this->startIndex=$startIndex; |
202 | 202 | return $this->addElements($js->fromDispatcher($dispatcher)); |
203 | 203 | } |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | * @return \Ajax\bootstrap\html\HtmlBreadcrumbs |
210 | 210 | */ |
211 | 211 | public function setHrefFunction($_hrefFunction) { |
212 | - $this->_hrefFunction = $_hrefFunction; |
|
212 | + $this->_hrefFunction=$_hrefFunction; |
|
213 | 213 | return $this; |
214 | 214 | } |
215 | 215 |
@@ -65,9 +65,9 @@ discard block |
||
65 | 65 | if(is_array($element)){ |
66 | 66 | $elm=new HtmlLink("lnk-".$this->identifier."-".$size); |
67 | 67 | $elm->fromArray($element); |
68 | - }else if($element instanceof HtmlLink){ |
|
68 | + } else if($element instanceof HtmlLink){ |
|
69 | 69 | $elm=$element; |
70 | - }else{ |
|
70 | + } else{ |
|
71 | 71 | $elm=new HtmlLink("lnk-".$this->identifier."-".$size,$href,$element); |
72 | 72 | if(isset($glyph)){ |
73 | 73 | $elm->wrapContentWithGlyph($glyph); |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | } |
115 | 115 | if($this->absolutePaths===true){ |
116 | 116 | return $this->_hrefFunction($this->content[$index]); |
117 | - }else{ |
|
117 | + } else{ |
|
118 | 118 | return $this->root.implode($separator, array_slice(array_map(function($e){return $this->_hrefFunction($e);}, $this->content),$this->startIndex,$index+1)); |
119 | 119 | } |
120 | 120 | } |
@@ -44,13 +44,13 @@ discard block |
||
44 | 44 | |
45 | 45 | public function addCloseButton() { |
46 | 46 | $button=new HtmlButton("close-".$this->identifier); |
47 | - $button->setProperties(array ( |
|
47 | + $button->setProperties(array( |
|
48 | 48 | "class" => "close", |
49 | 49 | "data-dismiss" => "alert", |
50 | 50 | "aria-label" => "close" |
51 | 51 | )); |
52 | 52 | $button->setValue('<span aria-hidden="true">×</span>'); |
53 | - $this->addToPropertyCtrl("class", "alert-dismissible", array ( |
|
53 | + $this->addToPropertyCtrl("class", "alert-dismissible", array( |
|
54 | 54 | "alert-dismissible" |
55 | 55 | )); |
56 | 56 | $this->button=$button; |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | * @see \Ajax\bootstrap\html\base\BaseHtml::compile() |
80 | 80 | */ |
81 | 81 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
82 | - if ($this->closeable&&$this->button==="") { |
|
82 | + if ($this->closeable && $this->button==="") { |
|
83 | 83 | $this->addCloseButton(); |
84 | 84 | } |
85 | 85 | return parent::compile($js, $view); |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | |
30 | 30 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
31 | 31 | $result=""; |
32 | - foreach ( $this->_elements as $element ) { |
|
32 | + foreach ($this->_elements as $element) { |
|
33 | 33 | if ($element instanceof PhBsElement) |
34 | 34 | $result.=$element->compile($js, $view); |
35 | 35 | } |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | } |
38 | 38 | |
39 | 39 | public function run(JsUtils $js) { |
40 | - foreach ( $this->_elements as $element ) { |
|
40 | + foreach ($this->_elements as $element) { |
|
41 | 41 | if ($element instanceof PhBsElement) |
42 | 42 | $element->run($js); |
43 | 43 | } |
@@ -30,16 +30,18 @@ |
||
30 | 30 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
31 | 31 | $result=""; |
32 | 32 | foreach ( $this->_elements as $element ) { |
33 | - if ($element instanceof PhBsElement) |
|
34 | - $result.=$element->compile($js, $view); |
|
33 | + if ($element instanceof PhBsElement) { |
|
34 | + $result.=$element->compile($js, $view); |
|
35 | + } |
|
35 | 36 | } |
36 | 37 | return $result; |
37 | 38 | } |
38 | 39 | |
39 | 40 | public function run(JsUtils $js) { |
40 | 41 | foreach ( $this->_elements as $element ) { |
41 | - if ($element instanceof PhBsElement) |
|
42 | - $element->run($js); |
|
42 | + if ($element instanceof PhBsElement) { |
|
43 | + $element->run($js); |
|
44 | + } |
|
43 | 45 | } |
44 | 46 | } |
45 | 47 | } |
46 | 48 | \ No newline at end of file |
@@ -1,9 +1,9 @@ discard block |
||
1 | 1 | <?php |
2 | -return array ( |
|
3 | - "JQuery" => array ( |
|
4 | - "MaxCDN" => array ( |
|
2 | +return array( |
|
3 | + "JQuery" => array( |
|
4 | + "MaxCDN" => array( |
|
5 | 5 | "url" => "http://code.jquery.com/jquery-%version%.min.js", |
6 | - "versions" => array ( |
|
6 | + "versions" => array( |
|
7 | 7 | "2.2.3", |
8 | 8 | "2.2.1", |
9 | 9 | "2.1.4", |
@@ -11,9 +11,9 @@ discard block |
||
11 | 11 | "1.11.2" |
12 | 12 | ) |
13 | 13 | ), |
14 | - "Google" => array ( |
|
14 | + "Google" => array( |
|
15 | 15 | "url" => "https://ajax.googleapis.com/ajax/libs/jquery/%version%/jquery.min.js", |
16 | - "versions" => array ( |
|
16 | + "versions" => array( |
|
17 | 17 | "2.2.2", |
18 | 18 | "2.2.1", |
19 | 19 | "2.2.0", |
@@ -25,17 +25,17 @@ discard block |
||
25 | 25 | ) |
26 | 26 | ) |
27 | 27 | ), |
28 | - "JQueryUI" => array ( |
|
29 | - "MaxCDN" => array ( |
|
28 | + "JQueryUI" => array( |
|
29 | + "MaxCDN" => array( |
|
30 | 30 | "core" => "http://code.jquery.com/ui/%version%/jquery-ui.min.js", |
31 | 31 | "css" => "http://code.jquery.com/ui/%version%/themes/%theme%/jquery-ui.css", |
32 | - "versions" => array ( |
|
32 | + "versions" => array( |
|
33 | 33 | "1.11.4", |
34 | 34 | "1.11.3", |
35 | 35 | "1.11.2", |
36 | 36 | "1.10.4" |
37 | 37 | ), |
38 | - "themes" => array ( |
|
38 | + "themes" => array( |
|
39 | 39 | "black-tie", |
40 | 40 | "blitzer", |
41 | 41 | "cupertino", |
@@ -62,10 +62,10 @@ discard block |
||
62 | 62 | "vader" |
63 | 63 | ) |
64 | 64 | ), |
65 | - "Google" => array ( |
|
65 | + "Google" => array( |
|
66 | 66 | "core" => "https://ajax.googleapis.com/ajax/libs/jqueryui/%version%/jquery-ui.min.js", |
67 | 67 | "css" => "https://ajax.googleapis.com/ajax/libs/jqueryui/%version%/themes/%theme%/jquery-ui.css", |
68 | - "versions" => array ( |
|
68 | + "versions" => array( |
|
69 | 69 | "1.11.4", |
70 | 70 | "1.11.3", |
71 | 71 | "1.11.2", |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | "1.10.4", |
75 | 75 | "1.10.0" |
76 | 76 | ), |
77 | - "themes" => array ( |
|
77 | + "themes" => array( |
|
78 | 78 | "black-tie", |
79 | 79 | "blitzer", |
80 | 80 | "cupertino", |
@@ -102,25 +102,25 @@ discard block |
||
102 | 102 | ) |
103 | 103 | ) |
104 | 104 | ), |
105 | - "Bootstrap" => array ( |
|
106 | - "MaxCDN" => array ( |
|
105 | + "Bootstrap" => array( |
|
106 | + "MaxCDN" => array( |
|
107 | 107 | "core" => "http://maxcdn.bootstrapcdn.com/bootstrap/%version%/js/bootstrap.min.js", |
108 | 108 | "css" => "http://maxcdn.bootstrapcdn.com/bootstrap/%version%/css/bootstrap.min.css", |
109 | - "versions" => array ( |
|
109 | + "versions" => array( |
|
110 | 110 | "3.3.6", |
111 | 111 | "3.3.5" |
112 | 112 | ), |
113 | - "themes" => array () |
|
113 | + "themes" => array() |
|
114 | 114 | ) |
115 | 115 | ), |
116 | - "Semantic" => array ( |
|
117 | - "cdnjs" => array ( |
|
116 | + "Semantic" => array( |
|
117 | + "cdnjs" => array( |
|
118 | 118 | "core" => "https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/%version%/semantic.min.js", |
119 | 119 | "css" => "https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/%version%/semantic.min.css", |
120 | - "versions" => array ( |
|
120 | + "versions" => array( |
|
121 | 121 | "2.1.8" |
122 | 122 | ), |
123 | - "themes" => array () |
|
123 | + "themes" => array() |
|
124 | 124 | ) |
125 | 125 | ) |
126 | 126 | ); |
127 | 127 | \ No newline at end of file |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | } |
25 | 25 | |
26 | 26 | public function __toString() { |
27 | - $result="\"" . $this->id . "\": { \"name\": \"" . $this->name . "\"," . $this->results . "}"; |
|
27 | + $result="\"".$this->id."\": { \"name\": \"".$this->name."\",".$this->results."}"; |
|
28 | 28 | return $result; |
29 | 29 | } |
30 | 30 | |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | |
58 | 58 | public function search($query, $field="title") { |
59 | 59 | $result=$this->results->_search($query, $field); |
60 | - if ($result !== false) { |
|
60 | + if ($result!==false) { |
|
61 | 61 | return new SearchCategory($this->id, $this->name, $result); |
62 | 62 | } |
63 | 63 | return false; |