@@ -51,7 +51,7 @@ |
||
| 51 | 51 | |
| 52 | 52 | public function render($attributes=null) { |
| 53 | 53 | $attrs=$this->element->getAttributes(); |
| 54 | - foreach ( $attrs as $key => $value ) { |
|
| 54 | + foreach ($attrs as $key => $value) { |
|
| 55 | 55 | $this->htmlElement->setProperty($key, $value); |
| 56 | 56 | } |
| 57 | 57 | if (isset($attributes)) |
@@ -54,8 +54,9 @@ |
||
| 54 | 54 | foreach ( $attrs as $key => $value ) { |
| 55 | 55 | $this->htmlElement->setProperty($key, $value); |
| 56 | 56 | } |
| 57 | - if (isset($attributes)) |
|
| 58 | - $this->htmlElement->addProperties($attributes); |
|
| 57 | + if (isset($attributes)) { |
|
| 58 | + $this->htmlElement->addProperties($attributes); |
|
| 59 | + } |
|
| 59 | 60 | $this->htmlElement->setIdentifier($this->element->getName()); |
| 60 | 61 | $this->htmlElement->setValue($this->element->getValue()); |
| 61 | 62 | |
@@ -13,7 +13,7 @@ |
||
| 13 | 13 | parent::__construct($name, $attributes); |
| 14 | 14 | $list=new HtmlSelect($name); |
| 15 | 15 | $list->setTagName("select"); |
| 16 | - $this->renderer=new PhBsRenderer(new Select($name, array (), $attributes), $list); |
|
| 16 | + $this->renderer=new PhBsRenderer(new Select($name, array(), $attributes), $list); |
|
| 17 | 17 | $this->setOptions($options); |
| 18 | 18 | } |
| 19 | 19 | |
@@ -27,8 +27,8 @@ discard block |
||
| 27 | 27 | |
| 28 | 28 | public function __construct($autoCompile=true) { |
| 29 | 29 | $this->autoCompile=$autoCompile; |
| 30 | - $this->components=array (); |
|
| 31 | - $this->htmlComponents=array (); |
|
| 30 | + $this->components=array(); |
|
| 31 | + $this->htmlComponents=array(); |
|
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | public function isAutoCompile() { |
@@ -41,9 +41,9 @@ discard block |
||
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | public function compile($internal=false) { |
| 44 | - if ($internal===false&&$this->autoCompile===true) |
|
| 44 | + if ($internal===false && $this->autoCompile===true) |
|
| 45 | 45 | throw new \Exception("Impossible to compile if autoCompile is set to 'true'"); |
| 46 | - foreach ( $this->components as $component ) { |
|
| 46 | + foreach ($this->components as $component) { |
|
| 47 | 47 | $component->compile(); |
| 48 | 48 | } |
| 49 | 49 | } |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | public function compileHtml(JsUtils $js=NULL, View $view=NULL) { |
| 73 | - foreach ( $this->htmlComponents as $htmlComponent ) { |
|
| 73 | + foreach ($this->htmlComponents as $htmlComponent) { |
|
| 74 | 74 | $htmlComponent->compile($js, $view); |
| 75 | 75 | } |
| 76 | 76 | } |
@@ -41,8 +41,9 @@ discard block |
||
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | public function compile($internal=false) { |
| 44 | - if ($internal===false&&$this->autoCompile===true) |
|
| 45 | - throw new \Exception("Impossible to compile if autoCompile is set to 'true'"); |
|
| 44 | + if ($internal===false&&$this->autoCompile===true) { |
|
| 45 | + throw new \Exception("Impossible to compile if autoCompile is set to 'true'"); |
|
| 46 | + } |
|
| 46 | 47 | foreach ( $this->components as $component ) { |
| 47 | 48 | $component->compile(); |
| 48 | 49 | } |
@@ -54,13 +55,16 @@ discard block |
||
| 54 | 55 | } |
| 55 | 56 | |
| 56 | 57 | public function addComponent(SimpleComponent $component, $attachTo, $params) { |
| 57 | - if ($this->autoCompile) |
|
| 58 | - $this->components []=$component; |
|
| 59 | - if (isset($attachTo)) |
|
| 60 | - $component->attach($attachTo); |
|
| 61 | - if (isset($params)) |
|
| 62 | - if (is_array($params)) |
|
| 58 | + if ($this->autoCompile) { |
|
| 59 | + $this->components []=$component; |
|
| 60 | + } |
|
| 61 | + if (isset($attachTo)) { |
|
| 62 | + $component->attach($attachTo); |
|
| 63 | + } |
|
| 64 | + if (isset($params)) { |
|
| 65 | + if (is_array($params)) |
|
| 63 | 66 | $component->setParams($params); |
| 67 | + } |
|
| 64 | 68 | return $component; |
| 65 | 69 | } |
| 66 | 70 | |
@@ -25,7 +25,7 @@ |
||
| 25 | 25 | |
| 26 | 26 | public function compile($keyAndvalues) { |
| 27 | 27 | $result=$this->mask; |
| 28 | - foreach ( $keyAndvalues as $k => $v ) { |
|
| 28 | + foreach ($keyAndvalues as $k => $v) { |
|
| 29 | 29 | $result=str_ireplace("%{$k}%", $v, $result); |
| 30 | 30 | } |
| 31 | 31 | return $result; |
@@ -7,8 +7,8 @@ |
||
| 7 | 7 | class DefaultConfig extends Config { |
| 8 | 8 | |
| 9 | 9 | public function __construct() { |
| 10 | - parent::__construct(array ( |
|
| 11 | - "formElementsPrefix" => array ( |
|
| 10 | + parent::__construct(array( |
|
| 11 | + "formElementsPrefix" => array( |
|
| 12 | 12 | "txt" => "input_text", |
| 13 | 13 | "btn" => "button", |
| 14 | 14 | "ck" => "checkbox", |
@@ -1,17 +1,17 @@ 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.1.4", |
| 8 | 8 | "2.1.3", |
| 9 | 9 | "1.11.2" |
| 10 | 10 | ) |
| 11 | 11 | ), |
| 12 | - "Google" => array ( |
|
| 12 | + "Google" => array( |
|
| 13 | 13 | "url" => "https://ajax.googleapis.com/ajax/libs/jquery/%version%/jquery.min.js", |
| 14 | - "versions" => array ( |
|
| 14 | + "versions" => array( |
|
| 15 | 15 | "2.1.4", |
| 16 | 16 | "2.1.3", |
| 17 | 17 | "2.1.1", |
@@ -20,17 +20,17 @@ discard block |
||
| 20 | 20 | ) |
| 21 | 21 | ) |
| 22 | 22 | ), |
| 23 | - "JQueryUI" => array ( |
|
| 24 | - "MaxCDN" => array ( |
|
| 23 | + "JQueryUI" => array( |
|
| 24 | + "MaxCDN" => array( |
|
| 25 | 25 | "core" => "http://code.jquery.com/ui/%version%/jquery-ui.min.js", |
| 26 | 26 | "css" => "http://code.jquery.com/ui/%version%/themes/%theme%/jquery-ui.css", |
| 27 | - "versions" => array ( |
|
| 27 | + "versions" => array( |
|
| 28 | 28 | "1.11.4", |
| 29 | 29 | "1.11.3", |
| 30 | 30 | "1.11.2", |
| 31 | 31 | "1.10.4" |
| 32 | 32 | ), |
| 33 | - "themes" => array ( |
|
| 33 | + "themes" => array( |
|
| 34 | 34 | "black-tie", |
| 35 | 35 | "blitzer", |
| 36 | 36 | "cupertino", |
@@ -57,10 +57,10 @@ discard block |
||
| 57 | 57 | "vader" |
| 58 | 58 | ) |
| 59 | 59 | ), |
| 60 | - "Google" => array ( |
|
| 60 | + "Google" => array( |
|
| 61 | 61 | "core" => "https://ajax.googleapis.com/ajax/libs/jqueryui/%version%/jquery-ui.min.js", |
| 62 | 62 | "css" => "https://ajax.googleapis.com/ajax/libs/jqueryui/%version%/themes/%theme%/jquery-ui.css", |
| 63 | - "versions" => array ( |
|
| 63 | + "versions" => array( |
|
| 64 | 64 | "1.11.4", |
| 65 | 65 | "1.11.3", |
| 66 | 66 | "1.11.2", |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | "1.10.4", |
| 70 | 70 | "1.10.0" |
| 71 | 71 | ), |
| 72 | - "themes" => array ( |
|
| 72 | + "themes" => array( |
|
| 73 | 73 | "black-tie", |
| 74 | 74 | "blitzer", |
| 75 | 75 | "cupertino", |
@@ -97,14 +97,14 @@ discard block |
||
| 97 | 97 | ) |
| 98 | 98 | ) |
| 99 | 99 | ), |
| 100 | - "Bootstrap" => array ( |
|
| 101 | - "MaxCDN" => array ( |
|
| 100 | + "Bootstrap" => array( |
|
| 101 | + "MaxCDN" => array( |
|
| 102 | 102 | "core" => "http://maxcdn.bootstrapcdn.com/bootstrap/%version%/js/bootstrap.min.js", |
| 103 | 103 | "css" => "http://maxcdn.bootstrapcdn.com/bootstrap/%version%/css/bootstrap.min.css", |
| 104 | - "versions" => array ( |
|
| 104 | + "versions" => array( |
|
| 105 | 105 | "3.3.5" |
| 106 | 106 | ), |
| 107 | - "themes" => array () |
|
| 107 | + "themes" => array() |
|
| 108 | 108 | ) |
| 109 | 109 | ) |
| 110 | 110 | ); |
| 111 | 111 | \ No newline at end of file |
@@ -60,10 +60,10 @@ |
||
| 60 | 60 | |
| 61 | 61 | protected function replaceVersionAndTheme($url, $version, $theme) { |
| 62 | 62 | if (isset($theme)) |
| 63 | - return str_ireplace(array ( |
|
| 63 | + return str_ireplace(array( |
|
| 64 | 64 | "%theme%", |
| 65 | 65 | "%version%" |
| 66 | - ), array ( |
|
| 66 | + ), array( |
|
| 67 | 67 | $theme, |
| 68 | 68 | $version |
| 69 | 69 | ), $url); |
@@ -33,11 +33,13 @@ discard block |
||
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | protected function getUrlOrCss($element, $key) { |
| 36 | - if (isset($element)) |
|
| 37 | - return $element; |
|
| 36 | + if (isset($element)) { |
|
| 37 | + return $element; |
|
| 38 | + } |
|
| 38 | 39 | $version=$this->version; |
| 39 | - if (array_search($version, $this->getVersions())===false) |
|
| 40 | - $version=$this->getLastVersion(); |
|
| 40 | + if (array_search($version, $this->getVersions())===false) { |
|
| 41 | + $version=$this->getLastVersion(); |
|
| 42 | + } |
|
| 41 | 43 | return $this->replaceVersion($this->data [$this->provider] [$key], $version); |
| 42 | 44 | } |
| 43 | 45 | |
@@ -59,16 +61,17 @@ discard block |
||
| 59 | 61 | } |
| 60 | 62 | |
| 61 | 63 | protected function replaceVersionAndTheme($url, $version, $theme) { |
| 62 | - if (isset($theme)) |
|
| 63 | - return str_ireplace(array ( |
|
| 64 | + if (isset($theme)) { |
|
| 65 | + return str_ireplace(array ( |
|
| 64 | 66 | "%theme%", |
| 65 | 67 | "%version%" |
| 66 | 68 | ), array ( |
| 67 | 69 | $theme, |
| 68 | 70 | $version |
| 69 | 71 | ), $url); |
| 70 | - else |
|
| 71 | - return $this->replaceVersion($url, $version); |
|
| 72 | + } else { |
|
| 73 | + return $this->replaceVersion($url, $version); |
|
| 74 | + } |
|
| 72 | 75 | } |
| 73 | 76 | |
| 74 | 77 | public function getProviders() { |
@@ -76,10 +79,11 @@ discard block |
||
| 76 | 79 | } |
| 77 | 80 | |
| 78 | 81 | public function getVersions($provider=NULL) { |
| 79 | - if (isset($provider)) |
|
| 80 | - return $this->data [$provider] ["versions"]; |
|
| 81 | - else |
|
| 82 | - return $this->data [$this->provider] ["versions"]; |
|
| 82 | + if (isset($provider)) { |
|
| 83 | + return $this->data [$provider] ["versions"]; |
|
| 84 | + } else { |
|
| 85 | + return $this->data [$this->provider] ["versions"]; |
|
| 86 | + } |
|
| 83 | 87 | } |
| 84 | 88 | |
| 85 | 89 | public function getLastVersion($provider=NULL) { |
@@ -14,10 +14,11 @@ discard block |
||
| 14 | 14 | $this->data=$this->data ["JQueryUI"]; |
| 15 | 15 | if (is_int($theme)) { |
| 16 | 16 | $themes=$this->getThemes(); |
| 17 | - if (sizeof($themes)>$theme-1) |
|
| 18 | - $this->theme=$themes [$theme-1]; |
|
| 19 | - else |
|
| 20 | - throw new \Exception("CDNGuiGen : Le numéro de thème demandé n'existe pas"); |
|
| 17 | + if (sizeof($themes)>$theme-1) { |
|
| 18 | + $this->theme=$themes [$theme-1]; |
|
| 19 | + } else { |
|
| 20 | + throw new \Exception("CDNGuiGen : Le numéro de thème demandé n'existe pas"); |
|
| 21 | + } |
|
| 21 | 22 | } |
| 22 | 23 | $this->theme=$theme; |
| 23 | 24 | $this->cssUrl=null; |
@@ -28,16 +29,18 @@ discard block |
||
| 28 | 29 | } |
| 29 | 30 | |
| 30 | 31 | public function getThemes($provider=NULL) { |
| 31 | - if (isset($provider)) |
|
| 32 | - return $this->data [$provider] ["themes"]; |
|
| 33 | - else |
|
| 34 | - return $this->data [$this->provider] ["themes"]; |
|
| 32 | + if (isset($provider)) { |
|
| 33 | + return $this->data [$provider] ["themes"]; |
|
| 34 | + } else { |
|
| 35 | + return $this->data [$this->provider] ["themes"]; |
|
| 36 | + } |
|
| 35 | 37 | } |
| 36 | 38 | |
| 37 | 39 | public function getFirstTheme($provider=NULL) { |
| 38 | 40 | $themes=$this->getThemes($provider); |
| 39 | - if (sizeof($themes)>0) |
|
| 40 | - return $themes [0]; |
|
| 41 | + if (sizeof($themes)>0) { |
|
| 42 | + return $themes [0]; |
|
| 43 | + } |
|
| 41 | 44 | return ""; |
| 42 | 45 | } |
| 43 | 46 | |
@@ -46,14 +49,17 @@ discard block |
||
| 46 | 49 | } |
| 47 | 50 | |
| 48 | 51 | public function getCss() { |
| 49 | - if (isset($this->cssUrl)) |
|
| 50 | - return $this->cssUrl; |
|
| 52 | + if (isset($this->cssUrl)) { |
|
| 53 | + return $this->cssUrl; |
|
| 54 | + } |
|
| 51 | 55 | $version=$this->version; |
| 52 | - if (array_search($version, $this->getVersions())===false) |
|
| 53 | - $version=$this->getLastVersion(); |
|
| 56 | + if (array_search($version, $this->getVersions())===false) { |
|
| 57 | + $version=$this->getLastVersion(); |
|
| 58 | + } |
|
| 54 | 59 | $theme=$this->theme; |
| 55 | - if (array_search($theme, $this->getThemes())===false) |
|
| 56 | - $theme=$this->getFirstTheme(); |
|
| 60 | + if (array_search($theme, $this->getThemes())===false) { |
|
| 61 | + $theme=$this->getFirstTheme(); |
|
| 62 | + } |
|
| 57 | 63 | return $this->replaceVersionAndTheme($this->data [$this->provider] ["css"], $version, $theme); |
| 58 | 64 | } |
| 59 | 65 | |
@@ -30,7 +30,7 @@ |
||
| 30 | 30 | if ($stopPropagation===true) { |
| 31 | 31 | $result.="event.stopPropagation();\n"; |
| 32 | 32 | } |
| 33 | - switch($this->method) { |
|
| 33 | + switch ($this->method) { |
|
| 34 | 34 | case "get": |
| 35 | 35 | $result.=$js->getDeferred($url, $responseElement, $params, $callback, $attr); |
| 36 | 36 | break; |
@@ -14,8 +14,9 @@ |
||
| 14 | 14 | } |
| 15 | 15 | |
| 16 | 16 | public function compile(JsUtils $js=null) { |
| 17 | - if ($js==null) |
|
| 18 | - return; |
|
| 17 | + if ($js==null) { |
|
| 18 | + return; |
|
| 19 | + } |
|
| 19 | 20 | $result=""; |
| 20 | 21 | $params="{}"; |
| 21 | 22 | $callback=NULL; |