@@ -47,8 +47,9 @@ discard block |
||
| 47 | 47 | |
| 48 | 48 | public function setVariations($variations) { |
| 49 | 49 | $this->setProperty("class", $this->_baseClass); |
| 50 | - if (\is_string($variations)) |
|
| 51 | - $variations=\explode(" ", $variations); |
|
| 50 | + if (\is_string($variations)) { |
|
| 51 | + $variations=\explode(" ", $variations); |
|
| 52 | + } |
|
| 52 | 53 | foreach ( $variations as $variation ) { |
| 53 | 54 | $this->addVariation($variation); |
| 54 | 55 | } |
@@ -61,8 +62,9 @@ discard block |
||
| 61 | 62 | } |
| 62 | 63 | |
| 63 | 64 | public function addVariations($variations=array()) { |
| 64 | - if (\is_string($variations)) |
|
| 65 | - $variations=\explode(" ", $variations); |
|
| 65 | + if (\is_string($variations)) { |
|
| 66 | + $variations=\explode(" ", $variations); |
|
| 67 | + } |
|
| 66 | 68 | foreach ( $variations as $variation ) { |
| 67 | 69 | $this->addVariation($variation); |
| 68 | 70 | } |
@@ -70,8 +72,9 @@ discard block |
||
| 70 | 72 | } |
| 71 | 73 | |
| 72 | 74 | public function addStates($states=array()) { |
| 73 | - if (\is_string($states)) |
|
| 74 | - $states=\explode(" ", $states); |
|
| 75 | + if (\is_string($states)) { |
|
| 76 | + $states=\explode(" ", $states); |
|
| 77 | + } |
|
| 75 | 78 | foreach ( $states as $state ) { |
| 76 | 79 | $this->addState($state); |
| 77 | 80 | } |
@@ -80,8 +83,9 @@ discard block |
||
| 80 | 83 | |
| 81 | 84 | public function setStates($states) { |
| 82 | 85 | $this->setProperty("class", $this->_baseClass); |
| 83 | - if (\is_string($states)) |
|
| 84 | - $states=\explode(" ", $states); |
|
| 86 | + if (\is_string($states)) { |
|
| 87 | + $states=\explode(" ", $states); |
|
| 88 | + } |
|
| 85 | 89 | foreach ( $states as $state ) { |
| 86 | 90 | $this->addState($state); |
| 87 | 91 | } |
@@ -113,8 +117,9 @@ discard block |
||
| 113 | 117 | * @return HtmlSemDoubleElement |
| 114 | 118 | */ |
| 115 | 119 | public function setDisabled($disable=true) { |
| 116 | - if($disable) |
|
| 117 | - $this->addToProperty("class", "disabled"); |
|
| 120 | + if($disable) { |
|
| 121 | + $this->addToProperty("class", "disabled"); |
|
| 122 | + } |
|
| 118 | 123 | return $this; |
| 119 | 124 | } |
| 120 | 125 | |
@@ -148,14 +153,16 @@ discard block |
||
| 148 | 153 | * @return HtmlSemDoubleElement |
| 149 | 154 | */ |
| 150 | 155 | public function setActive($value=true){ |
| 151 | - if($value) |
|
| 152 | - $this->addToProperty("class", "active"); |
|
| 156 | + if($value) { |
|
| 157 | + $this->addToProperty("class", "active"); |
|
| 158 | + } |
|
| 153 | 159 | return $this; |
| 154 | 160 | } |
| 155 | 161 | |
| 156 | 162 | public function setAttached($value=true){ |
| 157 | - if($value) |
|
| 158 | - $this->addToPropertyCtrl("class", "attached", array ("attached" )); |
|
| 163 | + if($value) { |
|
| 164 | + $this->addToPropertyCtrl("class", "attached", array ("attached" )); |
|
| 165 | + } |
|
| 159 | 166 | return $this; |
| 160 | 167 | } |
| 161 | 168 | |
@@ -191,10 +198,12 @@ discard block |
||
| 191 | 198 | if(isset($array[$key])){ |
| 192 | 199 | $p=JString::replaceAtFirstAndLast($array[$key], $before, "", $after, ""); |
| 193 | 200 | $array[$key]=$before.$p.$value.$after; |
| 194 | - }else |
|
| 195 | - $array[$key]=$before.$value.$after; |
|
| 196 | - }else |
|
| 197 | - $array[$key]=$value; |
|
| 201 | + } else { |
|
| 202 | + $array[$key]=$before.$value.$after; |
|
| 203 | + } |
|
| 204 | + } else { |
|
| 205 | + $array[$key]=$value; |
|
| 206 | + } |
|
| 198 | 207 | return $this; |
| 199 | 208 | } |
| 200 | 209 | } |
| 201 | 210 | \ No newline at end of file |
@@ -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) |
@@ -23,8 +23,9 @@ discard block |
||
| 23 | 23 | $this->widgetIdentifier=$identifier; |
| 24 | 24 | $this->values=[]; |
| 25 | 25 | $this->afterCompile=[]; |
| 26 | - if(isset($instance)) |
|
| 27 | - $this->setInstance($instance); |
|
| 26 | + if(isset($instance)) { |
|
| 27 | + $this->setInstance($instance); |
|
| 28 | + } |
|
| 28 | 29 | $this->setCaptions($captions); |
| 29 | 30 | $this->captionCallback=NULL; |
| 30 | 31 | $this->defaultValueFunction=function($name,$value){return $value;}; |
@@ -62,14 +63,16 @@ discard block |
||
| 62 | 63 | } |
| 63 | 64 | |
| 64 | 65 | public function getIdentifier($index=NULL){ |
| 65 | - if(!isset($index)) |
|
| 66 | - $index=self::$index; |
|
| 66 | + if(!isset($index)) { |
|
| 67 | + $index=self::$index; |
|
| 68 | + } |
|
| 67 | 69 | $value=$index; |
| 68 | 70 | if(isset($this->values["identifier"])){ |
| 69 | - if(\is_string($this->values["identifier"])) |
|
| 70 | - $value=JReflection::callMethod($this->instance, $this->values["identifier"], []); |
|
| 71 | - else |
|
| 72 | - $value=$this->values["identifier"]($index,$this->instance); |
|
| 71 | + if(\is_string($this->values["identifier"])) { |
|
| 72 | + $value=JReflection::callMethod($this->instance, $this->values["identifier"], []); |
|
| 73 | + } else { |
|
| 74 | + $value=$this->values["identifier"]($index,$this->instance); |
|
| 75 | + } |
|
| 73 | 76 | } |
| 74 | 77 | return $value; |
| 75 | 78 | } |
@@ -93,7 +96,7 @@ discard block |
||
| 93 | 96 | $value=$property->getValue($this->instance); |
| 94 | 97 | if(isset($this->values[$index])){ |
| 95 | 98 | $value= $this->values[$index]($value,$this->instance,$index); |
| 96 | - }else{ |
|
| 99 | + } else{ |
|
| 97 | 100 | $value=$this->_getDefaultValue($property->getName(),$value, $index); |
| 98 | 101 | } |
| 99 | 102 | return $value; |
@@ -103,16 +106,16 @@ discard block |
||
| 103 | 106 | $value=null; |
| 104 | 107 | if($property instanceof \ReflectionProperty){ |
| 105 | 108 | $value=$this->_getPropertyValue($property, $index); |
| 106 | - }else{ |
|
| 107 | - if(\is_callable($property)) |
|
| 108 | - $value=$property($this->instance); |
|
| 109 | - elseif(\is_array($property)){ |
|
| 109 | + } else{ |
|
| 110 | + if(\is_callable($property)) { |
|
| 111 | + $value=$property($this->instance); |
|
| 112 | + } elseif(\is_array($property)){ |
|
| 110 | 113 | $values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property); |
| 111 | 114 | $value=\implode("", $values); |
| 112 | - }else{ |
|
| 115 | + } else{ |
|
| 113 | 116 | if(isset($this->values[$index])){ |
| 114 | 117 | $value= $this->values[$index]($property,$this->instance,$index); |
| 115 | - }elseif(isset($this->instance->{$property})){ |
|
| 118 | + } elseif(isset($this->instance->{$property})){ |
|
| 116 | 119 | $value=$this->instance->{$property}; |
| 117 | 120 | } |
| 118 | 121 | } |
@@ -135,10 +138,10 @@ discard block |
||
| 135 | 138 | if(isset($vb[$index])){ |
| 136 | 139 | if(\is_array($vb[$index])){ |
| 137 | 140 | $this->visibleProperties[$index][]=$field; |
| 138 | - }else{ |
|
| 141 | + } else{ |
|
| 139 | 142 | $this->visibleProperties[$index]=[$vb[$index],$field]; |
| 140 | 143 | } |
| 141 | - }else{ |
|
| 144 | + } else{ |
|
| 142 | 145 | return $this->insertField($index, $field); |
| 143 | 146 | } |
| 144 | 147 | return $this; |
@@ -165,9 +168,9 @@ discard block |
||
| 165 | 168 | $property=$this->getProperty($index); |
| 166 | 169 | if($property instanceof \ReflectionProperty){ |
| 167 | 170 | $result=$property->getName(); |
| 168 | - }elseif(\is_callable($property)){ |
|
| 171 | + } elseif(\is_callable($property)){ |
|
| 169 | 172 | $result=$this->visibleProperties[$index]; |
| 170 | - }else{ |
|
| 173 | + } else{ |
|
| 171 | 174 | $result=$property; |
| 172 | 175 | } |
| 173 | 176 | return $result; |
@@ -187,7 +190,7 @@ discard block |
||
| 187 | 190 | $this->reflect=new \ReflectionClass($instance); |
| 188 | 191 | if(\sizeof($this->visibleProperties)===0){ |
| 189 | 192 | $this->properties=$this->getDefaultProperties(); |
| 190 | - }else{ |
|
| 193 | + } else{ |
|
| 191 | 194 | foreach ($this->visibleProperties as $property){ |
| 192 | 195 | $this->setInstanceProperty($property); |
| 193 | 196 | } |
@@ -198,22 +201,23 @@ discard block |
||
| 198 | 201 | private function setInstanceProperty($property){ |
| 199 | 202 | if(\is_callable($property)){ |
| 200 | 203 | $this->properties[]=$property; |
| 201 | - }elseif(\is_string($property)){ |
|
| 204 | + } elseif(\is_string($property)){ |
|
| 202 | 205 | try{ |
| 203 | 206 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
| 204 | 207 | $rProperty=$this->reflect->getProperty($property); |
| 205 | 208 | $this->properties[]=$rProperty; |
| 206 | - }catch(\Exception $e){ |
|
| 209 | + } catch(\Exception $e){ |
|
| 207 | 210 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
| 208 | 211 | $this->properties[]=$property; |
| 209 | 212 | } |
| 210 | - }elseif(\is_int($property)){ |
|
| 213 | + } elseif(\is_int($property)){ |
|
| 211 | 214 | $props=$this->getDefaultProperties(); |
| 212 | - if(isset($props[$property])) |
|
| 213 | - $this->properties[]=$props[$property]; |
|
| 214 | - else |
|
| 215 | - $this->properties[]=$property; |
|
| 216 | - }else{ |
|
| 215 | + if(isset($props[$property])) { |
|
| 216 | + $this->properties[]=$props[$property]; |
|
| 217 | + } else { |
|
| 218 | + $this->properties[]=$property; |
|
| 219 | + } |
|
| 220 | + } else{ |
|
| 217 | 221 | $this->properties[]=$property; |
| 218 | 222 | } |
| 219 | 223 | } |
@@ -257,12 +261,13 @@ discard block |
||
| 257 | 261 | if(isset($this->captions[$index])){ |
| 258 | 262 | return $this->captions[$index]; |
| 259 | 263 | } |
| 260 | - if($this->properties[$index] instanceof \ReflectionProperty) |
|
| 261 | - return $this->properties[$index]->getName(); |
|
| 262 | - elseif(\is_callable($this->properties[$index])) |
|
| 263 | - return ""; |
|
| 264 | - else |
|
| 265 | - return $this->properties[$index]; |
|
| 264 | + if($this->properties[$index] instanceof \ReflectionProperty) { |
|
| 265 | + return $this->properties[$index]->getName(); |
|
| 266 | + } elseif(\is_callable($this->properties[$index])) { |
|
| 267 | + return ""; |
|
| 268 | + } else { |
|
| 269 | + return $this->properties[$index]; |
|
| 270 | + } |
|
| 266 | 271 | } |
| 267 | 272 | |
| 268 | 273 | public function getCaptions(){ |
@@ -271,7 +276,7 @@ discard block |
||
| 271 | 276 | for($i=\sizeof($captions);$i<$this->count();$i++){ |
| 272 | 277 | $captions[]=""; |
| 273 | 278 | } |
| 274 | - }else{ |
|
| 279 | + } else{ |
|
| 275 | 280 | $captions=[]; |
| 276 | 281 | $index=0; |
| 277 | 282 | $count=$this->count(); |
@@ -287,8 +292,9 @@ discard block |
||
| 287 | 292 | } |
| 288 | 293 | |
| 289 | 294 | public function setCaption($index,$caption){ |
| 290 | - if(isset($this->captions)===false) |
|
| 291 | - $this->captions=[]; |
|
| 295 | + if(isset($this->captions)===false) { |
|
| 296 | + $this->captions=[]; |
|
| 297 | + } |
|
| 292 | 298 | $this->captions[$index]=$caption; |
| 293 | 299 | return $this; |
| 294 | 300 | } |
@@ -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; |
@@ -89,8 +89,9 @@ |
||
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | public function setPagesVisibles($pages_visibles) { |
| 92 | - if(!isset($pages_visibles)) |
|
| 93 | - $pages_visibles=(int)ceil($this->row_count / $this->items_per_page)+1; |
|
| 92 | + if(!isset($pages_visibles)) { |
|
| 93 | + $pages_visibles=(int)ceil($this->row_count / $this->items_per_page)+1; |
|
| 94 | + } |
|
| 94 | 95 | $this->pages_visibles=$pages_visibles; |
| 95 | 96 | return $this; |
| 96 | 97 | } |
@@ -48,8 +48,9 @@ |
||
| 48 | 48 | $('#pagination-{$id} ._firstPage').attr('data-page',Math.max(1,page-1)); |
| 49 | 49 | var lastPage=$('#pagination-{$id} ._lastPage');lastPage.attr('data-page',Math.min(lastPage.attr('data-max'),page+1));"; |
| 50 | 50 | } |
| 51 | - if(isset($this->_urls["refresh"])) |
|
| 52 | - $this->jsonArrayOnClick($menu, $this->_urls["refresh"],"post","{'p':$(this).attr('data-page')}",$callback); |
|
| 51 | + if(isset($this->_urls["refresh"])) { |
|
| 52 | + $this->jsonArrayOnClick($menu, $this->_urls["refresh"],"post","{'p':$(this).attr('data-page')}",$callback); |
|
| 53 | + } |
|
| 53 | 54 | } |
| 54 | 55 | |
| 55 | 56 | /** |
@@ -21,7 +21,7 @@ |
||
| 21 | 21 | if($class->getProperty($property)!==null){ |
| 22 | 22 | \call_user_func_array([$object,$name],[$value]); |
| 23 | 23 | } |
| 24 | - }catch(\Exception $e){ |
|
| 24 | + } catch(\Exception $e){ |
|
| 25 | 25 | //Nothing to do |
| 26 | 26 | } |
| 27 | 27 | } |
@@ -13,8 +13,9 @@ |
||
| 13 | 13 | public function __construct($identifier, $href="#", $content="Link",$target=NULL) { |
| 14 | 14 | parent::__construct($identifier, "a", ""); |
| 15 | 15 | $this->setHref($href); |
| 16 | - if(isset($target)) |
|
| 17 | - $this->setTarget($target); |
|
| 16 | + if(isset($target)) { |
|
| 17 | + $this->setTarget($target); |
|
| 18 | + } |
|
| 18 | 19 | $this->content=$content; |
| 19 | 20 | } |
| 20 | 21 | |