@@ -13,8 +13,9 @@ |
||
| 13 | 13 | if(\is_array($value)){ |
| 14 | 14 | $itemO=new HtmlFormInput(JArray::getDefaultValue($value, "id",""),JArray::getDefaultValue($value, "label",null),JArray::getDefaultValue($value, "type", "text"),JArray::getDefaultValue($value, "value",""),JArray::getDefaultValue($value, "placeholder",JArray::getDefaultValue($value, "label",null))); |
| 15 | 15 | return $itemO; |
| 16 | - }else |
|
| 17 | - return new HtmlFormInput($value); |
|
| 16 | + } else { |
|
| 17 | + return new HtmlFormInput($value); |
|
| 18 | + } |
|
| 18 | 19 | } |
| 19 | 20 | |
| 20 | 21 | public function addInputs($inputs,$fieldslabel=null){ |
@@ -173,10 +173,12 @@ discard block |
||
| 173 | 173 | if (isset($param)) { |
| 174 | 174 | $param=$this->_prep_value($param); |
| 175 | 175 | $str="$({$element}).{$jQueryCall}({$param});"; |
| 176 | - } else |
|
| 177 | - $str="$({$element}).{$jQueryCall}();"; |
|
| 178 | - if ($immediatly) |
|
| 179 | - $this->jquery_code_for_compile[]=$str; |
|
| 176 | + } else { |
|
| 177 | + $str="$({$element}).{$jQueryCall}();"; |
|
| 178 | + } |
|
| 179 | + if ($immediatly) { |
|
| 180 | + $this->jquery_code_for_compile[]=$str; |
|
| 181 | + } |
|
| 180 | 182 | return $str; |
| 181 | 183 | } |
| 182 | 184 | /** |
@@ -191,8 +193,9 @@ discard block |
||
| 191 | 193 | $to=$this->_prep_element($to); |
| 192 | 194 | $element=$this->_prep_element($element); |
| 193 | 195 | $str="$({$to}).{$jQueryCall}({$element});"; |
| 194 | - if ($immediatly) |
|
| 195 | - $this->jquery_code_for_compile[]=$str; |
|
| 196 | + if ($immediatly) { |
|
| 197 | + $this->jquery_code_for_compile[]=$str; |
|
| 198 | + } |
|
| 196 | 199 | return $str; |
| 197 | 200 | } |
| 198 | 201 | // -------------------------------------------------------------------- |
@@ -260,12 +263,14 @@ discard block |
||
| 260 | 263 | if ($stopPropagation===true) { |
| 261 | 264 | $js="event.stopPropagation();\n".$js; |
| 262 | 265 | } |
| 263 | - if (array_search($event, $this->jquery_events)===false) |
|
| 264 | - $event="\n\t$(".$this->_prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n"; |
|
| 265 | - else |
|
| 266 | - $event="\n\t$(".$this->_prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n"; |
|
| 267 | - if($immediatly) |
|
| 268 | - $this->jquery_code_for_compile[]=$event; |
|
| 266 | + if (array_search($event, $this->jquery_events)===false) { |
|
| 267 | + $event="\n\t$(".$this->_prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n"; |
|
| 268 | + } else { |
|
| 269 | + $event="\n\t$(".$this->_prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n"; |
|
| 270 | + } |
|
| 271 | + if($immediatly) { |
|
| 272 | + $this->jquery_code_for_compile[]=$event; |
|
| 273 | + } |
|
| 269 | 274 | return $event; |
| 270 | 275 | } |
| 271 | 276 | |
@@ -326,8 +331,9 @@ discard block |
||
| 326 | 331 | } |
| 327 | 332 | $output=($script_tags===FALSE) ? $script : $this->inline($script); |
| 328 | 333 | |
| 329 | - if ($view!=NULL) |
|
| 330 | - $view->setVar($view_var, $output); |
|
| 334 | + if ($view!=NULL) { |
|
| 335 | + $view->setVar($view_var, $output); |
|
| 336 | + } |
|
| 331 | 337 | return $output; |
| 332 | 338 | } |
| 333 | 339 | |
@@ -421,7 +427,9 @@ discard block |
||
| 421 | 427 | } |
| 422 | 428 | |
| 423 | 429 | private function minify($input) { |
| 424 | - if(trim($input) === "") return $input; |
|
| 430 | + if(trim($input) === "") { |
|
| 431 | + return $input; |
|
| 432 | + } |
|
| 425 | 433 | return preg_replace( |
| 426 | 434 | array( |
| 427 | 435 | // Remove comment(s) |
@@ -10,8 +10,9 @@ |
||
| 10 | 10 | |
| 11 | 11 | public function __construct($identifier,$context=NULL,$content=NULL) { |
| 12 | 12 | parent::__construct($identifier, "div", "ui sticky", $content); |
| 13 | - if(isset($content)) |
|
| 14 | - $this->setContext($context); |
|
| 13 | + if(isset($content)) { |
|
| 14 | + $this->setContext($context); |
|
| 15 | + } |
|
| 15 | 16 | } |
| 16 | 17 | |
| 17 | 18 | public function setContext($context){ |
@@ -9,8 +9,9 @@ |
||
| 9 | 9 | use TextFieldsTrait; |
| 10 | 10 | |
| 11 | 11 | public function __construct($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL) { |
| 12 | - if(!isset($placeholder) && $type==="text") |
|
| 13 | - $placeholder=$label; |
|
| 12 | + if(!isset($placeholder) && $type==="text") { |
|
| 13 | + $placeholder=$label; |
|
| 14 | + } |
|
| 14 | 15 | parent::__construct("field-".$identifier, new HtmlInput($identifier,$type,$value,$placeholder), $label); |
| 15 | 16 | } |
| 16 | 17 | |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | $itemO=$item; |
| 64 | 64 | if(!$item instanceof HtmlDropdownItem){ |
| 65 | 65 | $itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items),$item,$value,$image); |
| 66 | - }elseif($itemO instanceof HtmlDropdownItem){ |
|
| 66 | + } elseif($itemO instanceof HtmlDropdownItem){ |
|
| 67 | 67 | $this->addToProperty("class", "vertical"); |
| 68 | 68 | } |
| 69 | 69 | return $itemO; |
@@ -77,8 +77,9 @@ discard block |
||
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | public function addInput($name){ |
| 80 | - if(!isset($name)) |
|
| 81 | - $name="input-".$this->identifier; |
|
| 80 | + if(!isset($name)) { |
|
| 81 | + $name="input-".$this->identifier; |
|
| 82 | + } |
|
| 82 | 83 | $this->setAction("activate"); |
| 83 | 84 | $this->input=new HtmlInput($name,"hidden"); |
| 84 | 85 | } |
@@ -88,7 +89,7 @@ discard block |
||
| 88 | 89 | foreach ($items as $k=>$v){ |
| 89 | 90 | $this->addItem($v)->setData($k); |
| 90 | 91 | } |
| 91 | - }else{ |
|
| 92 | + } else{ |
|
| 92 | 93 | foreach ($items as $item){ |
| 93 | 94 | $this->addItem($item); |
| 94 | 95 | } |
@@ -105,7 +106,7 @@ discard block |
||
| 105 | 106 | if($dropdown===false){ |
| 106 | 107 | $this->_template=include dirname(__FILE__).'/../templates/tplDropdownMenu.php'; |
| 107 | 108 | $dropdown="menu"; |
| 108 | - }else{ |
|
| 109 | + } else{ |
|
| 109 | 110 | $dropdown="dropdown"; |
| 110 | 111 | $this->mClass="menu"; |
| 111 | 112 | } |
@@ -121,18 +122,22 @@ discard block |
||
| 121 | 122 | } |
| 122 | 123 | |
| 123 | 124 | public function asButton($floating=false){ |
| 124 | - if($floating) |
|
| 125 | - $this->addToProperty("class", "floating"); |
|
| 125 | + if($floating) { |
|
| 126 | + $this->addToProperty("class", "floating"); |
|
| 127 | + } |
|
| 126 | 128 | return $this->addToProperty("class", "button"); |
| 127 | 129 | } |
| 128 | 130 | |
| 129 | 131 | public function asSelect($name=NULL,$multiple=false,$selection=true){ |
| 130 | - if(isset($name)) |
|
| 131 | - $this->addInput($name); |
|
| 132 | - if($multiple) |
|
| 133 | - $this->addToProperty("class", "multiple"); |
|
| 134 | - if ($selection) |
|
| 135 | - $this->addToPropertyCtrl("class", "selection",array("selection")); |
|
| 132 | + if(isset($name)) { |
|
| 133 | + $this->addInput($name); |
|
| 134 | + } |
|
| 135 | + if($multiple) { |
|
| 136 | + $this->addToProperty("class", "multiple"); |
|
| 137 | + } |
|
| 138 | + if ($selection) { |
|
| 139 | + $this->addToPropertyCtrl("class", "selection",array("selection")); |
|
| 140 | + } |
|
| 136 | 141 | return $this; |
| 137 | 142 | } |
| 138 | 143 | |
@@ -142,8 +147,9 @@ discard block |
||
| 142 | 147 | } |
| 143 | 148 | |
| 144 | 149 | public function setSelect($name=NULL,$multiple=false){ |
| 145 | - if(!isset($name)) |
|
| 146 | - $name="select-".$this->identifier; |
|
| 150 | + if(!isset($name)) { |
|
| 151 | + $name="select-".$this->identifier; |
|
| 152 | + } |
|
| 147 | 153 | $this->input=null; |
| 148 | 154 | if($multiple){ |
| 149 | 155 | $this->setProperty("multiple", true); |
@@ -174,12 +180,13 @@ discard block |
||
| 174 | 180 | public function setValue($value){ |
| 175 | 181 | if(isset($this->input)){ |
| 176 | 182 | $this->input->setProperty("value", $value); |
| 177 | - }else{ |
|
| 183 | + } else{ |
|
| 178 | 184 | $this->setProperty("value", $value); |
| 179 | 185 | } |
| 180 | 186 | $textElement=$this->getElementById("text-".$this->identifier, $this->content); |
| 181 | - if(isset($textElement)) |
|
| 182 | - $textElement->setContent($value); |
|
| 187 | + if(isset($textElement)) { |
|
| 188 | + $textElement->setContent($value); |
|
| 189 | + } |
|
| 183 | 190 | return $this; |
| 184 | 191 | } |
| 185 | 192 | |
@@ -189,8 +196,9 @@ discard block |
||
| 189 | 196 | */ |
| 190 | 197 | public function run(JsUtils $js) { |
| 191 | 198 | if($this->propertyContains("class", "simple")===false){ |
| 192 | - if(isset($this->_bsComponent)===false) |
|
| 193 | - $this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier,$this->_params); |
|
| 199 | + if(isset($this->_bsComponent)===false) { |
|
| 200 | + $this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier,$this->_params); |
|
| 201 | + } |
|
| 194 | 202 | $this->addEventsOnRun($js); |
| 195 | 203 | return $this->_bsComponent; |
| 196 | 204 | } |
@@ -23,7 +23,7 @@ |
||
| 23 | 23 | } |
| 24 | 24 | if($content instanceof HtmlSemDoubleElement){ |
| 25 | 25 | $content=new HtmlSemDoubleElement($this->identifier."-".$index,"div","",$content); |
| 26 | - }elseif ($content instanceof HtmlImg){ |
|
| 26 | + } elseif ($content instanceof HtmlImg){ |
|
| 27 | 27 | $this->addToPropertyCtrl("class", "image", array("image")); |
| 28 | 28 | } |
| 29 | 29 | $content->addToProperty("class",(($index===0)?"visible":"hidden")." content"); |
@@ -54,26 +54,29 @@ |
||
| 54 | 54 | for($i=0;$i<$count;$i++){ |
| 55 | 55 | $step=$this->content[$i]; |
| 56 | 56 | $step->removeStatus(); |
| 57 | - if($i<$activestep) |
|
| 58 | - $step->setCompleted(); |
|
| 59 | - elseif ($i===$activestep) |
|
| 60 | - $step->setActive(); |
|
| 61 | - else |
|
| 62 | - $step->setDisabled(); |
|
| 57 | + if($i<$activestep) { |
|
| 58 | + $step->setCompleted(); |
|
| 59 | + } elseif ($i===$activestep) { |
|
| 60 | + $step->setActive(); |
|
| 61 | + } else { |
|
| 62 | + $step->setDisabled(); |
|
| 63 | + } |
|
| 63 | 64 | } |
| 64 | - }else{ |
|
| 65 | + } else{ |
|
| 65 | 66 | foreach ($this->content as $step){ |
| 66 | 67 | $step->removeStatus(); |
| 67 | 68 | } |
| 68 | - if($activestep<$count) |
|
| 69 | - $this->content[$activestep]->setActive(); |
|
| 69 | + if($activestep<$count) { |
|
| 70 | + $this->content[$activestep]->setActive(); |
|
| 71 | + } |
|
| 70 | 72 | } |
| 71 | 73 | return $this; |
| 72 | 74 | } |
| 73 | 75 | |
| 74 | 76 | public function compile(JsUtils $js=NULL, View $view=NULL) { |
| 75 | - if(isset($this->_activeStep)===true && \is_numeric($this->_activeStep)) |
|
| 76 | - $this->defineActiveStep(); |
|
| 77 | + if(isset($this->_activeStep)===true && \is_numeric($this->_activeStep)) { |
|
| 78 | + $this->defineActiveStep(); |
|
| 79 | + } |
|
| 77 | 80 | return parent::compile($js,$view); |
| 78 | 81 | } |
| 79 | 82 | |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | $title=JArray::getValue($content, "title",1); |
| 19 | 19 | $desc=JArray::getValue($content, "description",2); |
| 20 | 20 | $status=JArray::getValue($content, "status",3); |
| 21 | - }else{ |
|
| 21 | + } else{ |
|
| 22 | 22 | $icon=@$content["icon"]; |
| 23 | 23 | $title=@$content["title"]; |
| 24 | 24 | $desc=@$content["description"]; |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | if(isset($title)===true){ |
| 34 | 34 | $this->setTitle($title,$desc); |
| 35 | 35 | } |
| 36 | - }else{ |
|
| 36 | + } else{ |
|
| 37 | 37 | $this->setContent($content); |
| 38 | 38 | } |
| 39 | 39 | } |
@@ -18,8 +18,9 @@ |
||
| 18 | 18 | if (isset($type)) { |
| 19 | 19 | if ($type=="page") { |
| 20 | 20 | $this->asPageHeader($niveau); |
| 21 | - } else |
|
| 22 | - $this->asContentHeader($niveau); |
|
| 21 | + } else { |
|
| 22 | + $this->asContentHeader($niveau); |
|
| 23 | + } |
|
| 23 | 24 | } |
| 24 | 25 | $this->content=$content; |
| 25 | 26 | } |