@@ -355,9 +355,10 @@ public function jsonOn($event, $element, $url, $method = "get", $parameters = ar
355
355
$ this ->setDefaultParameters ( $ parameters , [
356
356
"preventDefault " => true ,
357
357
"stopPropagation " => true ,
358
- "immediatly " => true
358
+ "immediatly " => true ,
359
+ 'listenerOn ' =>false
359
360
] );
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 ' ] );
361
362
}
362
363
363
364
/**
@@ -459,9 +460,10 @@ public function jsonArrayOn($event, $element, $maskSelector, $url, $method = "ge
459
460
$ this ->setDefaultParameters ( $ parameters , [
460
461
"preventDefault " => true ,
461
462
"stopPropagation " => true ,
462
- "immediatly " => true
463
+ "immediatly " => true ,
464
+ 'listenerOn ' =>false
463
465
] );
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 ' ] );
465
467
}
466
468
467
469
/**
@@ -496,12 +498,8 @@ public function getDeferred($url, $responseElement = "", $parameters = [ ]) {
496
498
* 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)
497
499
*/
498
500
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 );
505
503
}
506
504
507
505
/**
@@ -667,12 +665,8 @@ public function postDeferred($url, $params = "{}", $responseElement = "", $param
667
665
* 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)
668
666
*/
669
667
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 );
676
670
}
677
671
678
672
/**
@@ -689,17 +683,17 @@ public function postOn($event, $element, $url, $params = "{}", $responseElement
689
683
* @param array $parameters
690
684
* 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)
691
685
*/
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 );
694
688
}
695
689
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 ' ] );
698
692
}
699
- $ params = " {} " ;
693
+ $ params = ' {} ' ;
700
694
$ validation = false ;
701
695
\extract ( $ parameters );
702
- $ async = ($ async ) ? " true " : " false " ;
696
+ $ async = ($ async ) ? ' true ' : ' false ' ;
703
697
$ jsCallback = isset ( $ jsCallback ) ? $ jsCallback : "" ;
704
698
$ retour = $ this ->_getAjaxUrl ( $ url , $ attr );
705
699
$ retour .= "\n$('# " . $ form . "').trigger('ajaxSubmit'); " ;
@@ -764,7 +758,7 @@ private function _postForm($url, $form, $responseElement, $parameters = [ ]) {
764
758
* default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null)
765
759
*/
766
760
public function postForm ($ url , $ form , $ responseElement , $ parameters = [ ]) {
767
- $ parameters [" immediatly " ] = true ;
761
+ $ parameters [' immediatly ' ] = true ;
768
762
return $ this ->_postForm ( $ url , $ form , $ responseElement , $ parameters );
769
763
}
770
764
@@ -782,7 +776,7 @@ public function postForm($url, $form, $responseElement, $parameters = [ ]) {
782
776
* default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null)
783
777
*/
784
778
public function postFormDeferred ($ url , $ form , $ responseElement , $ parameters = [ ]) {
785
- $ parameters [" immediatly " ] = false ;
779
+ $ parameters [' immediatly ' ] = false ;
786
780
return $ this ->_postForm ( $ url , $ form , $ responseElement , $ parameters );
787
781
}
788
782
@@ -801,11 +795,12 @@ public function postFormDeferred($url, $form, $responseElement, $parameters = [
801
795
*/
802
796
public function postFormOn ($ event , $ element , $ url , $ form , $ responseElement = "" , $ parameters = array ()) {
803
797
$ this ->setDefaultParameters ( $ parameters , [
804
- "preventDefault " => true ,
805
- "stopPropagation " => true ,
806
- "immediatly " => true
798
+ 'preventDefault ' => true ,
799
+ 'stopPropagation ' => true ,
800
+ 'immediatly ' => true ,
801
+ 'listenerOn ' =>false
807
802
] );
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 ' ] );
809
804
}
810
805
811
806
/**
0 commit comments