@@ -269,8 +269,8 @@ discard block |
||
| 269 | 269 | * @param string $tagName container tagName |
| 270 | 270 | * @return HtmlListgroup |
| 271 | 271 | */ |
| 272 | - public function htmlListgroup($identifier,$items=array(),$tagName="ul"){ |
|
| 273 | - $listGroup=new HtmlListgroup($identifier,$tagName); |
|
| 272 | + public function htmlListgroup($identifier, $items=array(), $tagName="ul") { |
|
| 273 | + $listGroup=new HtmlListgroup($identifier, $tagName); |
|
| 274 | 274 | $listGroup->addItems($items); |
| 275 | 275 | return $this->addHtmlComponent($listGroup); |
| 276 | 276 | } |
@@ -295,8 +295,8 @@ discard block |
||
| 295 | 295 | * @param string $onClick |
| 296 | 296 | * @return HtmlSplitbutton |
| 297 | 297 | */ |
| 298 | - public function htmlSplitbutton($identifier,$value="", $items=array(), $cssStyle="btn-default", $onClick=NULL) { |
|
| 299 | - return $this->addHtmlComponent(new HtmlSplitbutton($identifier, $value, $items, $cssStyle,$onClick)); |
|
| 298 | + public function htmlSplitbutton($identifier, $value="", $items=array(), $cssStyle="btn-default", $onClick=NULL) { |
|
| 299 | + return $this->addHtmlComponent(new HtmlSplitbutton($identifier, $value, $items, $cssStyle, $onClick)); |
|
| 300 | 300 | } |
| 301 | 301 | |
| 302 | 302 | /** |
@@ -304,7 +304,7 @@ discard block |
||
| 304 | 304 | * @param string $identifier |
| 305 | 305 | * @return HtmlInputgroup |
| 306 | 306 | */ |
| 307 | - public function htmlInputgroup($identifier){ |
|
| 307 | + public function htmlInputgroup($identifier) { |
|
| 308 | 308 | return $this->addHtmlComponent(new HtmlInputgroup($identifier)); |
| 309 | 309 | } |
| 310 | 310 | |
@@ -316,8 +316,8 @@ discard block |
||
| 316 | 316 | * @param function $hrefFunction the function who generates the href elements. default : function($e){return $e->getContent()} |
| 317 | 317 | * @return HtmlBreadcrumbs |
| 318 | 318 | */ |
| 319 | - public function htmlBreadcrumbs($identifier,$elements=array(),$autoActive=true,$startIndex=0,$hrefFunction=NULL){ |
|
| 320 | - return $this->addHtmlComponent(new HtmlBreadcrumbs($identifier,$elements,$autoActive,$startIndex,$hrefFunction)); |
|
| 319 | + public function htmlBreadcrumbs($identifier, $elements=array(), $autoActive=true, $startIndex=0, $hrefFunction=NULL) { |
|
| 320 | + return $this->addHtmlComponent(new HtmlBreadcrumbs($identifier, $elements, $autoActive, $startIndex, $hrefFunction)); |
|
| 321 | 321 | } |
| 322 | 322 | |
| 323 | 323 | /** |
@@ -329,8 +329,8 @@ discard block |
||
| 329 | 329 | * @param int $active The active page |
| 330 | 330 | * @return HtmlPagination |
| 331 | 331 | */ |
| 332 | - public function htmlPagination($identifier,$from=1,$to=1,$active=NULL,$countVisible=NULL){ |
|
| 333 | - return $this->addHtmlComponent(new HtmlPagination($identifier,$from,$to,$active,$countVisible)); |
|
| 332 | + public function htmlPagination($identifier, $from=1, $to=1, $active=NULL, $countVisible=NULL) { |
|
| 333 | + return $this->addHtmlComponent(new HtmlPagination($identifier, $from, $to, $active, $countVisible)); |
|
| 334 | 334 | } |
| 335 | 335 | |
| 336 | 336 | /** |
@@ -341,7 +341,7 @@ discard block |
||
| 341 | 341 | * @param int $numCols |
| 342 | 342 | * @return HtmlGridSystem |
| 343 | 343 | */ |
| 344 | - public function htmlGridSystem($identifier,$numRows=1,$numCols=NULL){ |
|
| 345 | - return $this->addHtmlComponent(new HtmlGridSystem($identifier,$numRows,$numCols)); |
|
| 344 | + public function htmlGridSystem($identifier, $numRows=1, $numCols=NULL) { |
|
| 345 | + return $this->addHtmlComponent(new HtmlGridSystem($identifier, $numRows, $numCols)); |
|
| 346 | 346 | } |
| 347 | 347 | } |
| 348 | 348 | \ No newline at end of file |
@@ -48,6 +48,9 @@ discard block |
||
| 48 | 48 | return $this; |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | + /** |
|
| 52 | + * @param string $name |
|
| 53 | + */ |
|
| 51 | 54 | public function getProperty($name) { |
| 52 | 55 | if (array_key_exists($name, $this->properties)) |
| 53 | 56 | return $this->properties [$name]; |
@@ -128,6 +131,10 @@ discard block |
||
| 128 | 131 | return $this; |
| 129 | 132 | } |
| 130 | 133 | |
| 134 | + /** |
|
| 135 | + * @param string $name |
|
| 136 | + * @param string[] $typeCtrl |
|
| 137 | + */ |
|
| 131 | 138 | protected function addToMemberCtrl(&$name, $value, $typeCtrl, $separator=" ") { |
| 132 | 139 | if ($this->ctrl($name, $value, $typeCtrl)===true) { |
| 133 | 140 | if (is_array($typeCtrl)) { |
@@ -152,6 +159,9 @@ discard block |
||
| 152 | 159 | return $this->addToProperty($name, $value); |
| 153 | 160 | } |
| 154 | 161 | |
| 162 | + /** |
|
| 163 | + * @param string $name |
|
| 164 | + */ |
|
| 155 | 165 | public function addToPropertyCtrl($name, $value, $typeCtrl) { |
| 156 | 166 | // if($this->ctrl($name, $value, $typeCtrl)===true){ |
| 157 | 167 | return $this->addToPropertyUnique($name, $value, $typeCtrl); |
@@ -219,6 +229,9 @@ discard block |
||
| 219 | 229 | |
| 220 | 230 | } |
| 221 | 231 | |
| 232 | + /** |
|
| 233 | + * @param string $before |
|
| 234 | + */ |
|
| 222 | 235 | public function wrap($before, $after="") { |
| 223 | 236 | if(isset($before)){ |
| 224 | 237 | $this->wrapBefore.=$before; |
@@ -287,6 +300,9 @@ discard block |
||
| 287 | 300 | } |
| 288 | 301 | } |
| 289 | 302 | |
| 303 | + /** |
|
| 304 | + * @param string $operation |
|
| 305 | + */ |
|
| 290 | 306 | public function _ajaxOn($operation, $event, $url, $responseElement="", $parameters=array()) { |
| 291 | 307 | $params=array ( |
| 292 | 308 | "url" => $url, |
@@ -297,14 +313,23 @@ discard block |
||
| 297 | 313 | return $this; |
| 298 | 314 | } |
| 299 | 315 | |
| 316 | + /** |
|
| 317 | + * @param string $event |
|
| 318 | + */ |
|
| 300 | 319 | public function getOn($event, $url, $responseElement="", $parameters=array()) { |
| 301 | 320 | return $this->_ajaxOn("get", $event, $url, $responseElement, $parameters); |
| 302 | 321 | } |
| 303 | 322 | |
| 323 | + /** |
|
| 324 | + * @param string $url |
|
| 325 | + */ |
|
| 304 | 326 | public function getOnClick($url, $responseElement="", $parameters=array()) { |
| 305 | 327 | return $this->getOn("click", $url, $responseElement, $parameters); |
| 306 | 328 | } |
| 307 | 329 | |
| 330 | + /** |
|
| 331 | + * @param string $event |
|
| 332 | + */ |
|
| 308 | 333 | public function postOn($event, $url, $params="{}", $responseElement="", $parameters=array()) { |
| 309 | 334 | $parameters ["params"]=$params; |
| 310 | 335 | return $this->_ajaxOn("post", $event, $url, $responseElement, $parameters); |
@@ -314,6 +339,9 @@ discard block |
||
| 314 | 339 | return $this->postOn("click", $url, $params, $responseElement, $parameters); |
| 315 | 340 | } |
| 316 | 341 | |
| 342 | + /** |
|
| 343 | + * @param string $event |
|
| 344 | + */ |
|
| 317 | 345 | public function postFormOn($event, $url, $form, $responseElement="", $parameters=array()) { |
| 318 | 346 | $parameters ["form"]=$form; |
| 319 | 347 | return $this->_ajaxOn("postForm", $event, $url, $responseElement, $parameters); |
@@ -363,6 +391,9 @@ discard block |
||
| 363 | 391 | return $value; |
| 364 | 392 | } |
| 365 | 393 | |
| 394 | + /** |
|
| 395 | + * @param string $jqueryCall |
|
| 396 | + */ |
|
| 366 | 397 | public function jsDoJquery($jqueryCall, $param=""){ |
| 367 | 398 | return "$('#".$this->identifier."').".$jqueryCall."(".$this->_prep_value($param).");"; |
| 368 | 399 | } |
@@ -15,8 +15,8 @@ discard block |
||
| 15 | 15 | abstract class BaseHtml extends BaseWidget { |
| 16 | 16 | protected $_template; |
| 17 | 17 | protected $tagName; |
| 18 | - protected $properties=array (); |
|
| 19 | - protected $events=array (); |
|
| 18 | + protected $properties=array(); |
|
| 19 | + protected $events=array(); |
|
| 20 | 20 | protected $wrapBefore=""; |
| 21 | 21 | protected $wrapAfter=""; |
| 22 | 22 | protected $_bsComponent; |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | |
| 56 | 56 | public function addToProperty($name, $value, $separator=" ") { |
| 57 | 57 | $v=$this->properties [$name]; |
| 58 | - if (isset($v)&&$v!=="") |
|
| 58 | + if (isset($v) && $v!=="") |
|
| 59 | 59 | $v=$v.$separator.$value; |
| 60 | 60 | else |
| 61 | 61 | $v=$value; |
@@ -70,11 +70,11 @@ discard block |
||
| 70 | 70 | |
| 71 | 71 | public function compile(JsUtils $js=NULL, View $view=NULL) { |
| 72 | 72 | $result=$this->getTemplate(); |
| 73 | - foreach ( $this as $key => $value ) { |
|
| 74 | - if (PhalconUtils::startsWith($key, "_")===false&&$key!=="events") { |
|
| 73 | + foreach ($this as $key => $value) { |
|
| 74 | + if (PhalconUtils::startsWith($key, "_")===false && $key!=="events") { |
|
| 75 | 75 | if (is_array($value)) { |
| 76 | 76 | $v=PropertyWrapper::wrap($value, $js); |
| 77 | - } else { |
|
| 77 | + }else { |
|
| 78 | 78 | $v=$value; |
| 79 | 79 | } |
| 80 | 80 | $result=str_ireplace("%".$key."%", $v, $result); |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | if (isset($view)===true) { |
| 87 | 87 | $controls=$view->getVar("q"); |
| 88 | 88 | if (isset($controls)===false) { |
| 89 | - $controls=array (); |
|
| 89 | + $controls=array(); |
|
| 90 | 90 | } |
| 91 | 91 | $controls [$this->identifier]=$result; |
| 92 | 92 | $view->setVar("q", $controls); |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | if (array_search($value, $typeCtrl)===false) { |
| 100 | 100 | throw new \Exception("La valeur passée a propriété `".$name."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}"); |
| 101 | 101 | } |
| 102 | - } else { |
|
| 102 | + }else { |
|
| 103 | 103 | if (!$typeCtrl($value)) { |
| 104 | 104 | throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$name); |
| 105 | 105 | } |
@@ -176,28 +176,28 @@ discard block |
||
| 176 | 176 | } |
| 177 | 177 | |
| 178 | 178 | public function fromArray($array) { |
| 179 | - foreach ( $this as $key => $value ) { |
|
| 179 | + foreach ($this as $key => $value) { |
|
| 180 | 180 | if (array_key_exists($key, $array) && !PhalconUtils::startsWith($key, "_")) { |
| 181 | 181 | $setter="set".ucfirst($key); |
| 182 | 182 | $this->$setter($array [$key]); |
| 183 | 183 | unset($array [$key]); |
| 184 | 184 | } |
| 185 | 185 | } |
| 186 | - foreach ( $array as $key => $value ) { |
|
| 186 | + foreach ($array as $key => $value) { |
|
| 187 | 187 | if (method_exists($this, $key)) { |
| 188 | 188 | try { |
| 189 | 189 | $this->$key($value); |
| 190 | 190 | unset($array [$key]); |
| 191 | - } catch ( \Exception $e ) { |
|
| 191 | + } catch (\Exception $e) { |
|
| 192 | 192 | // Nothing to do |
| 193 | 193 | } |
| 194 | - } else { |
|
| 194 | + }else { |
|
| 195 | 195 | $setter="set".ucfirst($key); |
| 196 | 196 | if (method_exists($this, $setter)) { |
| 197 | 197 | try { |
| 198 | 198 | $this->$setter($value); |
| 199 | 199 | unset($array [$key]); |
| 200 | - } catch ( \Exception $e ) { |
|
| 200 | + } catch (\Exception $e) { |
|
| 201 | 201 | // Nothing to do |
| 202 | 202 | } |
| 203 | 203 | } |
@@ -206,21 +206,21 @@ discard block |
||
| 206 | 206 | return $array; |
| 207 | 207 | } |
| 208 | 208 | |
| 209 | - public function fromDatabaseObjects($objects,$function) { |
|
| 210 | - if(isset($objects)){ |
|
| 211 | - foreach ($objects as $object){ |
|
| 212 | - $this->fromDatabaseObject($object,$function); |
|
| 209 | + public function fromDatabaseObjects($objects, $function) { |
|
| 210 | + if (isset($objects)) { |
|
| 211 | + foreach ($objects as $object) { |
|
| 212 | + $this->fromDatabaseObject($object, $function); |
|
| 213 | 213 | } |
| 214 | 214 | } |
| 215 | 215 | return $this; |
| 216 | 216 | } |
| 217 | 217 | |
| 218 | - public function fromDatabaseObject($object,$function){ |
|
| 218 | + public function fromDatabaseObject($object, $function) { |
|
| 219 | 219 | |
| 220 | 220 | } |
| 221 | 221 | |
| 222 | 222 | public function wrap($before, $after="") { |
| 223 | - if(isset($before)){ |
|
| 223 | + if (isset($before)) { |
|
| 224 | 224 | $this->wrapBefore.=$before; |
| 225 | 225 | } |
| 226 | 226 | $this->wrapAfter=$after.$this->wrapAfter; |
@@ -242,13 +242,13 @@ discard block |
||
| 242 | 242 | if (array_key_exists($event, $this->events)) { |
| 243 | 243 | if (is_array($this->events [$event])) { |
| 244 | 244 | $this->events [$event] []=$jsCode; |
| 245 | - } else { |
|
| 246 | - $this->events [$event]=array ( |
|
| 245 | + }else { |
|
| 246 | + $this->events [$event]=array( |
|
| 247 | 247 | $this->events [$event], |
| 248 | 248 | $jsCode |
| 249 | 249 | ); |
| 250 | 250 | } |
| 251 | - } else { |
|
| 251 | + }else { |
|
| 252 | 252 | $this->events [$event]=$jsCode; |
| 253 | 253 | } |
| 254 | 254 | } |
@@ -267,14 +267,14 @@ discard block |
||
| 267 | 267 | |
| 268 | 268 | public function addEventsOnRun(JsUtils $js) { |
| 269 | 269 | if (isset($this->_bsComponent)) { |
| 270 | - foreach ( $this->events as $event => $jsCode ) { |
|
| 270 | + foreach ($this->events as $event => $jsCode) { |
|
| 271 | 271 | $code=$jsCode; |
| 272 | 272 | if (is_array($jsCode)) { |
| 273 | 273 | $code=""; |
| 274 | - foreach ( $jsCode as $jsC ) { |
|
| 274 | + foreach ($jsCode as $jsC) { |
|
| 275 | 275 | if ($jsC instanceof AjaxCall) { |
| 276 | 276 | $code.="\n".$jsC->compile($js); |
| 277 | - } else { |
|
| 277 | + }else { |
|
| 278 | 278 | $code.="\n".$jsC; |
| 279 | 279 | } |
| 280 | 280 | } |
@@ -288,7 +288,7 @@ discard block |
||
| 288 | 288 | } |
| 289 | 289 | |
| 290 | 290 | public function _ajaxOn($operation, $event, $url, $responseElement="", $parameters=array()) { |
| 291 | - $params=array ( |
|
| 291 | + $params=array( |
|
| 292 | 292 | "url" => $url, |
| 293 | 293 | "responseElement" => $responseElement |
| 294 | 294 | ); |
@@ -327,7 +327,7 @@ discard block |
||
| 327 | 327 | if (is_array($elements)) { |
| 328 | 328 | $flag=false; |
| 329 | 329 | $index=0; |
| 330 | - while ( !$flag&&$index<sizeof($elements) ) { |
|
| 330 | + while (!$flag && $index<sizeof($elements)) { |
|
| 331 | 331 | if ($elements [$index] instanceof BaseHtml) |
| 332 | 332 | $flag=($elements [$index]->getIdentifier()===$identifier); |
| 333 | 333 | $index++; |
@@ -341,7 +341,7 @@ discard block |
||
| 341 | 341 | return null; |
| 342 | 342 | } |
| 343 | 343 | |
| 344 | - public function __toString(){ |
|
| 344 | + public function __toString() { |
|
| 345 | 345 | return $this->compile(); |
| 346 | 346 | } |
| 347 | 347 | |
@@ -357,25 +357,25 @@ discard block |
||
| 357 | 357 | if (is_array($value)) { |
| 358 | 358 | $value=implode(",", $value); |
| 359 | 359 | } |
| 360 | - if (strrpos($value, 'this')===false&&strrpos($value, 'event')===false) { |
|
| 360 | + if (strrpos($value, 'this')===false && strrpos($value, 'event')===false) { |
|
| 361 | 361 | $value='"'.$value.'"'; |
| 362 | 362 | } |
| 363 | 363 | return $value; |
| 364 | 364 | } |
| 365 | 365 | |
| 366 | - public function jsDoJquery($jqueryCall, $param=""){ |
|
| 366 | + public function jsDoJquery($jqueryCall, $param="") { |
|
| 367 | 367 | return "$('#".$this->identifier."').".$jqueryCall."(".$this->_prep_value($param).");"; |
| 368 | 368 | } |
| 369 | 369 | |
| 370 | - public function jsHtml($content=""){ |
|
| 371 | - return $this->jsDoJquery("html",$content); |
|
| 370 | + public function jsHtml($content="") { |
|
| 371 | + return $this->jsDoJquery("html", $content); |
|
| 372 | 372 | } |
| 373 | 373 | |
| 374 | - public function jsShow(){ |
|
| 374 | + public function jsShow() { |
|
| 375 | 375 | return $this->jsDoJquery("show"); |
| 376 | 376 | } |
| 377 | 377 | |
| 378 | - public function jsHide(){ |
|
| 378 | + public function jsHide() { |
|
| 379 | 379 | return $this->jsDoJquery("hide"); |
| 380 | 380 | } |
| 381 | 381 | } |
| 382 | 382 | \ No newline at end of file |
@@ -49,16 +49,18 @@ discard block |
||
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | public function getProperty($name) { |
| 52 | - if (array_key_exists($name, $this->properties)) |
|
| 53 | - return $this->properties [$name]; |
|
| 52 | + if (array_key_exists($name, $this->properties)) { |
|
| 53 | + return $this->properties [$name]; |
|
| 54 | + } |
|
| 54 | 55 | } |
| 55 | 56 | |
| 56 | 57 | public function addToProperty($name, $value, $separator=" ") { |
| 57 | 58 | $v=$this->properties [$name]; |
| 58 | - if (isset($v)&&$v!=="") |
|
| 59 | - $v=$v.$separator.$value; |
|
| 60 | - else |
|
| 61 | - $v=$value; |
|
| 59 | + if (isset($v)&&$v!=="") { |
|
| 60 | + $v=$v.$separator.$value; |
|
| 61 | + } else { |
|
| 62 | + $v=$value; |
|
| 63 | + } |
|
| 62 | 64 | |
| 63 | 65 | return $this->setProperty($name, $v); |
| 64 | 66 | } |
@@ -108,8 +110,9 @@ discard block |
||
| 108 | 110 | } |
| 109 | 111 | |
| 110 | 112 | protected function setPropertyCtrl($name, $value, $typeCtrl) { |
| 111 | - if ($this->ctrl($name, $value, $typeCtrl)===true) |
|
| 112 | - return $this->setProperty($name, $value); |
|
| 113 | + if ($this->ctrl($name, $value, $typeCtrl)===true) { |
|
| 114 | + return $this->setProperty($name, $value); |
|
| 115 | + } |
|
| 113 | 116 | return $this; |
| 114 | 117 | } |
| 115 | 118 | |
@@ -144,8 +147,9 @@ discard block |
||
| 144 | 147 | } |
| 145 | 148 | |
| 146 | 149 | protected function addToPropertyUnique($name, $value, $typeCtrl) { |
| 147 | - if (@class_exists($typeCtrl, true)) |
|
| 148 | - $typeCtrl=$typeCtrl::getConstants(); |
|
| 150 | + if (@class_exists($typeCtrl, true)) { |
|
| 151 | + $typeCtrl=$typeCtrl::getConstants(); |
|
| 152 | + } |
|
| 149 | 153 | if (is_array($typeCtrl)) { |
| 150 | 154 | $this->removeOldValues($this->properties [$name], $typeCtrl); |
| 151 | 155 | } |
@@ -326,15 +330,18 @@ discard block |
||
| 326 | 330 | $flag=false; |
| 327 | 331 | $index=0; |
| 328 | 332 | while ( !$flag&&$index<sizeof($elements) ) { |
| 329 | - if ($elements [$index] instanceof BaseHtml) |
|
| 330 | - $flag=($elements [$index]->getIdentifier()===$identifier); |
|
| 333 | + if ($elements [$index] instanceof BaseHtml) { |
|
| 334 | + $flag=($elements [$index]->getIdentifier()===$identifier); |
|
| 335 | + } |
|
| 331 | 336 | $index++; |
| 332 | 337 | } |
| 333 | - if ($flag===true) |
|
| 334 | - return $elements [$index-1]; |
|
| 338 | + if ($flag===true) { |
|
| 339 | + return $elements [$index-1]; |
|
| 340 | + } |
|
| 335 | 341 | } elseif ($elements instanceof BaseHtml) { |
| 336 | - if ($elements->getIdentifier()===$identifier) |
|
| 337 | - return $elements; |
|
| 342 | + if ($elements->getIdentifier()===$identifier) { |
|
| 343 | + return $elements; |
|
| 344 | + } |
|
| 338 | 345 | } |
| 339 | 346 | return null; |
| 340 | 347 | } |
@@ -7,6 +7,9 @@ |
||
| 7 | 7 | |
| 8 | 8 | class PropertyWrapper { |
| 9 | 9 | |
| 10 | + /** |
|
| 11 | + * @param \Ajax\JsUtils $js |
|
| 12 | + */ |
|
| 10 | 13 | public static function wrap($input, $js=NULL, $separator=' ', $valueQuote='"') { |
| 11 | 14 | $output=""; |
| 12 | 15 | if (is_string($input)) { |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | $value1=reset($input); |
| 18 | 18 | if (is_object($value1)) { |
| 19 | 19 | $output=PropertyWrapper::wrapObjects($input, $js, $separator=' '); |
| 20 | - } else |
|
| 20 | + }else |
|
| 21 | 21 | $output=PropertyWrapper::wrapStrings($input, $separator=' ', $valueQuote='"'); |
| 22 | 22 | } |
| 23 | 23 | } |
@@ -26,17 +26,17 @@ discard block |
||
| 26 | 26 | |
| 27 | 27 | public static function wrapStrings($input, $separator=' ', $valueQuote='"') { |
| 28 | 28 | if (JArray::isAssociative($input)===true) { |
| 29 | - $result=implode($separator, array_map(function ($v, $k) use($valueQuote) { |
|
| 29 | + $result=implode($separator, array_map(function($v, $k) use($valueQuote) { |
|
| 30 | 30 | return $k.'='.$valueQuote.$v.$valueQuote; |
| 31 | 31 | }, $input, array_keys($input))); |
| 32 | - } else { |
|
| 32 | + }else { |
|
| 33 | 33 | $result=implode($separator, array_values($input)); |
| 34 | 34 | } |
| 35 | 35 | return $result; |
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | public static function wrapObjects($input, $js=NULL, $separator=' ') { |
| 39 | - return implode($separator, array_map(function ($v) use($js) { |
|
| 39 | + return implode($separator, array_map(function($v) use($js) { |
|
| 40 | 40 | return $v->compile($js); |
| 41 | 41 | }, $input)); |
| 42 | 42 | } |
@@ -17,8 +17,9 @@ discard block |
||
| 17 | 17 | $value1=reset($input); |
| 18 | 18 | if (is_object($value1)) { |
| 19 | 19 | $output=PropertyWrapper::wrapObjects($input, $js, $separator=' '); |
| 20 | - } else |
|
| 21 | - $output=PropertyWrapper::wrapStrings($input, $separator=' ', $valueQuote='"'); |
|
| 20 | + } else { |
|
| 21 | + $output=PropertyWrapper::wrapStrings($input, $separator=' ', $valueQuote='"'); |
|
| 22 | + } |
|
| 22 | 23 | } |
| 23 | 24 | } |
| 24 | 25 | return $output; |
@@ -37,10 +38,11 @@ discard block |
||
| 37 | 38 | |
| 38 | 39 | public static function wrapObjects($input, $js=NULL, $separator=' ') { |
| 39 | 40 | return implode($separator, array_map(function ($v) use($js) { |
| 40 | - if (is_object($v)) |
|
| 41 | - return $v->compile($js); |
|
| 42 | - else |
|
| 43 | - return $v; |
|
| 41 | + if (is_object($v)) { |
|
| 42 | + return $v->compile($js); |
|
| 43 | + } else { |
|
| 44 | + return $v; |
|
| 45 | + } |
|
| 44 | 46 | }, $input)); |
| 45 | 47 | } |
| 46 | 48 | } |
| 47 | 49 | \ No newline at end of file |
@@ -36,7 +36,7 @@ |
||
| 36 | 36 | foreach ($icons as $icon=>$size){ |
| 37 | 37 | $group->addIcon($icon,$size); |
| 38 | 38 | } |
| 39 | - }else{ |
|
| 39 | + } else{ |
|
| 40 | 40 | foreach ($icons as $icon){ |
| 41 | 41 | $group->addIcon($icon); |
| 42 | 42 | } |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | * @param string $identifier |
| 53 | 53 | * @param string $icon |
| 54 | 54 | */ |
| 55 | - public function htmlIcon($identifier,$icon){ |
|
| 55 | + public function htmlIcon($identifier, $icon) { |
|
| 56 | 56 | return $this->addHtmlComponent(new HtmlIcon($identifier, $icon)); |
| 57 | 57 | } |
| 58 | 58 | |
@@ -61,14 +61,14 @@ discard block |
||
| 61 | 61 | * @param string $size |
| 62 | 62 | * @param array $icons |
| 63 | 63 | */ |
| 64 | - public function htmlIconGroups($identifier,$size="",$icons=array()){ |
|
| 65 | - $group=new HtmlIconGroups($identifier,$size); |
|
| 66 | - if(JArray::isAssociative($icons)){ |
|
| 67 | - foreach ($icons as $icon=>$size){ |
|
| 68 | - $group->add($icon,$size); |
|
| 64 | + public function htmlIconGroups($identifier, $size="", $icons=array()) { |
|
| 65 | + $group=new HtmlIconGroups($identifier, $size); |
|
| 66 | + if (JArray::isAssociative($icons)) { |
|
| 67 | + foreach ($icons as $icon=>$size) { |
|
| 68 | + $group->add($icon, $size); |
|
| 69 | 69 | } |
| 70 | - }else{ |
|
| 71 | - foreach ($icons as $icon){ |
|
| 70 | + }else { |
|
| 71 | + foreach ($icons as $icon) { |
|
| 72 | 72 | $group->add($icon); |
| 73 | 73 | } |
| 74 | 74 | } |
@@ -80,8 +80,8 @@ discard block |
||
| 80 | 80 | * @param array $elements |
| 81 | 81 | * @param boolean $asIcons |
| 82 | 82 | */ |
| 83 | - public function htmlButtonGroups($identifier,$elements=array(),$asIcons=false){ |
|
| 84 | - return $this->addHtmlComponent(new HtmlButtonGroups($identifier, $elements,$asIcons)); |
|
| 83 | + public function htmlButtonGroups($identifier, $elements=array(), $asIcons=false) { |
|
| 84 | + return $this->addHtmlComponent(new HtmlButtonGroups($identifier, $elements, $asIcons)); |
|
| 85 | 85 | } |
| 86 | 86 | |
| 87 | 87 | /** |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | * @param string $identifier |
| 90 | 90 | * @param string $content |
| 91 | 91 | */ |
| 92 | - public function htmlContainer($identifier,$content=""){ |
|
| 92 | + public function htmlContainer($identifier, $content="") { |
|
| 93 | 93 | return $this->addHtmlComponent(new HtmlContainer($identifier, $content)); |
| 94 | 94 | } |
| 95 | 95 | |
@@ -97,8 +97,8 @@ discard block |
||
| 97 | 97 | * @param string $identifier |
| 98 | 98 | * @param string $content |
| 99 | 99 | */ |
| 100 | - public function htmlDivider($identifier,$content="",$tagName="div"){ |
|
| 101 | - return $this->addHtmlComponent(new HtmlDivider($identifier, $content,$tagName)); |
|
| 100 | + public function htmlDivider($identifier, $content="", $tagName="div") { |
|
| 101 | + return $this->addHtmlComponent(new HtmlDivider($identifier, $content, $tagName)); |
|
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | /** |
@@ -106,16 +106,16 @@ discard block |
||
| 106 | 106 | * @param string $content |
| 107 | 107 | * @param string $tagName |
| 108 | 108 | */ |
| 109 | - public function htmlLabel($identifier,$content="",$tagName="div"){ |
|
| 110 | - return $this->addHtmlComponent(new HtmlLabel($identifier, $content,$tagName)); |
|
| 109 | + public function htmlLabel($identifier, $content="", $tagName="div") { |
|
| 110 | + return $this->addHtmlComponent(new HtmlLabel($identifier, $content, $tagName)); |
|
| 111 | 111 | } |
| 112 | 112 | |
| 113 | 113 | /** |
| 114 | 114 | * @param string $identifier |
| 115 | 115 | * @param array $items |
| 116 | 116 | */ |
| 117 | - public function htmlMenu($identifier,$items=array()){ |
|
| 118 | - return $this->addHtmlComponent(new HtmlMenu($identifier,$items)); |
|
| 117 | + public function htmlMenu($identifier, $items=array()) { |
|
| 118 | + return $this->addHtmlComponent(new HtmlMenu($identifier, $items)); |
|
| 119 | 119 | } |
| 120 | 120 | |
| 121 | 121 | /** |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | * @param string $value |
| 124 | 124 | * @param array $items |
| 125 | 125 | */ |
| 126 | - public function htmlDropdown($identifier, $value="", $items=array()){ |
|
| 127 | - return $this->addHtmlComponent(new HtmlDropdown($identifier,$value,$items)); |
|
| 126 | + public function htmlDropdown($identifier, $value="", $items=array()) { |
|
| 127 | + return $this->addHtmlComponent(new HtmlDropdown($identifier, $value, $items)); |
|
| 128 | 128 | } |
| 129 | 129 | } |
| 130 | 130 | \ No newline at end of file |
@@ -23,19 +23,19 @@ |
||
| 23 | 23 | return $this; |
| 24 | 24 | } |
| 25 | 25 | |
| 26 | - public function addGlyph($glyphicon,$before=true){ |
|
| 26 | + public function addGlyph($glyphicon, $before=true) { |
|
| 27 | 27 | $glyph=new HtmlGlyphicon(""); |
| 28 | 28 | $glyph->setGlyphicon($glyphicon); |
| 29 | - $this->addContent($glyph,$before); |
|
| 29 | + $this->addContent($glyph, $before); |
|
| 30 | 30 | return $this; |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | - public function wrapContentWithGlyph($glyphBefore,$glyphAfter=""){ |
|
| 33 | + public function wrapContentWithGlyph($glyphBefore, $glyphAfter="") { |
|
| 34 | 34 | $before=HtmlGlyphicon::getGlyphicon($glyphBefore)." "; |
| 35 | 35 | $after=""; |
| 36 | - if($glyphAfter!==""){ |
|
| 36 | + if ($glyphAfter!=="") { |
|
| 37 | 37 | $after=" ".HtmlGlyphicon::getGlyphicon($glyphAfter); |
| 38 | 38 | } |
| 39 | - return $this->wrapContent($before,$after); |
|
| 39 | + return $this->wrapContent($before, $after); |
|
| 40 | 40 | } |
| 41 | 41 | } |
| 42 | 42 | \ No newline at end of file |
@@ -27,15 +27,15 @@ discard block |
||
| 27 | 27 | return $this->content; |
| 28 | 28 | } |
| 29 | 29 | |
| 30 | - public function addContent($content,$before=false) { |
|
| 30 | + public function addContent($content, $before=false) { |
|
| 31 | 31 | if (is_array($this->content)===false) { |
| 32 | - if(isset($this->content)) |
|
| 33 | - $this->content=array ($this->content); |
|
| 32 | + if (isset($this->content)) |
|
| 33 | + $this->content=array($this->content); |
|
| 34 | 34 | else |
| 35 | 35 | $this->content=array(); |
| 36 | 36 | } |
| 37 | - if($before) |
|
| 38 | - array_unshift($this->content,$content); |
|
| 37 | + if ($before) |
|
| 38 | + array_unshift($this->content, $content); |
|
| 39 | 39 | else |
| 40 | 40 | $this->content []=$content; |
| 41 | 41 | return $this; |
@@ -49,8 +49,8 @@ discard block |
||
| 49 | 49 | parent::run($js); |
| 50 | 50 | if ($this->content instanceof HtmlDoubleElement) { |
| 51 | 51 | $this->content->run($js); |
| 52 | - } else if (is_array($this->content)) { |
|
| 53 | - foreach ( $this->content as $itemContent ) { |
|
| 52 | + }else if (is_array($this->content)) { |
|
| 53 | + foreach ($this->content as $itemContent) { |
|
| 54 | 54 | if ($itemContent instanceof HtmlDoubleElement) { |
| 55 | 55 | $itemContent->run($js); |
| 56 | 56 | } |
@@ -29,15 +29,17 @@ |
||
| 29 | 29 | |
| 30 | 30 | public function addContent($content,$before=false) { |
| 31 | 31 | if (is_array($this->content)===false) { |
| 32 | - if(isset($this->content)) |
|
| 33 | - $this->content=array ($this->content); |
|
| 34 | - else |
|
| 35 | - $this->content=array(); |
|
| 32 | + if(isset($this->content)) { |
|
| 33 | + $this->content=array ($this->content); |
|
| 34 | + } else { |
|
| 35 | + $this->content=array(); |
|
| 36 | + } |
|
| 37 | + } |
|
| 38 | + if($before) { |
|
| 39 | + array_unshift($this->content,$content); |
|
| 40 | + } else { |
|
| 41 | + $this->content []=$content; |
|
| 36 | 42 | } |
| 37 | - if($before) |
|
| 38 | - array_unshift($this->content,$content); |
|
| 39 | - else |
|
| 40 | - $this->content []=$content; |
|
| 41 | 43 | return $this; |
| 42 | 44 | } |
| 43 | 45 | |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | } |
| 14 | 14 | |
| 15 | 15 | public function setClass($classNames) { |
| 16 | - if(is_array($classNames)){ |
|
| 16 | + if (is_array($classNames)) { |
|
| 17 | 17 | $classNames=implode(" ", $classNames); |
| 18 | 18 | } |
| 19 | 19 | $this->setProperty("class", $classNames); |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | */ |
| 41 | 41 | public function fromArray($array) { |
| 42 | 42 | $array=parent::fromArray($array); |
| 43 | - foreach ( $array as $key => $value ) { |
|
| 43 | + foreach ($array as $key => $value) { |
|
| 44 | 44 | $this->setProperty($key, $value); |
| 45 | 45 | } |
| 46 | 46 | return $array; |
@@ -1,10 +1,10 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace Ajax\bootstrap\html\html5; |
| 3 | 3 | /** |
| 4 | - * HTML Select |
|
| 5 | - * @author jc |
|
| 6 | - * @version 1.002 |
|
| 7 | - */ |
|
| 4 | + * HTML Select |
|
| 5 | + * @author jc |
|
| 6 | + * @version 1.002 |
|
| 7 | + */ |
|
| 8 | 8 | use Ajax\bootstrap\html\base\HtmlDoubleElement; |
| 9 | 9 | |
| 10 | 10 | class HtmlOption extends HtmlDoubleElement { |
@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | class HtmlOption extends HtmlDoubleElement { |
| 11 | 11 | protected $value; |
| 12 | 12 | protected $selected; |
| 13 | - public function __construct($identifier,$caption,$value="") { |
|
| 13 | + public function __construct($identifier, $caption, $value="") { |
|
| 14 | 14 | parent::__construct($identifier, "option"); |
| 15 | 15 | $this->_template='<option id="%identifier%" value="%value%" %selected% %properties%>%content%</option>'; |
| 16 | 16 | $this->content=$caption; |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | $this->selected=""; |
| 19 | 19 | } |
| 20 | 20 | |
| 21 | - public function select(){ |
|
| 21 | + public function select() { |
|
| 22 | 22 | $this->selected="selected"; |
| 23 | 23 | return $this; |
| 24 | 24 | } |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | return $this->value; |
| 28 | 28 | } |
| 29 | 29 | public function setValue($value) { |
| 30 | - $this->value = $value; |
|
| 30 | + $this->value=$value; |
|
| 31 | 31 | return $this; |
| 32 | 32 | } |
| 33 | 33 | |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | private $default; |
| 17 | 17 | private $options; |
| 18 | 18 | |
| 19 | - public function __construct($identifier, $caption,$default=NULL) { |
|
| 19 | + public function __construct($identifier, $caption, $default=NULL) { |
|
| 20 | 20 | parent::__construct($identifier, "select"); |
| 21 | 21 | $this->setProperty("name", $identifier); |
| 22 | 22 | $this->setProperty("class", "form-control"); |
@@ -25,21 +25,21 @@ discard block |
||
| 25 | 25 | $this->options=array(); |
| 26 | 26 | } |
| 27 | 27 | |
| 28 | - public function addOption($element,$value="",$selected=false){ |
|
| 29 | - if($element instanceof HtmlOption){ |
|
| 28 | + public function addOption($element, $value="", $selected=false) { |
|
| 29 | + if ($element instanceof HtmlOption) { |
|
| 30 | 30 | $option=$element; |
| 31 | - }else{ |
|
| 32 | - $option=new HtmlOption($this->identifier."-".count($this->options), $element,$value); |
|
| 31 | + }else { |
|
| 32 | + $option=new HtmlOption($this->identifier."-".count($this->options), $element, $value); |
|
| 33 | 33 | } |
| 34 | - if($selected || $option->getValue()==$this->getProperty("value")){ |
|
| 34 | + if ($selected || $option->getValue()==$this->getProperty("value")) { |
|
| 35 | 35 | $option->select(); |
| 36 | 36 | } |
| 37 | 37 | $this->options[]=$option; |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | public function setValue($value) { |
| 41 | - foreach ( $this->options as $option ) { |
|
| 42 | - if (strcasecmp($option->getValue(),$value)===0) { |
|
| 41 | + foreach ($this->options as $option) { |
|
| 42 | + if (strcasecmp($option->getValue(), $value)===0) { |
|
| 43 | 43 | $option->setProperty("selected", ""); |
| 44 | 44 | } |
| 45 | 45 | } |
@@ -52,23 +52,23 @@ discard block |
||
| 52 | 52 | */ |
| 53 | 53 | public function compile(JsUtils $js=NULL, View $view=NULL) { |
| 54 | 54 | $this->content=array(); |
| 55 | - if(isset($this->default)){ |
|
| 55 | + if (isset($this->default)) { |
|
| 56 | 56 | $default=new HtmlOption("", $this->default); |
| 57 | 57 | $this->content[]=$default; |
| 58 | 58 | } |
| 59 | - foreach ($this->options as $option){ |
|
| 59 | + foreach ($this->options as $option) { |
|
| 60 | 60 | $this->content[]=$option; |
| 61 | 61 | } |
| 62 | 62 | return parent::compile($js, $view); |
| 63 | 63 | } |
| 64 | 64 | |
| 65 | - public function fromArray($array){ |
|
| 66 | - if(JArray::isAssociative($array)){ |
|
| 67 | - foreach ($array as $k=>$v){ |
|
| 65 | + public function fromArray($array) { |
|
| 66 | + if (JArray::isAssociative($array)) { |
|
| 67 | + foreach ($array as $k=>$v) { |
|
| 68 | 68 | $this->addOption($v, $k); |
| 69 | 69 | } |
| 70 | - }else{ |
|
| 71 | - foreach ($array as $v){ |
|
| 70 | + }else { |
|
| 71 | + foreach ($array as $v) { |
|
| 72 | 72 | $this->addOption($v, $v); |
| 73 | 73 | } |
| 74 | 74 | } |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | $this->addOption($function($object)); |
| 102 | 102 | } |
| 103 | 103 | |
| 104 | - public function setSize($size){ |
|
| 104 | + public function setSize($size) { |
|
| 105 | 105 | return $this->setProperty("size", $size); |
| 106 | 106 | } |
| 107 | 107 | } |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | public function addOption($element,$value="",$selected=false){ |
| 29 | 29 | if($element instanceof HtmlOption){ |
| 30 | 30 | $option=$element; |
| 31 | - }else{ |
|
| 31 | + } else{ |
|
| 32 | 32 | $option=new HtmlOption($this->identifier."-".count($this->options), $element,$value); |
| 33 | 33 | } |
| 34 | 34 | if($selected || $option->getValue()==$this->getProperty("value")){ |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | foreach ($array as $k=>$v){ |
| 68 | 68 | $this->addOption($v, $k); |
| 69 | 69 | } |
| 70 | - }else{ |
|
| 70 | + } else{ |
|
| 71 | 71 | foreach ($array as $v){ |
| 72 | 72 | $this->addOption($v, $v); |
| 73 | 73 | } |