@@ -16,16 +16,16 @@ discard block |
||
16 | 16 | |
17 | 17 | public function __construct(JsUtils $js) { |
18 | 18 | parent::__construct($js); |
19 | - $this->events=array (); |
|
19 | + $this->events=array(); |
|
20 | 20 | } |
21 | 21 | |
22 | 22 | protected function compileEvents() { |
23 | - foreach ( $this->events as $event => $jsCode ) { |
|
24 | - if($event=="execute"){ |
|
23 | + foreach ($this->events as $event => $jsCode) { |
|
24 | + if ($event=="execute") { |
|
25 | 25 | $this->jquery_code_for_compile []=$jsCode; |
26 | - }else if($event=="beforeExecute"){ |
|
26 | + } else if ($event=="beforeExecute") { |
|
27 | 27 | \array_unshift($this->jquery_code_for_compile, $jsCode); |
28 | - }else |
|
28 | + } else |
|
29 | 29 | $this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).on(\"".$event."\" , function( event, data ) {".$jsCode."});"; |
30 | 30 | } |
31 | 31 | } |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | $result=implode("\n", $this->jquery_code_for_compile); |
35 | 35 | $result=str_ireplace("\"%", "", $result); |
36 | 36 | $result=str_ireplace("%\"", "", $result); |
37 | - $result=str_replace(array ( |
|
37 | + $result=str_replace(array( |
|
38 | 38 | "\\n", |
39 | 39 | "\\r", |
40 | 40 | "\\t" |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | |
45 | 45 | public function getScript() { |
46 | 46 | $allParams=$this->params; |
47 | - $this->jquery_code_for_compile=array (); |
|
47 | + $this->jquery_code_for_compile=array(); |
|
48 | 48 | $this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).{$this->uiName}(".$this->getParamsAsJSON($allParams).");"; |
49 | 49 | $this->compileEvents(); |
50 | 50 | return $this->compileJQueryCode(); |
@@ -23,10 +23,11 @@ discard block |
||
23 | 23 | foreach ( $this->events as $event => $jsCode ) { |
24 | 24 | if($event=="execute"){ |
25 | 25 | $this->jquery_code_for_compile []=$jsCode; |
26 | - }else if($event=="beforeExecute"){ |
|
26 | + } else if($event=="beforeExecute"){ |
|
27 | 27 | \array_unshift($this->jquery_code_for_compile, $jsCode); |
28 | - }else |
|
29 | - $this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).on(\"".$event."\" , function( event, data ) {".$jsCode."});"; |
|
28 | + } else { |
|
29 | + $this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).on(\"".$event."\" , function( event, data ) {".$jsCode."});"; |
|
30 | + } |
|
30 | 31 | } |
31 | 32 | } |
32 | 33 | |
@@ -69,8 +70,9 @@ discard block |
||
69 | 70 | |
70 | 71 | protected function setParamCtrl($key, $value, $typeCtrl) { |
71 | 72 | if (is_array($typeCtrl)) { |
72 | - if (array_search($value, $typeCtrl)===false) |
|
73 | - throw new \Exception("La valeur passée a propriété `".$key."` pour le composant `".$this->uiName."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}"); |
|
73 | + if (array_search($value, $typeCtrl)===false) { |
|
74 | + throw new \Exception("La valeur passée a propriété `".$key."` pour le composant `".$this->uiName."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}"); |
|
75 | + } |
|
74 | 76 | } else { |
75 | 77 | if (!$typeCtrl($value)) { |
76 | 78 | throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$key." au composant ".$this->uiName); |
@@ -39,8 +39,9 @@ discard block |
||
39 | 39 | |
40 | 40 | public function getParam($key) { |
41 | 41 | $value=null; |
42 | - if (array_key_exists($key, $this->params)) |
|
43 | - $value=$this->params [$key]; |
|
42 | + if (array_key_exists($key, $this->params)) { |
|
43 | + $value=$this->params [$key]; |
|
44 | + } |
|
44 | 45 | return $value; |
45 | 46 | } |
46 | 47 | |
@@ -49,16 +50,18 @@ discard block |
||
49 | 50 | } |
50 | 51 | |
51 | 52 | public function compile(JsUtils $js=NULL) { |
52 | - if ($js==NULL) |
|
53 | - $js=$this->js; |
|
53 | + if ($js==NULL) { |
|
54 | + $js=$this->js; |
|
55 | + } |
|
54 | 56 | $script=$this->getScript(); |
55 | 57 | $js->addToCompile($script); |
56 | 58 | } |
57 | 59 | |
58 | 60 | protected function setParamCtrl($key, $value, $typeCtrl) { |
59 | 61 | if (is_array($typeCtrl)) { |
60 | - if (array_search($value, $typeCtrl)===false) |
|
61 | - throw new \Exception("La valeur passée a propriété `".$key."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}"); |
|
62 | + if (array_search($value, $typeCtrl)===false) { |
|
63 | + throw new \Exception("La valeur passée a propriété `".$key."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}"); |
|
64 | + } |
|
62 | 65 | } else { |
63 | 66 | if (!$typeCtrl($value)) { |
64 | 67 | throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$key); |
@@ -70,9 +73,9 @@ discard block |
||
70 | 73 | public function setParams($params) { |
71 | 74 | foreach ( $params as $k => $v ) { |
72 | 75 | $method="set".ucfirst($k); |
73 | - if (method_exists($this, $method)) |
|
74 | - $this->$method($v); |
|
75 | - else { |
|
76 | + if (method_exists($this, $method)) { |
|
77 | + $this->$method($v); |
|
78 | + } else { |
|
76 | 79 | $this->setParam($k, $v); |
77 | 80 | trigger_error("`".$k."` property n'existe pas", E_USER_NOTICE); |
78 | 81 | } |
@@ -10,8 +10,8 @@ discard block |
||
10 | 10 | * @version 1.001 |
11 | 11 | */ |
12 | 12 | abstract class BaseComponent { |
13 | - public $jquery_code_for_compile=array (); |
|
14 | - protected $params=array (); |
|
13 | + public $jquery_code_for_compile=array(); |
|
14 | + protected $params=array(); |
|
15 | 15 | |
16 | 16 | /** |
17 | 17 | * |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | } |
69 | 69 | |
70 | 70 | public function setParams($params) { |
71 | - foreach ( $params as $k => $v ) { |
|
71 | + foreach ($params as $k => $v) { |
|
72 | 72 | $method="set".ucfirst($k); |
73 | 73 | if (method_exists($this, $method)) |
74 | 74 | $this->$method($v); |
@@ -81,8 +81,8 @@ discard block |
||
81 | 81 | return $this; |
82 | 82 | } |
83 | 83 | |
84 | - public function addParams($params){ |
|
85 | - foreach ($params as $k=>$v){ |
|
84 | + public function addParams($params) { |
|
85 | + foreach ($params as $k=>$v) { |
|
86 | 86 | $this->setParam($k, $v); |
87 | 87 | } |
88 | 88 | return $this; |
@@ -6,8 +6,8 @@ discard block |
||
6 | 6 | use Ajax\common\JsCode; |
7 | 7 | |
8 | 8 | class SimpleExtComponent extends SimpleComponent { |
9 | - protected $events=array (); |
|
10 | - protected $jsCodes=array (); |
|
9 | + protected $events=array(); |
|
10 | + protected $jsCodes=array(); |
|
11 | 11 | |
12 | 12 | public function addEvent($event, $jsCode) { |
13 | 13 | $this->events [$event]=$jsCode; |
@@ -15,8 +15,8 @@ discard block |
||
15 | 15 | |
16 | 16 | public function getScript() { |
17 | 17 | parent::getScript(); |
18 | - foreach ( $this->jsCodes as $jsCode ) { |
|
19 | - $this->jquery_code_for_compile []=$jsCode->compile(array ( |
|
18 | + foreach ($this->jsCodes as $jsCode) { |
|
19 | + $this->jquery_code_for_compile []=$jsCode->compile(array( |
|
20 | 20 | "identifier" => $this->attachTo |
21 | 21 | )); |
22 | 22 | } |
@@ -11,9 +11,9 @@ |
||
11 | 11 | * @see \Ajax\common\components\SimpleExtComponent::getScript() |
12 | 12 | */ |
13 | 13 | public function getScript() { |
14 | - $this->jquery_code_for_compile=array (); |
|
15 | - foreach ( $this->jsCodes as $jsCode ) { |
|
16 | - $this->jquery_code_for_compile []=$jsCode->compile(array ( |
|
14 | + $this->jquery_code_for_compile=array(); |
|
15 | + foreach ($this->jsCodes as $jsCode) { |
|
16 | + $this->jquery_code_for_compile []=$jsCode->compile(array( |
|
17 | 17 | "identifier" => $this->attachTo |
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 | } |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | } |
70 | 70 | |
71 | 71 | public function compileHtml(JsUtils $js=NULL, &$view=NULL) { |
72 | - foreach ( $this->htmlComponents as $htmlComponent ) { |
|
72 | + foreach ($this->htmlComponents as $htmlComponent) { |
|
73 | 73 | $htmlComponent->compile($js, $view); |
74 | 74 | } |
75 | 75 | } |
@@ -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 | } |
@@ -53,13 +54,16 @@ discard block |
||
53 | 54 | } |
54 | 55 | |
55 | 56 | public function addComponent(SimpleComponent $component, $attachTo, $params) { |
56 | - if ($this->autoCompile) |
|
57 | - $this->components []=$component; |
|
58 | - if (isset($attachTo)) |
|
59 | - $component->attach($attachTo); |
|
60 | - if (isset($params)) |
|
61 | - if (is_array($params)) |
|
57 | + if ($this->autoCompile) { |
|
58 | + $this->components []=$component; |
|
59 | + } |
|
60 | + if (isset($attachTo)) { |
|
61 | + $component->attach($attachTo); |
|
62 | + } |
|
63 | + if (isset($params)) { |
|
64 | + if (is_array($params)) |
|
62 | 65 | $component->setParams($params); |
66 | + } |
|
63 | 67 | return $component; |
64 | 68 | } |
65 | 69 |
@@ -12,8 +12,8 @@ discard block |
||
12 | 12 | private static $constCacheArray=NULL; |
13 | 13 | |
14 | 14 | public static function getConstants() { |
15 | - if (self::$constCacheArray == NULL) { |
|
16 | - self::$constCacheArray=[ ]; |
|
15 | + if (self::$constCacheArray==NULL) { |
|
16 | + self::$constCacheArray=[]; |
|
17 | 17 | } |
18 | 18 | $calledClass=get_called_class(); |
19 | 19 | if (!array_key_exists($calledClass, self::$constCacheArray)) { |
@@ -23,16 +23,16 @@ discard block |
||
23 | 23 | return self::$constCacheArray[$calledClass]; |
24 | 24 | } |
25 | 25 | |
26 | - public static function getConstantValues($postFix="",$prefixBefore=false) { |
|
27 | - if ($postFix == "") |
|
26 | + public static function getConstantValues($postFix="", $prefixBefore=false) { |
|
27 | + if ($postFix=="") |
|
28 | 28 | return \array_values(self::getConstants()); |
29 | 29 | else { |
30 | - if($prefixBefore===false){ |
|
31 | - return \array_map(function ($elem) use($postFix) { |
|
32 | - return $elem . " " . $postFix; |
|
30 | + if ($prefixBefore===false) { |
|
31 | + return \array_map(function($elem) use($postFix) { |
|
32 | + return $elem." ".$postFix; |
|
33 | 33 | }, \array_values(self::getConstants())); |
34 | - }else{ |
|
35 | - return \array_map(function ($elem) use($postFix) { |
|
34 | + } else { |
|
35 | + return \array_map(function($elem) use($postFix) { |
|
36 | 36 | return $postFix." ".$elem; |
37 | 37 | }, \array_values(self::getConstants())); |
38 | 38 | } |
@@ -24,14 +24,14 @@ |
||
24 | 24 | } |
25 | 25 | |
26 | 26 | public static function getConstantValues($postFix="",$prefixBefore=false) { |
27 | - if ($postFix == "") |
|
28 | - return \array_values(self::getConstants()); |
|
29 | - else { |
|
27 | + if ($postFix == "") { |
|
28 | + return \array_values(self::getConstants()); |
|
29 | + } else { |
|
30 | 30 | if($prefixBefore===false){ |
31 | 31 | return \array_map(function ($elem) use($postFix) { |
32 | 32 | return $elem . " " . $postFix; |
33 | 33 | }, \array_values(self::getConstants())); |
34 | - }else{ |
|
34 | + } else{ |
|
35 | 35 | return \array_map(function ($elem) use($postFix) { |
36 | 36 | return $postFix." ".$elem; |
37 | 37 | }, \array_values(self::getConstants())); |
@@ -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,7 +7,7 @@ discard block |
||
7 | 7 | |
8 | 8 | class HtmlInput extends HtmlSingleElement { |
9 | 9 | |
10 | - public function __construct($identifier,$type="text",$value=NULL,$placeholder=NULL) { |
|
10 | + public function __construct($identifier, $type="text", $value=NULL, $placeholder=NULL) { |
|
11 | 11 | parent::__construct($identifier, "input"); |
12 | 12 | $this->setProperty("name", $identifier); |
13 | 13 | $this->setValue($value); |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | } |
17 | 17 | |
18 | 18 | public function setValue($value) { |
19 | - if(isset($value)) |
|
19 | + if (isset($value)) |
|
20 | 20 | $this->setProperty("value", $value); |
21 | 21 | return $this; |
22 | 22 | } |
@@ -25,12 +25,12 @@ discard block |
||
25 | 25 | return $this->setProperty("type", $value); |
26 | 26 | } |
27 | 27 | |
28 | - public function setPlaceholder($value){ |
|
29 | - if(JString::isNull($value)){ |
|
30 | - if(JString::isNotNull($this->identifier)) |
|
28 | + public function setPlaceholder($value) { |
|
29 | + if (JString::isNull($value)) { |
|
30 | + if (JString::isNotNull($this->identifier)) |
|
31 | 31 | $value=\ucfirst($this->identifier); |
32 | 32 | } |
33 | - if(JString::isNotNull($value)) |
|
33 | + if (JString::isNotNull($value)) |
|
34 | 34 | $this->setProperty("placeholder", $value); |
35 | 35 | return $this; |
36 | 36 | } |
@@ -16,8 +16,9 @@ discard block |
||
16 | 16 | } |
17 | 17 | |
18 | 18 | public function setValue($value) { |
19 | - if(isset($value)) |
|
20 | - $this->setProperty("value", $value); |
|
19 | + if(isset($value)) { |
|
20 | + $this->setProperty("value", $value); |
|
21 | + } |
|
21 | 22 | return $this; |
22 | 23 | } |
23 | 24 | |
@@ -27,11 +28,13 @@ discard block |
||
27 | 28 | |
28 | 29 | public function setPlaceholder($value){ |
29 | 30 | if(JString::isNull($value)){ |
30 | - if(JString::isNotNull($this->identifier)) |
|
31 | - $value=\ucfirst($this->identifier); |
|
31 | + if(JString::isNotNull($this->identifier)) { |
|
32 | + $value=\ucfirst($this->identifier); |
|
33 | + } |
|
34 | + } |
|
35 | + if(JString::isNotNull($value)) { |
|
36 | + $this->setProperty("placeholder", $value); |
|
32 | 37 | } |
33 | - if(JString::isNotNull($value)) |
|
34 | - $this->setProperty("placeholder", $value); |
|
35 | 38 | return $this; |
36 | 39 | } |
37 | 40 | } |
38 | 41 | \ No newline at end of file |
@@ -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 |