@@ -49,8 +49,9 @@ discard block |
||
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | public function setStyle($value) { |
| 52 | - foreach ( $this->elements as $element ) |
|
| 53 | - $element->setStyle($value); |
|
| 52 | + foreach ( $this->elements as $element ) { |
|
| 53 | + $element->setStyle($value); |
|
| 54 | + } |
|
| 54 | 55 | } |
| 55 | 56 | |
| 56 | 57 | private function dropdownAsButton($bt) { |
@@ -76,18 +77,19 @@ discard block |
||
| 76 | 77 | } elseif (is_string($element)) { |
| 77 | 78 | $result=new HtmlButton($this->identifier."-button-".$iid,$element); |
| 78 | 79 | } |
| 79 | - if($result instanceof HtmlButton) |
|
| 80 | - $this->elements[]=$result; |
|
| 80 | + if($result instanceof HtmlButton) { |
|
| 81 | + $this->elements[]=$result; |
|
| 82 | + } |
|
| 81 | 83 | return $result; |
| 82 | 84 | } |
| 83 | 85 | |
| 84 | 86 | private function _addArrayElement(array $element,$iid){ |
| 85 | - if (array_key_exists("glyph", $element)) |
|
| 86 | - $bt=new HtmlGlyphButton($this->identifier."-button-".$iid); |
|
| 87 | - elseif (array_key_exists("btnCaption", $element)) { |
|
| 88 | - if (array_key_exists("split", $element)) |
|
| 89 | - $bt=new HtmlSplitbutton($this->identifier."-dropdown-".$iid); |
|
| 90 | - else{ |
|
| 87 | + if (array_key_exists("glyph", $element)) { |
|
| 88 | + $bt=new HtmlGlyphButton($this->identifier."-button-".$iid); |
|
| 89 | + } elseif (array_key_exists("btnCaption", $element)) { |
|
| 90 | + if (array_key_exists("split", $element)) { |
|
| 91 | + $bt=new HtmlSplitbutton($this->identifier."-dropdown-".$iid); |
|
| 92 | + } else{ |
|
| 91 | 93 | $bt=new HtmlDropdown($this->identifier."-dropdown-".$iid); |
| 92 | 94 | $this->dropdownAsButton($bt); |
| 93 | 95 | } |
@@ -116,8 +118,9 @@ discard block |
||
| 116 | 118 | public function setAlignment($value) { |
| 117 | 119 | if (is_int($value)) { |
| 118 | 120 | $value=CssRef::alignment("btn-group")[$value]; |
| 119 | - } else |
|
| 120 | - $value="btn-group-".$value; |
|
| 121 | + } else { |
|
| 122 | + $value="btn-group-".$value; |
|
| 123 | + } |
|
| 121 | 124 | if (strstr($value, "justified")) { |
| 122 | 125 | foreach ( $this->elements as $element ) { |
| 123 | 126 | $element->wrap('<div class="btn-group" role="group">', '</div>'); |
@@ -132,9 +135,9 @@ discard block |
||
| 132 | 135 | * @return HtmlButton |
| 133 | 136 | */ |
| 134 | 137 | public function getElement($index) { |
| 135 | - if (is_int($index)) |
|
| 136 | - return $this->elements[$index]; |
|
| 137 | - else { |
|
| 138 | + if (is_int($index)) { |
|
| 139 | + return $this->elements[$index]; |
|
| 140 | + } else { |
|
| 138 | 141 | $elm=$this->getElementById($index, $this->elements); |
| 139 | 142 | return $elm; |
| 140 | 143 | } |
@@ -58,8 +58,9 @@ discard block |
||
| 58 | 58 | */ |
| 59 | 59 | private function getFieldButton($caption,$visibleHover=true){ |
| 60 | 60 | $bt= new HtmlButton("",$caption); |
| 61 | - if($visibleHover) |
|
| 62 | - $this->_visibleOver($bt); |
|
| 61 | + if($visibleHover) { |
|
| 62 | + $this->_visibleOver($bt); |
|
| 63 | + } |
|
| 63 | 64 | return $bt; |
| 64 | 65 | } |
| 65 | 66 | |
@@ -76,8 +77,9 @@ discard block |
||
| 76 | 77 | return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle,$index,$attributes){ |
| 77 | 78 | $button=new HtmlButton($id,$value,$cssStyle); |
| 78 | 79 | $button->postOnClick($url,"$(event.target).closest('tr').find(':input').serialize()",$responseElement,$attributes["ajax"]); |
| 79 | - if(!isset($attributes["visibleHover"]) || $attributes["visibleHover"]) |
|
| 80 | - $this->_visibleOver($button); |
|
| 80 | + if(!isset($attributes["visibleHover"]) || $attributes["visibleHover"]) { |
|
| 81 | + $this->_visibleOver($button); |
|
| 82 | + } |
|
| 81 | 83 | return $button; |
| 82 | 84 | }, $index,$attributes); |
| 83 | 85 | } |
@@ -136,8 +138,9 @@ discard block |
||
| 136 | 138 | private function getDefaultButton($icon,$class=null,$visibleHover=true){ |
| 137 | 139 | $bt=$this->getFieldButton("",$visibleHover); |
| 138 | 140 | $bt->asIcon($icon); |
| 139 | - if(isset($class)) |
|
| 140 | - $bt->addClass($class); |
|
| 141 | + if(isset($class)) { |
|
| 142 | + $bt->addClass($class); |
|
| 143 | + } |
|
| 141 | 144 | return $bt; |
| 142 | 145 | } |
| 143 | 146 | |
@@ -47,15 +47,17 @@ |
||
| 47 | 47 | |
| 48 | 48 | |
| 49 | 49 | public function addSeparatorAfter($fieldNum){ |
| 50 | - if(\array_search($fieldNum, $this->separators)===false) |
|
| 51 | - $this->separators[]=$fieldNum; |
|
| 50 | + if(\array_search($fieldNum, $this->separators)===false) { |
|
| 51 | + $this->separators[]=$fieldNum; |
|
| 52 | + } |
|
| 52 | 53 | return $this; |
| 53 | 54 | } |
| 54 | 55 | |
| 55 | 56 | public function addHeaderDividerBefore($fieldNum,$header){ |
| 56 | 57 | $this->headers[$fieldNum]=$header; |
| 57 | - if($fieldNum>0) |
|
| 58 | - $this->addSeparatorAfter($fieldNum-1); |
|
| 58 | + if($fieldNum>0) { |
|
| 59 | + $this->addSeparatorAfter($fieldNum-1); |
|
| 60 | + } |
|
| 59 | 61 | return $this; |
| 60 | 62 | } |
| 61 | 63 | |
@@ -18,8 +18,9 @@ discard block |
||
| 18 | 18 | parent::__construct($identifier, "div","field"); |
| 19 | 19 | $this->content=array(); |
| 20 | 20 | $this->_states=[State::ERROR,State::DISABLED]; |
| 21 | - if(isset($label) && $label!=="") |
|
| 22 | - $this->setLabel($label); |
|
| 21 | + if(isset($label) && $label!=="") { |
|
| 22 | + $this->setLabel($label); |
|
| 23 | + } |
|
| 23 | 24 | $this->setField($field); |
| 24 | 25 | $this->_validation=NULL; |
| 25 | 26 | } |
@@ -50,8 +51,9 @@ discard block |
||
| 50 | 51 | * @return mixed |
| 51 | 52 | */ |
| 52 | 53 | public function getLabel(){ |
| 53 | - if(\array_key_exists("label", $this->content)) |
|
| 54 | - return $this->content["label"]; |
|
| 54 | + if(\array_key_exists("label", $this->content)) { |
|
| 55 | + return $this->content["label"]; |
|
| 56 | + } |
|
| 55 | 57 | } |
| 56 | 58 | |
| 57 | 59 | /** |
@@ -9,8 +9,9 @@ discard block |
||
| 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 | $this->_identifier=$identifier; |
| 16 | 17 | } |
@@ -18,8 +19,9 @@ discard block |
||
| 18 | 19 | public function getDataField(){ |
| 19 | 20 | $field= $this->getField(); |
| 20 | 21 | //TODO check getField |
| 21 | - if($field instanceof HtmlInput) |
|
| 22 | - $field=$field->getDataField(); |
|
| 22 | + if($field instanceof HtmlInput) { |
|
| 23 | + $field=$field->getDataField(); |
|
| 24 | + } |
|
| 23 | 25 | return $field; |
| 24 | 26 | } |
| 25 | 27 | } |
| 26 | 28 | \ No newline at end of file |
@@ -10,8 +10,9 @@ |
||
| 10 | 10 | use TextFieldsTrait; |
| 11 | 11 | |
| 12 | 12 | public function __construct($identifier, $label=NULL,$value=NULL,$placeholder=NULL,$rows=NULL) { |
| 13 | - if(!isset($placeholder)) |
|
| 14 | - $placeholder=$label; |
|
| 13 | + if(!isset($placeholder)) { |
|
| 14 | + $placeholder=$label; |
|
| 15 | + } |
|
| 15 | 16 | parent::__construct("field-".$identifier, new HtmlTextarea($identifier,$value,$placeholder,$rows), $label); |
| 16 | 17 | $this->_identifier=$identifier; |
| 17 | 18 | } |
@@ -48,8 +48,9 @@ discard block |
||
| 48 | 48 | } |
| 49 | 49 | $retour.="$.".$method."(url,".$params.").done(function( data ) {\n"; |
| 50 | 50 | $retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback)."});\n"; |
| 51 | - if ($immediatly) |
|
| 52 | - $this->jquery_code_for_compile[]=$retour; |
|
| 51 | + if ($immediatly) { |
|
| 52 | + $this->jquery_code_for_compile[]=$retour; |
|
| 53 | + } |
|
| 53 | 54 | return $retour; |
| 54 | 55 | } |
| 55 | 56 | |
@@ -67,15 +68,17 @@ discard block |
||
| 67 | 68 | $url=$this->_correctAjaxUrl($url); |
| 68 | 69 | $retour="url='".$url."';"; |
| 69 | 70 | $slash="/"; |
| 70 | - if(JString::endswith($url, "/")===true) |
|
| 71 | - $slash=""; |
|
| 71 | + if(JString::endswith($url, "/")===true) { |
|
| 72 | + $slash=""; |
|
| 73 | + } |
|
| 72 | 74 | if(JString::isNotNull($attr)){ |
| 73 | - if ($attr==="value") |
|
| 74 | - $retour.="url=url+'".$slash."'+$(this).val();\n"; |
|
| 75 | - elseif ($attr==="html") |
|
| 76 | - $retour.="url=url+'".$slash."'+$(this).html();\n"; |
|
| 77 | - elseif($attr!=null && $attr!=="") |
|
| 78 | - $retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n"; |
|
| 75 | + if ($attr==="value") { |
|
| 76 | + $retour.="url=url+'".$slash."'+$(this).val();\n"; |
|
| 77 | + } elseif ($attr==="html") { |
|
| 78 | + $retour.="url=url+'".$slash."'+$(this).html();\n"; |
|
| 79 | + } elseif($attr!=null && $attr!=="") { |
|
| 80 | + $retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n"; |
|
| 81 | + } |
|
| 79 | 82 | } |
| 80 | 83 | return $retour; |
| 81 | 84 | } |
@@ -85,13 +88,14 @@ discard block |
||
| 85 | 88 | if ($responseElement!=="") { |
| 86 | 89 | if(isset($ajaxTransition)){ |
| 87 | 90 | $call=$this->setAjaxDataCall($ajaxTransition); |
| 88 | - }elseif(isset($this->ajaxTransition)){ |
|
| 91 | + } elseif(isset($this->ajaxTransition)){ |
|
| 89 | 92 | $call=$this->ajaxTransition; |
| 90 | 93 | } |
| 91 | - if(\is_callable($call)) |
|
| 92 | - $retour="\t".$call($responseElement,$jqueryDone).";\n"; |
|
| 93 | - else |
|
| 94 | - $retour="\t$({$responseElement}).{$jqueryDone}( data );\n"; |
|
| 94 | + if(\is_callable($call)) { |
|
| 95 | + $retour="\t".$call($responseElement,$jqueryDone).";\n"; |
|
| 96 | + } else { |
|
| 97 | + $retour="\t$({$responseElement}).{$jqueryDone}( data );\n"; |
|
| 98 | + } |
|
| 95 | 99 | } |
| 96 | 100 | $retour.="\t".$jsCallback."\n"; |
| 97 | 101 | return $retour; |
@@ -105,8 +109,9 @@ discard block |
||
| 105 | 109 | } |
| 106 | 110 | |
| 107 | 111 | protected function _correctAjaxUrl($url) { |
| 108 | - if ($url!=="/" && JString::endsWith($url, "/")===true) |
|
| 109 | - $url=substr($url, 0, strlen($url)-1); |
|
| 112 | + if ($url!=="/" && JString::endsWith($url, "/")===true) { |
|
| 113 | + $url=substr($url, 0, strlen($url)-1); |
|
| 114 | + } |
|
| 110 | 115 | if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) { |
| 111 | 116 | $url=$this->jsUtils->getUrl($url); |
| 112 | 117 | } |
@@ -130,8 +135,9 @@ discard block |
||
| 130 | 135 | $retour.="\t".$jsCallback."\n". |
| 131 | 136 | "\t$(document).trigger('jsonReady',[data]);\n". |
| 132 | 137 | "});\n"; |
| 133 | - if ($immediatly) |
|
| 134 | - $this->jquery_code_for_compile[]=$retour; |
|
| 138 | + if ($immediatly) { |
|
| 139 | + $this->jquery_code_for_compile[]=$retour; |
|
| 140 | + } |
|
| 135 | 141 | return $retour; |
| 136 | 142 | } |
| 137 | 143 | |
@@ -170,7 +176,7 @@ discard block |
||
| 170 | 176 | if($context===null){ |
| 171 | 177 | $parent="$('".$maskSelector."').parent()"; |
| 172 | 178 | $newElm = "$('#'+newId)"; |
| 173 | - }else{ |
|
| 179 | + } else{ |
|
| 174 | 180 | $parent=$context; |
| 175 | 181 | $newElm = $context.".find('#'+newId)"; |
| 176 | 182 | } |
@@ -183,8 +189,9 @@ discard block |
||
| 183 | 189 | $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"; |
| 184 | 190 | $retour.="\t$(document).trigger('jsonReady',[data]);\n"; |
| 185 | 191 | $retour.="\t".$jsCallback."\n"."});\n"; |
| 186 | - if ($immediatly) |
|
| 187 | - $this->jquery_code_for_compile[]=$retour; |
|
| 192 | + if ($immediatly) { |
|
| 193 | + $this->jquery_code_for_compile[]=$retour; |
|
| 194 | + } |
|
| 188 | 195 | return $retour; |
| 189 | 196 | } |
| 190 | 197 | /** |
@@ -225,8 +232,9 @@ discard block |
||
| 225 | 232 | }});\n"; |
| 226 | 233 | $retour.="$('#".$form."').submit();\n"; |
| 227 | 234 | } |
| 228 | - if ($immediatly) |
|
| 229 | - $this->jquery_code_for_compile[]=$retour; |
|
| 235 | + if ($immediatly) { |
|
| 236 | + $this->jquery_code_for_compile[]=$retour; |
|
| 237 | + } |
|
| 230 | 238 | return $retour; |
| 231 | 239 | } |
| 232 | 240 | |
@@ -54,8 +54,9 @@ discard block |
||
| 54 | 54 | $this->params[$key]=$params[$key]; |
| 55 | 55 | } |
| 56 | 56 | $this->jsUtils=$jsUtils; |
| 57 | - if(isset($params["ajaxTransition"])) |
|
| 58 | - $this->ajaxTransition=$this->setAjaxDataCall($params["ajaxTransition"]); |
|
| 57 | + if(isset($params["ajaxTransition"])) { |
|
| 58 | + $this->ajaxTransition=$this->setAjaxDataCall($params["ajaxTransition"]); |
|
| 59 | + } |
|
| 59 | 60 | } |
| 60 | 61 | |
| 61 | 62 | /** |
@@ -138,10 +139,12 @@ discard block |
||
| 138 | 139 | if (isset($param)) { |
| 139 | 140 | $param=Javascript::prep_value($param); |
| 140 | 141 | $str="$({$element}).{$jQueryCall}({$param});"; |
| 141 | - } else |
|
| 142 | - $str="$({$element}).{$jQueryCall}();"; |
|
| 143 | - if ($immediatly) |
|
| 144 | - $this->jquery_code_for_compile[]=$str; |
|
| 142 | + } else { |
|
| 143 | + $str="$({$element}).{$jQueryCall}();"; |
|
| 144 | + } |
|
| 145 | + if ($immediatly) { |
|
| 146 | + $this->jquery_code_for_compile[]=$str; |
|
| 147 | + } |
|
| 145 | 148 | return $str; |
| 146 | 149 | } |
| 147 | 150 | /** |
@@ -156,8 +159,9 @@ discard block |
||
| 156 | 159 | $to=Javascript::prep_element($to); |
| 157 | 160 | $element=Javascript::prep_element($element); |
| 158 | 161 | $str="$({$to}).{$jQueryCall}({$element});"; |
| 159 | - if ($immediatly) |
|
| 160 | - $this->jquery_code_for_compile[]=$str; |
|
| 162 | + if ($immediatly) { |
|
| 163 | + $this->jquery_code_for_compile[]=$str; |
|
| 164 | + } |
|
| 161 | 165 | return $str; |
| 162 | 166 | } |
| 163 | 167 | |
@@ -213,12 +217,14 @@ discard block |
||
| 213 | 217 | if ($stopPropagation===true) { |
| 214 | 218 | $js=Javascript::$stopPropagation.$js; |
| 215 | 219 | } |
| 216 | - if (array_search($event, $this->jquery_events)===false) |
|
| 217 | - $event="\n\t$(".Javascript::prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n"; |
|
| 218 | - else |
|
| 219 | - $event="\n\t$(".Javascript::prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n"; |
|
| 220 | - if($immediatly) |
|
| 221 | - $this->jquery_code_for_compile[]=$event; |
|
| 220 | + if (array_search($event, $this->jquery_events)===false) { |
|
| 221 | + $event="\n\t$(".Javascript::prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n"; |
|
| 222 | + } else { |
|
| 223 | + $event="\n\t$(".Javascript::prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n"; |
|
| 224 | + } |
|
| 225 | + if($immediatly) { |
|
| 226 | + $this->jquery_code_for_compile[]=$event; |
|
| 227 | + } |
|
| 222 | 228 | return $event; |
| 223 | 229 | } |
| 224 | 230 | |
@@ -261,8 +267,9 @@ discard block |
||
| 261 | 267 | |
| 262 | 268 | public function getScript($offset=0){ |
| 263 | 269 | $code=$this->jquery_code_for_compile; |
| 264 | - if($offset>0) |
|
| 265 | - $code=\array_slice($code, $offset); |
|
| 270 | + if($offset>0) { |
|
| 271 | + $code=\array_slice($code, $offset); |
|
| 272 | + } |
|
| 266 | 273 | return implode('', $code); |
| 267 | 274 | } |
| 268 | 275 | |
@@ -314,7 +321,9 @@ discard block |
||
| 314 | 321 | } |
| 315 | 322 | |
| 316 | 323 | private function minify($input) { |
| 317 | - if(trim($input) === "") return $input; |
|
| 324 | + if(trim($input) === "") { |
|
| 325 | + return $input; |
|
| 326 | + } |
|
| 318 | 327 | return preg_replace( |
| 319 | 328 | array( |
| 320 | 329 | // Remove comment(s) |
@@ -50,8 +50,9 @@ discard block |
||
| 50 | 50 | if(isset($this->_checkedClass)){ |
| 51 | 51 | $checkedMessageCall.="$(this).closest('tr').toggleClass('".$this->_checkedClass."',$(this).prop('checked'));"; |
| 52 | 52 | } |
| 53 | - if(isset($js)) |
|
| 54 | - $js->exec($this->_getCheckedMessageFunction(),true); |
|
| 53 | + if(isset($js)) { |
|
| 54 | + $js->exec($this->_getCheckedMessageFunction(),true); |
|
| 55 | + } |
|
| 55 | 56 | } |
| 56 | 57 | return $checkedMessageCall; |
| 57 | 58 | } |
@@ -59,8 +60,9 @@ discard block |
||
| 59 | 60 | protected function _generateMainCheckbox(&$captions){ |
| 60 | 61 | $ck=new HtmlCheckbox("main-ck-".$this->identifier,""); |
| 61 | 62 | $checkedMessageCall=""; |
| 62 | - if($this->_hasCheckedMessage) |
|
| 63 | - $checkedMessageCall="$('#{$this->identifier}').trigger('updateChecked');"; |
|
| 63 | + if($this->_hasCheckedMessage) { |
|
| 64 | + $checkedMessageCall="$('#{$this->identifier}').trigger('updateChecked');"; |
|
| 65 | + } |
|
| 64 | 66 | |
| 65 | 67 | $ck->setOnChecked($this->_setAllChecked("true").$checkedMessageCall); |
| 66 | 68 | $ck->setOnUnchecked($this->_setAllChecked("false").$checkedMessageCall); |
@@ -108,8 +110,9 @@ discard block |
||
| 108 | 110 | * @param callable $callback |
| 109 | 111 | */ |
| 110 | 112 | public function addCountCheckedInToolbar(array $checkedMessage=null,$callback=null){ |
| 111 | - if(isset($checkedMessage)) |
|
| 112 | - $this->_checkedMessage=$checkedMessage; |
|
| 113 | + if(isset($checkedMessage)) { |
|
| 114 | + $this->_checkedMessage=$checkedMessage; |
|
| 115 | + } |
|
| 113 | 116 | $checkedMessage=$this->getCheckedMessage(); |
| 114 | 117 | $this->_hasCheckboxes=true; |
| 115 | 118 | $this->_hasCheckedMessage=true; |