@@ -10,15 +10,15 @@ discard block |
||
10 | 10 | protected $_modelInstance; |
11 | 11 | protected $_instanceViewer; |
12 | 12 | |
13 | - public function __construct($identifier,$model,$modelInstance=NULL) { |
|
13 | + public function __construct($identifier, $model, $modelInstance=NULL) { |
|
14 | 14 | parent::__construct($identifier); |
15 | 15 | $this->_template="%wrapContentBefore%%content%%wrapContentAfter%"; |
16 | 16 | $this->setModel($model); |
17 | - if(isset($modelInstance)); |
|
17 | + if (isset($modelInstance)); |
|
18 | 18 | $this->show($modelInstance); |
19 | 19 | } |
20 | 20 | |
21 | - public function show($modelInstance){ |
|
21 | + public function show($modelInstance) { |
|
22 | 22 | $this->_modelInstance=$modelInstance; |
23 | 23 | } |
24 | 24 | |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | |
43 | 43 | public abstract function getHtmlComponent(); |
44 | 44 | |
45 | - public function setColor($color){ |
|
45 | + public function setColor($color) { |
|
46 | 46 | return $this->getHtmlComponent()->setColor($color); |
47 | 47 | } |
48 | 48 | } |
49 | 49 | \ No newline at end of file |
@@ -17,18 +17,18 @@ discard block |
||
17 | 17 | |
18 | 18 | public function __construct(JsUtils $js) { |
19 | 19 | parent::__construct($js); |
20 | - $this->events=array (); |
|
20 | + $this->events=array(); |
|
21 | 21 | } |
22 | 22 | |
23 | 23 | protected function compileEvents() { |
24 | - foreach ( $this->events as $event => $jsCode ) { |
|
25 | - if($event=="execute"){ |
|
24 | + foreach ($this->events as $event => $jsCode) { |
|
25 | + if ($event=="execute") { |
|
26 | 26 | $this->jquery_code_for_compile []=$jsCode; |
27 | - }else if($event=="beforeExecute"){ |
|
27 | + } else if ($event=="beforeExecute") { |
|
28 | 28 | \array_unshift($this->jquery_code_for_compile, $jsCode); |
29 | - }else{ |
|
29 | + } else { |
|
30 | 30 | $selector=$this->attachTo; |
31 | - if(isset($this->itemSelector)){ |
|
31 | + if (isset($this->itemSelector)) { |
|
32 | 32 | $selector.=" ".$this->itemSelector; |
33 | 33 | } |
34 | 34 | $this->jquery_code_for_compile []="$( \"".$selector."\" ).on(\"".$event."\" , function( event, data ) {".$jsCode."});"; |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | $result=implode("\n", $this->jquery_code_for_compile); |
41 | 41 | $result=str_ireplace("\"%", "", $result); |
42 | 42 | $result=str_ireplace("%\"", "", $result); |
43 | - $result=str_replace(array ( |
|
43 | + $result=str_replace(array( |
|
44 | 44 | "\\n", |
45 | 45 | "\\r", |
46 | 46 | "\\t" |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | |
51 | 51 | public function getScript() { |
52 | 52 | $allParams=$this->params; |
53 | - $this->jquery_code_for_compile=array (); |
|
53 | + $this->jquery_code_for_compile=array(); |
|
54 | 54 | $this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).{$this->uiName}(".$this->getParamsAsJSON($allParams).");"; |
55 | 55 | $this->compileEvents(); |
56 | 56 | return $this->compileJQueryCode(); |
@@ -24,9 +24,9 @@ discard block |
||
24 | 24 | foreach ( $this->events as $event => $jsCode ) { |
25 | 25 | if($event=="execute"){ |
26 | 26 | $this->jquery_code_for_compile []=$jsCode; |
27 | - }else if($event=="beforeExecute"){ |
|
27 | + } else if($event=="beforeExecute"){ |
|
28 | 28 | \array_unshift($this->jquery_code_for_compile, $jsCode); |
29 | - }else{ |
|
29 | + } else{ |
|
30 | 30 | $selector=$this->attachTo; |
31 | 31 | if(isset($this->itemSelector)){ |
32 | 32 | $selector.=" ".$this->itemSelector; |
@@ -75,8 +75,9 @@ discard block |
||
75 | 75 | |
76 | 76 | protected function setParamCtrl($key, $value, $typeCtrl) { |
77 | 77 | if (is_array($typeCtrl)) { |
78 | - if (array_search($value, $typeCtrl)===false) |
|
79 | - 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)."}"); |
|
78 | + if (array_search($value, $typeCtrl)===false) { |
|
79 | + 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)."}"); |
|
80 | + } |
|
80 | 81 | } else { |
81 | 82 | if (!$typeCtrl($value)) { |
82 | 83 | throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$key." au composant ".$this->uiName); |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | protected $ajaxLoader='<span></span><span></span><span></span><span></span><span></span>'; |
16 | 16 | |
17 | 17 | public abstract function _prep_value($value); |
18 | - public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true); |
|
18 | + public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true); |
|
19 | 19 | protected function addLoading(&$retour, $responseElement) { |
20 | 20 | $loading_notifier='<div class="ajax-loader">'; |
21 | 21 | if ($this->ajaxLoader=='') { |
@@ -28,20 +28,20 @@ discard block |
||
28 | 28 | $retour.="\t\t$({$responseElement}).prepend('{$loading_notifier}');\n"; |
29 | 29 | } |
30 | 30 | |
31 | - public function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) { |
|
32 | - return $this->_ajax("get", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$immediatly); |
|
31 | + public function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) { |
|
32 | + return $this->_ajax("get", $url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $immediatly); |
|
33 | 33 | } |
34 | - public function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) { |
|
35 | - return $this->_ajax("post", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$immediatly); |
|
34 | + public function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) { |
|
35 | + return $this->_ajax("post", $url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $immediatly); |
|
36 | 36 | } |
37 | 37 | |
38 | - protected function _ajax($method,$url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) { |
|
39 | - if(JString::isNull($params)){$params="{}";} |
|
38 | + protected function _ajax($method, $url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) { |
|
39 | + if (JString::isNull($params)) {$params="{}"; } |
|
40 | 40 | $jsCallback=isset($jsCallback) ? $jsCallback : ""; |
41 | 41 | $retour=$this->_getAjaxUrl($url, $attr); |
42 | 42 | $responseElement=$this->_getResponseElement($responseElement); |
43 | 43 | $retour.="var self=this;\n"; |
44 | - if($hasLoader===true){ |
|
44 | + if ($hasLoader===true) { |
|
45 | 45 | $this->addLoading($retour, $responseElement); |
46 | 46 | } |
47 | 47 | $retour.="$.".$method."(url,".$params.").done(function( data ) {\n"; |
@@ -51,30 +51,30 @@ discard block |
||
51 | 51 | return $retour; |
52 | 52 | } |
53 | 53 | |
54 | - protected function _getAjaxUrl($url,$attr){ |
|
54 | + protected function _getAjaxUrl($url, $attr) { |
|
55 | 55 | $url=$this->_correctAjaxUrl($url); |
56 | 56 | $retour="url='".$url."';\n"; |
57 | 57 | $slash="/"; |
58 | - if(JString::endswith($url, "/")===true) |
|
58 | + if (JString::endswith($url, "/")===true) |
|
59 | 59 | $slash=""; |
60 | - if(JString::isNotNull($attr)){ |
|
60 | + if (JString::isNotNull($attr)) { |
|
61 | 61 | if ($attr==="value") |
62 | 62 | $retour.="url=url+'".$slash."'+$(this).val();\n"; |
63 | 63 | elseif ($attr==="html") |
64 | 64 | $retour.="url=url+'".$slash."'+$(this).html();\n"; |
65 | - elseif($attr!=null && $attr!=="") |
|
65 | + elseif ($attr!=null && $attr!=="") |
|
66 | 66 | $retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n"; |
67 | 67 | } |
68 | 68 | return $retour; |
69 | 69 | } |
70 | 70 | |
71 | - protected function _getOnAjaxDone($responseElement,$jsCallback){ |
|
71 | + protected function _getOnAjaxDone($responseElement, $jsCallback) { |
|
72 | 72 | $retour=""; |
73 | 73 | if ($responseElement!=="") { |
74 | - if(JString::startswith($responseElement, "\"-")===true){ |
|
74 | + if (JString::startswith($responseElement, "\"-")===true) { |
|
75 | 75 | $responseElement=\str_replace("\"-", "\"", $responseElement); |
76 | 76 | $retour="\t$({$responseElement}).replaceWith( data );\n"; |
77 | - }else{ |
|
77 | + } else { |
|
78 | 78 | $retour="\t$({$responseElement}).html( data );\n"; |
79 | 79 | } |
80 | 80 | } |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | return $retour; |
83 | 83 | } |
84 | 84 | |
85 | - protected function _getResponseElement($responseElement){ |
|
85 | + protected function _getResponseElement($responseElement) { |
|
86 | 86 | if ($responseElement!=="") { |
87 | 87 | $responseElement=$this->_prep_value($responseElement); |
88 | 88 | } |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | protected function _correctAjaxUrl($url) { |
93 | 93 | if ($url!=="/" && JString::endsWith($url, "/")===true) |
94 | 94 | $url=substr($url, 0, strlen($url)-1); |
95 | - if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) { |
|
95 | + if (strncmp($url, 'http://', 7)!=0 && strncmp($url, 'https://', 8)!=0) { |
|
96 | 96 | $url=$this->jsUtils->getUrl($url); |
97 | 97 | } |
98 | 98 | return $url; |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | * @param string $jsCallback javascript code to execute after the request |
107 | 107 | * @param boolean $immediatly |
108 | 108 | */ |
109 | - public function _json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document",$immediatly=false) { |
|
109 | + public function _json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document", $immediatly=false) { |
|
110 | 110 | $jsCallback=isset($jsCallback) ? $jsCallback : ""; |
111 | 111 | $retour=$this->_getAjaxUrl($url, $attr); |
112 | 112 | $retour.="$.{$method}(url,".$params.").done(function( data ) {\n"; |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | * @param string $url the request address |
128 | 128 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true) |
129 | 129 | */ |
130 | - public function _jsonOn($event,$element, $url,$parameters=array()) { |
|
130 | + public function _jsonOn($event, $element, $url, $parameters=array()) { |
|
131 | 131 | $preventDefault=true; |
132 | 132 | $stopPropagation=true; |
133 | 133 | $jsCallback=null; |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | $params="{}"; |
138 | 138 | $immediatly=true; |
139 | 139 | extract($parameters); |
140 | - return $this->_add_event($element, $this->_json($url,$method, $params,$jsCallback, $attr,$context), $event, $preventDefault, $stopPropagation,$immediatly); |
|
140 | + return $this->_add_event($element, $this->_json($url, $method, $params, $jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation, $immediatly); |
|
141 | 141 | } |
142 | 142 | |
143 | 143 | /** |
@@ -149,19 +149,19 @@ discard block |
||
149 | 149 | * @param string $context jquery DOM element, array container. |
150 | 150 | * @param boolean $immediatly |
151 | 151 | */ |
152 | - public function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context=null,$immediatly=false) { |
|
152 | + public function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context=null, $immediatly=false) { |
|
153 | 153 | $jsCallback=isset($jsCallback) ? $jsCallback : ""; |
154 | 154 | $retour=$this->_getAjaxUrl($url, $attr); |
155 | - if($context===null){ |
|
155 | + if ($context===null) { |
|
156 | 156 | $appendTo="\t\tnewElm.appendTo($('".$maskSelector."').parent());\n"; |
157 | - $newElm = "$('#'+newId)"; |
|
158 | - }else{ |
|
157 | + $newElm="$('#'+newId)"; |
|
158 | + } else { |
|
159 | 159 | $appendTo="\t\tnewElm.appendTo(".$context.");\n"; |
160 | - $newElm = $context.".find('#'+newId)"; |
|
160 | + $newElm=$context.".find('#'+newId)"; |
|
161 | 161 | } |
162 | 162 | $retour.="var self = $(this);\n$.{$method}(url,".$params.").done(function( data ) {\n"; |
163 | 163 | $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"; |
164 | - $retour.= $appendTo; |
|
164 | + $retour.=$appendTo; |
|
165 | 165 | $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"; |
166 | 166 | $retour.="\t$(document).trigger('jsonReady',[data]);\n"; |
167 | 167 | $retour.="\t".$jsCallback."\n"."});\n"; |
@@ -176,26 +176,26 @@ discard block |
||
176 | 176 | * @param string $url the request address |
177 | 177 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get", "context"=>null) |
178 | 178 | */ |
179 | - public function _jsonArrayOn($event,$element, $maskSelector,$url,$parameters=array()) { |
|
179 | + public function _jsonArrayOn($event, $element, $maskSelector, $url, $parameters=array()) { |
|
180 | 180 | $preventDefault=true; |
181 | 181 | $stopPropagation=true; |
182 | 182 | $jsCallback=null; |
183 | 183 | $attr="id"; |
184 | 184 | $method="get"; |
185 | - $context = null; |
|
185 | + $context=null; |
|
186 | 186 | $params="{}"; |
187 | 187 | $immediatly=true; |
188 | 188 | extract($parameters); |
189 | - return $this->_add_event($element, $this->_jsonArray($maskSelector,$url,$method, $params,$jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation,$immediatly); |
|
189 | + return $this->_add_event($element, $this->_jsonArray($maskSelector, $url, $method, $params, $jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation, $immediatly); |
|
190 | 190 | } |
191 | 191 | |
192 | - public function _postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) { |
|
192 | + public function _postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) { |
|
193 | 193 | $jsCallback=isset($jsCallback) ? $jsCallback : ""; |
194 | 194 | $retour=$this->_getAjaxUrl($url, $attr); |
195 | 195 | $retour.="\nvar params=$('#".$form."').serialize();\n"; |
196 | 196 | $responseElement=$this->_getResponseElement($responseElement); |
197 | 197 | $retour.="var self=this;\n"; |
198 | - if($hasLoader===true){ |
|
198 | + if ($hasLoader===true) { |
|
199 | 199 | $this->addLoading($retour, $responseElement); |
200 | 200 | } |
201 | 201 | $retour.="$.post(url,params).done(function( data ) {\n"; |
@@ -222,7 +222,7 @@ discard block |
||
222 | 222 | * @param string $responseElement |
223 | 223 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true) |
224 | 224 | */ |
225 | - public function _getOn($event,$element, $url, $params="{}", $responseElement="", $parameters=array()) { |
|
225 | + public function _getOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) { |
|
226 | 226 | $preventDefault=true; |
227 | 227 | $stopPropagation=true; |
228 | 228 | $jsCallback=null; |
@@ -230,7 +230,7 @@ discard block |
||
230 | 230 | $hasLoader=true; |
231 | 231 | $immediatly=true; |
232 | 232 | extract($parameters); |
233 | - return $this->_add_event($element, $this->_get($url, $params, $responseElement, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation,$immediatly); |
|
233 | + return $this->_add_event($element, $this->_get($url, $params, $responseElement, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation, $immediatly); |
|
234 | 234 | } |
235 | 235 | |
236 | 236 | /** |
@@ -243,7 +243,7 @@ discard block |
||
243 | 243 | * @param string $responseElement |
244 | 244 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true) |
245 | 245 | */ |
246 | - public function _postOn($event,$element, $url, $params="{}", $responseElement="", $parameters=array()) { |
|
246 | + public function _postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) { |
|
247 | 247 | $preventDefault=true; |
248 | 248 | $stopPropagation=true; |
249 | 249 | $jsCallback=null; |
@@ -251,7 +251,7 @@ discard block |
||
251 | 251 | $hasLoader=true; |
252 | 252 | $immediatly=true; |
253 | 253 | extract($parameters); |
254 | - return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation,$immediatly); |
|
254 | + return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation, $immediatly); |
|
255 | 255 | } |
256 | 256 | |
257 | 257 | /** |
@@ -264,7 +264,7 @@ discard block |
||
264 | 264 | * @param string $responseElement |
265 | 265 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true) |
266 | 266 | */ |
267 | - public function _postFormOn($event,$element, $url, $form, $responseElement="", $parameters=array()) { |
|
267 | + public function _postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) { |
|
268 | 268 | $preventDefault=true; |
269 | 269 | $stopPropagation=true; |
270 | 270 | $validation=false; |
@@ -273,6 +273,6 @@ discard block |
||
273 | 273 | $hasLoader=true; |
274 | 274 | $immediatly=true; |
275 | 275 | extract($parameters); |
276 | - return $this->_add_event($element, $this->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation,$immediatly); |
|
276 | + return $this->_add_event($element, $this->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation, $immediatly); |
|
277 | 277 | } |
278 | 278 | } |
279 | 279 | \ No newline at end of file |
@@ -46,8 +46,9 @@ discard block |
||
46 | 46 | } |
47 | 47 | $retour.="$.".$method."(url,".$params.").done(function( data ) {\n"; |
48 | 48 | $retour.=$this->_getOnAjaxDone($responseElement, $jsCallback)."});\n"; |
49 | - if ($immediatly) |
|
50 | - $this->jquery_code_for_compile[]=$retour; |
|
49 | + if ($immediatly) { |
|
50 | + $this->jquery_code_for_compile[]=$retour; |
|
51 | + } |
|
51 | 52 | return $retour; |
52 | 53 | } |
53 | 54 | |
@@ -55,15 +56,17 @@ discard block |
||
55 | 56 | $url=$this->_correctAjaxUrl($url); |
56 | 57 | $retour="url='".$url."';\n"; |
57 | 58 | $slash="/"; |
58 | - if(JString::endswith($url, "/")===true) |
|
59 | - $slash=""; |
|
59 | + if(JString::endswith($url, "/")===true) { |
|
60 | + $slash=""; |
|
61 | + } |
|
60 | 62 | if(JString::isNotNull($attr)){ |
61 | - if ($attr==="value") |
|
62 | - $retour.="url=url+'".$slash."'+$(this).val();\n"; |
|
63 | - elseif ($attr==="html") |
|
64 | - $retour.="url=url+'".$slash."'+$(this).html();\n"; |
|
65 | - elseif($attr!=null && $attr!=="") |
|
66 | - $retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n"; |
|
63 | + if ($attr==="value") { |
|
64 | + $retour.="url=url+'".$slash."'+$(this).val();\n"; |
|
65 | + } elseif ($attr==="html") { |
|
66 | + $retour.="url=url+'".$slash."'+$(this).html();\n"; |
|
67 | + } elseif($attr!=null && $attr!=="") { |
|
68 | + $retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n"; |
|
69 | + } |
|
67 | 70 | } |
68 | 71 | return $retour; |
69 | 72 | } |
@@ -74,7 +77,7 @@ discard block |
||
74 | 77 | if(JString::startswith($responseElement, "\"-")===true){ |
75 | 78 | $responseElement=\str_replace("\"-", "\"", $responseElement); |
76 | 79 | $retour="\t$({$responseElement}).replaceWith( data );\n"; |
77 | - }else{ |
|
80 | + } else{ |
|
78 | 81 | $retour="\t$({$responseElement}).html( data );\n"; |
79 | 82 | } |
80 | 83 | } |
@@ -90,8 +93,9 @@ discard block |
||
90 | 93 | } |
91 | 94 | |
92 | 95 | protected function _correctAjaxUrl($url) { |
93 | - if ($url!=="/" && JString::endsWith($url, "/")===true) |
|
94 | - $url=substr($url, 0, strlen($url)-1); |
|
96 | + if ($url!=="/" && JString::endsWith($url, "/")===true) { |
|
97 | + $url=substr($url, 0, strlen($url)-1); |
|
98 | + } |
|
95 | 99 | if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) { |
96 | 100 | $url=$this->jsUtils->getUrl($url); |
97 | 101 | } |
@@ -115,8 +119,9 @@ discard block |
||
115 | 119 | $retour.="\t".$jsCallback."\n". |
116 | 120 | "\t$(document).trigger('jsonReady',[data]);\n". |
117 | 121 | "});\n"; |
118 | - if ($immediatly) |
|
119 | - $this->jquery_code_for_compile[]=$retour; |
|
122 | + if ($immediatly) { |
|
123 | + $this->jquery_code_for_compile[]=$retour; |
|
124 | + } |
|
120 | 125 | return $retour; |
121 | 126 | } |
122 | 127 | |
@@ -155,7 +160,7 @@ discard block |
||
155 | 160 | if($context===null){ |
156 | 161 | $appendTo="\t\tnewElm.appendTo($('".$maskSelector."').parent());\n"; |
157 | 162 | $newElm = "$('#'+newId)"; |
158 | - }else{ |
|
163 | + } else{ |
|
159 | 164 | $appendTo="\t\tnewElm.appendTo(".$context.");\n"; |
160 | 165 | $newElm = $context.".find('#'+newId)"; |
161 | 166 | } |
@@ -165,8 +170,9 @@ discard block |
||
165 | 170 | $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"; |
166 | 171 | $retour.="\t$(document).trigger('jsonReady',[data]);\n"; |
167 | 172 | $retour.="\t".$jsCallback."\n"."});\n"; |
168 | - if ($immediatly) |
|
169 | - $this->jquery_code_for_compile[]=$retour; |
|
173 | + if ($immediatly) { |
|
174 | + $this->jquery_code_for_compile[]=$retour; |
|
175 | + } |
|
170 | 176 | return $retour; |
171 | 177 | } |
172 | 178 | /** |
@@ -207,8 +213,9 @@ discard block |
||
207 | 213 | }});\n"; |
208 | 214 | $retour.="$('#".$form."').submit();\n"; |
209 | 215 | } |
210 | - if ($immediatly) |
|
211 | - $this->jquery_code_for_compile[]=$retour; |
|
216 | + if ($immediatly) { |
|
217 | + $this->jquery_code_for_compile[]=$retour; |
|
218 | + } |
|
212 | 219 | return $retour; |
213 | 220 | } |
214 | 221 |
@@ -8,34 +8,34 @@ discard block |
||
8 | 8 | private $page_count; |
9 | 9 | private $pages_visibles; |
10 | 10 | |
11 | - public function __construct($items_per_page=10,$pages_visibles=4,$page=1){ |
|
11 | + public function __construct($items_per_page=10, $pages_visibles=4, $page=1) { |
|
12 | 12 | $this->items_per_page=$items_per_page; |
13 | 13 | $this->page=$page; |
14 | 14 | $this->pages_visibles=$pages_visibles; |
15 | 15 | $this->visible=true; |
16 | 16 | } |
17 | 17 | |
18 | - public function getObjects($objects){ |
|
19 | - $offset = ($this->page - 1) * $this->items_per_page; |
|
18 | + public function getObjects($objects) { |
|
19 | + $offset=($this->page-1)*$this->items_per_page; |
|
20 | 20 | $os=$objects; |
21 | - if(\is_array($os)===false){ |
|
21 | + if (\is_array($os)===false) { |
|
22 | 22 | $os=[]; |
23 | - foreach ($objects as $o){ |
|
23 | + foreach ($objects as $o) { |
|
24 | 24 | $os[]=$o; |
25 | 25 | } |
26 | 26 | } |
27 | - $this->page_count = 0; |
|
27 | + $this->page_count=0; |
|
28 | 28 | $row_count=\sizeof($os); |
29 | - if (0 === $row_count) { |
|
29 | + if (0===$row_count) { |
|
30 | 30 | $this->visible=false; |
31 | 31 | } else { |
32 | 32 | $this->visible=true; |
33 | - $this->page_count = (int)ceil($row_count / $this->items_per_page); |
|
34 | - if($this->page > $this->page_count+1) { |
|
35 | - $this->page = 1; |
|
33 | + $this->page_count=(int)ceil($row_count/$this->items_per_page); |
|
34 | + if ($this->page>$this->page_count+1) { |
|
35 | + $this->page=1; |
|
36 | 36 | } |
37 | 37 | } |
38 | - return array_slice($os, $offset,$this->items_per_page); |
|
38 | + return array_slice($os, $offset, $this->items_per_page); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | public function getItemsPerPage() { |
@@ -69,14 +69,14 @@ discard block |
||
69 | 69 | return $this->page_count; |
70 | 70 | } |
71 | 71 | |
72 | - public function getPagesNumbers(){ |
|
73 | - $middle= (int)ceil(($this->pages_visibles-1)/ 2); |
|
72 | + public function getPagesNumbers() { |
|
73 | + $middle=(int)ceil(($this->pages_visibles-1)/2); |
|
74 | 74 | $first=$this->page-$middle; |
75 | - if($first<1){ |
|
75 | + if ($first<1) { |
|
76 | 76 | $first=1; |
77 | 77 | } |
78 | 78 | $last=$first+$this->pages_visibles-1; |
79 | - if($last>$this->page_count){ |
|
79 | + if ($last>$this->page_count) { |
|
80 | 80 | $last=$this->page_count; |
81 | 81 | } |
82 | 82 | return \range($first, $last); |
@@ -13,7 +13,7 @@ |
||
13 | 13 | * @param array $instances |
14 | 14 | * @return DataTable |
15 | 15 | */ |
16 | - public function dataTable($identifier,$model, $instances){ |
|
17 | - return $this->addHtmlComponent(new DataTable($identifier,$model,$instances)); |
|
16 | + public function dataTable($identifier, $model, $instances) { |
|
17 | + return $this->addHtmlComponent(new DataTable($identifier, $model, $instances)); |
|
18 | 18 | } |
19 | 19 | } |
20 | 20 | \ No newline at end of file |
@@ -7,20 +7,20 @@ |
||
7 | 7 | |
8 | 8 | use Ajax\semantic\html\elements\HtmlIcon; |
9 | 9 | |
10 | -class HtmlPaginationMenu extends HtmlMenu{ |
|
10 | +class HtmlPaginationMenu extends HtmlMenu { |
|
11 | 11 | private $_page; |
12 | - public function __construct( $identifier, $items=array() ){ |
|
13 | - parent::__construct( $identifier,$items); |
|
12 | + public function __construct($identifier, $items=array()) { |
|
13 | + parent::__construct($identifier, $items); |
|
14 | 14 | } |
15 | 15 | /** |
16 | 16 | * {@inheritDoc} |
17 | 17 | * @see \Ajax\common\html\BaseHtml::compile() |
18 | 18 | */ |
19 | - public function compile(JsUtils $js=NULL,&$view=NULL){ |
|
20 | - $this->insertItem(new HtmlIcon("", "left chevron"))->setProperty("data-page", \max([1,$this->_page-1])); |
|
21 | - $this->addItem(new HtmlIcon("", "right chevron"))->setProperty("data-page", \min([\sizeof($this->content)-2,$this->_page+1])); |
|
19 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
20 | + $this->insertItem(new HtmlIcon("", "left chevron"))->setProperty("data-page", \max([1, $this->_page-1])); |
|
21 | + $this->addItem(new HtmlIcon("", "right chevron"))->setProperty("data-page", \min([\sizeof($this->content)-2, $this->_page+1])); |
|
22 | 22 | $this->asPagination(); |
23 | - return parent::compile($js,$view); |
|
23 | + return parent::compile($js, $view); |
|
24 | 24 | } |
25 | 25 | |
26 | 26 | public function setActiveItem($index) { |
@@ -21,10 +21,10 @@ discard block |
||
21 | 21 | |
22 | 22 | public function __construct($identifier, $rowCount, $colCount) { |
23 | 23 | parent::__construct($identifier, "table", "ui table"); |
24 | - $this->content=array (); |
|
24 | + $this->content=array(); |
|
25 | 25 | $this->setRowCount($rowCount, $colCount); |
26 | - $this->_variations=[ Variation::CELLED,Variation::PADDED,Variation::COMPACT ]; |
|
27 | - $this->_compileParts=["thead","tbody","tfoot"]; |
|
26 | + $this->_variations=[Variation::CELLED, Variation::PADDED, Variation::COMPACT]; |
|
27 | + $this->_compileParts=["thead", "tbody", "tfoot"]; |
|
28 | 28 | } |
29 | 29 | |
30 | 30 | /** |
@@ -33,9 +33,9 @@ discard block |
||
33 | 33 | * @return HtmlTableContent |
34 | 34 | */ |
35 | 35 | public function getPart($key) { |
36 | - if (\array_key_exists($key, $this->content) === false) { |
|
36 | + if (\array_key_exists($key, $this->content)===false) { |
|
37 | 37 | $this->content[$key]=new HtmlTableContent("", $key); |
38 | - if ($key !== "tbody") { |
|
38 | + if ($key!=="tbody") { |
|
39 | 39 | $this->content[$key]->setRowCount(1, $this->_colCount); |
40 | 40 | } |
41 | 41 | } |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | * @return boolean |
73 | 73 | */ |
74 | 74 | public function hasPart($key) { |
75 | - return \array_key_exists($key, $this->content) === true; |
|
75 | + return \array_key_exists($key, $this->content)===true; |
|
76 | 76 | } |
77 | 77 | |
78 | 78 | /** |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | |
178 | 178 | private function colAlign($colIndex, $function) { |
179 | 179 | if (\is_array($colIndex)) { |
180 | - foreach ( $colIndex as $cIndex ) { |
|
180 | + foreach ($colIndex as $cIndex) { |
|
181 | 181 | $this->colAlign($cIndex, $function); |
182 | 182 | } |
183 | 183 | } else { |
@@ -195,8 +195,8 @@ discard block |
||
195 | 195 | |
196 | 196 | public function setBasic($very=false) { |
197 | 197 | if ($very) |
198 | - $this->addToPropertyCtrl("class", "very", array ("very" )); |
|
199 | - return $this->addToPropertyCtrl("class", "basic", array ("basic" )); |
|
198 | + $this->addToPropertyCtrl("class", "very", array("very")); |
|
199 | + return $this->addToPropertyCtrl("class", "basic", array("basic")); |
|
200 | 200 | } |
201 | 201 | |
202 | 202 | public function setCollapsing() { |
@@ -257,12 +257,12 @@ discard block |
||
257 | 257 | * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile() |
258 | 258 | */ |
259 | 259 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
260 | - if(\sizeof($this->_compileParts)<3){ |
|
260 | + if (\sizeof($this->_compileParts)<3) { |
|
261 | 261 | $this->_template="%content%"; |
262 | 262 | $this->refresh(); |
263 | - }else{ |
|
263 | + } else { |
|
264 | 264 | if ($this->propertyContains("class", "sortable")) { |
265 | - $this->addEvent("execute", "$('#" . $this->identifier . "').tablesort();"); |
|
265 | + $this->addEvent("execute", "$('#".$this->identifier."').tablesort();"); |
|
266 | 266 | } |
267 | 267 | } |
268 | 268 | $this->content=JArray::sortAssociative($this->content, $this->_compileParts); |
@@ -293,14 +293,14 @@ discard block |
||
293 | 293 | return $this; |
294 | 294 | } |
295 | 295 | |
296 | - public function refresh(){ |
|
296 | + public function refresh() { |
|
297 | 297 | $this->_footer=$this->getFooter(); |
298 | 298 | $this->addEvent("execute", '$("#'.$this->identifier.' tfoot").replaceWith("'.\addslashes($this->_footer).'");'); |
299 | 299 | } |
300 | 300 | |
301 | - public function run(JsUtils $js){ |
|
302 | - $result= parent::run($js); |
|
303 | - if(isset($this->_footer)) |
|
301 | + public function run(JsUtils $js) { |
|
302 | + $result=parent::run($js); |
|
303 | + if (isset($this->_footer)) |
|
304 | 304 | $this->_footer->run($js); |
305 | 305 | return $result; |
306 | 306 | } |
@@ -194,8 +194,9 @@ discard block |
||
194 | 194 | } |
195 | 195 | |
196 | 196 | public function setBasic($very=false) { |
197 | - if ($very) |
|
198 | - $this->addToPropertyCtrl("class", "very", array ("very" )); |
|
197 | + if ($very) { |
|
198 | + $this->addToPropertyCtrl("class", "very", array ("very" )); |
|
199 | + } |
|
199 | 200 | return $this->addToPropertyCtrl("class", "basic", array ("basic" )); |
200 | 201 | } |
201 | 202 | |
@@ -260,7 +261,7 @@ discard block |
||
260 | 261 | if(\sizeof($this->_compileParts)<3){ |
261 | 262 | $this->_template="%content%"; |
262 | 263 | $this->refresh(); |
263 | - }else{ |
|
264 | + } else{ |
|
264 | 265 | if ($this->propertyContains("class", "sortable")) { |
265 | 266 | $this->addEvent("execute", "$('#" . $this->identifier . "').tablesort();"); |
266 | 267 | } |
@@ -300,8 +301,9 @@ discard block |
||
300 | 301 | |
301 | 302 | public function run(JsUtils $js){ |
302 | 303 | $result= parent::run($js); |
303 | - if(isset($this->_footer)) |
|
304 | - $this->_footer->run($js); |
|
304 | + if(isset($this->_footer)) { |
|
305 | + $this->_footer->run($js); |
|
306 | + } |
|
305 | 307 | return $result; |
306 | 308 | } |
307 | 309 |
@@ -10,13 +10,13 @@ discard block |
||
10 | 10 | use Ajax\JsUtils; |
11 | 11 | |
12 | 12 | class HtmlInput extends HtmlSemDoubleElement { |
13 | - use IconTrait,TextFieldsTrait,FieldTrait; |
|
13 | + use IconTrait, TextFieldsTrait, FieldTrait; |
|
14 | 14 | |
15 | 15 | public function __construct($identifier, $type="text", $value="", $placeholder="") { |
16 | - parent::__construct("div-" . $identifier, "div", "ui input"); |
|
17 | - $this->content=[ "field" => new \Ajax\common\html\html5\HtmlInput($identifier, $type, $value, $placeholder) ]; |
|
18 | - $this->_states=[ State::DISABLED,State::FOCUS,State::ERROR ]; |
|
19 | - $this->_variations=[ Variation::TRANSPARENT ]; |
|
16 | + parent::__construct("div-".$identifier, "div", "ui input"); |
|
17 | + $this->content=["field" => new \Ajax\common\html\html5\HtmlInput($identifier, $type, $value, $placeholder)]; |
|
18 | + $this->_states=[State::DISABLED, State::FOCUS, State::ERROR]; |
|
19 | + $this->_variations=[Variation::TRANSPARENT]; |
|
20 | 20 | } |
21 | 21 | |
22 | 22 | public function getField() { |
@@ -36,11 +36,11 @@ discard block |
||
36 | 36 | |
37 | 37 | public function run(JsUtils $js) { |
38 | 38 | $result=parent::run($js); |
39 | - $result->attach("#" . $this->getDataField()->getIdentifier()); |
|
39 | + $result->attach("#".$this->getDataField()->getIdentifier()); |
|
40 | 40 | return $result; |
41 | 41 | } |
42 | 42 | |
43 | - public function setTransparent(){ |
|
43 | + public function setTransparent() { |
|
44 | 44 | return $this->addToProperty("class", "transparent"); |
45 | 45 | } |
46 | 46 | } |
47 | 47 | \ No newline at end of file |
@@ -2,33 +2,33 @@ |
||
2 | 2 | namespace Ajax\service; |
3 | 3 | class JString { |
4 | 4 | |
5 | - public static function contains($hay,$needle){ |
|
6 | - return strpos($hay, $needle) !== false; |
|
5 | + public static function contains($hay, $needle) { |
|
6 | + return strpos($hay, $needle)!==false; |
|
7 | 7 | } |
8 | 8 | public static function startswith($hay, $needle) { |
9 | - return substr($hay, 0, strlen($needle)) === $needle; |
|
9 | + return substr($hay, 0, strlen($needle))===$needle; |
|
10 | 10 | } |
11 | 11 | |
12 | 12 | public static function endswith($hay, $needle) { |
13 | - return substr($hay, -strlen($needle)) === $needle; |
|
13 | + return substr($hay, -strlen($needle))===$needle; |
|
14 | 14 | } |
15 | 15 | |
16 | - public static function isNull($s){ |
|
16 | + public static function isNull($s) { |
|
17 | 17 | return (!isset($s) || NULL===$s || ""===$s); |
18 | 18 | } |
19 | - public static function isNotNull($s){ |
|
19 | + public static function isNotNull($s) { |
|
20 | 20 | return (isset($s) && NULL!==$s && ""!==$s); |
21 | 21 | } |
22 | 22 | |
23 | - public static function isBoolean($value){ |
|
23 | + public static function isBoolean($value) { |
|
24 | 24 | return \is_bool($value) || $value==1 || $value==0; |
25 | 25 | } |
26 | 26 | |
27 | - public static function isBooleanTrue($value){ |
|
27 | + public static function isBooleanTrue($value) { |
|
28 | 28 | return $value==1 || $value; |
29 | 29 | } |
30 | 30 | |
31 | - public static function isBooleanFalse($value){ |
|
31 | + public static function isBooleanFalse($value) { |
|
32 | 32 | return $value==0 || !$value; |
33 | 33 | } |
34 | 34 | } |
35 | 35 | \ No newline at end of file |