Skip to content

Commit 4ae35d0

Browse files
committed
Fix listenerOn pb (getOn)
1 parent ec835f9 commit 4ae35d0

File tree

1 file changed

+23
-28
lines changed

1 file changed

+23
-28
lines changed

Ajax/common/traits/JsUtilsAjaxTrait.php

Lines changed: 23 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -355,9 +355,10 @@ public function jsonOn($event, $element, $url, $method = "get", $parameters = ar
355355
$this->setDefaultParameters ( $parameters, [
356356
"preventDefault" => true,
357357
"stopPropagation" => true,
358-
"immediatly" => true
358+
"immediatly" => true,
359+
'listenerOn'=>false
359360
] );
360-
return $this->_add_event ( $element, $this->jsonDeferred ( $url, $method, $parameters ), $event, $parameters ["preventDefault"], $parameters ["stopPropagation"], $parameters ["immediatly"] );
361+
return $this->_add_event ( $element, $this->jsonDeferred ( $url, $method, $parameters ), $event, $parameters ["preventDefault"], $parameters ["stopPropagation"], $parameters ["immediatly"] ,$parameters['listenerOn']);
361362
}
362363

363364
/**
@@ -459,9 +460,10 @@ public function jsonArrayOn($event, $element, $maskSelector, $url, $method = "ge
459460
$this->setDefaultParameters ( $parameters, [
460461
"preventDefault" => true,
461462
"stopPropagation" => true,
462-
"immediatly" => true
463+
"immediatly" => true,
464+
'listenerOn'=>false
463465
] );
464-
return $this->_add_event ( $element, $this->jsonArrayDeferred ( $maskSelector, $url, $method, $parameters ), $event, $parameters ["preventDefault"], $parameters ["stopPropagation"], $parameters ["immediatly"] );
466+
return $this->_add_event ( $element, $this->jsonArrayDeferred ( $maskSelector, $url, $method, $parameters ), $event, $parameters ["preventDefault"], $parameters ["stopPropagation"], $parameters ["immediatly"] ,$parameters['listenerOn']);
465467
}
466468

467469
/**
@@ -496,12 +498,8 @@ public function getDeferred($url, $responseElement = "", $parameters = [ ]) {
496498
* 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,"before"=>null,"listenerOn"=>false)
497499
*/
498500
public function getOn($event, $element, $url, $responseElement = "", $parameters = array ()) {
499-
$this->setDefaultParameters ( $parameters, [
500-
"preventDefault" => true,
501-
"stopPropagation" => true,
502-
"immediatly" => true
503-
] );
504-
return $this->_add_event ( $element, $this->getDeferred ( $url, $responseElement, $parameters ), $event, $parameters ["preventDefault"], $parameters ["stopPropagation"], $parameters ["immediatly"] );
501+
$parameters['method']='get';
502+
return $this->ajaxOn($event, $element, $url,$responseElement,$parameters);
505503
}
506504

507505
/**
@@ -667,12 +665,8 @@ public function postDeferred($url, $params = "{}", $responseElement = "", $param
667665
* 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,"before"=>null,"listenerOn"=>false)
668666
*/
669667
public function postOn($event, $element, $url, $params = "{}", $responseElement = "", $parameters = array ()) {
670-
$this->setDefaultParameters ( $parameters, [
671-
"preventDefault" => true,
672-
"stopPropagation" => true,
673-
"immediatly" => true
674-
] );
675-
return $this->_add_event ( $element, $this->postDeferred ( $url, $params, $responseElement, $parameters ), $event, $parameters ["preventDefault"], $parameters ["stopPropagation"], $parameters ["immediatly"] );
668+
$parameters['method']='post';
669+
return $this->ajaxOn($event, $element, $url,$responseElement,$parameters);
676670
}
677671

678672
/**
@@ -689,17 +683,17 @@ public function postOn($event, $element, $url, $params = "{}", $responseElement
689683
* @param array $parameters
690684
* 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,"before"=>null,"before"=>null,"listenerOn"=>false)
691685
*/
692-
public function postOnClick($element, $url, $params = "{}", $responseElement = "", $parameters = array ()) {
693-
return $this->postOn ( "click", $element, $url, $params, $responseElement, $parameters );
686+
public function postOnClick($element, $url, $params = '{}', $responseElement = '', $parameters = array ()) {
687+
return $this->postOn ( 'click', $element, $url, $params, $responseElement, $parameters );
694688
}
695689
private function _postForm($url, $form, $responseElement, $parameters = [ ]) {
696-
if (isset ( $this->params ["ajax"] )) {
697-
extract ( $this->params ["ajax"] );
690+
if (isset ( $this->params ['ajax'] )) {
691+
extract ( $this->params ['ajax'] );
698692
}
699-
$params = "{}";
693+
$params = '{}';
700694
$validation = false;
701695
\extract ( $parameters );
702-
$async = ($async) ? "true" : "false";
696+
$async = ($async) ? 'true' : 'false';
703697
$jsCallback = isset ( $jsCallback ) ? $jsCallback : "";
704698
$retour = $this->_getAjaxUrl ( $url, $attr );
705699
$retour .= "\n$('#" . $form . "').trigger('ajaxSubmit');";
@@ -764,7 +758,7 @@ private function _postForm($url, $form, $responseElement, $parameters = [ ]) {
764758
* default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null)
765759
*/
766760
public function postForm($url, $form, $responseElement, $parameters = [ ]) {
767-
$parameters ["immediatly"] = true;
761+
$parameters ['immediatly'] = true;
768762
return $this->_postForm ( $url, $form, $responseElement, $parameters );
769763
}
770764

@@ -782,7 +776,7 @@ public function postForm($url, $form, $responseElement, $parameters = [ ]) {
782776
* default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null)
783777
*/
784778
public function postFormDeferred($url, $form, $responseElement, $parameters = [ ]) {
785-
$parameters ["immediatly"] = false;
779+
$parameters ['immediatly'] = false;
786780
return $this->_postForm ( $url, $form, $responseElement, $parameters );
787781
}
788782

@@ -801,11 +795,12 @@ public function postFormDeferred($url, $form, $responseElement, $parameters = [
801795
*/
802796
public function postFormOn($event, $element, $url, $form, $responseElement = "", $parameters = array ()) {
803797
$this->setDefaultParameters ( $parameters, [
804-
"preventDefault" => true,
805-
"stopPropagation" => true,
806-
"immediatly" => true
798+
'preventDefault' => true,
799+
'stopPropagation' => true,
800+
'immediatly' => true,
801+
'listenerOn'=>false
807802
] );
808-
return $this->_add_event ( $element, $this->postFormDeferred ( $url, $form, $responseElement, $parameters ), $event, $parameters ["preventDefault"], $parameters ["stopPropagation"], $parameters ["immediatly"] );
803+
return $this->_add_event ( $element, $this->postFormDeferred ( $url, $form, $responseElement, $parameters ), $event, $parameters ["preventDefault"], $parameters ["stopPropagation"], $parameters ["immediatly"] ,$parameters['listenerOn']);
809804
}
810805

811806
/**

0 commit comments

Comments
 (0)