@@ -17,11 +17,11 @@ discard block |
||
17 | 17 | protected $ajaxLoader="<div class=\"ui active centered inline text loader\">Loading</div>"; |
18 | 18 | |
19 | 19 | abstract public function getUrl($url); |
20 | - abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true); |
|
21 | - abstract public function interval($jsCode,$time,$globalName=null,$immediatly=true); |
|
20 | + abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true); |
|
21 | + abstract public function interval($jsCode, $time, $globalName=null, $immediatly=true); |
|
22 | 22 | |
23 | - protected function _ajax($method,$url,$responseElement="",$parameters=[]) { |
|
24 | - if(isset($this->params["ajax"])){ |
|
23 | + protected function _ajax($method, $url, $responseElement="", $parameters=[]) { |
|
24 | + if (isset($this->params["ajax"])) { |
|
25 | 25 | extract($this->params["ajax"]); |
26 | 26 | } |
27 | 27 | extract($parameters); |
@@ -31,109 +31,109 @@ discard block |
||
31 | 31 | $originalSelector=$responseElement; |
32 | 32 | $responseElement=$this->_getResponseElement($responseElement); |
33 | 33 | $retour.="var self=this;\n"; |
34 | - if($hasLoader===true && JString::isNotNull($responseElement)){ |
|
35 | - $this->addLoading($retour, $responseElement,$ajaxLoader); |
|
36 | - }elseif($hasLoader==="internal"){ |
|
34 | + if ($hasLoader===true && JString::isNotNull($responseElement)) { |
|
35 | + $this->addLoading($retour, $responseElement, $ajaxLoader); |
|
36 | + }elseif ($hasLoader==="internal") { |
|
37 | 37 | $retour.="\n$(this).addClass('loading');"; |
38 | 38 | } |
39 | - $ajaxParameters=["url"=>"url","method"=>"'".\strtoupper($method)."'"]; |
|
39 | + $ajaxParameters=["url"=>"url", "method"=>"'".\strtoupper($method)."'"]; |
|
40 | 40 | |
41 | - $ajaxParameters["async"]=($async?"true":"false"); |
|
41 | + $ajaxParameters["async"]=($async ? "true" : "false"); |
|
42 | 42 | |
43 | - if(isset($params)){ |
|
43 | + if (isset($params)) { |
|
44 | 44 | $ajaxParameters["data"]=self::_correctParams($params); |
45 | 45 | } |
46 | - if(isset($headers)){ |
|
46 | + if (isset($headers)) { |
|
47 | 47 | $ajaxParameters["headers"]=$headers; |
48 | 48 | } |
49 | 49 | $this->createAjaxParameters($ajaxParameters, $parameters); |
50 | 50 | $retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data, textStatus, jqXHR ) {\n"; |
51 | - $retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback,$hasLoader,($historize?$originalSelector:null))."});\n"; |
|
52 | - $retour=$this->_addJsCondition($jsCondition,$retour); |
|
51 | + $retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader, ($historize ? $originalSelector : null))."});\n"; |
|
52 | + $retour=$this->_addJsCondition($jsCondition, $retour); |
|
53 | 53 | if ($immediatly) |
54 | 54 | $this->jquery_code_for_compile[]=$retour; |
55 | 55 | return $retour; |
56 | 56 | } |
57 | 57 | |
58 | - protected function createAjaxParameters(&$original,$parameters){ |
|
59 | - $validParameters=["dataType"=>"'%value%'","beforeSend"=>"function(jqXHR,settings){%value%}","complete"=>"function(jqXHR){%value%}"]; |
|
60 | - foreach ($validParameters as $param=>$mask){ |
|
61 | - if(isset($parameters[$param])){ |
|
58 | + protected function createAjaxParameters(&$original, $parameters) { |
|
59 | + $validParameters=["dataType"=>"'%value%'", "beforeSend"=>"function(jqXHR,settings){%value%}", "complete"=>"function(jqXHR){%value%}"]; |
|
60 | + foreach ($validParameters as $param=>$mask) { |
|
61 | + if (isset($parameters[$param])) { |
|
62 | 62 | $original[$param]=\str_replace("%value%", $parameters[$param], $mask); |
63 | 63 | } |
64 | 64 | } |
65 | 65 | } |
66 | 66 | |
67 | - protected function implodeAjaxParameters($ajaxParameters){ |
|
68 | - $s = ''; foreach ($ajaxParameters as $k=>$v) { if ($s !== '') { $s .= ','; } $s .= "'{$k}':{$v}"; } |
|
67 | + protected function implodeAjaxParameters($ajaxParameters) { |
|
68 | + $s=''; foreach ($ajaxParameters as $k=>$v) { if ($s!=='') { $s.=','; } $s.="'{$k}':{$v}"; } |
|
69 | 69 | return $s; |
70 | 70 | } |
71 | 71 | |
72 | - protected function _addJsCondition($jsCondition,$jsSource){ |
|
73 | - if(isset($jsCondition)){ |
|
72 | + protected function _addJsCondition($jsCondition, $jsSource) { |
|
73 | + if (isset($jsCondition)) { |
|
74 | 74 | return "if(".$jsCondition."){\n".$jsSource."\n}"; |
75 | 75 | } |
76 | 76 | return $jsSource; |
77 | 77 | } |
78 | 78 | |
79 | 79 | |
80 | - protected function _getAjaxUrl($url,$attr){ |
|
80 | + protected function _getAjaxUrl($url, $attr) { |
|
81 | 81 | $url=$this->_correctAjaxUrl($url); |
82 | 82 | $retour="url='".$url."';"; |
83 | 83 | $slash="/"; |
84 | - if(JString::endswith($url, "/")===true){ |
|
84 | + if (JString::endswith($url, "/")===true) { |
|
85 | 85 | $slash=""; |
86 | 86 | } |
87 | - if(JString::isNotNull($attr)){ |
|
88 | - if ($attr==="value"){ |
|
87 | + if (JString::isNotNull($attr)) { |
|
88 | + if ($attr==="value") { |
|
89 | 89 | $retour.="url=url+'".$slash."'+$(this).val();\n"; |
90 | - }elseif ($attr==="html"){ |
|
90 | + }elseif ($attr==="html") { |
|
91 | 91 | $retour.="url=url+'".$slash."'+$(this).html();\n"; |
92 | - }elseif(\substr($attr, 0,3)==="js:"){ |
|
92 | + }elseif (\substr($attr, 0, 3)==="js:") { |
|
93 | 93 | $retour.="url=url+'".$slash."'+".\substr($attr, 3).";\n"; |
94 | - }elseif($attr!==null && $attr!=="") |
|
94 | + }elseif ($attr!==null && $attr!=="") |
|
95 | 95 | $retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n"; |
96 | 96 | } |
97 | 97 | return $retour; |
98 | 98 | } |
99 | 99 | |
100 | - protected function onPopstate(){ |
|
100 | + protected function onPopstate() { |
|
101 | 101 | return "window.onpopstate = function(e){if(e.state){var target=e.state.jqueryDone;$(e.state.selector)[target](e.state.html);}};"; |
102 | 102 | } |
103 | 103 | |
104 | - protected function autoActiveLinks($previousURL="window.location.href"){ |
|
105 | - $result= "\nfunction getHref(url) { return \$('a').filter(function(){return \$(this).prop('href') == url; });}"; |
|
104 | + protected function autoActiveLinks($previousURL="window.location.href") { |
|
105 | + $result="\nfunction getHref(url) { return \$('a').filter(function(){return \$(this).prop('href') == url; });}"; |
|
106 | 106 | $result.="\nvar myurl={$previousURL};if(window._previousURL) getHref(window._previousURL).removeClass('active');getHref(myurl).addClass('active');window._previousURL=myurl;"; |
107 | 107 | return $result; |
108 | 108 | } |
109 | 109 | |
110 | - protected function _getOnAjaxDone($responseElement,$jqueryDone,$ajaxTransition,$jsCallback,$hasLoader=false,$history=null){ |
|
111 | - $retour="";$call=null; |
|
110 | + protected function _getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader=false, $history=null) { |
|
111 | + $retour=""; $call=null; |
|
112 | 112 | if (JString::isNotNull($responseElement)) { |
113 | - if(isset($ajaxTransition)){ |
|
113 | + if (isset($ajaxTransition)) { |
|
114 | 114 | $call=$this->setAjaxDataCall($ajaxTransition); |
115 | - }elseif(isset($this->ajaxTransition)){ |
|
115 | + }elseif (isset($this->ajaxTransition)) { |
|
116 | 116 | $call=$this->ajaxTransition; |
117 | 117 | } |
118 | - if(\is_callable($call)) |
|
119 | - $retour="\t".$call($responseElement,$jqueryDone).";\n"; |
|
118 | + if (\is_callable($call)) |
|
119 | + $retour="\t".$call($responseElement, $jqueryDone).";\n"; |
|
120 | 120 | else |
121 | 121 | $retour="\t{$responseElement}.{$jqueryDone}( data );\n"; |
122 | 122 | } |
123 | - if(isset($history)){ |
|
124 | - if($this->params["autoActiveLinks"]){ |
|
123 | + if (isset($history)) { |
|
124 | + if ($this->params["autoActiveLinks"]) { |
|
125 | 125 | $retour.=$this->autoActiveLinks("url"); |
126 | 126 | } |
127 | 127 | $retour.="\nwindow.history.pushState({'html':data,'selector':".Javascript::prep_value($history).",'jqueryDone':'{$jqueryDone}'},'', url);"; |
128 | 128 | } |
129 | - if($hasLoader==="internal"){ |
|
129 | + if ($hasLoader==="internal") { |
|
130 | 130 | $retour.="\n$(self).removeClass('loading');"; |
131 | 131 | } |
132 | 132 | $retour.="\t".$jsCallback."\n"; |
133 | 133 | return $retour; |
134 | 134 | } |
135 | 135 | |
136 | - protected function _getResponseElement($responseElement){ |
|
136 | + protected function _getResponseElement($responseElement) { |
|
137 | 137 | if (JString::isNotNull($responseElement)) { |
138 | 138 | $responseElement=Javascript::prep_jquery_selector($responseElement); |
139 | 139 | } |
@@ -143,33 +143,33 @@ discard block |
||
143 | 143 | protected function _correctAjaxUrl($url) { |
144 | 144 | if ($url!=="/" && JString::endsWith($url, "/")===true) |
145 | 145 | $url=substr($url, 0, strlen($url)-1); |
146 | - if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) { |
|
146 | + if (strncmp($url, 'http://', 7)!=0 && strncmp($url, 'https://', 8)!=0) { |
|
147 | 147 | $url=$this->getUrl($url); |
148 | 148 | } |
149 | 149 | return $url; |
150 | 150 | } |
151 | 151 | |
152 | - public static function _correctParams($params){ |
|
153 | - if(JString::isNull($params)){ |
|
152 | + public static function _correctParams($params) { |
|
153 | + if (JString::isNull($params)) { |
|
154 | 154 | return ""; |
155 | 155 | } |
156 | - if(\preg_match("@^\{.*?\}$@", $params)){ |
|
156 | + if (\preg_match("@^\{.*?\}$@", $params)) { |
|
157 | 157 | return '$.param('.$params.')'; |
158 | 158 | } |
159 | 159 | return $params; |
160 | 160 | } |
161 | 161 | |
162 | - public static function _implodeParams($parameters){ |
|
162 | + public static function _implodeParams($parameters) { |
|
163 | 163 | $allParameters=[]; |
164 | - foreach ($parameters as $params){ |
|
165 | - if(isset($params)) |
|
164 | + foreach ($parameters as $params) { |
|
165 | + if (isset($params)) |
|
166 | 166 | $allParameters[]=self::_correctParams($params); |
167 | 167 | } |
168 | 168 | return \implode("+'&'+", $allParameters); |
169 | 169 | } |
170 | 170 | |
171 | - protected function addLoading(&$retour, $responseElement,$ajaxLoader=null) { |
|
172 | - if(!isset($ajaxLoader)){ |
|
171 | + protected function addLoading(&$retour, $responseElement, $ajaxLoader=null) { |
|
172 | + if (!isset($ajaxLoader)) { |
|
173 | 173 | $ajaxLoader=$this->ajaxLoader; |
174 | 174 | } |
175 | 175 | $loading_notifier='<div class="ajax-loader">'.$ajaxLoader.'</div>'; |
@@ -177,19 +177,19 @@ discard block |
||
177 | 177 | $retour.="\t\t{$responseElement}.prepend('{$loading_notifier}');\n"; |
178 | 178 | } |
179 | 179 | |
180 | - protected function setAjaxDataCall($params){ |
|
180 | + protected function setAjaxDataCall($params) { |
|
181 | 181 | $result=null; |
182 | - if(!\is_callable($params)){ |
|
183 | - $result=function ($responseElement,$jqueryDone="html") use($params){ |
|
184 | - return AjaxTransition::{$params}($responseElement,$jqueryDone); |
|
182 | + if (!\is_callable($params)) { |
|
183 | + $result=function($responseElement, $jqueryDone="html") use($params){ |
|
184 | + return AjaxTransition::{$params}($responseElement, $jqueryDone); |
|
185 | 185 | }; |
186 | 186 | } |
187 | 187 | return $result; |
188 | 188 | } |
189 | 189 | |
190 | - protected function setDefaultParameters(&$parameters,$default){ |
|
191 | - foreach ($default as $k=>$v){ |
|
192 | - if(!isset($parameters[$k])) |
|
190 | + protected function setDefaultParameters(&$parameters, $default) { |
|
191 | + foreach ($default as $k=>$v) { |
|
192 | + if (!isset($parameters[$k])) |
|
193 | 193 | $parameters[$k]=$v; |
194 | 194 | } |
195 | 195 | } |
@@ -203,8 +203,8 @@ discard block |
||
203 | 203 | * @param string $url The url of the request |
204 | 204 | * @param string $responseElement selector of the HTML element displaying the answer |
205 | 205 | */ |
206 | - private function _get($url, $responseElement="",$parameters=[]) { |
|
207 | - return $this->_ajax("get", $url,$responseElement,$parameters); |
|
206 | + private function _get($url, $responseElement="", $parameters=[]) { |
|
207 | + return $this->_ajax("get", $url, $responseElement, $parameters); |
|
208 | 208 | } |
209 | 209 | |
210 | 210 | /** |
@@ -213,9 +213,9 @@ discard block |
||
213 | 213 | * @param string $responseElement selector of the HTML element displaying the answer |
214 | 214 | * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
215 | 215 | */ |
216 | - public function get($url, $responseElement="",$parameters=[]) { |
|
216 | + public function get($url, $responseElement="", $parameters=[]) { |
|
217 | 217 | $parameters["immediatly"]=true; |
218 | - return $this->_get($url,$responseElement,$parameters); |
|
218 | + return $this->_get($url, $responseElement, $parameters); |
|
219 | 219 | } |
220 | 220 | |
221 | 221 | /** |
@@ -225,9 +225,9 @@ discard block |
||
225 | 225 | * @param string $responseElement selector of the HTML element displaying the answer |
226 | 226 | * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
227 | 227 | */ |
228 | - public function ajax($method,$url, $responseElement="", $parameters=[]) { |
|
228 | + public function ajax($method, $url, $responseElement="", $parameters=[]) { |
|
229 | 229 | $parameters["immediatly"]=true; |
230 | - return $this->_ajax($method,$url,$responseElement,$parameters); |
|
230 | + return $this->_ajax($method, $url, $responseElement, $parameters); |
|
231 | 231 | } |
232 | 232 | |
233 | 233 | /** |
@@ -239,8 +239,8 @@ discard block |
||
239 | 239 | * @param array $parameters The ajax parameters, default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
240 | 240 | * @return string |
241 | 241 | */ |
242 | - public function ajaxInterval($method,$url, $interval,$globalName=null,$responseElement="", $parameters=[]){ |
|
243 | - return $this->interval($this->ajaxDeferred($method, $url,$responseElement,$parameters), $interval,$globalName); |
|
242 | + public function ajaxInterval($method, $url, $interval, $globalName=null, $responseElement="", $parameters=[]) { |
|
243 | + return $this->interval($this->ajaxDeferred($method, $url, $responseElement, $parameters), $interval, $globalName); |
|
244 | 244 | } |
245 | 245 | |
246 | 246 | /** |
@@ -250,9 +250,9 @@ discard block |
||
250 | 250 | * @param string $responseElement selector of the HTML element displaying the answer |
251 | 251 | * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
252 | 252 | */ |
253 | - public function ajaxDeferred($method,$url, $responseElement="", $parameters=[]) { |
|
253 | + public function ajaxDeferred($method, $url, $responseElement="", $parameters=[]) { |
|
254 | 254 | $parameters["immediatly"]=false; |
255 | - return $this->_ajax($method,$url,$responseElement,$parameters); |
|
255 | + return $this->_ajax($method, $url, $responseElement, $parameters); |
|
256 | 256 | } |
257 | 257 | |
258 | 258 | /** |
@@ -261,8 +261,8 @@ discard block |
||
261 | 261 | * @param string $method Method used |
262 | 262 | * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>"document","jsCondition"=>NULL,"headers"=>null,"immediatly"=>false) |
263 | 263 | */ |
264 | - private function _json($url, $method="get",$parameters=[]) { |
|
265 | - $parameters=\array_merge($parameters,["hasLoader"=>false]); |
|
264 | + private function _json($url, $method="get", $parameters=[]) { |
|
265 | + $parameters=\array_merge($parameters, ["hasLoader"=>false]); |
|
266 | 266 | $jsCallback=isset($parameters['jsCallback']) ? $parameters['jsCallback'] : ""; |
267 | 267 | $context=isset($parameters['context']) ? $parameters['context'] : "document"; |
268 | 268 | $retour="\tdata=($.isPlainObject(data))?data:JSON.parse(data);\t".$jsCallback.";" |
@@ -270,7 +270,7 @@ discard block |
||
270 | 270 | ."if($('#'+key,".$context.").length){ if($('#'+key,".$context.").is('[value]')) { $('#'+key,".$context.").val(data[key]);} else { $('#'+key,".$context.").html(data[key]); }}};\n"; |
271 | 271 | $retour.="\t$(document).trigger('jsonReady',[data]);\n"; |
272 | 272 | $parameters["jsCallback"]=$retour; |
273 | - return $this->_ajax($method, $url,null,$parameters); |
|
273 | + return $this->_ajax($method, $url, null, $parameters); |
|
274 | 274 | } |
275 | 275 | |
276 | 276 | /** |
@@ -280,7 +280,7 @@ discard block |
||
280 | 280 | * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>"document","jsCondition"=>NULL,"headers"=>null,"immediatly"=>false) |
281 | 281 | */ |
282 | 282 | public function json($url, $method="get", $parameters=[]) { |
283 | - return $this->_json($url,$method,$parameters); |
|
283 | + return $this->_json($url, $method, $parameters); |
|
284 | 284 | } |
285 | 285 | |
286 | 286 | /** |
@@ -291,9 +291,9 @@ discard block |
||
291 | 291 | * @param string $method default get |
292 | 292 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true) |
293 | 293 | */ |
294 | - public function jsonOn($event,$element, $url,$method="get",$parameters=array()) { |
|
295 | - $this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]); |
|
296 | - return $this->_add_event($element, $this->jsonDeferred($url,$method, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]); |
|
294 | + public function jsonOn($event, $element, $url, $method="get", $parameters=array()) { |
|
295 | + $this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]); |
|
296 | + return $this->_add_event($element, $this->jsonDeferred($url, $method, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]); |
|
297 | 297 | } |
298 | 298 | |
299 | 299 | /** |
@@ -304,7 +304,7 @@ discard block |
||
304 | 304 | */ |
305 | 305 | public function jsonDeferred($url, $method="get", $parameters=[]) { |
306 | 306 | $parameters["immediatly"]=false; |
307 | - return $this->_json($url,$method,$parameters); |
|
307 | + return $this->_json($url, $method, $parameters); |
|
308 | 308 | } |
309 | 309 | |
310 | 310 | /** |
@@ -315,27 +315,27 @@ discard block |
||
315 | 315 | * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"rowClass"=>"_json") |
316 | 316 | */ |
317 | 317 | private function _jsonArray($maskSelector, $url, $method="get", $parameters=[]) { |
318 | - $parameters=\array_merge($parameters,["hasLoader"=>false]); |
|
318 | + $parameters=\array_merge($parameters, ["hasLoader"=>false]); |
|
319 | 319 | $rowClass=isset($parameters['rowClass']) ? $parameters['rowClass'] : "_json"; |
320 | 320 | $jsCallback=isset($parameters['jsCallback']) ? $parameters['jsCallback'] : ""; |
321 | 321 | $context=isset($parameters['context']) ? $parameters['context'] : null; |
322 | - if($context===null){ |
|
322 | + if ($context===null) { |
|
323 | 323 | $parent="$('".$maskSelector."').parent()"; |
324 | - $newElm = "$('#'+newId)"; |
|
325 | - }else{ |
|
324 | + $newElm="$('#'+newId)"; |
|
325 | + } else { |
|
326 | 326 | $parent=$context; |
327 | - $newElm = $context.".find('#'+newId)"; |
|
327 | + $newElm=$context.".find('#'+newId)"; |
|
328 | 328 | } |
329 | 329 | $appendTo="\t\tnewElm.appendTo(".$parent.");\n"; |
330 | 330 | $retour=$parent.".find('.{$rowClass}').remove();"; |
331 | 331 | $retour.="\tdata=($.isPlainObject(data)||$.isArray(data))?data:JSON.parse(data);\n$.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(); |
332 | 332 | newElm.attr('id',newId);\n;newElm.addClass('{$rowClass}').removeClass('_jsonArrayModel');\nnewElm.find('[id]').each(function(){ var newId=$(this).attr('id')+'-'+index;$(this).attr('id',newId).removeClass('_jsonArrayChecked');});\n"; |
333 | - $retour.= $appendTo; |
|
333 | + $retour.=$appendTo; |
|
334 | 334 | $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"; |
335 | 335 | $retour.="\t$(document).trigger('jsonReady',[data]);\n"; |
336 | 336 | $retour.="\t".$jsCallback; |
337 | 337 | $parameters["jsCallback"]=$retour; |
338 | - return $this->_ajax($method, $url,null,$parameters); |
|
338 | + return $this->_ajax($method, $url, null, $parameters); |
|
339 | 339 | } |
340 | 340 | |
341 | 341 | /** |
@@ -346,7 +346,7 @@ discard block |
||
346 | 346 | * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"rowClass"=>"_json") |
347 | 347 | */ |
348 | 348 | public function jsonArray($maskSelector, $url, $method="get", $parameters=[]) { |
349 | - return $this->_jsonArray($maskSelector, $url,$method,$parameters); |
|
349 | + return $this->_jsonArray($maskSelector, $url, $method, $parameters); |
|
350 | 350 | } |
351 | 351 | |
352 | 352 | /** |
@@ -369,9 +369,9 @@ discard block |
||
369 | 369 | * @param string $method Method used, default : get |
370 | 370 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","rowClass"=>"_json","immediatly"=>true) |
371 | 371 | */ |
372 | - public function jsonArrayOn($event,$element,$maskSelector, $url,$method="get",$parameters=array()) { |
|
373 | - $this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]); |
|
374 | - return $this->_add_event($element, $this->jsonArrayDeferred($maskSelector,$url,$method, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]); |
|
372 | + public function jsonArrayOn($event, $element, $maskSelector, $url, $method="get", $parameters=array()) { |
|
373 | + $this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]); |
|
374 | + return $this->_add_event($element, $this->jsonArrayDeferred($maskSelector, $url, $method, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]); |
|
375 | 375 | } |
376 | 376 | |
377 | 377 | /** |
@@ -383,7 +383,7 @@ discard block |
||
383 | 383 | */ |
384 | 384 | public function getDeferred($url, $responseElement="", $parameters=[]) { |
385 | 385 | $parameters["immediatly"]=false; |
386 | - return $this->_get($url, $responseElement,$parameters); |
|
386 | + return $this->_get($url, $responseElement, $parameters); |
|
387 | 387 | } |
388 | 388 | |
389 | 389 | /** |
@@ -396,8 +396,8 @@ discard block |
||
396 | 396 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>null,"headers"=>null,"historize"=>false) |
397 | 397 | */ |
398 | 398 | public function getOn($event, $element, $url, $responseElement="", $parameters=array()) { |
399 | - $this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]); |
|
400 | - return $this->_add_event($element, $this->getDeferred($url,$responseElement,$parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]); |
|
399 | + $this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]); |
|
400 | + return $this->_add_event($element, $this->getDeferred($url, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]); |
|
401 | 401 | } |
402 | 402 | |
403 | 403 | /** |
@@ -410,8 +410,8 @@ discard block |
||
410 | 410 | * @param array $parameters default : array("method"=>"get","preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
411 | 411 | */ |
412 | 412 | public function ajaxOn($event, $element, $url, $responseElement="", $parameters=array()) { |
413 | - $this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true,"method"=>"get"]); |
|
414 | - return $this->_add_event($element, $this->ajaxDeferred($parameters["method"],$url,$responseElement,$parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]); |
|
413 | + $this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true, "method"=>"get"]); |
|
414 | + return $this->_add_event($element, $this->ajaxDeferred($parameters["method"], $url, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]); |
|
415 | 415 | } |
416 | 416 | |
417 | 417 | /** |
@@ -445,15 +445,15 @@ discard block |
||
445 | 445 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"href","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>true) |
446 | 446 | * @return $this |
447 | 447 | */ |
448 | - public function getHref($element,$responseElement="",$parameters=array()){ |
|
448 | + public function getHref($element, $responseElement="", $parameters=array()) { |
|
449 | 449 | $parameters["attr"]="href"; |
450 | - if(JString::isNull($responseElement)){ |
|
450 | + if (JString::isNull($responseElement)) { |
|
451 | 451 | $responseElement='%$(self).attr("data-target")%'; |
452 | 452 | } |
453 | - if(!isset($parameters["historize"])){ |
|
453 | + if (!isset($parameters["historize"])) { |
|
454 | 454 | $parameters["historize"]=true; |
455 | 455 | } |
456 | - return $this->getOnClick($element, "",$responseElement,$parameters); |
|
456 | + return $this->getOnClick($element, "", $responseElement, $parameters); |
|
457 | 457 | } |
458 | 458 | |
459 | 459 | /** |
@@ -463,20 +463,20 @@ discard block |
||
463 | 463 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"href","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
464 | 464 | * @return $this |
465 | 465 | */ |
466 | - public function postHref($element,$responseElement="",$parameters=array()){ |
|
466 | + public function postHref($element, $responseElement="", $parameters=array()) { |
|
467 | 467 | $parameters["attr"]="href"; |
468 | - if(JString::isNull($responseElement)){ |
|
468 | + if (JString::isNull($responseElement)) { |
|
469 | 469 | $responseElement='%$(this).attr("data-target")%'; |
470 | 470 | } |
471 | - if(!isset($parameters["historize"])){ |
|
471 | + if (!isset($parameters["historize"])) { |
|
472 | 472 | $parameters["historize"]=true; |
473 | 473 | } |
474 | - return $this->postOnClick($element, "","{}",$responseElement,$parameters); |
|
474 | + return $this->postOnClick($element, "", "{}", $responseElement, $parameters); |
|
475 | 475 | } |
476 | 476 | |
477 | - private function _post($url, $params="{}",$responseElement="", $parameters=[]) { |
|
477 | + private function _post($url, $params="{}", $responseElement="", $parameters=[]) { |
|
478 | 478 | $parameters["params"]=$params; |
479 | - return $this->_ajax("POST", $url,$responseElement,$parameters); |
|
479 | + return $this->_ajax("POST", $url, $responseElement, $parameters); |
|
480 | 480 | } |
481 | 481 | |
482 | 482 | /** |
@@ -486,8 +486,8 @@ discard block |
||
486 | 486 | * @param string $params JSON parameters |
487 | 487 | * @param array $parameters default : array("jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
488 | 488 | */ |
489 | - public function post($url, $params="{}",$responseElement="", $parameters=[]) { |
|
490 | - return $this->_post($url, $params,$responseElement, $parameters); |
|
489 | + public function post($url, $params="{}", $responseElement="", $parameters=[]) { |
|
490 | + return $this->_post($url, $params, $responseElement, $parameters); |
|
491 | 491 | } |
492 | 492 | |
493 | 493 | /** |
@@ -498,7 +498,7 @@ discard block |
||
498 | 498 | * @param string $responseElement selector of the HTML element displaying the answer |
499 | 499 | * @param array $parameters default : array("jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
500 | 500 | */ |
501 | - public function postDeferred($url, $params="{}",$responseElement="", $parameters=[]) { |
|
501 | + public function postDeferred($url, $params="{}", $responseElement="", $parameters=[]) { |
|
502 | 502 | $parameters["immediatly"]=false; |
503 | 503 | return $this->_post($url, $params, $responseElement, $parameters); |
504 | 504 | } |
@@ -514,8 +514,8 @@ discard block |
||
514 | 514 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
515 | 515 | */ |
516 | 516 | public function postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) { |
517 | - $this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]); |
|
518 | - return $this->_add_event($element, $this->postDeferred($url, $params, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]); |
|
517 | + $this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]); |
|
518 | + return $this->_add_event($element, $this->postDeferred($url, $params, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]); |
|
519 | 519 | } |
520 | 520 | |
521 | 521 | /** |
@@ -532,33 +532,33 @@ discard block |
||
532 | 532 | } |
533 | 533 | |
534 | 534 | private function _postForm($url, $form, $responseElement, $parameters=[]) { |
535 | - if(isset($this->params["ajax"])){ |
|
535 | + if (isset($this->params["ajax"])) { |
|
536 | 536 | extract($this->params["ajax"]); |
537 | 537 | } |
538 | - $params="{}";$validation=false; |
|
538 | + $params="{}"; $validation=false; |
|
539 | 539 | \extract($parameters); |
540 | - $async=($async)?"true":"false"; |
|
540 | + $async=($async) ? "true" : "false"; |
|
541 | 541 | $jsCallback=isset($jsCallback) ? $jsCallback : ""; |
542 | 542 | $retour=$this->_getAjaxUrl($url, $attr); |
543 | 543 | $retour.="\n$('#".$form."').trigger('ajaxSubmit');"; |
544 | 544 | $retour.="\nvar params=$('#".$form."').serialize();\n"; |
545 | - if(isset($params)){ |
|
545 | + if (isset($params)) { |
|
546 | 546 | $retour.="params+='&'+".self::_correctParams($params).";\n"; |
547 | 547 | } |
548 | 548 | $responseElement=$this->_getResponseElement($responseElement); |
549 | 549 | $retour.="var self=this;\n"; |
550 | - if($hasLoader===true){ |
|
551 | - $this->addLoading($retour, $responseElement,$ajaxLoader); |
|
552 | - }elseif($hasLoader==="internal"){ |
|
550 | + if ($hasLoader===true) { |
|
551 | + $this->addLoading($retour, $responseElement, $ajaxLoader); |
|
552 | + }elseif ($hasLoader==="internal") { |
|
553 | 553 | $retour.="\n$(this).addClass('loading');"; |
554 | 554 | } |
555 | - $ajaxParameters=["url"=>"url","method"=>"'POST'","data"=>"params","async"=>$async]; |
|
556 | - if(isset($headers)){ |
|
555 | + $ajaxParameters=["url"=>"url", "method"=>"'POST'", "data"=>"params", "async"=>$async]; |
|
556 | + if (isset($headers)) { |
|
557 | 557 | $ajaxParameters["headers"]=$headers; |
558 | 558 | } |
559 | 559 | $this->createAjaxParameters($ajaxParameters, $parameters); |
560 | 560 | $retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data ) {\n"; |
561 | - $retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback,$hasLoader)."});\n"; |
|
561 | + $retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader)."});\n"; |
|
562 | 562 | |
563 | 563 | if ($validation) { |
564 | 564 | $retour="$('#".$form."').validate({submitHandler: function(form) { |
@@ -608,8 +608,8 @@ discard block |
||
608 | 608 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>null,"headers"=>null,"historize"=>false) |
609 | 609 | */ |
610 | 610 | public function postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) { |
611 | - $this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]); |
|
612 | - return $this->_add_event($element, $this->postFormDeferred($url, $form, $responseElement,$parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]); |
|
611 | + $this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]); |
|
612 | + return $this->_add_event($element, $this->postFormDeferred($url, $form, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]); |
|
613 | 613 | } |
614 | 614 | |
615 | 615 | /** |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | */ |
12 | 12 | trait JsUtilsActionsTrait { |
13 | 13 | |
14 | - abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true); |
|
14 | + abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true); |
|
15 | 15 | /** |
16 | 16 | * show or hide with effect |
17 | 17 | * |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | * @param boolean $immediatly defers the execution if set to false |
23 | 23 | * @return string |
24 | 24 | */ |
25 | - protected function _showHideWithEffect($action,$element='this', $speed='', $callback='', $immediatly=false) { |
|
25 | + protected function _showHideWithEffect($action, $element='this', $speed='', $callback='', $immediatly=false) { |
|
26 | 26 | $element=Javascript::prep_element($element); |
27 | 27 | $speed=$this->_validate_speed($speed); |
28 | 28 | if ($callback!='') { |
@@ -39,8 +39,8 @@ discard block |
||
39 | 39 | * @return string |
40 | 40 | */ |
41 | 41 | private function _validate_speed($speed) { |
42 | - if (in_array($speed, array ( |
|
43 | - 'slow','normal','fast' |
|
42 | + if (in_array($speed, array( |
|
43 | + 'slow', 'normal', 'fast' |
|
44 | 44 | ))) { |
45 | 45 | $speed='"'.$speed.'"'; |
46 | 46 | } elseif (preg_match("/[^0-9]/", $speed)) { |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | * @param string $param |
58 | 58 | * @param boolean $immediatly delayed if false |
59 | 59 | */ |
60 | - public function _genericCallValue($jQueryCall,$element='this', $param="", $immediatly=false) { |
|
60 | + public function _genericCallValue($jQueryCall, $element='this', $param="", $immediatly=false) { |
|
61 | 61 | $element=Javascript::prep_element($element); |
62 | 62 | if (isset($param)) { |
63 | 63 | $param=Javascript::prep_value($param); |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | * @param boolean $immediatly delayed if false |
78 | 78 | * @return string |
79 | 79 | */ |
80 | - public function _genericCallElement($jQueryCall,$to='this', $element, $immediatly=false) { |
|
80 | + public function _genericCallElement($jQueryCall, $to='this', $element, $immediatly=false) { |
|
81 | 81 | $to=Javascript::prep_element($to); |
82 | 82 | $element=Javascript::prep_element($element); |
83 | 83 | $str="$({$to}).{$jQueryCall}({$element});"; |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | * @return string |
95 | 95 | */ |
96 | 96 | public function addClass($element='this', $class='', $immediatly=false) { |
97 | - return $this->_genericCallValue('addClass',$element, $class, $immediatly); |
|
97 | + return $this->_genericCallValue('addClass', $element, $class, $immediatly); |
|
98 | 98 | } |
99 | 99 | |
100 | 100 | /** |
@@ -104,8 +104,8 @@ discard block |
||
104 | 104 | * @param boolean $immediatly defers the execution if set to false |
105 | 105 | * @return string |
106 | 106 | */ |
107 | - public function after($to, $element, $immediatly=false){ |
|
108 | - return $this->_genericCallElement('after',$to, $element, $immediatly); |
|
107 | + public function after($to, $element, $immediatly=false) { |
|
108 | + return $this->_genericCallElement('after', $to, $element, $immediatly); |
|
109 | 109 | } |
110 | 110 | |
111 | 111 | /** |
@@ -115,8 +115,8 @@ discard block |
||
115 | 115 | * @param boolean $immediatly defers the execution if set to false |
116 | 116 | * @return string |
117 | 117 | */ |
118 | - public function before($to, $element, $immediatly=false){ |
|
119 | - return $this->_genericCallElement('before',$to, $element, $immediatly); |
|
118 | + public function before($to, $element, $immediatly=false) { |
|
119 | + return $this->_genericCallElement('before', $to, $element, $immediatly); |
|
120 | 120 | } |
121 | 121 | |
122 | 122 | /** |
@@ -144,8 +144,8 @@ discard block |
||
144 | 144 | * @param string $value |
145 | 145 | * @param boolean $immediatly defers the execution if set to false |
146 | 146 | */ |
147 | - public function val($element='this',$value='',$immediatly=false){ |
|
148 | - return $this->_genericCallValue('val',$element,$value,$immediatly); |
|
147 | + public function val($element='this', $value='', $immediatly=false) { |
|
148 | + return $this->_genericCallValue('val', $element, $value, $immediatly); |
|
149 | 149 | } |
150 | 150 | |
151 | 151 | /** |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | * @param boolean $immediatly defers the execution if set to false |
156 | 156 | */ |
157 | 157 | public function html($element='this', $value='', $immediatly=false) { |
158 | - return $this->_genericCallValue('html',$element, $value, $immediatly); |
|
158 | + return $this->_genericCallValue('html', $element, $value, $immediatly); |
|
159 | 159 | } |
160 | 160 | |
161 | 161 | /** |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | |
175 | 175 | $animations="\t\t\t"; |
176 | 176 | if (\is_array($params)) { |
177 | - foreach ( $params as $param => $value ) { |
|
177 | + foreach ($params as $param => $value) { |
|
178 | 178 | $animations.=$param.': \''.$value.'\', '; |
179 | 179 | } |
180 | 180 | } |
@@ -203,7 +203,7 @@ discard block |
||
203 | 203 | * @return string |
204 | 204 | */ |
205 | 205 | public function append($to, $element, $immediatly=false) { |
206 | - return $this->_genericCallElement('append',$to, $element, $immediatly); |
|
206 | + return $this->_genericCallElement('append', $to, $element, $immediatly); |
|
207 | 207 | } |
208 | 208 | |
209 | 209 | /** |
@@ -214,7 +214,7 @@ discard block |
||
214 | 214 | * @return string |
215 | 215 | */ |
216 | 216 | public function prepend($to, $element, $immediatly=false) { |
217 | - return $this->_genericCallElement('prepend',$to, $element, $immediatly); |
|
217 | + return $this->_genericCallElement('prepend', $to, $element, $immediatly); |
|
218 | 218 | } |
219 | 219 | |
220 | 220 | /** |
@@ -227,7 +227,7 @@ discard block |
||
227 | 227 | * @return string |
228 | 228 | */ |
229 | 229 | public function fadeIn($element='this', $speed='', $callback='', $immediatly=false) { |
230 | - return $this->_showHideWithEffect("fadeIn",$element,$speed,$callback,$immediatly); |
|
230 | + return $this->_showHideWithEffect("fadeIn", $element, $speed, $callback, $immediatly); |
|
231 | 231 | } |
232 | 232 | |
233 | 233 | /** |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | * @return string |
241 | 241 | */ |
242 | 242 | public function fadeOut($element='this', $speed='', $callback='', $immediatly=false) { |
243 | - return $this->_showHideWithEffect("fadeOut",$element,$speed,$callback,$immediatly); |
|
243 | + return $this->_showHideWithEffect("fadeOut", $element, $speed, $callback, $immediatly); |
|
244 | 244 | } |
245 | 245 | |
246 | 246 | /** |
@@ -253,7 +253,7 @@ discard block |
||
253 | 253 | * @return string |
254 | 254 | */ |
255 | 255 | public function slideUp($element='this', $speed='', $callback='', $immediatly=false) { |
256 | - return $this->_showHideWithEffect("slideUp",$element,$speed,$callback,$immediatly); |
|
256 | + return $this->_showHideWithEffect("slideUp", $element, $speed, $callback, $immediatly); |
|
257 | 257 | } |
258 | 258 | |
259 | 259 | /** |
@@ -265,7 +265,7 @@ discard block |
||
265 | 265 | * @return string |
266 | 266 | */ |
267 | 267 | public function removeClass($element='this', $class='', $immediatly=false) { |
268 | - return $this->_genericCallValue('removeClass',$element, $class, $immediatly); |
|
268 | + return $this->_genericCallValue('removeClass', $element, $class, $immediatly); |
|
269 | 269 | } |
270 | 270 | |
271 | 271 | /** |
@@ -278,7 +278,7 @@ discard block |
||
278 | 278 | * @return string |
279 | 279 | */ |
280 | 280 | public function slideDown($element='this', $speed='', $callback='', $immediatly=false) { |
281 | - return $this->_showHideWithEffect("slideDown",$element,$speed,$callback,$immediatly); |
|
281 | + return $this->_showHideWithEffect("slideDown", $element, $speed, $callback, $immediatly); |
|
282 | 282 | } |
283 | 283 | |
284 | 284 | /** |
@@ -291,7 +291,7 @@ discard block |
||
291 | 291 | * @return string |
292 | 292 | */ |
293 | 293 | public function slideToggle($element='this', $speed='', $callback='', $immediatly=false) { |
294 | - return $this->_showHideWithEffect("slideToggle",$element,$speed,$callback,$immediatly); |
|
294 | + return $this->_showHideWithEffect("slideToggle", $element, $speed, $callback, $immediatly); |
|
295 | 295 | } |
296 | 296 | |
297 | 297 | /** |
@@ -304,7 +304,7 @@ discard block |
||
304 | 304 | * @return string |
305 | 305 | */ |
306 | 306 | public function hide($element='this', $speed='', $callback='', $immediatly=false) { |
307 | - return $this->_showHideWithEffect("hide",$element,$speed,$callback,$immediatly); |
|
307 | + return $this->_showHideWithEffect("hide", $element, $speed, $callback, $immediatly); |
|
308 | 308 | } |
309 | 309 | |
310 | 310 | /** |
@@ -317,7 +317,7 @@ discard block |
||
317 | 317 | * @return string |
318 | 318 | */ |
319 | 319 | public function toggle($element='this', $speed='', $callback='', $immediatly=false) { |
320 | - return $this->_showHideWithEffect("toggle",$element,$speed,$callback,$immediatly); |
|
320 | + return $this->_showHideWithEffect("toggle", $element, $speed, $callback, $immediatly); |
|
321 | 321 | } |
322 | 322 | |
323 | 323 | /** |
@@ -329,7 +329,7 @@ discard block |
||
329 | 329 | * @return string |
330 | 330 | */ |
331 | 331 | public function toggleClass($element='this', $class='', $immediatly=false) { |
332 | - return $this->_genericCallValue('toggleClass',$element, $class, $immediatly); |
|
332 | + return $this->_genericCallValue('toggleClass', $element, $class, $immediatly); |
|
333 | 333 | } |
334 | 334 | |
335 | 335 | /** |
@@ -357,7 +357,7 @@ discard block |
||
357 | 357 | * @return string |
358 | 358 | */ |
359 | 359 | public function show($element='this', $speed='', $callback='', $immediatly=false) { |
360 | - return $this->_showHideWithEffect("show",$element,$speed,$callback,$immediatly); |
|
360 | + return $this->_showHideWithEffect("show", $element, $speed, $callback, $immediatly); |
|
361 | 361 | } |
362 | 362 | |
363 | 363 | /** |
@@ -369,8 +369,8 @@ discard block |
||
369 | 369 | */ |
370 | 370 | public function sortable($element, $options=array()) { |
371 | 371 | if (count($options)>0) { |
372 | - $sort_options=array (); |
|
373 | - foreach ( $options as $k => $v ) { |
|
372 | + $sort_options=array(); |
|
373 | + foreach ($options as $k => $v) { |
|
374 | 374 | $sort_options[]="\n\t\t".$k.': '.$v.""; |
375 | 375 | } |
376 | 376 | $sort_options=implode(",", $sort_options); |
@@ -467,8 +467,8 @@ discard block |
||
467 | 467 | * @param boolean $immediatly |
468 | 468 | * @return string |
469 | 469 | */ |
470 | - private function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $preventDefault=false, $stopPropagation=false, $jsCallback="",$immediatly=true) { |
|
471 | - return $this->_add_event($element, $this->_doJQuery($elementToModify, $jqueryCall, $param, $jsCallback), $event, $preventDefault, $stopPropagation,$immediatly); |
|
470 | + private function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $preventDefault=false, $stopPropagation=false, $jsCallback="", $immediatly=true) { |
|
471 | + return $this->_add_event($element, $this->_doJQuery($elementToModify, $jqueryCall, $param, $jsCallback), $event, $preventDefault, $stopPropagation, $immediatly); |
|
472 | 472 | } |
473 | 473 | |
474 | 474 | /** |
@@ -486,7 +486,7 @@ discard block |
||
486 | 486 | $preventDefault=false; |
487 | 487 | $immediatly=true; |
488 | 488 | extract($parameters); |
489 | - return $this->_doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param, $preventDefault, $stopPropagation, $jsCallback,$immediatly); |
|
489 | + return $this->_doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param, $preventDefault, $stopPropagation, $jsCallback, $immediatly); |
|
490 | 490 | } |
491 | 491 | |
492 | 492 | /** |
@@ -527,11 +527,11 @@ discard block |
||
527 | 527 | $preventDefault=false; |
528 | 528 | $immediatly=true; |
529 | 529 | extract($parameters); |
530 | - $script=$this->_add_event($element, $this->exec($js), $event, $preventDefault, $stopPropagation,$immediatly); |
|
530 | + $script=$this->_add_event($element, $this->exec($js), $event, $preventDefault, $stopPropagation, $immediatly); |
|
531 | 531 | return $script; |
532 | 532 | } |
533 | 533 | |
534 | - public function setJsonToElement($json,$elementClass="_element",$immediatly=true){ |
|
534 | + public function setJsonToElement($json, $elementClass="_element", $immediatly=true) { |
|
535 | 535 | $retour="var data={$json};" |
536 | 536 | ."\n\tdata=($.isPlainObject(data))?data:JSON.parse(data);" |
537 | 537 | ."\n\tvar pk=data['pk'];var object=data['object'];" |
@@ -542,7 +542,7 @@ discard block |
||
542 | 542 | ."\n\t});" |
543 | 543 | ."\n}};\n"; |
544 | 544 | $retour.="\t$(document).trigger('jsonReady',[data]);\n"; |
545 | - return $this->exec($retour,$immediatly); |
|
545 | + return $this->exec($retour, $immediatly); |
|
546 | 546 | } |
547 | 547 | |
548 | 548 | /** |
@@ -550,10 +550,10 @@ discard block |
||
550 | 550 | * @param string $element The element selector |
551 | 551 | * @param array $parameters default : array("attr"=>"id","preventDefault"=>false,"stopPropagation"=>false,"immediatly"=>true) |
552 | 552 | */ |
553 | - public function setDraggable($element,$parameters=[]){ |
|
553 | + public function setDraggable($element, $parameters=[]) { |
|
554 | 554 | $attr="id"; |
555 | 555 | extract($parameters); |
556 | - $script=$this->_add_event($element, Javascript::draggable($attr), "dragstart",$parameters); |
|
556 | + $script=$this->_add_event($element, Javascript::draggable($attr), "dragstart", $parameters); |
|
557 | 557 | return $script; |
558 | 558 | } |
559 | 559 | |
@@ -563,13 +563,13 @@ discard block |
||
563 | 563 | * @param array $parameters default : array("attr"=>"id","stopPropagation"=>false,"immediatly"=>true,"jqueryDone"=>"append") |
564 | 564 | * @param string $jsCallback the js script to call when element is dropped |
565 | 565 | */ |
566 | - public function asDropZone($element,$jsCallback="",$parameters=[]){ |
|
566 | + public function asDropZone($element, $jsCallback="", $parameters=[]) { |
|
567 | 567 | $stopPropagation=false; |
568 | 568 | $immediatly=true; |
569 | 569 | $jqueryDone="append"; |
570 | - $script=$this->_add_event($element, '', "dragover",true,$stopPropagation,$immediatly); |
|
570 | + $script=$this->_add_event($element, '', "dragover", true, $stopPropagation, $immediatly); |
|
571 | 571 | extract($parameters); |
572 | - $script.=$this->_add_event($element, Javascript::dropZone($jqueryDone,$jsCallback), "drop",true,$stopPropagation,$immediatly); |
|
572 | + $script.=$this->_add_event($element, Javascript::dropZone($jqueryDone, $jsCallback), "drop", true, $stopPropagation, $immediatly); |
|
573 | 573 | return $script; |
574 | 574 | } |
575 | 575 | |
@@ -581,16 +581,16 @@ discard block |
||
581 | 581 | * @param boolean $immediatly delayed if false |
582 | 582 | * @return string |
583 | 583 | */ |
584 | - public function interval($jsCode,$time,$globalName=null,$immediatly=true){ |
|
585 | - if(!Javascript::isFunction($jsCode)){ |
|
584 | + public function interval($jsCode, $time, $globalName=null, $immediatly=true) { |
|
585 | + if (!Javascript::isFunction($jsCode)) { |
|
586 | 586 | $jsCode="function(){\n".$jsCode."\n}"; |
587 | 587 | } |
588 | - if(isset($globalName)){ |
|
588 | + if (isset($globalName)) { |
|
589 | 589 | $script="if(window.{$globalName}){clearInterval(window.{$globalName});}\nwindow.{$globalName}=setInterval({$jsCode},{$time});"; |
590 | - }else{ |
|
590 | + } else { |
|
591 | 591 | $script="setInterval({$jsCode},{$time});"; |
592 | 592 | } |
593 | - return $this->exec($script,$immediatly); |
|
593 | + return $this->exec($script, $immediatly); |
|
594 | 594 | } |
595 | 595 | |
596 | 596 | /** |
@@ -599,7 +599,7 @@ discard block |
||
599 | 599 | * @param boolean $immediatly delayed if false |
600 | 600 | * @return string |
601 | 601 | */ |
602 | - public function clearInterval($globalName,$immediatly=true){ |
|
603 | - return $this->exec("if(window.{$globalName}){clearInterval(window.{$globalName});}",$immediatly); |
|
602 | + public function clearInterval($globalName, $immediatly=true) { |
|
603 | + return $this->exec("if(window.{$globalName}){clearInterval(window.{$globalName});}", $immediatly); |
|
604 | 604 | } |
605 | 605 | } |