@@ -52,8 +52,9 @@ discard block |
||
| 52 | 52 | */ |
| 53 | 53 | public function addHeader($title, $niveau=1, $dividing=true) { |
| 54 | 54 | $header=new HtmlHeader("", $niveau, $title); |
| 55 | - if ($dividing) |
|
| 56 | - $header->setDividing(); |
|
| 55 | + if ($dividing) { |
|
| 56 | + $header->setDividing(); |
|
| 57 | + } |
|
| 57 | 58 | return $this->addItem($header); |
| 58 | 59 | } |
| 59 | 60 | |
@@ -81,8 +82,9 @@ discard block |
||
| 81 | 82 | if (\is_string($end)) { |
| 82 | 83 | $label=$end; |
| 83 | 84 | \array_pop($fields); |
| 84 | - } else |
|
| 85 | - $label=NULL; |
|
| 85 | + } else { |
|
| 86 | + $label=NULL; |
|
| 87 | + } |
|
| 86 | 88 | } |
| 87 | 89 | $this->_fields=\array_merge($this->_fields, $fields); |
| 88 | 90 | $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count(), $fields); |
@@ -146,27 +148,31 @@ discard block |
||
| 146 | 148 | */ |
| 147 | 149 | public function addMessage($identifier, $content, $header=NULL, $icon=NULL, $type=NULL) { |
| 148 | 150 | $message=new HtmlMessage($identifier, $content); |
| 149 | - if (isset($header)) |
|
| 150 | - $message->addHeader($header); |
|
| 151 | - if (isset($icon)) |
|
| 152 | - $message->setIcon($icon); |
|
| 153 | - if (isset($type)) |
|
| 154 | - $message->setStyle($type); |
|
| 151 | + if (isset($header)) { |
|
| 152 | + $message->addHeader($header); |
|
| 153 | + } |
|
| 154 | + if (isset($icon)) { |
|
| 155 | + $message->setIcon($icon); |
|
| 156 | + } |
|
| 157 | + if (isset($type)) { |
|
| 158 | + $message->setStyle($type); |
|
| 159 | + } |
|
| 155 | 160 | return $this->addItem($message); |
| 156 | 161 | } |
| 157 | 162 | |
| 158 | 163 | |
| 159 | 164 | |
| 160 | 165 | public function compile(JsUtils $js=NULL,&$view=NULL){ |
| 161 | - if(\sizeof($this->_validationParams)>0) |
|
| 162 | - $this->setProperty("novalidate", ""); |
|
| 166 | + if(\sizeof($this->_validationParams)>0) { |
|
| 167 | + $this->setProperty("novalidate", ""); |
|
| 168 | + } |
|
| 163 | 169 | return parent::compile($js,$view); |
| 164 | 170 | } |
| 165 | 171 | |
| 166 | 172 | public function run(JsUtils $js) { |
| 167 | 173 | if(isset($js)){ |
| 168 | 174 | $compo=$js->semantic()->form("#".$this->identifier); |
| 169 | - }else{ |
|
| 175 | + } else{ |
|
| 170 | 176 | $compo=new Form(); |
| 171 | 177 | $compo->attach("#".$this->identifier); |
| 172 | 178 | } |
@@ -179,8 +185,9 @@ discard block |
||
| 179 | 185 | if($field instanceof HtmlFormFields){ |
| 180 | 186 | $items=$field->getItems(); |
| 181 | 187 | foreach ($items as $_field){ |
| 182 | - if($_field instanceof HtmlFormField) |
|
| 183 | - $compo=$this->addCompoValidation($compo, $_field); |
|
| 188 | + if($_field instanceof HtmlFormField) { |
|
| 189 | + $compo=$this->addCompoValidation($compo, $_field); |
|
| 190 | + } |
|
| 184 | 191 | } |
| 185 | 192 | } |
| 186 | 193 | } |
@@ -49,15 +49,16 @@ |
||
| 49 | 49 | * @return Rule |
| 50 | 50 | */ |
| 51 | 51 | public function addRule($type,$prompt=NULL,$value=NULL){ |
| 52 | - if($type instanceof Rule) |
|
| 53 | - $rule=$type; |
|
| 54 | - else if(\is_array($type)){ |
|
| 52 | + if($type instanceof Rule) { |
|
| 53 | + $rule=$type; |
|
| 54 | + } else if(\is_array($type)){ |
|
| 55 | 55 | $value=JArray::getValue($type, "value", 2); |
| 56 | 56 | $prompt=JArray::getValue($type, "prompt", 1); |
| 57 | 57 | $type=JArray::getValue($type, "type", 0); |
| 58 | 58 | $rule=new Rule($type,$prompt,$value); |
| 59 | - }else |
|
| 60 | - $rule=new Rule($type,$prompt,$value); |
|
| 59 | + } else { |
|
| 60 | + $rule=new Rule($type,$prompt,$value); |
|
| 61 | + } |
|
| 61 | 62 | $this->rules[]=$rule; |
| 62 | 63 | return $rule; |
| 63 | 64 | } |
@@ -50,8 +50,9 @@ discard block |
||
| 50 | 50 | $retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data, textStatus, jqXHR ) {\n"; |
| 51 | 51 | $retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback)."});\n"; |
| 52 | 52 | $retour=$this->_addJsCondition($jsCondition,$retour); |
| 53 | - if ($immediatly) |
|
| 54 | - $this->jquery_code_for_compile[]=$retour; |
|
| 53 | + if ($immediatly) { |
|
| 54 | + $this->jquery_code_for_compile[]=$retour; |
|
| 55 | + } |
|
| 55 | 56 | return $retour; |
| 56 | 57 | } |
| 57 | 58 | |
@@ -87,12 +88,13 @@ discard block |
||
| 87 | 88 | if(JString::isNotNull($attr)){ |
| 88 | 89 | if ($attr==="value"){ |
| 89 | 90 | $retour.="url=url+'".$slash."'+$(this).val();\n"; |
| 90 | - }elseif ($attr==="html"){ |
|
| 91 | + } elseif ($attr==="html"){ |
|
| 91 | 92 | $retour.="url=url+'".$slash."'+$(this).html();\n"; |
| 92 | - }elseif(\substr($attr, 0,3)==="js:"){ |
|
| 93 | + } elseif(\substr($attr, 0,3)==="js:"){ |
|
| 93 | 94 | $retour.="url=url+'".$slash."'+".\substr($attr, 3).";\n"; |
| 94 | - }elseif($attr!==null && $attr!=="") |
|
| 95 | - $retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n"; |
|
| 95 | + } elseif($attr!==null && $attr!=="") { |
|
| 96 | + $retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n"; |
|
| 97 | + } |
|
| 96 | 98 | } |
| 97 | 99 | return $retour; |
| 98 | 100 | } |
@@ -102,13 +104,14 @@ discard block |
||
| 102 | 104 | if (JString::isNotNull($responseElement)) { |
| 103 | 105 | if(isset($ajaxTransition)){ |
| 104 | 106 | $call=$this->setAjaxDataCall($ajaxTransition); |
| 105 | - }elseif(isset($this->ajaxTransition)){ |
|
| 107 | + } elseif(isset($this->ajaxTransition)){ |
|
| 106 | 108 | $call=$this->ajaxTransition; |
| 107 | 109 | } |
| 108 | - if(\is_callable($call)) |
|
| 109 | - $retour="\t".$call($responseElement,$jqueryDone).";\n"; |
|
| 110 | - else |
|
| 111 | - $retour="\t{$responseElement}.{$jqueryDone}( data );\n"; |
|
| 110 | + if(\is_callable($call)) { |
|
| 111 | + $retour="\t".$call($responseElement,$jqueryDone).";\n"; |
|
| 112 | + } else { |
|
| 113 | + $retour="\t{$responseElement}.{$jqueryDone}( data );\n"; |
|
| 114 | + } |
|
| 112 | 115 | } |
| 113 | 116 | $retour.="\t".$jsCallback."\n"; |
| 114 | 117 | return $retour; |
@@ -123,8 +126,9 @@ discard block |
||
| 123 | 126 | } |
| 124 | 127 | |
| 125 | 128 | protected function _correctAjaxUrl($url) { |
| 126 | - if ($url!=="/" && JString::endsWith($url, "/")===true) |
|
| 127 | - $url=substr($url, 0, strlen($url)-1); |
|
| 129 | + if ($url!=="/" && JString::endsWith($url, "/")===true) { |
|
| 130 | + $url=substr($url, 0, strlen($url)-1); |
|
| 131 | + } |
|
| 128 | 132 | if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) { |
| 129 | 133 | $url=$this->getUrl($url); |
| 130 | 134 | } |
@@ -144,8 +148,9 @@ discard block |
||
| 144 | 148 | public static function _implodeParams($parameters){ |
| 145 | 149 | $allParameters=[]; |
| 146 | 150 | foreach ($parameters as $params){ |
| 147 | - if(isset($params)) |
|
| 148 | - $allParameters[]=self::_correctParams($params); |
|
| 151 | + if(isset($params)) { |
|
| 152 | + $allParameters[]=self::_correctParams($params); |
|
| 153 | + } |
|
| 149 | 154 | } |
| 150 | 155 | return \implode("+'&'+", $allParameters); |
| 151 | 156 | } |
@@ -174,8 +179,9 @@ discard block |
||
| 174 | 179 | |
| 175 | 180 | protected function setDefaultParameters(&$parameters,$default){ |
| 176 | 181 | foreach ($default as $k=>$v){ |
| 177 | - if(!isset($parameters[$k])) |
|
| 178 | - $parameters[$k]=$v; |
|
| 182 | + if(!isset($parameters[$k])) { |
|
| 183 | + $parameters[$k]=$v; |
|
| 184 | + } |
|
| 179 | 185 | } |
| 180 | 186 | } |
| 181 | 187 | |
@@ -246,8 +252,9 @@ discard block |
||
| 246 | 252 | $retour.="\t".$jsCallback."\n". |
| 247 | 253 | "\t$(document).trigger('jsonReady',[data]);\n". |
| 248 | 254 | "});\n"; |
| 249 | - if ($immediatly) |
|
| 250 | - $this->jquery_code_for_compile[]=$retour; |
|
| 255 | + if ($immediatly) { |
|
| 256 | + $this->jquery_code_for_compile[]=$retour; |
|
| 257 | + } |
|
| 251 | 258 | return $retour; |
| 252 | 259 | } |
| 253 | 260 | |
@@ -312,7 +319,7 @@ discard block |
||
| 312 | 319 | if($context===null){ |
| 313 | 320 | $parent="$('".$maskSelector."').parent()"; |
| 314 | 321 | $newElm = "$('#'+newId)"; |
| 315 | - }else{ |
|
| 322 | + } else{ |
|
| 316 | 323 | $parent=$context; |
| 317 | 324 | $newElm = $context.".find('#'+newId)"; |
| 318 | 325 | } |
@@ -325,8 +332,9 @@ discard block |
||
| 325 | 332 | $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"; |
| 326 | 333 | $retour.="\t$(document).trigger('jsonReady',[data]);\n"; |
| 327 | 334 | $retour.="\t".$jsCallback."\n"."});\n"; |
| 328 | - if ($immediatly) |
|
| 329 | - $this->jquery_code_for_compile[]=$retour; |
|
| 335 | + if ($immediatly) { |
|
| 336 | + $this->jquery_code_for_compile[]=$retour; |
|
| 337 | + } |
|
| 330 | 338 | return $retour; |
| 331 | 339 | } |
| 332 | 340 | |
@@ -530,8 +538,9 @@ discard block |
||
| 530 | 538 | $retour.="$('#".$form."').submit();\n"; |
| 531 | 539 | } |
| 532 | 540 | $retour=$this->_addJsCondition($jsCondition, $retour); |
| 533 | - if ($immediatly) |
|
| 534 | - $this->jquery_code_for_compile[]=$retour; |
|
| 541 | + if ($immediatly) { |
|
| 542 | + $this->jquery_code_for_compile[]=$retour; |
|
| 543 | + } |
|
| 535 | 544 | return $retour; |
| 536 | 545 | } |
| 537 | 546 | |