phpMv /
phpMv-UI
@@ -8,7 +8,7 @@ discard block |
||
| 8 | 8 | * @version 1.001 |
| 9 | 9 | * Generates a JSON Rule for the validation of a field |
| 10 | 10 | */ |
| 11 | -class Rule implements \JsonSerializable{ |
|
| 11 | +class Rule implements \JsonSerializable { |
|
| 12 | 12 | /** |
| 13 | 13 | * @var string |
| 14 | 14 | */ |
@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | */ |
| 24 | 24 | private $value; |
| 25 | 25 | |
| 26 | - public function __construct($type,$prompt=NULL,$value=NULL){ |
|
| 26 | + public function __construct($type, $prompt=NULL, $value=NULL) { |
|
| 27 | 27 | $this->type=$type; |
| 28 | 28 | $this->prompt=$prompt; |
| 29 | 29 | $this->value=$value; |
@@ -57,10 +57,10 @@ discard block |
||
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | public function jsonSerialize() { |
| 60 | - $result= ["type"=>$this->type]; |
|
| 61 | - if(isset($this->prompt)) |
|
| 60 | + $result=["type"=>$this->type]; |
|
| 61 | + if (isset($this->prompt)) |
|
| 62 | 62 | $result["prompt"]=$this->prompt; |
| 63 | - if(isset($this->value)) |
|
| 63 | + if (isset($this->value)) |
|
| 64 | 64 | $result["value"]=$this->value; |
| 65 | 65 | return $result; |
| 66 | 66 | } |
@@ -71,8 +71,8 @@ discard block |
||
| 71 | 71 | * @param string $prompt |
| 72 | 72 | * @return \Ajax\semantic\components\validation\Rule |
| 73 | 73 | */ |
| 74 | - public static function match($name,$prompt=NULL){ |
|
| 75 | - return new Rule("match[".$name."]",$prompt); |
|
| 74 | + public static function match($name, $prompt=NULL) { |
|
| 75 | + return new Rule("match[".$name."]", $prompt); |
|
| 76 | 76 | } |
| 77 | 77 | |
| 78 | 78 | /** |
@@ -81,8 +81,8 @@ discard block |
||
| 81 | 81 | * @param string $prompt |
| 82 | 82 | * @return \Ajax\semantic\components\validation\Rule |
| 83 | 83 | */ |
| 84 | - public static function different($name,$prompt=NULL){ |
|
| 85 | - return new Rule("different[".$name."]",$prompt); |
|
| 84 | + public static function different($name, $prompt=NULL) { |
|
| 85 | + return new Rule("different[".$name."]", $prompt); |
|
| 86 | 86 | } |
| 87 | 87 | |
| 88 | 88 | /** |
@@ -92,82 +92,82 @@ discard block |
||
| 92 | 92 | * @param string $prompt |
| 93 | 93 | * @return \Ajax\semantic\components\validation\Rule |
| 94 | 94 | */ |
| 95 | - public static function integer($min=NULL,$max=NULL,$prompt=NULL){ |
|
| 96 | - if(\is_int($min) && \is_int($max)) |
|
| 97 | - return new Rule("integer[{$min}..{$max}]",$prompt); |
|
| 98 | - return new Rule("integer",$prompt); |
|
| 95 | + public static function integer($min=NULL, $max=NULL, $prompt=NULL) { |
|
| 96 | + if (\is_int($min) && \is_int($max)) |
|
| 97 | + return new Rule("integer[{$min}..{$max}]", $prompt); |
|
| 98 | + return new Rule("integer", $prompt); |
|
| 99 | 99 | } |
| 100 | 100 | |
| 101 | - public static function decimal($prompt=NULL){ |
|
| 102 | - return new Rule("decimal",$prompt); |
|
| 101 | + public static function decimal($prompt=NULL) { |
|
| 102 | + return new Rule("decimal", $prompt); |
|
| 103 | 103 | } |
| 104 | 104 | |
| 105 | - public static function number($prompt=NULL){ |
|
| 106 | - return new Rule("number",$prompt); |
|
| 105 | + public static function number($prompt=NULL) { |
|
| 106 | + return new Rule("number", $prompt); |
|
| 107 | 107 | } |
| 108 | 108 | |
| 109 | - public static function is($value,$prompt=NULL){ |
|
| 110 | - return new Rule("is[".$value."]",$prompt); |
|
| 109 | + public static function is($value, $prompt=NULL) { |
|
| 110 | + return new Rule("is[".$value."]", $prompt); |
|
| 111 | 111 | } |
| 112 | 112 | |
| 113 | - public static function isExactly($value,$prompt=NULL){ |
|
| 114 | - return new Rule("isExactly[".$value."]",$prompt); |
|
| 113 | + public static function isExactly($value, $prompt=NULL) { |
|
| 114 | + return new Rule("isExactly[".$value."]", $prompt); |
|
| 115 | 115 | } |
| 116 | 116 | |
| 117 | - public static function not($value,$prompt=NULL){ |
|
| 118 | - return new Rule("not[".$value."]",$prompt); |
|
| 117 | + public static function not($value, $prompt=NULL) { |
|
| 118 | + return new Rule("not[".$value."]", $prompt); |
|
| 119 | 119 | } |
| 120 | 120 | |
| 121 | - public static function notExactly($value,$prompt=NULL){ |
|
| 122 | - return new Rule("notExactly[".$value."]",$prompt); |
|
| 121 | + public static function notExactly($value, $prompt=NULL) { |
|
| 122 | + return new Rule("notExactly[".$value."]", $prompt); |
|
| 123 | 123 | } |
| 124 | 124 | |
| 125 | - public static function contains($value,$prompt=NULL){ |
|
| 126 | - return new Rule("contains[".$value."]",$prompt); |
|
| 125 | + public static function contains($value, $prompt=NULL) { |
|
| 126 | + return new Rule("contains[".$value."]", $prompt); |
|
| 127 | 127 | } |
| 128 | 128 | |
| 129 | - public static function containsExactly($value,$prompt=NULL){ |
|
| 130 | - return new Rule("containsExactly[".$value."]",$prompt); |
|
| 129 | + public static function containsExactly($value, $prompt=NULL) { |
|
| 130 | + return new Rule("containsExactly[".$value."]", $prompt); |
|
| 131 | 131 | } |
| 132 | 132 | |
| 133 | - public static function doesntContain($value,$prompt=NULL){ |
|
| 134 | - return new Rule("doesntContain[".$value."]",$prompt); |
|
| 133 | + public static function doesntContain($value, $prompt=NULL) { |
|
| 134 | + return new Rule("doesntContain[".$value."]", $prompt); |
|
| 135 | 135 | } |
| 136 | 136 | |
| 137 | - public static function doesntContainExactly($value,$prompt=NULL){ |
|
| 138 | - return new Rule("doesntContainExactly[".$value."]",$prompt); |
|
| 137 | + public static function doesntContainExactly($value, $prompt=NULL) { |
|
| 138 | + return new Rule("doesntContainExactly[".$value."]", $prompt); |
|
| 139 | 139 | } |
| 140 | 140 | |
| 141 | - public static function minCount($value,$prompt=NULL){ |
|
| 142 | - return new Rule("minCount[".$value."]",$prompt); |
|
| 141 | + public static function minCount($value, $prompt=NULL) { |
|
| 142 | + return new Rule("minCount[".$value."]", $prompt); |
|
| 143 | 143 | } |
| 144 | 144 | |
| 145 | - public static function maxCount($value,$prompt=NULL){ |
|
| 146 | - return new Rule("maxCount[".$value."]",$prompt); |
|
| 145 | + public static function maxCount($value, $prompt=NULL) { |
|
| 146 | + return new Rule("maxCount[".$value."]", $prompt); |
|
| 147 | 147 | } |
| 148 | 148 | |
| 149 | - public static function exactCount($value,$prompt=NULL){ |
|
| 150 | - return new Rule("exactCount[".$value."]",$prompt); |
|
| 149 | + public static function exactCount($value, $prompt=NULL) { |
|
| 150 | + return new Rule("exactCount[".$value."]", $prompt); |
|
| 151 | 151 | } |
| 152 | 152 | |
| 153 | - public static function email($prompt=NULL){ |
|
| 154 | - return new Rule("email",$prompt); |
|
| 153 | + public static function email($prompt=NULL) { |
|
| 154 | + return new Rule("email", $prompt); |
|
| 155 | 155 | } |
| 156 | 156 | |
| 157 | - public static function url($prompt=NULL){ |
|
| 158 | - return new Rule("url",$prompt); |
|
| 157 | + public static function url($prompt=NULL) { |
|
| 158 | + return new Rule("url", $prompt); |
|
| 159 | 159 | } |
| 160 | 160 | |
| 161 | - public static function regExp($value,$prompt=NULL){ |
|
| 162 | - return new Rule("regExp",$prompt,$value); |
|
| 161 | + public static function regExp($value, $prompt=NULL) { |
|
| 162 | + return new Rule("regExp", $prompt, $value); |
|
| 163 | 163 | } |
| 164 | 164 | |
| 165 | - public static function custom($name,$jsFunction){ |
|
| 166 | - return "$.fn.form.settings.rules.".$name." =".$jsFunction ; |
|
| 165 | + public static function custom($name, $jsFunction) { |
|
| 166 | + return "$.fn.form.settings.rules.".$name." =".$jsFunction; |
|
| 167 | 167 | } |
| 168 | 168 | |
| 169 | - public static function ajax(JsUtils $js,$name,$url,$params,$jsCallback,$method="post",$parameters=[]){ |
|
| 170 | - $parameters=\array_merge(["async"=>false,"url"=>$url,"params"=>$params,"hasLoader"=>false,"jsCallback"=>$jsCallback,"dataType"=>"json","stopPropagation"=>false,"preventDefault"=>false,"responseElement"=>null],$parameters); |
|
| 169 | + public static function ajax(JsUtils $js, $name, $url, $params, $jsCallback, $method="post", $parameters=[]) { |
|
| 170 | + $parameters=\array_merge(["async"=>false, "url"=>$url, "params"=>$params, "hasLoader"=>false, "jsCallback"=>$jsCallback, "dataType"=>"json", "stopPropagation"=>false, "preventDefault"=>false, "responseElement"=>null], $parameters); |
|
| 171 | 171 | $ajax=new AjaxCall($method, $parameters); |
| 172 | 172 | return self::custom($name, "function(value){var result=true;".$ajax->compile($js)."return result;}"); |
| 173 | 173 | } |
@@ -16,9 +16,9 @@ discard block |
||
| 16 | 16 | protected $ajaxLoader='<span></span><span></span><span></span><span></span><span></span>'; |
| 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; |
@@ -35,80 +35,80 @@ discard block |
||
| 35 | 35 | $retour=$this->_getAjaxUrl($url, $attr); |
| 36 | 36 | $responseElement=$this->_getResponseElement($responseElement); |
| 37 | 37 | $retour.="var self=this;\n"; |
| 38 | - if($hasLoader===true && JString::isNotNull($responseElement)){ |
|
| 38 | + if ($hasLoader===true && JString::isNotNull($responseElement)) { |
|
| 39 | 39 | $this->addLoading($retour, $responseElement); |
| 40 | 40 | } |
| 41 | - $ajaxParameters=["url"=>"url","method"=>"'".\strtoupper($method)."'"]; |
|
| 42 | - if(!$async){ |
|
| 41 | + $ajaxParameters=["url"=>"url", "method"=>"'".\strtoupper($method)."'"]; |
|
| 42 | + if (!$async) { |
|
| 43 | 43 | $ajaxParameters["async"]="false"; |
| 44 | 44 | } |
| 45 | - if(isset($params)){ |
|
| 45 | + if (isset($params)) { |
|
| 46 | 46 | $ajaxParameters["data"]=self::_correctParams($params); |
| 47 | 47 | } |
| 48 | - if(isset($headers)){ |
|
| 48 | + if (isset($headers)) { |
|
| 49 | 49 | $ajaxParameters["headers"]=$headers; |
| 50 | 50 | } |
| 51 | 51 | $this->createAjaxParameters($ajaxParameters, $parameters); |
| 52 | 52 | $retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data, textStatus, jqXHR ) {\n"; |
| 53 | - $retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback)."});\n"; |
|
| 54 | - $retour=$this->_addJsCondition($jsCondition,$retour); |
|
| 53 | + $retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback)."});\n"; |
|
| 54 | + $retour=$this->_addJsCondition($jsCondition, $retour); |
|
| 55 | 55 | if ($immediatly) |
| 56 | 56 | $this->jquery_code_for_compile[]=$retour; |
| 57 | 57 | return $retour; |
| 58 | 58 | } |
| 59 | 59 | |
| 60 | - protected function createAjaxParameters(&$original,$parameters){ |
|
| 61 | - $validParameters=["dataType"=>"'%value%'","beforeSend"=>"function(jqXHR,settings){%value%}","complete"=>"function(jqXHR){%value%}"]; |
|
| 62 | - foreach ($validParameters as $param=>$mask){ |
|
| 63 | - if(isset($parameters[$param])){ |
|
| 60 | + protected function createAjaxParameters(&$original, $parameters) { |
|
| 61 | + $validParameters=["dataType"=>"'%value%'", "beforeSend"=>"function(jqXHR,settings){%value%}", "complete"=>"function(jqXHR){%value%}"]; |
|
| 62 | + foreach ($validParameters as $param=>$mask) { |
|
| 63 | + if (isset($parameters[$param])) { |
|
| 64 | 64 | $original[$param]=\str_replace("%value%", $parameters[$param], $mask); |
| 65 | 65 | } |
| 66 | 66 | } |
| 67 | 67 | } |
| 68 | 68 | |
| 69 | - protected function implodeAjaxParameters($ajaxParameters){ |
|
| 70 | - $s = ''; foreach ($ajaxParameters as $k=>$v) { if ($s !== '') { $s .= ','; } $s .= "'{$k}':{$v}"; } |
|
| 69 | + protected function implodeAjaxParameters($ajaxParameters) { |
|
| 70 | + $s=''; foreach ($ajaxParameters as $k=>$v) { if ($s!=='') { $s.=','; } $s.="'{$k}':{$v}"; } |
|
| 71 | 71 | return $s; |
| 72 | 72 | } |
| 73 | 73 | |
| 74 | - protected function _addJsCondition($jsCondition,$jsSource){ |
|
| 75 | - if(isset($jsCondition)){ |
|
| 74 | + protected function _addJsCondition($jsCondition, $jsSource) { |
|
| 75 | + if (isset($jsCondition)) { |
|
| 76 | 76 | return "if(".$jsCondition."){\n".$jsSource."\n}"; |
| 77 | 77 | } |
| 78 | 78 | return $jsSource; |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | |
| 82 | - protected function _getAjaxUrl($url,$attr){ |
|
| 82 | + protected function _getAjaxUrl($url, $attr) { |
|
| 83 | 83 | $url=$this->_correctAjaxUrl($url); |
| 84 | 84 | $retour="url='".$url."';"; |
| 85 | 85 | $slash="/"; |
| 86 | - if(JString::endswith($url, "/")===true){ |
|
| 86 | + if (JString::endswith($url, "/")===true) { |
|
| 87 | 87 | $slash=""; |
| 88 | 88 | } |
| 89 | - if(JString::isNotNull($attr)){ |
|
| 90 | - if ($attr==="value"){ |
|
| 89 | + if (JString::isNotNull($attr)) { |
|
| 90 | + if ($attr==="value") { |
|
| 91 | 91 | $retour.="url=url+'".$slash."'+$(this).val();\n"; |
| 92 | - }elseif ($attr==="html"){ |
|
| 92 | + }elseif ($attr==="html") { |
|
| 93 | 93 | $retour.="url=url+'".$slash."'+$(this).html();\n"; |
| 94 | - }elseif(\substr($attr, 0,3)==="js:"){ |
|
| 94 | + }elseif (\substr($attr, 0, 3)==="js:") { |
|
| 95 | 95 | $retour.="url=url+'".$slash."'+".\substr($attr, 3).";\n"; |
| 96 | - }elseif($attr!==null && $attr!=="") |
|
| 96 | + }elseif ($attr!==null && $attr!=="") |
|
| 97 | 97 | $retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n"; |
| 98 | 98 | } |
| 99 | 99 | return $retour; |
| 100 | 100 | } |
| 101 | 101 | |
| 102 | - protected function _getOnAjaxDone($responseElement,$jqueryDone,$ajaxTransition,$jsCallback){ |
|
| 103 | - $retour="";$call=null; |
|
| 102 | + protected function _getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback) { |
|
| 103 | + $retour=""; $call=null; |
|
| 104 | 104 | if (JString::isNotNull($responseElement)) { |
| 105 | - if(isset($ajaxTransition)){ |
|
| 105 | + if (isset($ajaxTransition)) { |
|
| 106 | 106 | $call=$this->setAjaxDataCall($ajaxTransition); |
| 107 | - }elseif(isset($this->ajaxTransition)){ |
|
| 107 | + }elseif (isset($this->ajaxTransition)) { |
|
| 108 | 108 | $call=$this->ajaxTransition; |
| 109 | 109 | } |
| 110 | - if(\is_callable($call)) |
|
| 111 | - $retour="\t".$call($responseElement,$jqueryDone).";\n"; |
|
| 110 | + if (\is_callable($call)) |
|
| 111 | + $retour="\t".$call($responseElement, $jqueryDone).";\n"; |
|
| 112 | 112 | else |
| 113 | 113 | $retour="\t{$responseElement}.{$jqueryDone}( data );\n"; |
| 114 | 114 | } |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | return $retour; |
| 117 | 117 | } |
| 118 | 118 | |
| 119 | - protected function _getResponseElement($responseElement){ |
|
| 119 | + protected function _getResponseElement($responseElement) { |
|
| 120 | 120 | if (JString::isNotNull($responseElement)) { |
| 121 | 121 | $responseElement=Javascript::prep_value($responseElement); |
| 122 | 122 | $responseElement=Javascript::prep_jquery_selector($responseElement); |
@@ -127,26 +127,26 @@ discard block |
||
| 127 | 127 | protected function _correctAjaxUrl($url) { |
| 128 | 128 | if ($url!=="/" && JString::endsWith($url, "/")===true) |
| 129 | 129 | $url=substr($url, 0, strlen($url)-1); |
| 130 | - if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) { |
|
| 130 | + if (strncmp($url, 'http://', 7)!=0 && strncmp($url, 'https://', 8)!=0) { |
|
| 131 | 131 | $url=$this->getUrl($url); |
| 132 | 132 | } |
| 133 | 133 | return $url; |
| 134 | 134 | } |
| 135 | 135 | |
| 136 | - public static function _correctParams($params){ |
|
| 137 | - if(JString::isNull($params)){ |
|
| 136 | + public static function _correctParams($params) { |
|
| 137 | + if (JString::isNull($params)) { |
|
| 138 | 138 | return ""; |
| 139 | 139 | } |
| 140 | - if(\preg_match("@^\{.*?\}$@", $params)){ |
|
| 140 | + if (\preg_match("@^\{.*?\}$@", $params)) { |
|
| 141 | 141 | return '$.param('.$params.')'; |
| 142 | 142 | } |
| 143 | 143 | return $params; |
| 144 | 144 | } |
| 145 | 145 | |
| 146 | - public static function _implodeParams($parameters){ |
|
| 146 | + public static function _implodeParams($parameters) { |
|
| 147 | 147 | $allParameters=[]; |
| 148 | - foreach ($parameters as $params){ |
|
| 149 | - if(isset($params)) |
|
| 148 | + foreach ($parameters as $params) { |
|
| 149 | + if (isset($params)) |
|
| 150 | 150 | $allParameters[]=self::_correctParams($params); |
| 151 | 151 | } |
| 152 | 152 | return \implode("+'&'+", $allParameters); |
@@ -164,19 +164,19 @@ discard block |
||
| 164 | 164 | $retour.="\t\t{$responseElement}.prepend('{$loading_notifier}');\n"; |
| 165 | 165 | } |
| 166 | 166 | |
| 167 | - protected function setAjaxDataCall($params){ |
|
| 167 | + protected function setAjaxDataCall($params) { |
|
| 168 | 168 | $result=null; |
| 169 | - if(!\is_callable($params)){ |
|
| 170 | - $result=function ($responseElement,$jqueryDone="html") use($params){ |
|
| 171 | - return AjaxTransition::{$params}($responseElement,$jqueryDone); |
|
| 169 | + if (!\is_callable($params)) { |
|
| 170 | + $result=function($responseElement, $jqueryDone="html") use($params){ |
|
| 171 | + return AjaxTransition::{$params}($responseElement, $jqueryDone); |
|
| 172 | 172 | }; |
| 173 | 173 | } |
| 174 | 174 | return $result; |
| 175 | 175 | } |
| 176 | 176 | |
| 177 | - protected function setDefaultParameters(&$parameters,$default){ |
|
| 178 | - foreach ($default as $k=>$v){ |
|
| 179 | - if(!isset($parameters[$k])) |
|
| 177 | + protected function setDefaultParameters(&$parameters, $default) { |
|
| 178 | + foreach ($default as $k=>$v) { |
|
| 179 | + if (!isset($parameters[$k])) |
|
| 180 | 180 | $parameters[$k]=$v; |
| 181 | 181 | } |
| 182 | 182 | } |
@@ -190,8 +190,8 @@ discard block |
||
| 190 | 190 | * @param string $url The url of the request |
| 191 | 191 | * @param string $responseElement selector of the HTML element displaying the answer |
| 192 | 192 | */ |
| 193 | - private function _get($url, $responseElement="",$parameters=[]) { |
|
| 194 | - return $this->_ajax("get", $url,$responseElement,$parameters); |
|
| 193 | + private function _get($url, $responseElement="", $parameters=[]) { |
|
| 194 | + return $this->_ajax("get", $url, $responseElement, $parameters); |
|
| 195 | 195 | } |
| 196 | 196 | |
| 197 | 197 | /** |
@@ -200,9 +200,9 @@ discard block |
||
| 200 | 200 | * @param string $responseElement selector of the HTML element displaying the answer |
| 201 | 201 | * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null) |
| 202 | 202 | */ |
| 203 | - public function get($url, $responseElement="",$parameters=[]) { |
|
| 203 | + public function get($url, $responseElement="", $parameters=[]) { |
|
| 204 | 204 | $parameters["immediatly"]=true; |
| 205 | - return $this->_get($url,$responseElement,$parameters); |
|
| 205 | + return $this->_get($url, $responseElement, $parameters); |
|
| 206 | 206 | } |
| 207 | 207 | |
| 208 | 208 | /** |
@@ -212,9 +212,9 @@ discard block |
||
| 212 | 212 | * @param string $responseElement selector of the HTML element displaying the answer |
| 213 | 213 | * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null) |
| 214 | 214 | */ |
| 215 | - public function ajax($method,$url, $responseElement="", $parameters=[]) { |
|
| 215 | + public function ajax($method, $url, $responseElement="", $parameters=[]) { |
|
| 216 | 216 | $parameters["immediatly"]=true; |
| 217 | - return $this->_ajax($method,$url,$responseElement,$parameters); |
|
| 217 | + return $this->_ajax($method, $url, $responseElement, $parameters); |
|
| 218 | 218 | } |
| 219 | 219 | |
| 220 | 220 | /** |
@@ -224,9 +224,9 @@ discard block |
||
| 224 | 224 | * @param string $responseElement selector of the HTML element displaying the answer |
| 225 | 225 | * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null) |
| 226 | 226 | */ |
| 227 | - public function ajaxDeferred($method,$url, $responseElement="", $parameters=[]) { |
|
| 227 | + public function ajaxDeferred($method, $url, $responseElement="", $parameters=[]) { |
|
| 228 | 228 | $parameters["immediatly"]=false; |
| 229 | - return $this->_ajax($method,$url,$responseElement,$parameters); |
|
| 229 | + return $this->_ajax($method, $url, $responseElement, $parameters); |
|
| 230 | 230 | } |
| 231 | 231 | |
| 232 | 232 | /** |
@@ -235,15 +235,15 @@ discard block |
||
| 235 | 235 | * @param string $method Method used |
| 236 | 236 | * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>"document","jsCondition"=>NULL,"headers"=>null,"immediatly"=>false) |
| 237 | 237 | */ |
| 238 | - private function _json($url, $method="get",$parameters=[]) { |
|
| 239 | - $parameters=\array_merge($parameters,["hasLoader"=>false]); |
|
| 238 | + private function _json($url, $method="get", $parameters=[]) { |
|
| 239 | + $parameters=\array_merge($parameters, ["hasLoader"=>false]); |
|
| 240 | 240 | $jsCallback=isset($parameters['jsCallback']) ? $parameters['jsCallback'] : ""; |
| 241 | 241 | $context=isset($parameters['context']) ? $parameters['context'] : "document"; |
| 242 | 242 | $retour="\tdata=($.isPlainObject(data))?data:JSON.parse(data);\t".$jsCallback.";\n\tfor(var key in data){" |
| 243 | 243 | ."if($('#'+key,".$context.").length){ if($('#'+key,".$context.").is('[value]')) { $('#'+key,".$context.").val(data[key]);} else { $('#'+key,".$context.").html(data[key]); }}};\n"; |
| 244 | 244 | $retour.="\t$(document).trigger('jsonReady',[data]);\n"; |
| 245 | 245 | $parameters["jsCallback"]=$retour; |
| 246 | - return $this->_ajax($method, $url,null,$parameters); |
|
| 246 | + return $this->_ajax($method, $url, null, $parameters); |
|
| 247 | 247 | } |
| 248 | 248 | |
| 249 | 249 | /** |
@@ -253,7 +253,7 @@ discard block |
||
| 253 | 253 | * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>"document","jsCondition"=>NULL,"headers"=>null,"immediatly"=>false) |
| 254 | 254 | */ |
| 255 | 255 | public function json($url, $method="get", $parameters=[]) { |
| 256 | - return $this->_json($url,$method,$parameters); |
|
| 256 | + return $this->_json($url, $method, $parameters); |
|
| 257 | 257 | } |
| 258 | 258 | |
| 259 | 259 | /** |
@@ -264,9 +264,9 @@ discard block |
||
| 264 | 264 | * @param string $method default get |
| 265 | 265 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true) |
| 266 | 266 | */ |
| 267 | - public function jsonOn($event,$element, $url,$method="get",$parameters=array()) { |
|
| 268 | - $this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]); |
|
| 269 | - return $this->_add_event($element, $this->jsonDeferred($url,$method, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]); |
|
| 267 | + public function jsonOn($event, $element, $url, $method="get", $parameters=array()) { |
|
| 268 | + $this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]); |
|
| 269 | + return $this->_add_event($element, $this->jsonDeferred($url, $method, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]); |
|
| 270 | 270 | } |
| 271 | 271 | |
| 272 | 272 | /** |
@@ -277,7 +277,7 @@ discard block |
||
| 277 | 277 | */ |
| 278 | 278 | public function jsonDeferred($url, $method="get", $parameters=[]) { |
| 279 | 279 | $parameters["immediatly"]=false; |
| 280 | - return $this->_json($url,$method,$parameters); |
|
| 280 | + return $this->_json($url, $method, $parameters); |
|
| 281 | 281 | } |
| 282 | 282 | |
| 283 | 283 | /** |
@@ -288,26 +288,26 @@ discard block |
||
| 288 | 288 | * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"rowClass"=>"_json") |
| 289 | 289 | */ |
| 290 | 290 | private function _jsonArray($maskSelector, $url, $method="get", $parameters=[]) { |
| 291 | - $parameters=\array_merge($parameters,["hasLoader"=>false]); |
|
| 291 | + $parameters=\array_merge($parameters, ["hasLoader"=>false]); |
|
| 292 | 292 | $rowClass=isset($parameters['rowClass']) ? $parameters['rowClass'] : "_json"; |
| 293 | 293 | $jsCallback=isset($parameters['jsCallback']) ? $parameters['jsCallback'] : ""; |
| 294 | 294 | $context=isset($parameters['context']) ? $parameters['context'] : null; |
| 295 | - if($context===null){ |
|
| 295 | + if ($context===null) { |
|
| 296 | 296 | $parent="$('".$maskSelector."').parent()"; |
| 297 | - $newElm = "$('#'+newId)"; |
|
| 298 | - }else{ |
|
| 297 | + $newElm="$('#'+newId)"; |
|
| 298 | + } else { |
|
| 299 | 299 | $parent=$context; |
| 300 | - $newElm = $context.".find('#'+newId)"; |
|
| 300 | + $newElm=$context.".find('#'+newId)"; |
|
| 301 | 301 | } |
| 302 | 302 | $appendTo="\t\tnewElm.appendTo(".$parent.");\n"; |
| 303 | 303 | $retour=$parent.".find('.{$rowClass}').remove();"; |
| 304 | 304 | $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(); |
| 305 | 305 | 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"; |
| 306 | - $retour.= $appendTo; |
|
| 306 | + $retour.=$appendTo; |
|
| 307 | 307 | $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"; |
| 308 | 308 | $retour.="\t$(document).trigger('jsonReady',[data]);\n"; |
| 309 | 309 | $parameters["jsCallback"]=$retour; |
| 310 | - return $this->_ajax($method, $url,null,$parameters); |
|
| 310 | + return $this->_ajax($method, $url, null, $parameters); |
|
| 311 | 311 | } |
| 312 | 312 | |
| 313 | 313 | /** |
@@ -318,7 +318,7 @@ discard block |
||
| 318 | 318 | * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"rowClass"=>"_json") |
| 319 | 319 | */ |
| 320 | 320 | public function jsonArray($maskSelector, $url, $method="get", $parameters=[]) { |
| 321 | - return $this->_jsonArray($maskSelector, $url,$method,$parameters); |
|
| 321 | + return $this->_jsonArray($maskSelector, $url, $method, $parameters); |
|
| 322 | 322 | } |
| 323 | 323 | |
| 324 | 324 | /** |
@@ -341,9 +341,9 @@ discard block |
||
| 341 | 341 | * @param string $method Method used, default : get |
| 342 | 342 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","rowClass"=>"_json","immediatly"=>true) |
| 343 | 343 | */ |
| 344 | - public function jsonArrayOn($event,$element,$maskSelector, $url,$method="get",$parameters=array()) { |
|
| 345 | - $this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]); |
|
| 346 | - return $this->_add_event($element, $this->jsonArrayDeferred($maskSelector,$url,$method, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]); |
|
| 344 | + public function jsonArrayOn($event, $element, $maskSelector, $url, $method="get", $parameters=array()) { |
|
| 345 | + $this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]); |
|
| 346 | + return $this->_add_event($element, $this->jsonArrayDeferred($maskSelector, $url, $method, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]); |
|
| 347 | 347 | } |
| 348 | 348 | |
| 349 | 349 | /** |
@@ -355,7 +355,7 @@ discard block |
||
| 355 | 355 | */ |
| 356 | 356 | public function getDeferred($url, $responseElement="", $parameters=[]) { |
| 357 | 357 | $parameters["immediatly"]=false; |
| 358 | - return $this->_get($url, $responseElement,$parameters); |
|
| 358 | + return $this->_get($url, $responseElement, $parameters); |
|
| 359 | 359 | } |
| 360 | 360 | |
| 361 | 361 | /** |
@@ -368,8 +368,8 @@ discard block |
||
| 368 | 368 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>null,"headers"=>null) |
| 369 | 369 | */ |
| 370 | 370 | public function getOn($event, $element, $url, $responseElement="", $parameters=array()) { |
| 371 | - $this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]); |
|
| 372 | - return $this->_add_event($element, $this->getDeferred($url,$responseElement,$parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]); |
|
| 371 | + $this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]); |
|
| 372 | + return $this->_add_event($element, $this->getDeferred($url, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]); |
|
| 373 | 373 | } |
| 374 | 374 | |
| 375 | 375 | /** |
@@ -382,8 +382,8 @@ discard block |
||
| 382 | 382 | * @param array $parameters default : array("method"=>"get","preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null) |
| 383 | 383 | */ |
| 384 | 384 | public function ajaxOn($event, $element, $url, $responseElement="", $parameters=array()) { |
| 385 | - $this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true,"method"=>"get"]); |
|
| 386 | - return $this->_add_event($element, $this->ajaxDeferred($parameters["method"],$url,$responseElement,$parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]); |
|
| 385 | + $this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true, "method"=>"get"]); |
|
| 386 | + return $this->_add_event($element, $this->ajaxDeferred($parameters["method"], $url, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]); |
|
| 387 | 387 | } |
| 388 | 388 | |
| 389 | 389 | /** |
@@ -410,9 +410,9 @@ discard block |
||
| 410 | 410 | return $this->getOn("click", $element, $url, $responseElement, $parameters); |
| 411 | 411 | } |
| 412 | 412 | |
| 413 | - private function _post($url, $params="{}",$responseElement="", $parameters=[]) { |
|
| 413 | + private function _post($url, $params="{}", $responseElement="", $parameters=[]) { |
|
| 414 | 414 | $parameters["params"]=$params; |
| 415 | - return $this->_ajax("POST", $url,$responseElement,$parameters); |
|
| 415 | + return $this->_ajax("POST", $url, $responseElement, $parameters); |
|
| 416 | 416 | } |
| 417 | 417 | |
| 418 | 418 | /** |
@@ -422,8 +422,8 @@ discard block |
||
| 422 | 422 | * @param string $params JSON parameters |
| 423 | 423 | * @param array $parameters default : array("jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null) |
| 424 | 424 | */ |
| 425 | - public function post($url, $params="{}",$responseElement="", $parameters=[]) { |
|
| 426 | - return $this->_post($url, $params,$responseElement, $parameters); |
|
| 425 | + public function post($url, $params="{}", $responseElement="", $parameters=[]) { |
|
| 426 | + return $this->_post($url, $params, $responseElement, $parameters); |
|
| 427 | 427 | } |
| 428 | 428 | |
| 429 | 429 | /** |
@@ -434,7 +434,7 @@ discard block |
||
| 434 | 434 | * @param string $responseElement selector of the HTML element displaying the answer |
| 435 | 435 | * @param array $parameters default : array("jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null) |
| 436 | 436 | */ |
| 437 | - public function postDeferred($url, $params="{}",$responseElement="", $parameters=[]) { |
|
| 437 | + public function postDeferred($url, $params="{}", $responseElement="", $parameters=[]) { |
|
| 438 | 438 | $parameters["immediatly"]=false; |
| 439 | 439 | return $this->_post($url, $params, $responseElement, $parameters); |
| 440 | 440 | } |
@@ -450,8 +450,8 @@ discard block |
||
| 450 | 450 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null) |
| 451 | 451 | */ |
| 452 | 452 | public function postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) { |
| 453 | - $this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]); |
|
| 454 | - return $this->_add_event($element, $this->postDeferred($url, $params, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]); |
|
| 453 | + $this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]); |
|
| 454 | + return $this->_add_event($element, $this->postDeferred($url, $params, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]); |
|
| 455 | 455 | } |
| 456 | 456 | |
| 457 | 457 | /** |
@@ -468,27 +468,27 @@ discard block |
||
| 468 | 468 | } |
| 469 | 469 | |
| 470 | 470 | private function _postForm($url, $form, $responseElement, $parameters=[]) { |
| 471 | - $params="{}";$validation=false;$jsCallback=NULL;$attr="id";$hasLoader=true;$jqueryDone="html";$ajaxTransition=null;$immediatly=false;$jsCondition=NULL;$headers=NULL;$async=true; |
|
| 471 | + $params="{}"; $validation=false; $jsCallback=NULL; $attr="id"; $hasLoader=true; $jqueryDone="html"; $ajaxTransition=null; $immediatly=false; $jsCondition=NULL; $headers=NULL; $async=true; |
|
| 472 | 472 | \extract($parameters); |
| 473 | - $async=($async)?"true":"false"; |
|
| 473 | + $async=($async) ? "true" : "false"; |
|
| 474 | 474 | $jsCallback=isset($jsCallback) ? $jsCallback : ""; |
| 475 | 475 | $retour=$this->_getAjaxUrl($url, $attr); |
| 476 | 476 | $retour.="\nvar params=$('#".$form."').serialize();\n"; |
| 477 | - if(isset($params)){ |
|
| 477 | + if (isset($params)) { |
|
| 478 | 478 | $retour.="params+='&'+".self::_correctParams($params).";\n"; |
| 479 | 479 | } |
| 480 | 480 | $responseElement=$this->_getResponseElement($responseElement); |
| 481 | 481 | $retour.="var self=this;\n"; |
| 482 | - if($hasLoader===true){ |
|
| 482 | + if ($hasLoader===true) { |
|
| 483 | 483 | $this->addLoading($retour, $responseElement); |
| 484 | 484 | } |
| 485 | - $ajaxParameters=["url"=>"url","method"=>"'POST'","data"=>"params","async"=>$async]; |
|
| 486 | - if(isset($headers)){ |
|
| 485 | + $ajaxParameters=["url"=>"url", "method"=>"'POST'", "data"=>"params", "async"=>$async]; |
|
| 486 | + if (isset($headers)) { |
|
| 487 | 487 | $ajaxParameters["headers"]=$headers; |
| 488 | 488 | } |
| 489 | 489 | $this->createAjaxParameters($ajaxParameters, $parameters); |
| 490 | 490 | $retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data ) {\n"; |
| 491 | - $retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback)."});\n"; |
|
| 491 | + $retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback)."});\n"; |
|
| 492 | 492 | |
| 493 | 493 | if ($validation) { |
| 494 | 494 | $retour="$('#".$form."').validate({submitHandler: function(form) { |
@@ -538,8 +538,8 @@ discard block |
||
| 538 | 538 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>null,"headers"=>null) |
| 539 | 539 | */ |
| 540 | 540 | public function postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) { |
| 541 | - $this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]); |
|
| 542 | - return $this->_add_event($element, $this->postFormDeferred($url, $form, $responseElement,$parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]); |
|
| 541 | + $this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]); |
|
| 542 | + return $this->_add_event($element, $this->postFormDeferred($url, $form, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]); |
|
| 543 | 543 | } |
| 544 | 544 | |
| 545 | 545 | /** |
@@ -52,8 +52,9 @@ discard block |
||
| 52 | 52 | $retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data, textStatus, jqXHR ) {\n"; |
| 53 | 53 | $retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback)."});\n"; |
| 54 | 54 | $retour=$this->_addJsCondition($jsCondition,$retour); |
| 55 | - if ($immediatly) |
|
| 56 | - $this->jquery_code_for_compile[]=$retour; |
|
| 55 | + if ($immediatly) { |
|
| 56 | + $this->jquery_code_for_compile[]=$retour; |
|
| 57 | + } |
|
| 57 | 58 | return $retour; |
| 58 | 59 | } |
| 59 | 60 | |
@@ -89,12 +90,13 @@ discard block |
||
| 89 | 90 | if(JString::isNotNull($attr)){ |
| 90 | 91 | if ($attr==="value"){ |
| 91 | 92 | $retour.="url=url+'".$slash."'+$(this).val();\n"; |
| 92 | - }elseif ($attr==="html"){ |
|
| 93 | + } elseif ($attr==="html"){ |
|
| 93 | 94 | $retour.="url=url+'".$slash."'+$(this).html();\n"; |
| 94 | - }elseif(\substr($attr, 0,3)==="js:"){ |
|
| 95 | + } elseif(\substr($attr, 0,3)==="js:"){ |
|
| 95 | 96 | $retour.="url=url+'".$slash."'+".\substr($attr, 3).";\n"; |
| 96 | - }elseif($attr!==null && $attr!=="") |
|
| 97 | - $retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n"; |
|
| 97 | + } elseif($attr!==null && $attr!=="") { |
|
| 98 | + $retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n"; |
|
| 99 | + } |
|
| 98 | 100 | } |
| 99 | 101 | return $retour; |
| 100 | 102 | } |
@@ -104,13 +106,14 @@ discard block |
||
| 104 | 106 | if (JString::isNotNull($responseElement)) { |
| 105 | 107 | if(isset($ajaxTransition)){ |
| 106 | 108 | $call=$this->setAjaxDataCall($ajaxTransition); |
| 107 | - }elseif(isset($this->ajaxTransition)){ |
|
| 109 | + } elseif(isset($this->ajaxTransition)){ |
|
| 108 | 110 | $call=$this->ajaxTransition; |
| 109 | 111 | } |
| 110 | - if(\is_callable($call)) |
|
| 111 | - $retour="\t".$call($responseElement,$jqueryDone).";\n"; |
|
| 112 | - else |
|
| 113 | - $retour="\t{$responseElement}.{$jqueryDone}( data );\n"; |
|
| 112 | + if(\is_callable($call)) { |
|
| 113 | + $retour="\t".$call($responseElement,$jqueryDone).";\n"; |
|
| 114 | + } else { |
|
| 115 | + $retour="\t{$responseElement}.{$jqueryDone}( data );\n"; |
|
| 116 | + } |
|
| 114 | 117 | } |
| 115 | 118 | $retour.="\t".$jsCallback."\n"; |
| 116 | 119 | return $retour; |
@@ -125,8 +128,9 @@ discard block |
||
| 125 | 128 | } |
| 126 | 129 | |
| 127 | 130 | protected function _correctAjaxUrl($url) { |
| 128 | - if ($url!=="/" && JString::endsWith($url, "/")===true) |
|
| 129 | - $url=substr($url, 0, strlen($url)-1); |
|
| 131 | + if ($url!=="/" && JString::endsWith($url, "/")===true) { |
|
| 132 | + $url=substr($url, 0, strlen($url)-1); |
|
| 133 | + } |
|
| 130 | 134 | if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) { |
| 131 | 135 | $url=$this->getUrl($url); |
| 132 | 136 | } |
@@ -146,8 +150,9 @@ discard block |
||
| 146 | 150 | public static function _implodeParams($parameters){ |
| 147 | 151 | $allParameters=[]; |
| 148 | 152 | foreach ($parameters as $params){ |
| 149 | - if(isset($params)) |
|
| 150 | - $allParameters[]=self::_correctParams($params); |
|
| 153 | + if(isset($params)) { |
|
| 154 | + $allParameters[]=self::_correctParams($params); |
|
| 155 | + } |
|
| 151 | 156 | } |
| 152 | 157 | return \implode("+'&'+", $allParameters); |
| 153 | 158 | } |
@@ -176,8 +181,9 @@ discard block |
||
| 176 | 181 | |
| 177 | 182 | protected function setDefaultParameters(&$parameters,$default){ |
| 178 | 183 | foreach ($default as $k=>$v){ |
| 179 | - if(!isset($parameters[$k])) |
|
| 180 | - $parameters[$k]=$v; |
|
| 184 | + if(!isset($parameters[$k])) { |
|
| 185 | + $parameters[$k]=$v; |
|
| 186 | + } |
|
| 181 | 187 | } |
| 182 | 188 | } |
| 183 | 189 | |
@@ -295,7 +301,7 @@ discard block |
||
| 295 | 301 | if($context===null){ |
| 296 | 302 | $parent="$('".$maskSelector."').parent()"; |
| 297 | 303 | $newElm = "$('#'+newId)"; |
| 298 | - }else{ |
|
| 304 | + } else{ |
|
| 299 | 305 | $parent=$context; |
| 300 | 306 | $newElm = $context.".find('#'+newId)"; |
| 301 | 307 | } |
@@ -497,8 +503,9 @@ discard block |
||
| 497 | 503 | $retour.="$('#".$form."').submit();\n"; |
| 498 | 504 | } |
| 499 | 505 | $retour=$this->_addJsCondition($jsCondition, $retour); |
| 500 | - if ($immediatly) |
|
| 501 | - $this->jquery_code_for_compile[]=$retour; |
|
| 506 | + if ($immediatly) { |
|
| 507 | + $this->jquery_code_for_compile[]=$retour; |
|
| 508 | + } |
|
| 502 | 509 | return $retour; |
| 503 | 510 | } |
| 504 | 511 | |
@@ -23,21 +23,21 @@ discard block |
||
| 23 | 23 | $this->parameters["immediatly"]=false; |
| 24 | 24 | extract($this->parameters); |
| 25 | 25 | $result=$this->_eventPreparing($preventDefault, $stopPropagation); |
| 26 | - switch($this->method) { |
|
| 26 | + switch ($this->method) { |
|
| 27 | 27 | case "get": |
| 28 | 28 | $result.=$js->getDeferred($url, $responseElement, $this->parameters); |
| 29 | 29 | break; |
| 30 | 30 | case "post": |
| 31 | - $result.=$js->postDeferred($url, $params,$responseElement, $this->parameters); |
|
| 31 | + $result.=$js->postDeferred($url, $params, $responseElement, $this->parameters); |
|
| 32 | 32 | break; |
| 33 | 33 | case "postForm": |
| 34 | 34 | $result.=$js->postFormDeferred($url, $form, $responseElement, $this->parameters); |
| 35 | 35 | break; |
| 36 | 36 | case "json": |
| 37 | - $result.=$js->jsonDeferred($url,$method,$this->parameters); |
|
| 37 | + $result.=$js->jsonDeferred($url, $method, $this->parameters); |
|
| 38 | 38 | break; |
| 39 | 39 | case "jsonArray": |
| 40 | - $result.=$js->jsonArrayDeferred($modelSelector, $url,$method,$this->parameters); |
|
| 40 | + $result.=$js->jsonArrayDeferred($modelSelector, $url, $method, $this->parameters); |
|
| 41 | 41 | break; |
| 42 | 42 | default: |
| 43 | 43 | //$result.=$js->ajax($this->method, $url,$responseElement,$this->parameters); |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | return $result; |
| 47 | 47 | } |
| 48 | 48 | |
| 49 | - protected function _eventPreparing($preventDefault,$stopPropagation){ |
|
| 49 | + protected function _eventPreparing($preventDefault, $stopPropagation) { |
|
| 50 | 50 | $result=""; |
| 51 | 51 | if ($preventDefault===true) { |
| 52 | 52 | $result.=Javascript::$preventDefault; |
@@ -14,8 +14,9 @@ |
||
| 14 | 14 | } |
| 15 | 15 | |
| 16 | 16 | public function compile(JsUtils $js=null) { |
| 17 | - if ($js===null) |
|
| 18 | - return; |
|
| 17 | + if ($js===null) { |
|
| 18 | + return; |
|
| 19 | + } |
|
| 19 | 20 | $params="{}"; |
| 20 | 21 | $stopPropagation=true; |
| 21 | 22 | $preventDefault=true; |
