|
@@ -16,9 +16,9 @@ discard block |
|
|
block discarded – undo |
|
16
|
16
|
protected $ajaxLoader="<div class=\"ui active centered inline text loader\">Loading</div>"; |
|
17
|
17
|
|
|
18
|
18
|
abstract public function getUrl($url); |
|
19
|
|
- abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true); |
|
|
19
|
+ abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true); |
|
20
|
20
|
|
|
21
|
|
- protected function _ajax($method,$url,$responseElement="",$parameters=[]) { |
|
|
21
|
+ protected function _ajax($method, $url, $responseElement="", $parameters=[]) { |
|
22
|
22
|
$jsCallback=null; |
|
23
|
23
|
$attr="id"; |
|
24
|
24
|
$hasLoader=true; |
|
@@ -36,80 +36,80 @@ discard block |
|
|
block discarded – undo |
|
36
|
36
|
$retour=$this->_getAjaxUrl($url, $attr); |
|
37
|
37
|
$responseElement=$this->_getResponseElement($responseElement); |
|
38
|
38
|
$retour.="var self=this;\n"; |
|
39
|
|
- if($hasLoader===true && JString::isNotNull($responseElement)){ |
|
40
|
|
- $this->addLoading($retour, $responseElement,$ajaxLoader); |
|
|
39
|
+ if ($hasLoader===true && JString::isNotNull($responseElement)) { |
|
|
40
|
+ $this->addLoading($retour, $responseElement, $ajaxLoader); |
|
41
|
41
|
} |
|
42
|
|
- $ajaxParameters=["url"=>"url","method"=>"'".\strtoupper($method)."'"]; |
|
43
|
|
- if(!$async){ |
|
|
42
|
+ $ajaxParameters=["url"=>"url", "method"=>"'".\strtoupper($method)."'"]; |
|
|
43
|
+ if (!$async) { |
|
44
|
44
|
$ajaxParameters["async"]="false"; |
|
45
|
45
|
} |
|
46
|
|
- if(isset($params)){ |
|
|
46
|
+ if (isset($params)) { |
|
47
|
47
|
$ajaxParameters["data"]=self::_correctParams($params); |
|
48
|
48
|
} |
|
49
|
|
- if(isset($headers)){ |
|
|
49
|
+ if (isset($headers)) { |
|
50
|
50
|
$ajaxParameters["headers"]=$headers; |
|
51
|
51
|
} |
|
52
|
52
|
$this->createAjaxParameters($ajaxParameters, $parameters); |
|
53
|
53
|
$retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data, textStatus, jqXHR ) {\n"; |
|
54
|
|
- $retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback)."});\n"; |
|
55
|
|
- $retour=$this->_addJsCondition($jsCondition,$retour); |
|
|
54
|
+ $retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback)."});\n"; |
|
|
55
|
+ $retour=$this->_addJsCondition($jsCondition, $retour); |
|
56
|
56
|
if ($immediatly) |
|
57
|
57
|
$this->jquery_code_for_compile[]=$retour; |
|
58
|
58
|
return $retour; |
|
59
|
59
|
} |
|
60
|
60
|
|
|
61
|
|
- protected function createAjaxParameters(&$original,$parameters){ |
|
62
|
|
- $validParameters=["dataType"=>"'%value%'","beforeSend"=>"function(jqXHR,settings){%value%}","complete"=>"function(jqXHR){%value%}"]; |
|
63
|
|
- foreach ($validParameters as $param=>$mask){ |
|
64
|
|
- if(isset($parameters[$param])){ |
|
|
61
|
+ protected function createAjaxParameters(&$original, $parameters) { |
|
|
62
|
+ $validParameters=["dataType"=>"'%value%'", "beforeSend"=>"function(jqXHR,settings){%value%}", "complete"=>"function(jqXHR){%value%}"]; |
|
|
63
|
+ foreach ($validParameters as $param=>$mask) { |
|
|
64
|
+ if (isset($parameters[$param])) { |
|
65
|
65
|
$original[$param]=\str_replace("%value%", $parameters[$param], $mask); |
|
66
|
66
|
} |
|
67
|
67
|
} |
|
68
|
68
|
} |
|
69
|
69
|
|
|
70
|
|
- protected function implodeAjaxParameters($ajaxParameters){ |
|
71
|
|
- $s = ''; foreach ($ajaxParameters as $k=>$v) { if ($s !== '') { $s .= ','; } $s .= "'{$k}':{$v}"; } |
|
|
70
|
+ protected function implodeAjaxParameters($ajaxParameters) { |
|
|
71
|
+ $s=''; foreach ($ajaxParameters as $k=>$v) { if ($s!=='') { $s.=','; } $s.="'{$k}':{$v}"; } |
|
72
|
72
|
return $s; |
|
73
|
73
|
} |
|
74
|
74
|
|
|
75
|
|
- protected function _addJsCondition($jsCondition,$jsSource){ |
|
76
|
|
- if(isset($jsCondition)){ |
|
|
75
|
+ protected function _addJsCondition($jsCondition, $jsSource) { |
|
|
76
|
+ if (isset($jsCondition)) { |
|
77
|
77
|
return "if(".$jsCondition."){\n".$jsSource."\n}"; |
|
78
|
78
|
} |
|
79
|
79
|
return $jsSource; |
|
80
|
80
|
} |
|
81
|
81
|
|
|
82
|
82
|
|
|
83
|
|
- protected function _getAjaxUrl($url,$attr){ |
|
|
83
|
+ protected function _getAjaxUrl($url, $attr) { |
|
84
|
84
|
$url=$this->_correctAjaxUrl($url); |
|
85
|
85
|
$retour="url='".$url."';"; |
|
86
|
86
|
$slash="/"; |
|
87
|
|
- if(JString::endswith($url, "/")===true){ |
|
|
87
|
+ if (JString::endswith($url, "/")===true) { |
|
88
|
88
|
$slash=""; |
|
89
|
89
|
} |
|
90
|
|
- if(JString::isNotNull($attr)){ |
|
91
|
|
- if ($attr==="value"){ |
|
|
90
|
+ if (JString::isNotNull($attr)) { |
|
|
91
|
+ if ($attr==="value") { |
|
92
|
92
|
$retour.="url=url+'".$slash."'+$(this).val();\n"; |
|
93
|
|
- }elseif ($attr==="html"){ |
|
|
93
|
+ }elseif ($attr==="html") { |
|
94
|
94
|
$retour.="url=url+'".$slash."'+$(this).html();\n"; |
|
95
|
|
- }elseif(\substr($attr, 0,3)==="js:"){ |
|
|
95
|
+ }elseif (\substr($attr, 0, 3)==="js:") { |
|
96
|
96
|
$retour.="url=url+'".$slash."'+".\substr($attr, 3).";\n"; |
|
97
|
|
- }elseif($attr!==null && $attr!=="") |
|
|
97
|
+ }elseif ($attr!==null && $attr!=="") |
|
98
|
98
|
$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n"; |
|
99
|
99
|
} |
|
100
|
100
|
return $retour; |
|
101
|
101
|
} |
|
102
|
102
|
|
|
103
|
|
- protected function _getOnAjaxDone($responseElement,$jqueryDone,$ajaxTransition,$jsCallback){ |
|
104
|
|
- $retour="";$call=null; |
|
|
103
|
+ protected function _getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback) { |
|
|
104
|
+ $retour=""; $call=null; |
|
105
|
105
|
if (JString::isNotNull($responseElement)) { |
|
106
|
|
- if(isset($ajaxTransition)){ |
|
|
106
|
+ if (isset($ajaxTransition)) { |
|
107
|
107
|
$call=$this->setAjaxDataCall($ajaxTransition); |
|
108
|
|
- }elseif(isset($this->ajaxTransition)){ |
|
|
108
|
+ }elseif (isset($this->ajaxTransition)) { |
|
109
|
109
|
$call=$this->ajaxTransition; |
|
110
|
110
|
} |
|
111
|
|
- if(\is_callable($call)) |
|
112
|
|
- $retour="\t".$call($responseElement,$jqueryDone).";\n"; |
|
|
111
|
+ if (\is_callable($call)) |
|
|
112
|
+ $retour="\t".$call($responseElement, $jqueryDone).";\n"; |
|
113
|
113
|
else |
|
114
|
114
|
$retour="\t{$responseElement}.{$jqueryDone}( data );\n"; |
|
115
|
115
|
} |
|
@@ -117,7 +117,7 @@ discard block |
|
|
block discarded – undo |
|
117
|
117
|
return $retour; |
|
118
|
118
|
} |
|
119
|
119
|
|
|
120
|
|
- protected function _getResponseElement($responseElement){ |
|
|
120
|
+ protected function _getResponseElement($responseElement) { |
|
121
|
121
|
if (JString::isNotNull($responseElement)) { |
|
122
|
122
|
$responseElement=Javascript::prep_value($responseElement); |
|
123
|
123
|
$responseElement=Javascript::prep_jquery_selector($responseElement); |
|
@@ -128,33 +128,33 @@ discard block |
|
|
block discarded – undo |
|
128
|
128
|
protected function _correctAjaxUrl($url) { |
|
129
|
129
|
if ($url!=="/" && JString::endsWith($url, "/")===true) |
|
130
|
130
|
$url=substr($url, 0, strlen($url)-1); |
|
131
|
|
- if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) { |
|
|
131
|
+ if (strncmp($url, 'http://', 7)!=0 && strncmp($url, 'https://', 8)!=0) { |
|
132
|
132
|
$url=$this->getUrl($url); |
|
133
|
133
|
} |
|
134
|
134
|
return $url; |
|
135
|
135
|
} |
|
136
|
136
|
|
|
137
|
|
- public static function _correctParams($params){ |
|
138
|
|
- if(JString::isNull($params)){ |
|
|
137
|
+ public static function _correctParams($params) { |
|
|
138
|
+ if (JString::isNull($params)) { |
|
139
|
139
|
return ""; |
|
140
|
140
|
} |
|
141
|
|
- if(\preg_match("@^\{.*?\}$@", $params)){ |
|
|
141
|
+ if (\preg_match("@^\{.*?\}$@", $params)) { |
|
142
|
142
|
return '$.param('.$params.')'; |
|
143
|
143
|
} |
|
144
|
144
|
return $params; |
|
145
|
145
|
} |
|
146
|
146
|
|
|
147
|
|
- public static function _implodeParams($parameters){ |
|
|
147
|
+ public static function _implodeParams($parameters) { |
|
148
|
148
|
$allParameters=[]; |
|
149
|
|
- foreach ($parameters as $params){ |
|
150
|
|
- if(isset($params)) |
|
|
149
|
+ foreach ($parameters as $params) { |
|
|
150
|
+ if (isset($params)) |
|
151
|
151
|
$allParameters[]=self::_correctParams($params); |
|
152
|
152
|
} |
|
153
|
153
|
return \implode("+'&'+", $allParameters); |
|
154
|
154
|
} |
|
155
|
155
|
|
|
156
|
|
- protected function addLoading(&$retour, $responseElement,$ajaxLoader=null) { |
|
157
|
|
- if(!isset($ajaxLoader)){ |
|
|
156
|
+ protected function addLoading(&$retour, $responseElement, $ajaxLoader=null) { |
|
|
157
|
+ if (!isset($ajaxLoader)) { |
|
158
|
158
|
$ajaxLoader=$this->ajaxLoader; |
|
159
|
159
|
} |
|
160
|
160
|
$loading_notifier='<div class="ajax-loader">'.$ajaxLoader.'</div>'; |
|
@@ -162,19 +162,19 @@ discard block |
|
|
block discarded – undo |
|
162
|
162
|
$retour.="\t\t{$responseElement}.prepend('{$loading_notifier}');\n"; |
|
163
|
163
|
} |
|
164
|
164
|
|
|
165
|
|
- protected function setAjaxDataCall($params){ |
|
|
165
|
+ protected function setAjaxDataCall($params) { |
|
166
|
166
|
$result=null; |
|
167
|
|
- if(!\is_callable($params)){ |
|
168
|
|
- $result=function ($responseElement,$jqueryDone="html") use($params){ |
|
169
|
|
- return AjaxTransition::{$params}($responseElement,$jqueryDone); |
|
|
167
|
+ if (!\is_callable($params)) { |
|
|
168
|
+ $result=function($responseElement, $jqueryDone="html") use($params){ |
|
|
169
|
+ return AjaxTransition::{$params}($responseElement, $jqueryDone); |
|
170
|
170
|
}; |
|
171
|
171
|
} |
|
172
|
172
|
return $result; |
|
173
|
173
|
} |
|
174
|
174
|
|
|
175
|
|
- protected function setDefaultParameters(&$parameters,$default){ |
|
176
|
|
- foreach ($default as $k=>$v){ |
|
177
|
|
- if(!isset($parameters[$k])) |
|
|
175
|
+ protected function setDefaultParameters(&$parameters, $default) { |
|
|
176
|
+ foreach ($default as $k=>$v) { |
|
|
177
|
+ if (!isset($parameters[$k])) |
|
178
|
178
|
$parameters[$k]=$v; |
|
179
|
179
|
} |
|
180
|
180
|
} |
|
@@ -188,8 +188,8 @@ discard block |
|
|
block discarded – undo |
|
188
|
188
|
* @param string $url The url of the request |
|
189
|
189
|
* @param string $responseElement selector of the HTML element displaying the answer |
|
190
|
190
|
*/ |
|
191
|
|
- private function _get($url, $responseElement="",$parameters=[]) { |
|
192
|
|
- return $this->_ajax("get", $url,$responseElement,$parameters); |
|
|
191
|
+ private function _get($url, $responseElement="", $parameters=[]) { |
|
|
192
|
+ return $this->_ajax("get", $url, $responseElement, $parameters); |
|
193
|
193
|
} |
|
194
|
194
|
|
|
195
|
195
|
/** |
|
@@ -198,9 +198,9 @@ discard block |
|
|
block discarded – undo |
|
198
|
198
|
* @param string $responseElement selector of the HTML element displaying the answer |
|
199
|
199
|
* @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null) |
|
200
|
200
|
*/ |
|
201
|
|
- public function get($url, $responseElement="",$parameters=[]) { |
|
|
201
|
+ public function get($url, $responseElement="", $parameters=[]) { |
|
202
|
202
|
$parameters["immediatly"]=true; |
|
203
|
|
- return $this->_get($url,$responseElement,$parameters); |
|
|
203
|
+ return $this->_get($url, $responseElement, $parameters); |
|
204
|
204
|
} |
|
205
|
205
|
|
|
206
|
206
|
/** |
|
@@ -210,9 +210,9 @@ discard block |
|
|
block discarded – undo |
|
210
|
210
|
* @param string $responseElement selector of the HTML element displaying the answer |
|
211
|
211
|
* @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null) |
|
212
|
212
|
*/ |
|
213
|
|
- public function ajax($method,$url, $responseElement="", $parameters=[]) { |
|
|
213
|
+ public function ajax($method, $url, $responseElement="", $parameters=[]) { |
|
214
|
214
|
$parameters["immediatly"]=true; |
|
215
|
|
- return $this->_ajax($method,$url,$responseElement,$parameters); |
|
|
215
|
+ return $this->_ajax($method, $url, $responseElement, $parameters); |
|
216
|
216
|
} |
|
217
|
217
|
|
|
218
|
218
|
/** |
|
@@ -222,9 +222,9 @@ discard block |
|
|
block discarded – undo |
|
222
|
222
|
* @param string $responseElement selector of the HTML element displaying the answer |
|
223
|
223
|
* @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null) |
|
224
|
224
|
*/ |
|
225
|
|
- public function ajaxDeferred($method,$url, $responseElement="", $parameters=[]) { |
|
|
225
|
+ public function ajaxDeferred($method, $url, $responseElement="", $parameters=[]) { |
|
226
|
226
|
$parameters["immediatly"]=false; |
|
227
|
|
- return $this->_ajax($method,$url,$responseElement,$parameters); |
|
|
227
|
+ return $this->_ajax($method, $url, $responseElement, $parameters); |
|
228
|
228
|
} |
|
229
|
229
|
|
|
230
|
230
|
/** |
|
@@ -233,15 +233,15 @@ discard block |
|
|
block discarded – undo |
|
233
|
233
|
* @param string $method Method used |
|
234
|
234
|
* @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>"document","jsCondition"=>NULL,"headers"=>null,"immediatly"=>false) |
|
235
|
235
|
*/ |
|
236
|
|
- private function _json($url, $method="get",$parameters=[]) { |
|
237
|
|
- $parameters=\array_merge($parameters,["hasLoader"=>false]); |
|
|
236
|
+ private function _json($url, $method="get", $parameters=[]) { |
|
|
237
|
+ $parameters=\array_merge($parameters, ["hasLoader"=>false]); |
|
238
|
238
|
$jsCallback=isset($parameters['jsCallback']) ? $parameters['jsCallback'] : ""; |
|
239
|
239
|
$context=isset($parameters['context']) ? $parameters['context'] : "document"; |
|
240
|
240
|
$retour="\tdata=($.isPlainObject(data))?data:JSON.parse(data);\t".$jsCallback.";\n\tfor(var key in data){" |
|
241
|
241
|
."if($('#'+key,".$context.").length){ if($('#'+key,".$context.").is('[value]')) { $('#'+key,".$context.").val(data[key]);} else { $('#'+key,".$context.").html(data[key]); }}};\n"; |
|
242
|
242
|
$retour.="\t$(document).trigger('jsonReady',[data]);\n"; |
|
243
|
243
|
$parameters["jsCallback"]=$retour; |
|
244
|
|
- return $this->_ajax($method, $url,null,$parameters); |
|
|
244
|
+ return $this->_ajax($method, $url, null, $parameters); |
|
245
|
245
|
} |
|
246
|
246
|
|
|
247
|
247
|
/** |
|
@@ -251,7 +251,7 @@ discard block |
|
|
block discarded – undo |
|
251
|
251
|
* @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>"document","jsCondition"=>NULL,"headers"=>null,"immediatly"=>false) |
|
252
|
252
|
*/ |
|
253
|
253
|
public function json($url, $method="get", $parameters=[]) { |
|
254
|
|
- return $this->_json($url,$method,$parameters); |
|
|
254
|
+ return $this->_json($url, $method, $parameters); |
|
255
|
255
|
} |
|
256
|
256
|
|
|
257
|
257
|
/** |
|
@@ -262,9 +262,9 @@ discard block |
|
|
block discarded – undo |
|
262
|
262
|
* @param string $method default get |
|
263
|
263
|
* @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true) |
|
264
|
264
|
*/ |
|
265
|
|
- public function jsonOn($event,$element, $url,$method="get",$parameters=array()) { |
|
266
|
|
- $this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]); |
|
267
|
|
- return $this->_add_event($element, $this->jsonDeferred($url,$method, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]); |
|
|
265
|
+ public function jsonOn($event, $element, $url, $method="get", $parameters=array()) { |
|
|
266
|
+ $this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]); |
|
|
267
|
+ return $this->_add_event($element, $this->jsonDeferred($url, $method, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]); |
|
268
|
268
|
} |
|
269
|
269
|
|
|
270
|
270
|
/** |
|
@@ -275,7 +275,7 @@ discard block |
|
|
block discarded – undo |
|
275
|
275
|
*/ |
|
276
|
276
|
public function jsonDeferred($url, $method="get", $parameters=[]) { |
|
277
|
277
|
$parameters["immediatly"]=false; |
|
278
|
|
- return $this->_json($url,$method,$parameters); |
|
|
278
|
+ return $this->_json($url, $method, $parameters); |
|
279
|
279
|
} |
|
280
|
280
|
|
|
281
|
281
|
/** |
|
@@ -286,26 +286,26 @@ discard block |
|
|
block discarded – undo |
|
286
|
286
|
* @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"rowClass"=>"_json") |
|
287
|
287
|
*/ |
|
288
|
288
|
private function _jsonArray($maskSelector, $url, $method="get", $parameters=[]) { |
|
289
|
|
- $parameters=\array_merge($parameters,["hasLoader"=>false]); |
|
|
289
|
+ $parameters=\array_merge($parameters, ["hasLoader"=>false]); |
|
290
|
290
|
$rowClass=isset($parameters['rowClass']) ? $parameters['rowClass'] : "_json"; |
|
291
|
291
|
$jsCallback=isset($parameters['jsCallback']) ? $parameters['jsCallback'] : ""; |
|
292
|
292
|
$context=isset($parameters['context']) ? $parameters['context'] : null; |
|
293
|
|
- if($context===null){ |
|
|
293
|
+ if ($context===null) { |
|
294
|
294
|
$parent="$('".$maskSelector."').parent()"; |
|
295
|
|
- $newElm = "$('#'+newId)"; |
|
296
|
|
- }else{ |
|
|
295
|
+ $newElm="$('#'+newId)"; |
|
|
296
|
+ } else { |
|
297
|
297
|
$parent=$context; |
|
298
|
|
- $newElm = $context.".find('#'+newId)"; |
|
|
298
|
+ $newElm=$context.".find('#'+newId)"; |
|
299
|
299
|
} |
|
300
|
300
|
$appendTo="\t\tnewElm.appendTo(".$parent.");\n"; |
|
301
|
301
|
$retour=$parent.".find('.{$rowClass}').remove();"; |
|
302
|
302
|
$retour.="\tdata=($.isPlainObject(data))?data:JSON.parse(data);\t".$jsCallback.";\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(); |
|
303
|
303
|
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"; |
|
304
|
|
- $retour.= $appendTo; |
|
|
304
|
+ $retour.=$appendTo; |
|
305
|
305
|
$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"; |
|
306
|
306
|
$retour.="\t$(document).trigger('jsonReady',[data]);\n"; |
|
307
|
307
|
$parameters["jsCallback"]=$retour; |
|
308
|
|
- return $this->_ajax($method, $url,null,$parameters); |
|
|
308
|
+ return $this->_ajax($method, $url, null, $parameters); |
|
309
|
309
|
} |
|
310
|
310
|
|
|
311
|
311
|
/** |
|
@@ -316,7 +316,7 @@ discard block |
|
|
block discarded – undo |
|
316
|
316
|
* @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"rowClass"=>"_json") |
|
317
|
317
|
*/ |
|
318
|
318
|
public function jsonArray($maskSelector, $url, $method="get", $parameters=[]) { |
|
319
|
|
- return $this->_jsonArray($maskSelector, $url,$method,$parameters); |
|
|
319
|
+ return $this->_jsonArray($maskSelector, $url, $method, $parameters); |
|
320
|
320
|
} |
|
321
|
321
|
|
|
322
|
322
|
/** |
|
@@ -339,9 +339,9 @@ discard block |
|
|
block discarded – undo |
|
339
|
339
|
* @param string $method Method used, default : get |
|
340
|
340
|
* @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","rowClass"=>"_json","immediatly"=>true) |
|
341
|
341
|
*/ |
|
342
|
|
- public function jsonArrayOn($event,$element,$maskSelector, $url,$method="get",$parameters=array()) { |
|
343
|
|
- $this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]); |
|
344
|
|
- return $this->_add_event($element, $this->jsonArrayDeferred($maskSelector,$url,$method, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]); |
|
|
342
|
+ public function jsonArrayOn($event, $element, $maskSelector, $url, $method="get", $parameters=array()) { |
|
|
343
|
+ $this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]); |
|
|
344
|
+ return $this->_add_event($element, $this->jsonArrayDeferred($maskSelector, $url, $method, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]); |
|
345
|
345
|
} |
|
346
|
346
|
|
|
347
|
347
|
/** |
|
@@ -353,7 +353,7 @@ discard block |
|
|
block discarded – undo |
|
353
|
353
|
*/ |
|
354
|
354
|
public function getDeferred($url, $responseElement="", $parameters=[]) { |
|
355
|
355
|
$parameters["immediatly"]=false; |
|
356
|
|
- return $this->_get($url, $responseElement,$parameters); |
|
|
356
|
+ return $this->_get($url, $responseElement, $parameters); |
|
357
|
357
|
} |
|
358
|
358
|
|
|
359
|
359
|
/** |
|
@@ -366,8 +366,8 @@ discard block |
|
|
block discarded – undo |
|
366
|
366
|
* @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) |
|
367
|
367
|
*/ |
|
368
|
368
|
public function getOn($event, $element, $url, $responseElement="", $parameters=array()) { |
|
369
|
|
- $this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]); |
|
370
|
|
- return $this->_add_event($element, $this->getDeferred($url,$responseElement,$parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]); |
|
|
369
|
+ $this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]); |
|
|
370
|
+ return $this->_add_event($element, $this->getDeferred($url, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]); |
|
371
|
371
|
} |
|
372
|
372
|
|
|
373
|
373
|
/** |
|
@@ -380,8 +380,8 @@ discard block |
|
|
block discarded – undo |
|
380
|
380
|
* @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) |
|
381
|
381
|
*/ |
|
382
|
382
|
public function ajaxOn($event, $element, $url, $responseElement="", $parameters=array()) { |
|
383
|
|
- $this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true,"method"=>"get"]); |
|
384
|
|
- return $this->_add_event($element, $this->ajaxDeferred($parameters["method"],$url,$responseElement,$parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]); |
|
|
383
|
+ $this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true, "method"=>"get"]); |
|
|
384
|
+ return $this->_add_event($element, $this->ajaxDeferred($parameters["method"], $url, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]); |
|
385
|
385
|
} |
|
386
|
386
|
|
|
387
|
387
|
/** |
|
@@ -408,9 +408,9 @@ discard block |
|
|
block discarded – undo |
|
408
|
408
|
return $this->getOn("click", $element, $url, $responseElement, $parameters); |
|
409
|
409
|
} |
|
410
|
410
|
|
|
411
|
|
- private function _post($url, $params="{}",$responseElement="", $parameters=[]) { |
|
|
411
|
+ private function _post($url, $params="{}", $responseElement="", $parameters=[]) { |
|
412
|
412
|
$parameters["params"]=$params; |
|
413
|
|
- return $this->_ajax("POST", $url,$responseElement,$parameters); |
|
|
413
|
+ return $this->_ajax("POST", $url, $responseElement, $parameters); |
|
414
|
414
|
} |
|
415
|
415
|
|
|
416
|
416
|
/** |
|
@@ -420,8 +420,8 @@ discard block |
|
|
block discarded – undo |
|
420
|
420
|
* @param string $params JSON parameters |
|
421
|
421
|
* @param array $parameters default : array("jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null) |
|
422
|
422
|
*/ |
|
423
|
|
- public function post($url, $params="{}",$responseElement="", $parameters=[]) { |
|
424
|
|
- return $this->_post($url, $params,$responseElement, $parameters); |
|
|
423
|
+ public function post($url, $params="{}", $responseElement="", $parameters=[]) { |
|
|
424
|
+ return $this->_post($url, $params, $responseElement, $parameters); |
|
425
|
425
|
} |
|
426
|
426
|
|
|
427
|
427
|
/** |
|
@@ -432,7 +432,7 @@ discard block |
|
|
block discarded – undo |
|
432
|
432
|
* @param string $responseElement selector of the HTML element displaying the answer |
|
433
|
433
|
* @param array $parameters default : array("jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null) |
|
434
|
434
|
*/ |
|
435
|
|
- public function postDeferred($url, $params="{}",$responseElement="", $parameters=[]) { |
|
|
435
|
+ public function postDeferred($url, $params="{}", $responseElement="", $parameters=[]) { |
|
436
|
436
|
$parameters["immediatly"]=false; |
|
437
|
437
|
return $this->_post($url, $params, $responseElement, $parameters); |
|
438
|
438
|
} |
|
@@ -448,8 +448,8 @@ discard block |
|
|
block discarded – undo |
|
448
|
448
|
* @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) |
|
449
|
449
|
*/ |
|
450
|
450
|
public function postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) { |
|
451
|
|
- $this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]); |
|
452
|
|
- return $this->_add_event($element, $this->postDeferred($url, $params, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]); |
|
|
451
|
+ $this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]); |
|
|
452
|
+ return $this->_add_event($element, $this->postDeferred($url, $params, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]); |
|
453
|
453
|
} |
|
454
|
454
|
|
|
455
|
455
|
/** |
|
@@ -466,27 +466,27 @@ discard block |
|
|
block discarded – undo |
|
466
|
466
|
} |
|
467
|
467
|
|
|
468
|
468
|
private function _postForm($url, $form, $responseElement, $parameters=[]) { |
|
469
|
|
- $params="{}";$validation=false;$jsCallback=NULL;$attr="id";$hasLoader=true;$ajaxLoader=null;$jqueryDone="html";$ajaxTransition=null;$immediatly=false;$jsCondition=NULL;$headers=NULL;$async=true; |
|
|
469
|
+ $params="{}"; $validation=false; $jsCallback=NULL; $attr="id"; $hasLoader=true; $ajaxLoader=null; $jqueryDone="html"; $ajaxTransition=null; $immediatly=false; $jsCondition=NULL; $headers=NULL; $async=true; |
|
470
|
470
|
\extract($parameters); |
|
471
|
|
- $async=($async)?"true":"false"; |
|
|
471
|
+ $async=($async) ? "true" : "false"; |
|
472
|
472
|
$jsCallback=isset($jsCallback) ? $jsCallback : ""; |
|
473
|
473
|
$retour=$this->_getAjaxUrl($url, $attr); |
|
474
|
474
|
$retour.="\nvar params=$('#".$form."').serialize();\n"; |
|
475
|
|
- if(isset($params)){ |
|
|
475
|
+ if (isset($params)) { |
|
476
|
476
|
$retour.="params+='&'+".self::_correctParams($params).";\n"; |
|
477
|
477
|
} |
|
478
|
478
|
$responseElement=$this->_getResponseElement($responseElement); |
|
479
|
479
|
$retour.="var self=this;\n"; |
|
480
|
|
- if($hasLoader===true){ |
|
481
|
|
- $this->addLoading($retour, $responseElement,$ajaxLoader); |
|
|
480
|
+ if ($hasLoader===true) { |
|
|
481
|
+ $this->addLoading($retour, $responseElement, $ajaxLoader); |
|
482
|
482
|
} |
|
483
|
|
- $ajaxParameters=["url"=>"url","method"=>"'POST'","data"=>"params","async"=>$async]; |
|
484
|
|
- if(isset($headers)){ |
|
|
483
|
+ $ajaxParameters=["url"=>"url", "method"=>"'POST'", "data"=>"params", "async"=>$async]; |
|
|
484
|
+ if (isset($headers)) { |
|
485
|
485
|
$ajaxParameters["headers"]=$headers; |
|
486
|
486
|
} |
|
487
|
487
|
$this->createAjaxParameters($ajaxParameters, $parameters); |
|
488
|
488
|
$retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data ) {\n"; |
|
489
|
|
- $retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback)."});\n"; |
|
|
489
|
+ $retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback)."});\n"; |
|
490
|
490
|
|
|
491
|
491
|
if ($validation) { |
|
492
|
492
|
$retour="$('#".$form."').validate({submitHandler: function(form) { |
|
@@ -536,8 +536,8 @@ discard block |
|
|
block discarded – undo |
|
536
|
536
|
* @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) |
|
537
|
537
|
*/ |
|
538
|
538
|
public function postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) { |
|
539
|
|
- $this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]); |
|
540
|
|
- return $this->_add_event($element, $this->postFormDeferred($url, $form, $responseElement,$parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]); |
|
|
539
|
+ $this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]); |
|
|
540
|
+ return $this->_add_event($element, $this->postFormDeferred($url, $form, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]); |
|
541
|
541
|
} |
|
542
|
542
|
|
|
543
|
543
|
/** |