Skip to content

Commit b05b279

Browse files
jcheronjcheron
committed
Fix postOn pb (no params)
1 parent 4ae35d0 commit b05b279

File tree

1 file changed

+54
-52
lines changed

1 file changed

+54
-52
lines changed

‎Ajax/common/traits/JsUtilsAjaxTrait.php‎

Lines changed: 54 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,14 @@ trait JsUtilsAjaxTrait {
1818
abstract public function getUrl($url);
1919
abstract public function _add_event($element, $js, $event, $preventDefault = false, $stopPropagation = false, $immediatly = true, $listenerOn=false);
2020
abstract public function interval($jsCode, $time, $globalName = null, $immediatly = true);
21-
protected function _ajax($method, $url, $responseElement = "", $parameters = [ ]) {
22-
if (isset ( $this->params ["ajax"] )) {
23-
extract ( $this->params ["ajax"] );
21+
22+
protected function _ajax($method, $url, $responseElement = '', $parameters = [ ]) {
23+
if (isset ( $this->params ['ajax'] )) {
24+
extract ( $this->params ['ajax'] );
2425
}
2526
extract ( $parameters );
2627

27-
$jsCallback = isset ( $jsCallback ) ? $jsCallback : "";
28+
$jsCallback = isset ( $jsCallback ) ? $jsCallback : '';
2829
$retour = $this->_getAjaxUrl ( $url, $attr );
2930
$originalSelector = $responseElement;
3031
$responseElement = $this->_getResponseElement ( $responseElement );
@@ -145,7 +146,7 @@ protected function _getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition
145146
}
146147
$retour .= "\nwindow.history.pushState({'html':data,'selector':" . Javascript::prep_value ( $history ) . ",'jqueryDone':'{$jqueryDone}'},'', url);";
147148
}
148-
if ($hasLoader === "internal") {
149+
if ($hasLoader === 'internal') {
149150
$retour .= "\n$(self).removeClass('loading');";
150151
}
151152
$retour .= "\t" . $jsCallback . "\n";
@@ -204,7 +205,7 @@ protected function addResponseLoading(&$retour, $responseElement, $ajaxLoader =
204205
protected function setAjaxDataCall($params) {
205206
$result = null;
206207
if (! \is_callable ( $params )) {
207-
$result = function ($responseElement, $jqueryDone = "html") use ($params) {
208+
$result = function ($responseElement, $jqueryDone = 'html') use ($params) {
208209
return AjaxTransition::{$params} ( $responseElement, $jqueryDone );
209210
};
210211
}
@@ -228,8 +229,8 @@ public function setAjaxLoader($loader) {
228229
* @param string $responseElement
229230
* selector of the HTML element displaying the answer
230231
*/
231-
private function _get($url, $responseElement = "", $parameters = [ ]) {
232-
return $this->_ajax ( "get", $url, $responseElement, $parameters );
232+
private function _get($url, $responseElement = '', $parameters = [ ]) {
233+
return $this->_ajax ( 'get', $url, $responseElement, $parameters );
233234
}
234235

235236
/**
@@ -242,8 +243,8 @@ private function _get($url, $responseElement = "", $parameters = [ ]) {
242243
* @param array $parameters
243244
* default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null)
244245
*/
245-
public function get($url, $responseElement = "", $parameters = [ ]) {
246-
$parameters ["immediatly"] = true;
246+
public function get($url, $responseElement = '', $parameters = [ ]) {
247+
$parameters ['immediatly'] = true;
247248
return $this->_get ( $url, $responseElement, $parameters );
248249
}
249250

@@ -259,8 +260,8 @@ public function get($url, $responseElement = "", $parameters = [ ]) {
259260
* @param array $parameters
260261
* default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null)
261262
*/
262-
public function ajax($method, $url, $responseElement = "", $parameters = [ ]) {
263-
$parameters ["immediatly"] = true;
263+
public function ajax($method, $url, $responseElement = '', $parameters = [ ]) {
264+
$parameters ['immediatly'] = true;
264265
return $this->_ajax ( $method, $url, $responseElement, $parameters );
265266
}
266267

@@ -282,7 +283,7 @@ public function ajax($method, $url, $responseElement = "", $parameters = [ ]) {
282283
* $immediatly
283284
* @return string
284285
*/
285-
public function ajaxInterval($method, $url, $interval, $globalName = null, $responseElement = "", $parameters = [ ], $immediatly = true) {
286+
public function ajaxInterval($method, $url, $interval, $globalName = null, $responseElement = '', $parameters = [ ], $immediatly = true) {
286287
return $this->interval ( $this->ajaxDeferred ( $method, $url, $responseElement, $parameters ), $interval, $globalName, $immediatly );
287288
}
288289

@@ -298,8 +299,8 @@ public function ajaxInterval($method, $url, $interval, $globalName = null, $resp
298299
* @param array $parameters
299300
* default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null)
300301
*/
301-
public function ajaxDeferred($method, $url, $responseElement = "", $parameters = [ ]) {
302-
$parameters ["immediatly"] = false;
302+
public function ajaxDeferred($method, $url, $responseElement = '', $parameters = [ ]) {
303+
$parameters ['immediatly'] = false;
303304
return $this->_ajax ( $method, $url, $responseElement, $parameters );
304305
}
305306

@@ -351,11 +352,11 @@ public function json($url, $method = "get", $parameters = [ ]) {
351352
* @param array $parameters
352353
* default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true,"before"=>null,"listenerOn"=>false)
353354
*/
354-
public function jsonOn($event, $element, $url, $method = "get", $parameters = array ()) {
355+
public function jsonOn($event, $element, $url, $method = 'get', $parameters = array ()) {
355356
$this->setDefaultParameters ( $parameters, [
356-
"preventDefault" => true,
357-
"stopPropagation" => true,
358-
"immediatly" => true,
357+
'preventDefault' => true,
358+
'stopPropagation' => true,
359+
'immediatly' => true,
359360
'listenerOn'=>false
360361
] );
361362
return $this->_add_event ( $element, $this->jsonDeferred ( $url, $method, $parameters ), $event, $parameters ["preventDefault"], $parameters ["stopPropagation"], $parameters ["immediatly"] ,$parameters['listenerOn']);
@@ -371,8 +372,8 @@ public function jsonOn($event, $element, $url, $method = "get", $parameters = ar
371372
* @param array $parameters
372373
* default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>"document","jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"before"=>null)
373374
*/
374-
public function jsonDeferred($url, $method = "get", $parameters = [ ]) {
375-
$parameters ["immediatly"] = false;
375+
public function jsonDeferred($url, $method = 'get', $parameters = [ ]) {
376+
$parameters ['immediatly'] = false;
376377
return $this->_json ( $url, $method, $parameters );
377378
}
378379

@@ -387,7 +388,7 @@ public function jsonDeferred($url, $method = "get", $parameters = [ ]) {
387388
* @param array $parameters
388389
* default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"rowClass"=>"_json","before"=>null)
389390
*/
390-
private function _jsonArray($maskSelector, $url, $method = "get", $parameters = [ ]) {
391+
private function _jsonArray($maskSelector, $url, $method = 'get', $parameters = [ ]) {
391392
$parameters = \array_merge ( $parameters, [
392393
"hasLoader" => false
393394
] );
@@ -424,7 +425,7 @@ private function _jsonArray($maskSelector, $url, $method = "get", $parameters =
424425
* @param array $parameters
425426
* default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"rowClass"=>"_json","before"=>null)
426427
*/
427-
public function jsonArray($maskSelector, $url, $method = "get", $parameters = [ ]) {
428+
public function jsonArray($maskSelector, $url, $method = 'get', $parameters = [ ]) {
428429
return $this->_jsonArray ( $maskSelector, $url, $method, $parameters );
429430
}
430431

@@ -439,8 +440,8 @@ public function jsonArray($maskSelector, $url, $method = "get", $parameters = [
439440
* @param array $parameters
440441
* default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"rowClass"=>"_json","before"=>null)
441442
*/
442-
public function jsonArrayDeferred($maskSelector, $url, $method = "get", $parameters = [ ]) {
443-
$parameters ["immediatly"] = false;
443+
public function jsonArrayDeferred($maskSelector, $url, $method = 'get', $parameters = [ ]) {
444+
$parameters ['immediatly'] = false;
444445
return $this->jsonArray ( $maskSelector, $url, $method, $parameters );
445446
}
446447

@@ -456,11 +457,11 @@ public function jsonArrayDeferred($maskSelector, $url, $method = "get", $paramet
456457
* @param array $parameters
457458
* default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","rowClass"=>"_json","immediatly"=>true,"before"=>null,"listenerOn"=>false)
458459
*/
459-
public function jsonArrayOn($event, $element, $maskSelector, $url, $method = "get", $parameters = array ()) {
460+
public function jsonArrayOn($event, $element, $maskSelector, $url, $method = 'get', $parameters = array ()) {
460461
$this->setDefaultParameters ( $parameters, [
461-
"preventDefault" => true,
462-
"stopPropagation" => true,
463-
"immediatly" => true,
462+
'preventDefault' => true,
463+
'stopPropagation' => true,
464+
'immediatly' => true,
464465
'listenerOn'=>false
465466
] );
466467
return $this->_add_event ( $element, $this->jsonArrayDeferred ( $maskSelector, $url, $method, $parameters ), $event, $parameters ["preventDefault"], $parameters ["stopPropagation"], $parameters ["immediatly"] ,$parameters['listenerOn']);
@@ -478,7 +479,7 @@ public function jsonArrayOn($event, $element, $maskSelector, $url, $method = "ge
478479
* default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null)
479480
*/
480481
public function getDeferred($url, $responseElement = "", $parameters = [ ]) {
481-
$parameters ["immediatly"] = false;
482+
$parameters ['immediatly'] = false;
482483
return $this->_get ( $url, $responseElement, $parameters );
483484
}
484485

@@ -517,15 +518,15 @@ public function getOn($event, $element, $url, $responseElement = "", $parameters
517518
* @param array $parameters
518519
* 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,"before"=>null,"listenerOn"=>false)
519520
*/
520-
public function ajaxOn($event, $element, $url, $responseElement = "", $parameters = array ()) {
521+
public function ajaxOn($event, $element, $url, $responseElement = '', $parameters = array ()) {
521522
$this->setDefaultParameters ( $parameters, [
522-
"preventDefault" => true,
523-
"stopPropagation" => true,
524-
"immediatly" => true,
525-
"method" => "get",
526-
"listenerOn"=>false
523+
'preventDefault' => true,
524+
'stopPropagation' => true,
525+
'immediatly' => true,
526+
'method' => 'get',
527+
'listenerOn'=>false
527528
] );
528-
return $this->_add_event ( $element, $this->ajaxDeferred ( $parameters ["method"], $url, $responseElement, $parameters ), $event, $parameters ["preventDefault"], $parameters ["stopPropagation"], $parameters ["immediatly"],$parameters['listenerOn'] );
529+
return $this->_add_event ( $element, $this->ajaxDeferred ( $parameters ['method'], $url, $responseElement, $parameters ), $event, $parameters ["preventDefault"], $parameters ["stopPropagation"], $parameters ["immediatly"],$parameters['listenerOn'] );
529530
}
530531

531532
/**
@@ -541,8 +542,8 @@ public function ajaxOn($event, $element, $url, $responseElement = "", $parameter
541542
* @param array $parameters
542543
* 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,"before"=>null,"listenerOn"=>false)
543544
*/
544-
public function ajaxOnClick($element, $url, $responseElement = "", $parameters = array ()) {
545-
return $this->ajaxOn ( "click", $element, $url, $responseElement, $parameters );
545+
public function ajaxOnClick($element, $url, $responseElement = '', $parameters = array ()) {
546+
return $this->ajaxOn ( 'click', $element, $url, $responseElement, $parameters );
546547
}
547548

548549
/**
@@ -558,8 +559,8 @@ public function ajaxOnClick($element, $url, $responseElement = "", $parameters =
558559
* @param array $parameters
559560
* default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null,"listenerOn"=>false)
560561
*/
561-
public function getOnClick($element, $url, $responseElement = "", $parameters = array ()) {
562-
return $this->getOn ( "click", $element, $url, $responseElement, $parameters );
562+
public function getOnClick($element, $url, $responseElement = '', $parameters = array ()) {
563+
return $this->getOn ( 'click', $element, $url, $responseElement, $parameters );
563564
}
564565

565566
/**
@@ -574,14 +575,14 @@ public function getOnClick($element, $url, $responseElement = "", $parameters =
574575
* @return $this
575576
*/
576577
public function getHref($element, $responseElement = "", $parameters = array ()) {
577-
$parameters ["attr"] = "href";
578+
$parameters ['attr'] = 'href';
578579
if (JString::isNull ( $responseElement )) {
579580
$responseElement = '%$(self).attr("data-target")%';
580581
} else {
581582
$responseElement = '%$(self).attr("data-target") || "' . $responseElement . '"%';
582583
}
583-
if (! isset ( $parameters ["historize"] )) {
584-
$parameters ["historize"] = true;
584+
if (! isset ( $parameters ['historize'] )) {
585+
$parameters ['historize'] = true;
585586
}
586587
return $this->getOnClick ( $element, "", $responseElement, $parameters );
587588
}
@@ -598,20 +599,20 @@ public function getHref($element, $responseElement = "", $parameters = array ())
598599
* @return $this
599600
*/
600601
public function postHref($element, $responseElement = "", $parameters = array ()) {
601-
$parameters ["attr"] = "href";
602+
$parameters ['attr'] = 'href';
602603
if (JString::isNull ( $responseElement )) {
603604
$responseElement = '%$(this).attr("data-target")%';
604605
} else {
605606
$responseElement = '%$(self).attr("data-target") || "' . $responseElement . '"%';
606607
}
607-
if (! isset ( $parameters ["historize"] )) {
608-
$parameters ["historize"] = true;
608+
if (! isset ( $parameters ['historize'] )) {
609+
$parameters ['historize'] = true;
609610
}
610-
return $this->postOnClick ( $element, "", "{}", $responseElement, $parameters );
611+
return $this->postOnClick ( $element, '', '{}', $responseElement, $parameters );
611612
}
612-
private function _post($url, $params = "{}", $responseElement = "", $parameters = [ ]) {
613-
$parameters ["params"] = $params;
614-
return $this->_ajax ( "POST", $url, $responseElement, $parameters );
613+
private function _post($url, $params = '{}', $responseElement = '', $parameters = [ ]) {
614+
$parameters ['params'] = $params;
615+
return $this->_ajax ( 'POST', $url, $responseElement, $parameters );
615616
}
616617

617618
/**
@@ -645,7 +646,7 @@ public function post($url, $params = "{}", $responseElement = "", $parameters =
645646
* default : array("jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null)
646647
*/
647648
public function postDeferred($url, $params = "{}", $responseElement = "", $parameters = [ ]) {
648-
$parameters ["immediatly"] = false;
649+
$parameters ['immediatly'] = false;
649650
return $this->_post ( $url, $params, $responseElement, $parameters );
650651
}
651652

@@ -666,6 +667,7 @@ public function postDeferred($url, $params = "{}", $responseElement = "", $param
666667
*/
667668
public function postOn($event, $element, $url, $params = "{}", $responseElement = "", $parameters = array ()) {
668669
$parameters['method']='post';
670+
$parameters ['params'] = $params;
669671
return $this->ajaxOn($event, $element, $url,$responseElement,$parameters);
670672
}
671673

0 commit comments

Comments
 (0)