@@ -55,26 +55,29 @@ |
||
| 55 | 55 | for($i=$this->_startStep;$i<$count;$i++){ |
| 56 | 56 | $step=$this->content[$i]; |
| 57 | 57 | $step->removeStatus(); |
| 58 | - if($i<$activestep) |
|
| 59 | - $step->setCompleted(); |
|
| 60 | - elseif ($i===$activestep) |
|
| 61 | - $step->setActive(); |
|
| 62 | - else |
|
| 63 | - $step->setDisabled(); |
|
| 58 | + if($i<$activestep) { |
|
| 59 | + $step->setCompleted(); |
|
| 60 | + } elseif ($i===$activestep) { |
|
| 61 | + $step->setActive(); |
|
| 62 | + } else { |
|
| 63 | + $step->setDisabled(); |
|
| 64 | + } |
|
| 64 | 65 | } |
| 65 | - }else{ |
|
| 66 | + } else{ |
|
| 66 | 67 | foreach ($this->content as $step){ |
| 67 | 68 | $step->removeStatus(); |
| 68 | 69 | } |
| 69 | - if($activestep<$count) |
|
| 70 | - $this->content[$activestep]->setActive(); |
|
| 70 | + if($activestep<$count) { |
|
| 71 | + $this->content[$activestep]->setActive(); |
|
| 72 | + } |
|
| 71 | 73 | } |
| 72 | 74 | return $this; |
| 73 | 75 | } |
| 74 | 76 | |
| 75 | 77 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
| 76 | - if(isset($this->_activeStep) && \is_numeric($this->_activeStep)) |
|
| 77 | - $this->defineActiveStep(); |
|
| 78 | + if(isset($this->_activeStep) && \is_numeric($this->_activeStep)) { |
|
| 79 | + $this->defineActiveStep(); |
|
| 80 | + } |
|
| 78 | 81 | return parent::compile($js,$view); |
| 79 | 82 | } |
| 80 | 83 | |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | $icon=@$content[0]; |
| 18 | 18 | $title=@$content[1]; |
| 19 | 19 | $desc=@$content[2]; |
| 20 | - }else{ |
|
| 20 | + } else{ |
|
| 21 | 21 | $icon=@$content["icon"]; |
| 22 | 22 | $image=@$content["image"]; |
| 23 | 23 | $title=@$content["title"]; |
@@ -33,20 +33,21 @@ discard block |
||
| 33 | 33 | } |
| 34 | 34 | if(isset($title)){ |
| 35 | 35 | $this->setTitle($title,$desc); |
| 36 | - }elseif (isset($header)){ |
|
| 36 | + } elseif (isset($header)){ |
|
| 37 | 37 | $this->setTitle($header,$desc,"header"); |
| 38 | 38 | } |
| 39 | 39 | if(isset($items)){ |
| 40 | 40 | $this->addList($items); |
| 41 | 41 | } |
| 42 | - }else{ |
|
| 42 | + } else{ |
|
| 43 | 43 | $this->setContent($content); |
| 44 | 44 | } |
| 45 | 45 | } |
| 46 | 46 | public function addList($items=array(),$ordered=false) { |
| 47 | 47 | $list=new HtmlList("", $items); |
| 48 | - if($ordered) |
|
| 49 | - $list->setOrdered(); |
|
| 48 | + if($ordered) { |
|
| 49 | + $list->setOrdered(); |
|
| 50 | + } |
|
| 50 | 51 | $list->setClass("list"); |
| 51 | 52 | $this->content["list"]=$list; |
| 52 | 53 | return $list; |
@@ -50,8 +50,9 @@ discard block |
||
| 50 | 50 | |
| 51 | 51 | protected function getItemToAdd($item){ |
| 52 | 52 | $itemO=parent::getItemToAdd($item); |
| 53 | - if($itemO instanceof AbstractCheckbox) |
|
| 54 | - $itemO->addClass("item"); |
|
| 53 | + if($itemO instanceof AbstractCheckbox) { |
|
| 54 | + $itemO->addClass("item"); |
|
| 55 | + } |
|
| 55 | 56 | return $itemO; |
| 56 | 57 | } |
| 57 | 58 | |
@@ -106,14 +107,15 @@ discard block |
||
| 106 | 107 | if (isset($masterItem)) { |
| 107 | 108 | if(\is_array($masterItem)){ |
| 108 | 109 | $masterO=new HtmlFormCheckbox("master-" . $identifier, @$masterItem[0],@$masterItem[1]); |
| 109 | - if(isset($name)) |
|
| 110 | - $masterO->setName($name); |
|
| 110 | + if(isset($name)) { |
|
| 111 | + $masterO->setName($name); |
|
| 112 | + } |
|
| 111 | 113 | if(isset($masterItem[1])){ |
| 112 | 114 | if(\array_search($masterItem[1], $values)!==false){ |
| 113 | 115 | $masterO->getDataField()->setProperty("checked", ""); |
| 114 | 116 | } |
| 115 | 117 | } |
| 116 | - }else{ |
|
| 118 | + } else{ |
|
| 117 | 119 | $masterO=new HtmlFormCheckbox("master-" . $identifier, $masterItem); |
| 118 | 120 | } |
| 119 | 121 | if($notAllChecked){ |
@@ -130,8 +132,9 @@ discard block |
||
| 130 | 132 | if (\array_search($val, $values) !== false) { |
| 131 | 133 | $itemO->getDataField()->setProperty("checked", ""); |
| 132 | 134 | } |
| 133 | - if(isset($name)) |
|
| 134 | - $itemO->setName($name); |
|
| 135 | + if(isset($name)) { |
|
| 136 | + $itemO->setName($name); |
|
| 137 | + } |
|
| 135 | 138 | $itemO->setClass("item"); |
| 136 | 139 | $fields[]=$itemO; |
| 137 | 140 | } |
@@ -62,15 +62,17 @@ discard block |
||
| 62 | 62 | */ |
| 63 | 63 | private function getFieldButton($caption,$visibleHover=true){ |
| 64 | 64 | $bt= new HtmlButton($this->cleanIdentifier($caption),$caption); |
| 65 | - if($visibleHover) |
|
| 66 | - $this->_visibleOver($bt); |
|
| 65 | + if($visibleHover) { |
|
| 66 | + $this->_visibleOver($bt); |
|
| 67 | + } |
|
| 67 | 68 | return $bt; |
| 68 | 69 | } |
| 69 | 70 | |
| 70 | 71 | private function getFieldButtons($buttons,$visibleHover=true){ |
| 71 | 72 | $bts=new HtmlButtonGroups("",$buttons); |
| 72 | - if($visibleHover) |
|
| 73 | - $this->_visibleOver($bts); |
|
| 73 | + if($visibleHover) { |
|
| 74 | + $this->_visibleOver($bts); |
|
| 75 | + } |
|
| 74 | 76 | return $bts; |
| 75 | 77 | } |
| 76 | 78 | |
@@ -87,8 +89,9 @@ discard block |
||
| 87 | 89 | return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle,$index,$attributes){ |
| 88 | 90 | $button=new HtmlButton($id,$value,$cssStyle); |
| 89 | 91 | $button->postOnClick($url,"$(event.target).closest('tr').find(':input').serialize()",$responseElement,$attributes["ajax"]); |
| 90 | - if(!isset($attributes["visibleHover"]) || $attributes["visibleHover"]) |
|
| 91 | - $this->_visibleOver($button); |
|
| 92 | + if(!isset($attributes["visibleHover"]) || $attributes["visibleHover"]) { |
|
| 93 | + $this->_visibleOver($button); |
|
| 94 | + } |
|
| 92 | 95 | return $button; |
| 93 | 96 | }, $index,$attributes); |
| 94 | 97 | } |
@@ -159,8 +162,9 @@ discard block |
||
| 159 | 162 | private function getDefaultButton($icon,$class=null,$visibleHover=true){ |
| 160 | 163 | $bt=$this->getFieldButton("",$visibleHover); |
| 161 | 164 | $bt->asIcon($icon); |
| 162 | - if(isset($class)) |
|
| 163 | - $bt->addClass($class); |
|
| 165 | + if(isset($class)) { |
|
| 166 | + $bt->addClass($class); |
|
| 167 | + } |
|
| 164 | 168 | return $bt; |
| 165 | 169 | } |
| 166 | 170 | |
@@ -58,10 +58,12 @@ discard block |
||
| 58 | 58 | $js->execOn("mouseover", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'visible');",["preventDefault"=>false,"stopPropagation"=>true]); |
| 59 | 59 | $js->execOn("mouseout", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'hidden');",["preventDefault"=>false,"stopPropagation"=>true]); |
| 60 | 60 | } |
| 61 | - if(\is_array($this->_deleteBehavior)) |
|
| 62 | - $this->_generateBehavior("delete",$this->_deleteBehavior, $js); |
|
| 63 | - if(\is_array($this->_editBehavior)) |
|
| 64 | - $this->_generateBehavior("edit",$this->_editBehavior,$js); |
|
| 61 | + if(\is_array($this->_deleteBehavior)) { |
|
| 62 | + $this->_generateBehavior("delete",$this->_deleteBehavior, $js); |
|
| 63 | + } |
|
| 64 | + if(\is_array($this->_editBehavior)) { |
|
| 65 | + $this->_generateBehavior("edit",$this->_editBehavior,$js); |
|
| 66 | + } |
|
| 65 | 67 | return parent::run($js); |
| 66 | 68 | } |
| 67 | 69 | |
@@ -94,8 +96,9 @@ discard block |
||
| 94 | 96 | $table->setRowCount(0, \sizeof($captions)); |
| 95 | 97 | $this->_generateHeader($table,$captions); |
| 96 | 98 | |
| 97 | - if(isset($this->_compileParts)) |
|
| 98 | - $table->setCompileParts($this->_compileParts); |
|
| 99 | + if(isset($this->_compileParts)) { |
|
| 100 | + $table->setCompileParts($this->_compileParts); |
|
| 101 | + } |
|
| 99 | 102 | |
| 100 | 103 | $this->_generateContent($table); |
| 101 | 104 | |
@@ -126,8 +129,9 @@ discard block |
||
| 126 | 129 | } |
| 127 | 130 | |
| 128 | 131 | protected function _applyStyleAttributes($table){ |
| 129 | - if(isset($this->_hiddenColumns)) |
|
| 130 | - $this->_hideColumns(); |
|
| 132 | + if(isset($this->_hiddenColumns)) { |
|
| 133 | + $this->_hideColumns(); |
|
| 134 | + } |
|
| 131 | 135 | if(isset($this->_colWidths)){ |
| 132 | 136 | foreach ($this->_colWidths as $colIndex=>$width){ |
| 133 | 137 | $table->setColWidth($colIndex,$width); |
@@ -180,8 +184,9 @@ discard block |
||
| 180 | 184 | $field=$ck->getField(); |
| 181 | 185 | $field->setProperty("value",$dataAjax); |
| 182 | 186 | $field->setProperty("name", "selection[]"); |
| 183 | - if(isset($checkedClass)) |
|
| 184 | - $field->setClass($checkedClass); |
|
| 187 | + if(isset($checkedClass)) { |
|
| 188 | + $field->setClass($checkedClass); |
|
| 189 | + } |
|
| 185 | 190 | \array_unshift($values, $ck); |
| 186 | 191 | } |
| 187 | 192 | $result=$table->newRow(); |
@@ -194,8 +199,9 @@ discard block |
||
| 194 | 199 | |
| 195 | 200 | protected function _generatePagination($table,$js=NULL){ |
| 196 | 201 | if(isset($this->_toolbar)){ |
| 197 | - if($this->_toolbarPosition==PositionInTable::FOOTER) |
|
| 198 | - $this->_toolbar->setFloated("left"); |
|
| 202 | + if($this->_toolbarPosition==PositionInTable::FOOTER) { |
|
| 203 | + $this->_toolbar->setFloated("left"); |
|
| 204 | + } |
|
| 199 | 205 | } |
| 200 | 206 | $footer=$table->getFooter(); |
| 201 | 207 | $footer->mergeCol(); |
@@ -214,8 +220,9 @@ discard block |
||
| 214 | 220 | |
| 215 | 221 | protected function _getFieldName($index){ |
| 216 | 222 | $fieldName=parent::_getFieldName($index); |
| 217 | - if(\is_object($fieldName)) |
|
| 218 | - $fieldName="field-".$index; |
|
| 223 | + if(\is_object($fieldName)) { |
|
| 224 | + $fieldName="field-".$index; |
|
| 225 | + } |
|
| 219 | 226 | return $fieldName."[]"; |
| 220 | 227 | } |
| 221 | 228 | |
@@ -255,7 +262,7 @@ discard block |
||
| 255 | 262 | $hasPart=$table->hasPart($part); |
| 256 | 263 | if($hasPart){ |
| 257 | 264 | $row=$table->getPart($part)->addRow(\sizeof($captions)); |
| 258 | - }else{ |
|
| 265 | + } else{ |
|
| 259 | 266 | $row=$table->getPart($part)->getRow(0); |
| 260 | 267 | } |
| 261 | 268 | $row->mergeCol(); |
@@ -286,7 +293,7 @@ discard block |
||
| 286 | 293 | $this->_urls["refresh"]=JArray::getValue($urls, "refresh",0); |
| 287 | 294 | $this->_urls["edit"]=JArray::getValue($urls, "edit",1); |
| 288 | 295 | $this->_urls["delete"]=JArray::getValue($urls, "delete",2); |
| 289 | - }else{ |
|
| 296 | + } else{ |
|
| 290 | 297 | $this->_urls=["refresh"=>$urls,"edit"=>$urls,"delete"=>$urls]; |
| 291 | 298 | } |
| 292 | 299 | return $this; |
@@ -369,8 +376,9 @@ discard block |
||
| 369 | 376 | |
| 370 | 377 | protected function getTargetSelector($op) { |
| 371 | 378 | $result=$this->_targetSelector; |
| 372 | - if(!isset($result[$op])) |
|
| 373 | - $result="#".$this->identifier; |
|
| 379 | + if(!isset($result[$op])) { |
|
| 380 | + $result="#".$this->identifier; |
|
| 381 | + } |
|
| 374 | 382 | return $result[$op]; |
| 375 | 383 | } |
| 376 | 384 | |
@@ -388,8 +396,9 @@ discard block |
||
| 388 | 396 | } |
| 389 | 397 | |
| 390 | 398 | public function getRefreshSelector() { |
| 391 | - if(isset($this->_refreshSelector)) |
|
| 392 | - return $this->_refreshSelector; |
|
| 399 | + if(isset($this->_refreshSelector)) { |
|
| 400 | + return $this->_refreshSelector; |
|
| 401 | + } |
|
| 393 | 402 | return "#".$this->identifier." tbody"; |
| 394 | 403 | } |
| 395 | 404 | |
@@ -408,8 +417,9 @@ discard block |
||
| 408 | 417 | */ |
| 409 | 418 | public function show($modelInstance){ |
| 410 | 419 | if(\is_array($modelInstance)){ |
| 411 | - if(isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0])) |
|
| 412 | - $modelInstance=\json_decode(\json_encode($modelInstance), FALSE); |
|
| 420 | + if(isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0])) { |
|
| 421 | + $modelInstance=\json_decode(\json_encode($modelInstance), FALSE); |
|
| 422 | + } |
|
| 413 | 423 | } |
| 414 | 424 | $this->_modelInstance=$modelInstance; |
| 415 | 425 | } |
@@ -449,8 +459,9 @@ discard block |
||
| 449 | 459 | } |
| 450 | 460 | |
| 451 | 461 | public function hideColumn($colIndex){ |
| 452 | - if(!\is_array($this->_hiddenColumns)) |
|
| 453 | - $this->_hiddenColumns=[]; |
|
| 462 | + if(!\is_array($this->_hiddenColumns)) { |
|
| 463 | + $this->_hiddenColumns=[]; |
|
| 464 | + } |
|
| 454 | 465 | $this->_hiddenColumns[]=$colIndex; |
| 455 | 466 | return $this; |
| 456 | 467 | } |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | $this->wrapContent("<div class='content'>","</div>"); |
| 52 | 52 | if(\is_string($icon)){ |
| 53 | 53 | $this->icon=new HtmlIcon("icon-".$this->identifier, $icon); |
| 54 | - }else{ |
|
| 54 | + } else{ |
|
| 55 | 55 | $this->icon=$icon; |
| 56 | 56 | } |
| 57 | 57 | return $this; |
@@ -64,10 +64,11 @@ discard block |
||
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | public function setDismissable($dismiss=true){ |
| 67 | - if($dismiss===true) |
|
| 68 | - $this->close=new HtmlIcon("close-".$this->identifier, "close"); |
|
| 69 | - else |
|
| 70 | - $this->close=NULL; |
|
| 67 | + if($dismiss===true) { |
|
| 68 | + $this->close=new HtmlIcon("close-".$this->identifier, "close"); |
|
| 69 | + } else { |
|
| 70 | + $this->close=NULL; |
|
| 71 | + } |
|
| 71 | 72 | return $this; |
| 72 | 73 | } |
| 73 | 74 | |
@@ -111,8 +112,9 @@ discard block |
||
| 111 | 112 | public function setMessage($message){ |
| 112 | 113 | if(\is_array($this->content)){ |
| 113 | 114 | $this->content[\sizeof($this->content)-1]=$message; |
| 114 | - }else |
|
| 115 | - $this->setContent($message); |
|
| 115 | + } else { |
|
| 116 | + $this->setContent($message); |
|
| 117 | + } |
|
| 116 | 118 | } |
| 117 | 119 | |
| 118 | 120 | } |
@@ -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 | } |
@@ -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 | |