@@ -11,7 +11,6 @@ |
||
11 | 11 | use Ajax\bootstrap\components\Tab; |
12 | 12 | use Ajax\bootstrap\components\Carousel; |
13 | 13 | use Ajax\bootstrap\components\Collapse; |
14 | -use Ajax\Bootstrap; |
|
15 | 14 | use Ajax\common\components\SimpleComponent; |
16 | 15 | |
17 | 16 | trait BootstrapComponentsTrait { |
@@ -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; |
@@ -3,8 +3,6 @@ |
||
3 | 3 | namespace Ajax\common\traits; |
4 | 4 | |
5 | 5 | use Ajax\service\JString; |
6 | -use Ajax\service\PhalconUtils; |
|
7 | -use Symfony\Component\Config\Definition\Exception\Exception; |
|
8 | 6 | trait JqueryAjaxTrait { |
9 | 7 | |
10 | 8 | protected $ajaxLoader='<span></span><span></span><span></span><span></span><span></span>'; |
@@ -10,7 +10,7 @@ discard block |
||
10 | 10 | protected $ajaxLoader='<span></span><span></span><span></span><span></span><span></span>'; |
11 | 11 | |
12 | 12 | public abstract function _prep_value($value); |
13 | - public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true); |
|
13 | + public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true); |
|
14 | 14 | protected function addLoading(&$retour, $responseElement) { |
15 | 15 | $loading_notifier='<div class="ajax-loader">'; |
16 | 16 | if ($this->ajaxLoader=='') { |
@@ -23,20 +23,20 @@ discard block |
||
23 | 23 | $retour.="\t\t$({$responseElement}).prepend('{$loading_notifier}');\n"; |
24 | 24 | } |
25 | 25 | |
26 | - public function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) { |
|
27 | - return $this->_ajax("get", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$immediatly); |
|
26 | + public function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) { |
|
27 | + return $this->_ajax("get", $url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $immediatly); |
|
28 | 28 | } |
29 | - public function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) { |
|
30 | - return $this->_ajax("post", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$immediatly); |
|
29 | + public function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) { |
|
30 | + return $this->_ajax("post", $url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $immediatly); |
|
31 | 31 | } |
32 | 32 | |
33 | - protected function _ajax($method,$url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) { |
|
34 | - if(JString::isNull($params)){$params="{}";} |
|
33 | + protected function _ajax($method, $url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) { |
|
34 | + if (JString::isNull($params)) {$params="{}"; } |
|
35 | 35 | $jsCallback=isset($jsCallback) ? $jsCallback : ""; |
36 | 36 | $retour=$this->_getAjaxUrl($url, $attr); |
37 | 37 | $responseElement=$this->_getResponseElement($responseElement); |
38 | 38 | $retour.="var self=this;\n"; |
39 | - if($hasLoader===true){ |
|
39 | + if ($hasLoader===true) { |
|
40 | 40 | $this->addLoading($retour, $responseElement); |
41 | 41 | } |
42 | 42 | $retour.="$.".$method."(url,".$params.").done(function( data ) {\n"; |
@@ -46,22 +46,22 @@ discard block |
||
46 | 46 | return $retour; |
47 | 47 | } |
48 | 48 | |
49 | - protected function _getAjaxUrl($url,$attr){ |
|
49 | + protected function _getAjaxUrl($url, $attr) { |
|
50 | 50 | $url=$this->_correctAjaxUrl($url); |
51 | 51 | $retour="url='".$url."';\n"; |
52 | 52 | $slash="/"; |
53 | - if(JString::endswith($url, "/")===true) |
|
53 | + if (JString::endswith($url, "/")===true) |
|
54 | 54 | $slash=""; |
55 | - if(JString::isNotNull($attr)){ |
|
55 | + if (JString::isNotNull($attr)) { |
|
56 | 56 | if ($attr=="value") |
57 | 57 | $retour.="url=url+'".$slash."'+$(this).val();\n"; |
58 | - else if($attr!=null && $attr!=="") |
|
58 | + else if ($attr!=null && $attr!=="") |
|
59 | 59 | $retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n"; |
60 | 60 | } |
61 | 61 | return $retour; |
62 | 62 | } |
63 | 63 | |
64 | - protected function _getOnAjaxDone($responseElement,$jsCallback){ |
|
64 | + protected function _getOnAjaxDone($responseElement, $jsCallback) { |
|
65 | 65 | $retour=""; |
66 | 66 | if ($responseElement!=="") { |
67 | 67 | $retour="\t$({$responseElement}).html( data );\n"; |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | return $retour; |
71 | 71 | } |
72 | 72 | |
73 | - protected function _getResponseElement($responseElement){ |
|
73 | + protected function _getResponseElement($responseElement) { |
|
74 | 74 | if ($responseElement!=="") { |
75 | 75 | $responseElement=$this->_prep_value($responseElement); |
76 | 76 | } |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | protected function _correctAjaxUrl($url) { |
81 | 81 | if ($url!=="/" && JString::endsWith($url, "/")===true) |
82 | 82 | $url=substr($url, 0, strlen($url)-1); |
83 | - if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) { |
|
83 | + if (strncmp($url, 'http://', 7)!=0 && strncmp($url, 'https://', 8)!=0) { |
|
84 | 84 | $url=$this->jsUtils->getUrl($url); |
85 | 85 | } |
86 | 86 | return $url; |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | * @param string $jsCallback javascript code to execute after the request |
95 | 95 | * @param boolean $immediatly |
96 | 96 | */ |
97 | - public function _json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document",$immediatly=false) { |
|
97 | + public function _json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document", $immediatly=false) { |
|
98 | 98 | $jsCallback=isset($jsCallback) ? $jsCallback : ""; |
99 | 99 | $retour=$this->_getAjaxUrl($url, $attr); |
100 | 100 | $retour.="$.{$method}(url,".$params.").done(function( data ) {\n"; |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | * @param string $url the request address |
116 | 116 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true) |
117 | 117 | */ |
118 | - public function _jsonOn($event,$element, $url,$parameters=array()) { |
|
118 | + public function _jsonOn($event, $element, $url, $parameters=array()) { |
|
119 | 119 | $preventDefault=true; |
120 | 120 | $stopPropagation=true; |
121 | 121 | $jsCallback=null; |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | $params="{}"; |
126 | 126 | $immediatly=true; |
127 | 127 | extract($parameters); |
128 | - return $this->_add_event($element, $this->_json($url,$method, $params,$jsCallback, $attr,$context), $event, $preventDefault, $stopPropagation,$immediatly); |
|
128 | + return $this->_add_event($element, $this->_json($url, $method, $params, $jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation, $immediatly); |
|
129 | 129 | } |
130 | 130 | |
131 | 131 | /** |
@@ -137,19 +137,19 @@ discard block |
||
137 | 137 | * @param string $context jquery DOM element, array container. |
138 | 138 | * @param boolean $immediatly |
139 | 139 | */ |
140 | - public function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context=null,$immediatly=false) { |
|
140 | + public function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context=null, $immediatly=false) { |
|
141 | 141 | $jsCallback=isset($jsCallback) ? $jsCallback : ""; |
142 | 142 | $retour=$this->_getAjaxUrl($url, $attr); |
143 | - if($context===null){ |
|
143 | + if ($context===null) { |
|
144 | 144 | $appendTo="\t\tnewElm.appendTo($('".$maskSelector."').parent());\n"; |
145 | - $newElm = "$('#'+newId)"; |
|
146 | - }else{ |
|
145 | + $newElm="$('#'+newId)"; |
|
146 | + } else { |
|
147 | 147 | $appendTo="\t\tnewElm.appendTo(".$context.");\n"; |
148 | - $newElm = $context.".find('#'+newId)"; |
|
148 | + $newElm=$context.".find('#'+newId)"; |
|
149 | 149 | } |
150 | 150 | $retour.="var self = $(this);\n$.{$method}(url,".$params.").done(function( data ) {\n"; |
151 | 151 | $retour.="\tdata=$.parseJSON(data);$.each(data, function(index, value) {\n"."\tvar created=false;var maskElm=$('".$maskSelector."').first();maskElm.hide();"."\tvar newId=(maskElm.attr('id') || 'mask')+'-'+index;"."\tvar newElm=".$newElm.";\n"."\tif(!newElm.length){\n"."\t\tnewElm=maskElm.clone();newElm.attr('id',newId);\n"; |
152 | - $retour.= $appendTo; |
|
152 | + $retour.=$appendTo; |
|
153 | 153 | $retour.="\t}\n"."\tfor(var key in value){\n"."\t\t\tvar html = $('<div />').append($(newElm).clone()).html();\n"."\t\t\tif(html.indexOf('[['+key+']]')>-1){\n"."\t\t\t\tcontent=$(html.split('[['+key+']]').join(value[key]));\n"."\t\t\t\t$(newElm).replaceWith(content);newElm=content;\n"."\t\t\t}\n"."\t\tvar sel='[data-id=\"'+key+'\"]';if($(sel,newElm).length){\n"."\t\t\tvar selElm=$(sel,newElm);\n"."\t\t\t if(selElm.is('[value]')) { selElm.attr('value',value[key]);selElm.val(value[key]);} else { selElm.html(value[key]); }\n"."\t\t}\n"."}\n"."\t$(newElm).show(true);"."\n"."\t$(newElm).removeClass('hide');"."});\n"; |
154 | 154 | $retour.="\t$(document).trigger('jsonReady',[data]);\n"; |
155 | 155 | $retour.="\t".$jsCallback."\n"."});\n"; |
@@ -164,26 +164,26 @@ discard block |
||
164 | 164 | * @param string $url the request address |
165 | 165 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get", "context"=>null) |
166 | 166 | */ |
167 | - public function _jsonArrayOn($event,$element, $maskSelector,$url,$parameters=array()) { |
|
167 | + public function _jsonArrayOn($event, $element, $maskSelector, $url, $parameters=array()) { |
|
168 | 168 | $preventDefault=true; |
169 | 169 | $stopPropagation=true; |
170 | 170 | $jsCallback=null; |
171 | 171 | $attr="id"; |
172 | 172 | $method="get"; |
173 | - $context = null; |
|
173 | + $context=null; |
|
174 | 174 | $params="{}"; |
175 | 175 | $immediatly=true; |
176 | 176 | extract($parameters); |
177 | - return $this->_add_event($element, $this->_jsonArray($maskSelector,$url,$method, $params,$jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation,$immediatly); |
|
177 | + return $this->_add_event($element, $this->_jsonArray($maskSelector, $url, $method, $params, $jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation, $immediatly); |
|
178 | 178 | } |
179 | 179 | |
180 | - public function _postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) { |
|
180 | + public function _postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) { |
|
181 | 181 | $jsCallback=isset($jsCallback) ? $jsCallback : ""; |
182 | 182 | $retour=$this->_getAjaxUrl($url, $attr); |
183 | 183 | $retour.="\nvar params=$('#".$form."').serialize();\n"; |
184 | 184 | $responseElement=$this->_getResponseElement($responseElement); |
185 | 185 | $retour.="var self=this;\n"; |
186 | - if($hasLoader===true){ |
|
186 | + if ($hasLoader===true) { |
|
187 | 187 | $this->addLoading($retour, $responseElement); |
188 | 188 | } |
189 | 189 | $retour.="$.post(url,params).done(function( data ) {\n"; |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | * @param string $responseElement |
211 | 211 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true) |
212 | 212 | */ |
213 | - public function _getOn($event,$element, $url, $params="{}", $responseElement="", $parameters=array()) { |
|
213 | + public function _getOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) { |
|
214 | 214 | $preventDefault=true; |
215 | 215 | $stopPropagation=true; |
216 | 216 | $jsCallback=null; |
@@ -218,7 +218,7 @@ discard block |
||
218 | 218 | $hasLoader=true; |
219 | 219 | $immediatly=true; |
220 | 220 | extract($parameters); |
221 | - return $this->_add_event($element, $this->_get($url, $params, $responseElement, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation,$immediatly); |
|
221 | + return $this->_add_event($element, $this->_get($url, $params, $responseElement, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation, $immediatly); |
|
222 | 222 | } |
223 | 223 | |
224 | 224 | /** |
@@ -231,7 +231,7 @@ discard block |
||
231 | 231 | * @param string $responseElement |
232 | 232 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true) |
233 | 233 | */ |
234 | - public function _postOn($event,$element, $url, $params="{}", $responseElement="", $parameters=array()) { |
|
234 | + public function _postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) { |
|
235 | 235 | $preventDefault=true; |
236 | 236 | $stopPropagation=true; |
237 | 237 | $jsCallback=null; |
@@ -239,7 +239,7 @@ discard block |
||
239 | 239 | $hasLoader=true; |
240 | 240 | $immediatly=true; |
241 | 241 | extract($parameters); |
242 | - return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation,$immediatly); |
|
242 | + return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation, $immediatly); |
|
243 | 243 | } |
244 | 244 | |
245 | 245 | /** |
@@ -252,7 +252,7 @@ discard block |
||
252 | 252 | * @param string $responseElement |
253 | 253 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true) |
254 | 254 | */ |
255 | - public function _postFormOn($event,$element, $url, $form, $responseElement="", $parameters=array()) { |
|
255 | + public function _postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) { |
|
256 | 256 | $preventDefault=true; |
257 | 257 | $stopPropagation=true; |
258 | 258 | $validation=false; |
@@ -261,6 +261,6 @@ discard block |
||
261 | 261 | $hasLoader=true; |
262 | 262 | $immediatly=true; |
263 | 263 | extract($parameters); |
264 | - return $this->_add_event($element, $this->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation,$immediatly); |
|
264 | + return $this->_add_event($element, $this->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation, $immediatly); |
|
265 | 265 | } |
266 | 266 | } |
267 | 267 | \ No newline at end of file |
@@ -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 | } |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Ajax\JsUtils; |
6 | 6 | use Phalcon\Text; |
7 | -use Phalcon\Mvc\Url; |
|
8 | 7 | use Ajax\ui\Properties\Position; |
9 | 8 | use Ajax\common\components\SimpleComponent; |
10 | 9 |
@@ -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); |
@@ -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" |
@@ -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"; |