Skip to content

Commit 2672cd2

Browse files
committed
Update JsUtilsAjaxTrait.php
1 parent 8529938 commit 2672cd2

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

Ajax/common/traits/JsUtilsAjaxTrait.php

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ protected function createAjaxParameters(&$original, $parameters) {
6969
"dataType" => "'%value%'",
7070
"beforeSend" => "function(jqXHR,settings){%value%}",
7171
"complete" => "function(jqXHR){%value%}",
72-
"processData"=>"%value%"
72+
"processData" => "%value%"
7373
];
7474
foreach ($validParameters as $param => $mask) {
7575
if (isset($parameters[$param])) {
@@ -284,10 +284,12 @@ public function ajax($method, $url, $responseElement = "", $parameters = []) {
284284
* @param string $responseElement
285285
* @param array $parameters
286286
* The ajax parameters, default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null)
287+
* @param
288+
* $immediatly
287289
* @return string
288290
*/
289-
public function ajaxInterval($method, $url, $interval, $globalName = null, $responseElement = "", $parameters = []) {
290-
return $this->interval($this->ajaxDeferred($method, $url, $responseElement, $parameters), $interval, $globalName);
291+
public function ajaxInterval($method, $url, $interval, $globalName = null, $responseElement = "", $parameters = [], $immediatly = true) {
292+
return $this->interval($this->ajaxDeferred($method, $url, $responseElement, $parameters), $interval, $globalName, $immediatly);
291293
}
292294

293295
/**
@@ -707,12 +709,12 @@ private function _postForm($url, $form, $responseElement, $parameters = []) {
707709
$jsCallback = isset($jsCallback) ? $jsCallback : "";
708710
$retour = $this->_getAjaxUrl($url, $attr);
709711
$retour .= "\n$('#" . $form . "').trigger('ajaxSubmit');";
710-
if(!isset($contentType) || $contentType!='false'){
712+
if (! isset($contentType) || $contentType != 'false') {
711713
$retour .= "\nvar params=$('#" . $form . "').serialize();\n";
712714
if (isset($params)) {
713715
$retour .= "params+='&'+" . self::_correctParams($params) . ";\n";
714716
}
715-
}else{
717+
} else {
716718
$retour .= "\nvar params=new FormData($('#" . $form . "')[0]);\n";
717719
}
718720
$responseElement = $this->_getResponseElement($responseElement);

0 commit comments

Comments
 (0)