@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Ajax\common\html\HtmlDoubleElement; |
6 | 6 | use Ajax\service\JArray; |
7 | -use Ajax\JsUtils; |
|
8 | 7 | |
9 | 8 | /** |
10 | 9 | * Base class for Html collections |
@@ -13,36 +13,36 @@ discard block |
||
13 | 13 | */ |
14 | 14 | abstract class HtmlCollection extends HtmlDoubleElement { |
15 | 15 | |
16 | - public function __construct($identifier,$tagName="div"){ |
|
17 | - parent::__construct($identifier,$tagName); |
|
16 | + public function __construct($identifier, $tagName="div") { |
|
17 | + parent::__construct($identifier, $tagName); |
|
18 | 18 | $this->content=array(); |
19 | 19 | } |
20 | 20 | |
21 | - public function addItems($items){ |
|
22 | - if(JArray::isAssociative($items)){ |
|
23 | - foreach ($items as $k=>$v){ |
|
24 | - $this->addItem([$k,$v]); |
|
21 | + public function addItems($items) { |
|
22 | + if (JArray::isAssociative($items)) { |
|
23 | + foreach ($items as $k=>$v) { |
|
24 | + $this->addItem([$k, $v]); |
|
25 | 25 | } |
26 | - }else{ |
|
27 | - foreach ($items as $item){ |
|
26 | + } else { |
|
27 | + foreach ($items as $item) { |
|
28 | 28 | $this->addItem($item); |
29 | 29 | } |
30 | 30 | } |
31 | 31 | return $this; |
32 | 32 | } |
33 | 33 | |
34 | - public function setItems($items){ |
|
34 | + public function setItems($items) { |
|
35 | 35 | $this->content=$items; |
36 | 36 | return $this; |
37 | 37 | } |
38 | 38 | |
39 | - public function getItems(){ |
|
39 | + public function getItems() { |
|
40 | 40 | return $this->content; |
41 | 41 | } |
42 | 42 | |
43 | - protected function getItemToAdd($item){ |
|
43 | + protected function getItemToAdd($item) { |
|
44 | 44 | $itemO=$item; |
45 | - if($this->createCondition($item)===true){ |
|
45 | + if ($this->createCondition($item)===true) { |
|
46 | 46 | $itemO=$this->createItem($item); |
47 | 47 | } |
48 | 48 | return $itemO; |
@@ -53,15 +53,15 @@ discard block |
||
53 | 53 | * @param HtmlDoubleElement|string $item |
54 | 54 | * @return \Ajax\common\html\HtmlDoubleElement |
55 | 55 | */ |
56 | - public function addItem($item){ |
|
56 | + public function addItem($item) { |
|
57 | 57 | $itemO=$this->getItemToAdd($item); |
58 | 58 | $this->addContent($itemO); |
59 | 59 | return $itemO; |
60 | 60 | } |
61 | 61 | |
62 | - public function insertItem($item,$position=0){ |
|
62 | + public function insertItem($item, $position=0) { |
|
63 | 63 | $itemO=$this->getItemToAdd($item); |
64 | - \array_splice( $this->content, $position, 0, array($itemO)); |
|
64 | + \array_splice($this->content, $position, 0, array($itemO)); |
|
65 | 65 | return $itemO; |
66 | 66 | } |
67 | 67 | |
@@ -84,11 +84,11 @@ discard block |
||
84 | 84 | return $this; |
85 | 85 | } |
86 | 86 | |
87 | - public function removeItem($index){ |
|
87 | + public function removeItem($index) { |
|
88 | 88 | return array_splice($this->content, $index, 1); |
89 | 89 | } |
90 | 90 | |
91 | - public function count(){ |
|
91 | + public function count() { |
|
92 | 92 | return \sizeof($this->content); |
93 | 93 | } |
94 | 94 | |
@@ -99,8 +99,8 @@ discard block |
||
99 | 99 | return $this->addItem($function($object)); |
100 | 100 | } |
101 | 101 | |
102 | - public function apply($callBack){ |
|
103 | - foreach ($this->content as $item){ |
|
102 | + public function apply($callBack) { |
|
103 | + foreach ($this->content as $item) { |
|
104 | 104 | $callBack($item); |
105 | 105 | } |
106 | 106 | return $this; |
@@ -120,12 +120,12 @@ discard block |
||
120 | 120 | */ |
121 | 121 | protected abstract function createItem($value); |
122 | 122 | |
123 | - protected function createCondition($value){ |
|
123 | + protected function createCondition($value) { |
|
124 | 124 | return \is_object($value)===false; |
125 | 125 | } |
126 | 126 | |
127 | - protected function contentAs($tagName){ |
|
128 | - foreach ($this->content as $item){ |
|
127 | + protected function contentAs($tagName) { |
|
128 | + foreach ($this->content as $item) { |
|
129 | 129 | $item->setTagName($tagName); |
130 | 130 | } |
131 | 131 | return $this; |
@@ -5,7 +5,6 @@ |
||
5 | 5 | use Ajax\semantic\html\base\HtmlSemDoubleElement; |
6 | 6 | use Ajax\JsUtils; |
7 | 7 | use Ajax\service\JArray; |
8 | - |
|
9 | 8 | use Ajax\semantic\html\base\constants\State; |
10 | 9 | |
11 | 10 | class HtmlProgress extends HtmlSemDoubleElement { |
@@ -9,26 +9,26 @@ discard block |
||
9 | 9 | use Ajax\semantic\html\base\constants\State; |
10 | 10 | |
11 | 11 | class HtmlProgress extends HtmlSemDoubleElement { |
12 | - private $_params=array (); |
|
12 | + private $_params=array(); |
|
13 | 13 | |
14 | 14 | public function __construct($identifier, $value=NULL, $label=NULL, $attributes=array()) { |
15 | 15 | parent::__construct($identifier, "div", "ui progress"); |
16 | - if (isset($value) === true) |
|
16 | + if (isset($value)===true) |
|
17 | 17 | $this->setProperty("data-percent", $value); |
18 | 18 | $this->createBar(); |
19 | - if (isset($label) === true) |
|
19 | + if (isset($label)===true) |
|
20 | 20 | $this->setLabel($label); |
21 | - $this->_states=[ State::SUCCESS,State::WARNING,State::ERROR,State::ACTIVE,State::DISABLED ]; |
|
21 | + $this->_states=[State::SUCCESS, State::WARNING, State::ERROR, State::ACTIVE, State::DISABLED]; |
|
22 | 22 | $this->addToProperty("class", $attributes); |
23 | 23 | } |
24 | 24 | |
25 | 25 | public function setLabel($label) { |
26 | - $this->content["label"]=new HtmlSemDoubleElement("lbl-" . $this->identifier, "div", "label", $label); |
|
26 | + $this->content["label"]=new HtmlSemDoubleElement("lbl-".$this->identifier, "div", "label", $label); |
|
27 | 27 | return $this; |
28 | 28 | } |
29 | 29 | |
30 | 30 | private function createBar() { |
31 | - $bar=new HtmlSemDoubleElement("bar-" . $this->identifier, "div", "bar", new HtmlSemDoubleElement("progress-" . $this->identifier, "div", "progress")); |
|
31 | + $bar=new HtmlSemDoubleElement("bar-".$this->identifier, "div", "bar", new HtmlSemDoubleElement("progress-".$this->identifier, "div", "progress")); |
|
32 | 32 | $this->content["bar"]=$bar; |
33 | 33 | return $this; |
34 | 34 | } |
@@ -68,20 +68,20 @@ discard block |
||
68 | 68 | * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile() |
69 | 69 | */ |
70 | 70 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
71 | - $this->content=JArray::sortAssociative($this->content, [ "bar","label" ]); |
|
71 | + $this->content=JArray::sortAssociative($this->content, ["bar", "label"]); |
|
72 | 72 | return parent::compile($js, $view); |
73 | 73 | } |
74 | 74 | |
75 | 75 | public function jsSetValue($value) { |
76 | - return '$("#' . $this->identifier . '").progress({value:' . $value . '});'; |
|
76 | + return '$("#'.$this->identifier.'").progress({value:'.$value.'});'; |
|
77 | 77 | } |
78 | 78 | |
79 | 79 | public function jsIncValue() { |
80 | - return '$("#' . $this->identifier . '").progress("increment");'; |
|
80 | + return '$("#'.$this->identifier.'").progress("increment");'; |
|
81 | 81 | } |
82 | 82 | |
83 | 83 | public function jsDecValue() { |
84 | - return '$("#' . $this->identifier . '").progress("decrement");'; |
|
84 | + return '$("#'.$this->identifier.'").progress("decrement");'; |
|
85 | 85 | } |
86 | 86 | |
87 | 87 | /** |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | * @return HtmlProgress |
96 | 96 | */ |
97 | 97 | public function setTextValues($active=false, $error=false, $success=false, $warning=false, $percent="{percent}%", $ratio="{value} of {total}") { |
98 | - if (\is_array($active) == true) { |
|
98 | + if (\is_array($active)==true) { |
|
99 | 99 | $array=$active; |
100 | 100 | $active=JArray::getDefaultValue($array, "active", false); |
101 | 101 | $success=JArray::getDefaultValue($array, "success", $success); |
@@ -103,12 +103,12 @@ discard block |
||
103 | 103 | $percent=JArray::getDefaultValue($array, "percent", $percent); |
104 | 104 | $ratio=JArray::getDefaultValue($array, "ratio", $ratio); |
105 | 105 | } |
106 | - $this->_params["text"]="%{active : " . \var_export($active, true) . ",error: " . \var_export($error, true) . ",success : " . \var_export($success, true) . ",warning : " . \var_export($warning, true) . ",percent : " . \var_export($percent, true) . ",ratio : " . \var_export($ratio, true) . "}%"; |
|
106 | + $this->_params["text"]="%{active : ".\var_export($active, true).",error: ".\var_export($error, true).",success : ".\var_export($success, true).",warning : ".\var_export($warning, true).",percent : ".\var_export($percent, true).",ratio : ".\var_export($ratio, true)."}%"; |
|
107 | 107 | return $this; |
108 | 108 | } |
109 | 109 | |
110 | 110 | public function onChange($jsCode) { |
111 | - return $this->_params["onChange"]="%function(percent, value, total){" . $jsCode . "}%"; |
|
111 | + return $this->_params["onChange"]="%function(percent, value, total){".$jsCode."}%"; |
|
112 | 112 | } |
113 | 113 | |
114 | 114 | /* |
@@ -116,8 +116,8 @@ discard block |
||
116 | 116 | * @see BaseHtml::run() |
117 | 117 | */ |
118 | 118 | public function run(JsUtils $js) { |
119 | - if (isset($this->_bsComponent) === false) |
|
120 | - $this->_bsComponent=$js->semantic()->progress("#" . $this->identifier, $this->_params); |
|
119 | + if (isset($this->_bsComponent)===false) |
|
120 | + $this->_bsComponent=$js->semantic()->progress("#".$this->identifier, $this->_params); |
|
121 | 121 | $this->addEventsOnRun($js); |
122 | 122 | return $this->_bsComponent; |
123 | 123 | } |
@@ -24,8 +24,8 @@ |
||
24 | 24 | use Ajax\semantic\traits\SemanticHtmlViewsTrait; |
25 | 25 | |
26 | 26 | class Semantic extends BaseGui { |
27 | - use SemanticComponentsTrait,SemanticHtmlElementsTrait,SemanticHtmlCollectionsTrait, |
|
28 | - SemanticHtmlModulesTrait,SemanticHtmlViewsTrait; |
|
27 | + use SemanticComponentsTrait, SemanticHtmlElementsTrait, SemanticHtmlCollectionsTrait, |
|
28 | + SemanticHtmlModulesTrait, SemanticHtmlViewsTrait; |
|
29 | 29 | |
30 | 30 | public function __construct($autoCompile=true) { |
31 | 31 | parent::__construct($autoCompile=true); |
@@ -30,7 +30,7 @@ |
||
30 | 30 | * @param string $value default : swing |
31 | 31 | */ |
32 | 32 | public function setEasing($value) { |
33 | - $this->setParamCtrl("easing", $value, array ( |
|
33 | + $this->setParamCtrl("easing", $value, array( |
|
34 | 34 | "linear", |
35 | 35 | "swing", |
36 | 36 | "easeInQuad", |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | |
17 | 17 | public function __construct(JsUtils $js) { |
18 | 18 | parent::__construct($js); |
19 | - $this->params=array ( |
|
19 | + $this->params=array( |
|
20 | 20 | "active" => 0 |
21 | 21 | ); |
22 | 22 | $this->uiName="accordion"; |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | * @return $this |
113 | 113 | */ |
114 | 114 | public function setHeightStyle($value) { |
115 | - return $this->setParamCtrl("heightStyle", $value, array ( |
|
115 | + return $this->setParamCtrl("heightStyle", $value, array( |
|
116 | 116 | "auto", |
117 | 117 | "fill", |
118 | 118 | "content" |
@@ -52,7 +52,7 @@ |
||
52 | 52 | * @return $this |
53 | 53 | */ |
54 | 54 | public function setSource($source) { |
55 | - $source=str_ireplace(array ( |
|
55 | + $source=str_ireplace(array( |
|
56 | 56 | "\"", |
57 | 57 | "'" |
58 | 58 | ), "%quote%", $source); |
@@ -14,7 +14,7 @@ |
||
14 | 14 | |
15 | 15 | public function __construct(JsUtils $js) { |
16 | 16 | parent::__construct($js); |
17 | - $this->params=array ( |
|
17 | + $this->params=array( |
|
18 | 18 | "value" => 50 |
19 | 19 | ); |
20 | 20 | $this->uiName="progressbar"; |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | |
17 | 17 | private function addFunction($jsCode) { |
18 | 18 | if (!Text::startsWith($jsCode, "function")) |
19 | - $jsCode="%function(){" . $jsCode . "}%"; |
|
19 | + $jsCode="%function(){".$jsCode."}%"; |
|
20 | 20 | return $jsCode; |
21 | 21 | } |
22 | 22 | |
@@ -43,6 +43,6 @@ discard block |
||
43 | 43 | } |
44 | 44 | |
45 | 45 | public static function submitButton(JsUtils $js, $url, $form, $responseElement, $caption="Okay") { |
46 | - return new DialogButton($caption, $js->postForm($url, $form, $responseElement) . ";$( this ).dialog( 'close' );"); |
|
46 | + return new DialogButton($caption, $js->postForm($url, $form, $responseElement).";$( this ).dialog( 'close' );"); |
|
47 | 47 | } |
48 | 48 | } |
49 | 49 | \ No newline at end of file |
@@ -12,11 +12,11 @@ discard block |
||
12 | 12 | */ |
13 | 13 | class Dialog extends SimpleComponent { |
14 | 14 | protected $attachTo; |
15 | - protected $buttons=array (); |
|
15 | + protected $buttons=array(); |
|
16 | 16 | |
17 | 17 | public function __construct(JsUtils $js) { |
18 | 18 | parent::__construct($js); |
19 | - $this->params=array ( |
|
19 | + $this->params=array( |
|
20 | 20 | "dialogClass" => "no-close" |
21 | 21 | ); |
22 | 22 | $this->addCancelBtn("Annuler"); |
@@ -24,12 +24,12 @@ discard block |
||
24 | 24 | |
25 | 25 | public function getScript() { |
26 | 26 | $allParams=$this->params; |
27 | - $jsonButtons=array (); |
|
28 | - foreach ( $this->buttons as $button ) { |
|
27 | + $jsonButtons=array(); |
|
28 | + foreach ($this->buttons as $button) { |
|
29 | 29 | $jsonButtons []=$button->getParams(); |
30 | 30 | } |
31 | 31 | $allParams ["buttons"]=$jsonButtons; |
32 | - $this->jquery_code_for_compile []="$( '" . $this->attachTo . "' ).dialog(" . $this->getParamsAsJSON($allParams) . ");"; |
|
32 | + $this->jquery_code_for_compile []="$( '".$this->attachTo."' ).dialog(".$this->getParamsAsJSON($allParams).");"; |
|
33 | 33 | $result=implode("", $this->jquery_code_for_compile); |
34 | 34 | $result=str_ireplace("\"%", "", $result); |
35 | 35 | $result=str_ireplace("%\"", "", $result); |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | } |
60 | 60 | |
61 | 61 | private function insertBtn($insert, $position=NULL) { |
62 | - if ($position != NULL) { |
|
62 | + if ($position!=NULL) { |
|
63 | 63 | $this->buttons=array_splice($this->buttons, $position, 0, $insert); |
64 | 64 | } else { |
65 | 65 | $this->buttons []=$insert; |