@@ -14,11 +14,11 @@ discard block |
||
| 14 | 14 | * @version 1.3 |
| 15 | 15 | */ |
| 16 | 16 | abstract class BaseHtml extends BaseWidget { |
| 17 | - use BaseHtmlEventsTrait,BaseHtmlPropertiesTrait; |
|
| 17 | + use BaseHtmlEventsTrait, BaseHtmlPropertiesTrait; |
|
| 18 | 18 | protected $_template; |
| 19 | 19 | protected $tagName; |
| 20 | - protected $_wrapBefore=array (); |
|
| 21 | - protected $_wrapAfter=array (); |
|
| 20 | + protected $_wrapBefore=array(); |
|
| 21 | + protected $_wrapAfter=array(); |
|
| 22 | 22 | protected $_bsComponent; |
| 23 | 23 | protected $_compiled=false; |
| 24 | 24 | protected $_postCompile; |
@@ -31,14 +31,14 @@ discard block |
||
| 31 | 31 | */ |
| 32 | 32 | abstract public function run(JsUtils $js); |
| 33 | 33 | |
| 34 | - private function _callSetter($setter,$key,$value,&$array){ |
|
| 34 | + private function _callSetter($setter, $key, $value, &$array) { |
|
| 35 | 35 | $result=false; |
| 36 | - if (method_exists($this, $setter) && substr($setter, 0, 1) !== "_") { |
|
| 36 | + if (method_exists($this, $setter) && substr($setter, 0, 1)!=="_") { |
|
| 37 | 37 | try { |
| 38 | 38 | $this->$setter($value); |
| 39 | 39 | unset($array[$key]); |
| 40 | 40 | $result=true; |
| 41 | - } catch ( \Exception $e ) { |
|
| 41 | + }catch (\Exception $e) { |
|
| 42 | 42 | $result=false; |
| 43 | 43 | } |
| 44 | 44 | } |
@@ -46,17 +46,17 @@ discard block |
||
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | protected function getTemplate(JsUtils $js=NULL) { |
| 49 | - return PropertyWrapper::wrap($this->_wrapBefore, $js) . $this->_template . PropertyWrapper::wrap($this->_wrapAfter, $js); |
|
| 49 | + return PropertyWrapper::wrap($this->_wrapBefore, $js).$this->_template.PropertyWrapper::wrap($this->_wrapAfter, $js); |
|
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | protected function ctrl($name, $value, $typeCtrl) { |
| 53 | 53 | if (\is_array($typeCtrl)) { |
| 54 | - if (array_search($value, $typeCtrl) === false) { |
|
| 55 | - throw new \Exception("La valeur passée `" . $value . "` à la propriété `" . $name . "` ne fait pas partie des valeurs possibles : {" . implode(",", $typeCtrl) . "}"); |
|
| 54 | + if (array_search($value, $typeCtrl)===false) { |
|
| 55 | + throw new \Exception("La valeur passée `".$value."` à la propriété `".$name."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}"); |
|
| 56 | 56 | } |
| 57 | 57 | } else { |
| 58 | 58 | if (!$typeCtrl($value)) { |
| 59 | - throw new \Exception("La fonction " . $typeCtrl . " a retourné faux pour l'affectation de la propriété " . $name); |
|
| 59 | + throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$name); |
|
| 60 | 60 | } |
| 61 | 61 | } |
| 62 | 62 | return true; |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | |
| 66 | 66 | |
| 67 | 67 | protected function setMemberCtrl(&$name, $value, $typeCtrl) { |
| 68 | - if ($this->ctrl($name, $value, $typeCtrl) === true) { |
|
| 68 | + if ($this->ctrl($name, $value, $typeCtrl)===true) { |
|
| 69 | 69 | return $name=$value; |
| 70 | 70 | } |
| 71 | 71 | return $this; |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | protected function addToMemberUnique(&$name, $value, $typeCtrl, $separator=" ") { |
| 75 | 75 | if (\is_array($typeCtrl)) { |
| 76 | 76 | $this->removeOldValues($name, $typeCtrl); |
| 77 | - $name.=$separator . $value; |
|
| 77 | + $name.=$separator.$value; |
|
| 78 | 78 | } |
| 79 | 79 | return $this; |
| 80 | 80 | } |
@@ -82,17 +82,17 @@ discard block |
||
| 82 | 82 | |
| 83 | 83 | |
| 84 | 84 | protected function addToMemberCtrl(&$name, $value, $typeCtrl, $separator=" ") { |
| 85 | - if ($this->ctrl($name, $value, $typeCtrl) === true) { |
|
| 85 | + if ($this->ctrl($name, $value, $typeCtrl)===true) { |
|
| 86 | 86 | if (\is_array($typeCtrl)) { |
| 87 | 87 | $this->removeOldValues($name, $typeCtrl); |
| 88 | 88 | } |
| 89 | - $name.=$separator . $value; |
|
| 89 | + $name.=$separator.$value; |
|
| 90 | 90 | } |
| 91 | 91 | return $this; |
| 92 | 92 | } |
| 93 | 93 | |
| 94 | 94 | protected function addToMember(&$name, $value, $separator=" ") { |
| 95 | - $name=str_ireplace($value, "", $name) . $separator . $value; |
|
| 95 | + $name=str_ireplace($value, "", $name).$separator.$value; |
|
| 96 | 96 | return $this; |
| 97 | 97 | } |
| 98 | 98 | |
@@ -103,18 +103,18 @@ discard block |
||
| 103 | 103 | $oldValue=trim($oldValue); |
| 104 | 104 | } |
| 105 | 105 | |
| 106 | - protected function _getElementBy($callback,$elements){ |
|
| 106 | + protected function _getElementBy($callback, $elements) { |
|
| 107 | 107 | if (\is_array($elements)) { |
| 108 | 108 | $elements=\array_values($elements); |
| 109 | 109 | $flag=false; |
| 110 | 110 | $index=0; |
| 111 | - while ( !$flag && $index < sizeof($elements) ) { |
|
| 111 | + while (!$flag && $index<sizeof($elements)) { |
|
| 112 | 112 | if ($elements[$index] instanceof BaseHtml) |
| 113 | 113 | $flag=($callback($elements[$index])); |
| 114 | 114 | $index++; |
| 115 | 115 | } |
| 116 | - if ($flag === true) |
|
| 117 | - return $elements[$index - 1]; |
|
| 116 | + if ($flag===true) |
|
| 117 | + return $elements[$index-1]; |
|
| 118 | 118 | } elseif ($elements instanceof BaseHtml) { |
| 119 | 119 | if ($callback($elements)) |
| 120 | 120 | return $elements; |
@@ -142,13 +142,13 @@ discard block |
||
| 142 | 142 | } |
| 143 | 143 | |
| 144 | 144 | public function fromArray($array) { |
| 145 | - foreach ( $this as $key => $value ) { |
|
| 146 | - if(array_key_exists($key, $array)===true) |
|
| 147 | - $this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array); |
|
| 145 | + foreach ($this as $key => $value) { |
|
| 146 | + if (array_key_exists($key, $array)===true) |
|
| 147 | + $this->_callSetter("set".ucfirst($key), $key, $array[$key], $array); |
|
| 148 | 148 | } |
| 149 | - foreach ( $array as $key => $value ) { |
|
| 150 | - if($this->_callSetter($key, $key, $value, $array)===false){ |
|
| 151 | - $this->_callSetter("set" . ucfirst($key), $key, $value, $array); |
|
| 149 | + foreach ($array as $key => $value) { |
|
| 150 | + if ($this->_callSetter($key, $key, $value, $array)===false) { |
|
| 151 | + $this->_callSetter("set".ucfirst($key), $key, $value, $array); |
|
| 152 | 152 | } |
| 153 | 153 | } |
| 154 | 154 | return $array; |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | |
| 157 | 157 | public function fromDatabaseObjects($objects, $function) { |
| 158 | 158 | if (isset($objects)) { |
| 159 | - foreach ( $objects as $object ) { |
|
| 159 | + foreach ($objects as $object) { |
|
| 160 | 160 | $this->fromDatabaseObject($object, $function); |
| 161 | 161 | } |
| 162 | 162 | } |
@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | |
| 178 | 178 | |
| 179 | 179 | public function getElementById($identifier, $elements) { |
| 180 | - return $this->_getElementBy(function(BaseWidget $element) use ($identifier){return $element->getIdentifier()===$identifier;}, $elements); |
|
| 180 | + return $this->_getElementBy(function(BaseWidget $element) use ($identifier){return $element->getIdentifier()===$identifier; }, $elements); |
|
| 181 | 181 | } |
| 182 | 182 | |
| 183 | 183 | public function getBsComponent() { |
@@ -190,14 +190,14 @@ discard block |
||
| 190 | 190 | } |
| 191 | 191 | |
| 192 | 192 | protected function compile_once(JsUtils $js=NULL, &$view=NULL) { |
| 193 | - if(!$this->_compiled){ |
|
| 194 | - if(isset($js)){ |
|
| 193 | + if (!$this->_compiled) { |
|
| 194 | + if (isset($js)) { |
|
| 195 | 195 | $beforeCompile=$js->getParam("beforeCompileHtml"); |
| 196 | - if(\is_callable($beforeCompile)){ |
|
| 197 | - $beforeCompile($this,$js,$view); |
|
| 196 | + if (\is_callable($beforeCompile)) { |
|
| 197 | + $beforeCompile($this, $js, $view); |
|
| 198 | 198 | } |
| 199 | 199 | } |
| 200 | - if(\is_callable($this->_preCompile)){ |
|
| 200 | + if (\is_callable($this->_preCompile)) { |
|
| 201 | 201 | $pc=$this->_preCompile; |
| 202 | 202 | $pc($this); |
| 203 | 203 | } |
@@ -207,15 +207,15 @@ discard block |
||
| 207 | 207 | } |
| 208 | 208 | |
| 209 | 209 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
| 210 | - $this->compile_once($js,$view); |
|
| 210 | + $this->compile_once($js, $view); |
|
| 211 | 211 | $result=$this->getTemplate($js); |
| 212 | - foreach ( $this as $key => $value ) { |
|
| 213 | - if(\strstr($result, "%{$key}%")!==false){ |
|
| 212 | + foreach ($this as $key => $value) { |
|
| 213 | + if (\strstr($result, "%{$key}%")!==false) { |
|
| 214 | 214 | if (\is_array($value)) { |
| 215 | 215 | $v=PropertyWrapper::wrap($value, $js); |
| 216 | - }elseif($value instanceof \stdClass){ |
|
| 217 | - $v=\print_r($value,true); |
|
| 218 | - }else{ |
|
| 216 | + }elseif ($value instanceof \stdClass) { |
|
| 217 | + $v=\print_r($value, true); |
|
| 218 | + } else { |
|
| 219 | 219 | $v=$value; |
| 220 | 220 | } |
| 221 | 221 | $result=str_replace("%{$key}%", $v, $result); |
@@ -223,12 +223,12 @@ discard block |
||
| 223 | 223 | } |
| 224 | 224 | if (isset($js)===true) { |
| 225 | 225 | $this->run($js); |
| 226 | - if (isset($view) === true) { |
|
| 226 | + if (isset($view)===true) { |
|
| 227 | 227 | $js->addViewElement($this->_identifier, $result, $view); |
| 228 | 228 | } |
| 229 | 229 | } |
| 230 | 230 | |
| 231 | - if(\is_callable($this->_postCompile)){ |
|
| 231 | + if (\is_callable($this->_postCompile)) { |
|
| 232 | 232 | $pc=$this->_postCompile; |
| 233 | 233 | $pc($this); |
| 234 | 234 | } |
@@ -239,11 +239,11 @@ discard block |
||
| 239 | 239 | return $this->compile(); |
| 240 | 240 | } |
| 241 | 241 | |
| 242 | - public function onPostCompile($callback){ |
|
| 242 | + public function onPostCompile($callback) { |
|
| 243 | 243 | $this->_postCompile=$callback; |
| 244 | 244 | } |
| 245 | 245 | |
| 246 | - public function onPreCompile($callback){ |
|
| 246 | + public function onPreCompile($callback) { |
|
| 247 | 247 | $this->_preCompile=$callback; |
| 248 | 248 | } |
| 249 | 249 | } |
@@ -109,15 +109,18 @@ discard block |
||
| 109 | 109 | $flag=false; |
| 110 | 110 | $index=0; |
| 111 | 111 | while ( !$flag && $index < sizeof($elements) ) { |
| 112 | - if ($elements[$index] instanceof BaseHtml) |
|
| 113 | - $flag=($callback($elements[$index])); |
|
| 112 | + if ($elements[$index] instanceof BaseHtml) { |
|
| 113 | + $flag=($callback($elements[$index])); |
|
| 114 | + } |
|
| 114 | 115 | $index++; |
| 115 | 116 | } |
| 116 | - if ($flag === true) |
|
| 117 | - return $elements[$index - 1]; |
|
| 117 | + if ($flag === true) { |
|
| 118 | + return $elements[$index - 1]; |
|
| 119 | + } |
|
| 118 | 120 | } elseif ($elements instanceof BaseHtml) { |
| 119 | - if ($callback($elements)) |
|
| 120 | - return $elements; |
|
| 121 | + if ($callback($elements)) { |
|
| 122 | + return $elements; |
|
| 123 | + } |
|
| 121 | 124 | } |
| 122 | 125 | return null; |
| 123 | 126 | } |
@@ -143,8 +146,9 @@ discard block |
||
| 143 | 146 | |
| 144 | 147 | public function fromArray($array) { |
| 145 | 148 | foreach ( $this as $key => $value ) { |
| 146 | - if(array_key_exists($key, $array)===true) |
|
| 147 | - $this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array); |
|
| 149 | + if(array_key_exists($key, $array)===true) { |
|
| 150 | + $this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array); |
|
| 151 | + } |
|
| 148 | 152 | } |
| 149 | 153 | foreach ( $array as $key => $value ) { |
| 150 | 154 | if($this->_callSetter($key, $key, $value, $array)===false){ |
@@ -213,9 +217,9 @@ discard block |
||
| 213 | 217 | if(\strstr($result, "%{$key}%")!==false){ |
| 214 | 218 | if (\is_array($value)) { |
| 215 | 219 | $v=PropertyWrapper::wrap($value, $js); |
| 216 | - }elseif($value instanceof \stdClass){ |
|
| 220 | + } elseif($value instanceof \stdClass){ |
|
| 217 | 221 | $v=\print_r($value,true); |
| 218 | - }else{ |
|
| 222 | + } else{ |
|
| 219 | 223 | $v=$value; |
| 220 | 224 | } |
| 221 | 225 | $result=str_replace("%{$key}%", $v, $result); |
@@ -12,8 +12,8 @@ discard block |
||
| 12 | 12 | } |
| 13 | 13 | $output=""; |
| 14 | 14 | if (\is_array($input)) { |
| 15 | - if (sizeof($input) > 0) { |
|
| 16 | - if (self::containsElement($input) === false) { |
|
| 15 | + if (sizeof($input)>0) { |
|
| 16 | + if (self::containsElement($input)===false) { |
|
| 17 | 17 | $output=self::wrapStrings($input, $separator=' ', $valueQuote='"'); |
| 18 | 18 | } else { |
| 19 | 19 | $output=self::wrapObjects($input, $js, $separator, $valueQuote); |
@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | private static function containsElement($input) { |
| 27 | - foreach ( $input as $v ) { |
|
| 27 | + foreach ($input as $v) { |
|
| 28 | 28 | if (\is_object($v) || \is_array($v)) |
| 29 | 29 | return true; |
| 30 | 30 | } |
@@ -32,9 +32,9 @@ discard block |
||
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | public static function wrapStrings($input, $separator=' ', $valueQuote='"') { |
| 35 | - if (JArray::isAssociative($input) === true) { |
|
| 36 | - $result=implode($separator, array_map(function ($v, $k) use($valueQuote) { |
|
| 37 | - return $k . '=' . $valueQuote . $v . $valueQuote; |
|
| 35 | + if (JArray::isAssociative($input)===true) { |
|
| 36 | + $result=implode($separator, array_map(function($v, $k) use($valueQuote) { |
|
| 37 | + return $k.'='.$valueQuote.$v.$valueQuote; |
|
| 38 | 38 | }, $input, array_keys($input))); |
| 39 | 39 | } else { |
| 40 | 40 | $result=implode($separator, $input); |
@@ -43,17 +43,17 @@ discard block |
||
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | public static function wrapObjects($input, $js=NULL, $separator=' ', $valueQuote='"') { |
| 46 | - return implode($separator, array_map(function ($v) use($js, $separator, $valueQuote) { |
|
| 47 | - if(\is_string($v)){ |
|
| 46 | + return implode($separator, array_map(function($v) use($js, $separator, $valueQuote) { |
|
| 47 | + if (\is_string($v)) { |
|
| 48 | 48 | return $v; |
| 49 | 49 | } |
| 50 | - if ($v instanceof BaseHtml){ |
|
| 50 | + if ($v instanceof BaseHtml) { |
|
| 51 | 51 | return $v->compile($js); |
| 52 | 52 | } |
| 53 | 53 | if (\is_array($v)) { |
| 54 | 54 | return self::wrap($v, $js, $separator, $valueQuote); |
| 55 | 55 | } |
| 56 | - if(!\is_callable($v)){ |
|
| 56 | + if (!\is_callable($v)) { |
|
| 57 | 57 | return $v; |
| 58 | 58 | } |
| 59 | 59 | }, $input)); |
@@ -71,14 +71,14 @@ discard block |
||
| 71 | 71 | return $result;*/ |
| 72 | 72 | } |
| 73 | 73 | |
| 74 | - protected static function wrapValue($value,$js=NULL, $separator=' ', $valueQuote='"'){ |
|
| 74 | + protected static function wrapValue($value, $js=NULL, $separator=' ', $valueQuote='"') { |
|
| 75 | 75 | if (\is_array($value)) { |
| 76 | 76 | return self::wrap($value, $js, $separator, $valueQuote); |
| 77 | 77 | } |
| 78 | - if ($value instanceof BaseHtml){ |
|
| 78 | + if ($value instanceof BaseHtml) { |
|
| 79 | 79 | return $value->compile($js); |
| 80 | 80 | } |
| 81 | - if(!\is_callable($value)){ |
|
| 81 | + if (!\is_callable($value)) { |
|
| 82 | 82 | return $value; |
| 83 | 83 | } |
| 84 | 84 | return ''; |
@@ -25,8 +25,9 @@ |
||
| 25 | 25 | |
| 26 | 26 | private static function containsElement($input) { |
| 27 | 27 | foreach ( $input as $v ) { |
| 28 | - if (\is_object($v) || \is_array($v)) |
|
| 29 | - return true; |
|
| 28 | + if (\is_object($v) || \is_array($v)) { |
|
| 29 | + return true; |
|
| 30 | + } |
|
| 30 | 31 | } |
| 31 | 32 | return false; |
| 32 | 33 | } |
@@ -2,10 +2,10 @@ discard block |
||
| 2 | 2 | namespace Ajax\common\traits; |
| 3 | 3 | use Ajax\common\BaseGui; |
| 4 | 4 | |
| 5 | -trait JsUtilsInternalTrait{ |
|
| 5 | +trait JsUtilsInternalTrait { |
|
| 6 | 6 | |
| 7 | - protected $jquery_code_for_compile=array (); |
|
| 8 | - protected $jquery_code_for_compile_at_last=array (); |
|
| 7 | + protected $jquery_code_for_compile=array(); |
|
| 8 | + protected $jquery_code_for_compile_at_last=array(); |
|
| 9 | 9 | |
| 10 | 10 | protected function _addToCompile($jsScript) { |
| 11 | 11 | $this->jquery_code_for_compile[]=$jsScript; |
@@ -15,28 +15,28 @@ discard block |
||
| 15 | 15 | * @param BaseGui $library |
| 16 | 16 | * @param mixed $view |
| 17 | 17 | */ |
| 18 | - protected function _compileLibrary(BaseGui $library=NULL, &$view=NULL){ |
|
| 19 | - if(isset($view)) |
|
| 18 | + protected function _compileLibrary(BaseGui $library=NULL, &$view=NULL) { |
|
| 19 | + if (isset($view)) |
|
| 20 | 20 | $library->compileHtml($this, $view); |
| 21 | 21 | if ($library->isAutoCompile()) { |
| 22 | 22 | $library->compile(true); |
| 23 | 23 | } |
| 24 | 24 | } |
| 25 | 25 | |
| 26 | - protected function defer($script){ |
|
| 26 | + protected function defer($script) { |
|
| 27 | 27 | $result="window.defer=function (method) {if (window.jQuery) method(); else setTimeout(function() { defer(method) }, 50);};"; |
| 28 | 28 | $result.="window.defer(function(){".$script."})"; |
| 29 | 29 | return $result; |
| 30 | 30 | } |
| 31 | 31 | |
| 32 | - protected function ready($script){ |
|
| 32 | + protected function ready($script) { |
|
| 33 | 33 | $result='$(document).ready(function() {'."\n"; |
| 34 | 34 | $result.=$script.'})'; |
| 35 | 35 | return $result; |
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | protected function minify($input) { |
| 39 | - if(trim($input) === "") return $input; |
|
| 39 | + if (trim($input)==="") return $input; |
|
| 40 | 40 | return preg_replace( |
| 41 | 41 | array( |
| 42 | 42 | // Remove comment(s) |
@@ -16,8 +16,9 @@ discard block |
||
| 16 | 16 | * @param mixed $view |
| 17 | 17 | */ |
| 18 | 18 | protected function _compileLibrary(BaseGui $library=NULL, &$view=NULL){ |
| 19 | - if(isset($view)) |
|
| 20 | - $library->compileHtml($this, $view); |
|
| 19 | + if(isset($view)) { |
|
| 20 | + $library->compileHtml($this, $view); |
|
| 21 | + } |
|
| 21 | 22 | if ($library->isAutoCompile()) { |
| 22 | 23 | $library->compile(true); |
| 23 | 24 | } |
@@ -36,7 +37,9 @@ discard block |
||
| 36 | 37 | } |
| 37 | 38 | |
| 38 | 39 | protected function minify($input) { |
| 39 | - if(trim($input) === "") return $input; |
|
| 40 | + if(trim($input) === "") { |
|
| 41 | + return $input; |
|
| 42 | + } |
|
| 40 | 43 | return preg_replace( |
| 41 | 44 | array( |
| 42 | 45 | // Remove comment(s) |
@@ -120,25 +120,29 @@ discard block |
||
| 120 | 120 | } |
| 121 | 121 | |
| 122 | 122 | public function getColPosition($colIndex) { |
| 123 | - if($this->_container->_isMerged()!==true) |
|
| 124 | - return $colIndex; |
|
| 123 | + if($this->_container->_isMerged()!==true) { |
|
| 124 | + return $colIndex; |
|
| 125 | + } |
|
| 125 | 126 | $pos=0; |
| 126 | 127 | $rows=$this->_container->getContent(); |
| 127 | 128 | for($i=0; $i < $this->_row; $i++) { |
| 128 | 129 | $max=\min($colIndex, $rows[$i]->count()); |
| 129 | 130 | for($j=0; $j < $max; $j++) { |
| 130 | 131 | $rowspan=$rows[$i]->getItem($j)->getRowspan(); |
| 131 | - if ($rowspan + $i > $this->_row) |
|
| 132 | - $pos++; |
|
| 132 | + if ($rowspan + $i > $this->_row) { |
|
| 133 | + $pos++; |
|
| 134 | + } |
|
| 133 | 135 | } |
| 134 | 136 | } |
| 135 | - if ($pos > $colIndex) |
|
| 136 | - return NULL; |
|
| 137 | + if ($pos > $colIndex) { |
|
| 138 | + return NULL; |
|
| 139 | + } |
|
| 137 | 140 | $count=$this->count(); |
| 138 | 141 | for($i=0; $i < $count; $i++) { |
| 139 | 142 | $pos+=$this->content[$i]->getColspan(); |
| 140 | - if ($pos >= $colIndex + 1) |
|
| 141 | - return $i; |
|
| 143 | + if ($pos >= $colIndex + 1) { |
|
| 144 | + return $i; |
|
| 145 | + } |
|
| 142 | 146 | } |
| 143 | 147 | return null; |
| 144 | 148 | } |
@@ -161,8 +165,9 @@ discard block |
||
| 161 | 165 | public function containsStr($needle) { |
| 162 | 166 | $cells=$this->content; |
| 163 | 167 | foreach ( $cells as $cell ) { |
| 164 | - if (\strpos($cell->getContent(), $needle) !== false) |
|
| 165 | - return true; |
|
| 168 | + if (\strpos($cell->getContent(), $needle) !== false) { |
|
| 169 | + return true; |
|
| 170 | + } |
|
| 166 | 171 | } |
| 167 | 172 | return false; |
| 168 | 173 | } |
@@ -20,19 +20,19 @@ discard block |
||
| 20 | 20 | |
| 21 | 21 | public function __construct($identifier) { |
| 22 | 22 | parent::__construct($identifier, "tr", ""); |
| 23 | - $this->_states=[ State::ACTIVE,State::POSITIVE,State::NEGATIVE,State::WARNING,State::ERROR,State::DISABLED ]; |
|
| 23 | + $this->_states=[State::ACTIVE, State::POSITIVE, State::NEGATIVE, State::WARNING, State::ERROR, State::DISABLED]; |
|
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | public function setColCount($colCount) { |
| 27 | 27 | $count=$this->count(); |
| 28 | - for($i=$count; $i < $colCount; $i++) { |
|
| 28 | + for ($i=$count; $i<$colCount; $i++) { |
|
| 29 | 29 | $item=$this->addItem(NULL); |
| 30 | 30 | $item->setTagName($this->_tdTagName); |
| 31 | 31 | } |
| 32 | 32 | return $this; |
| 33 | 33 | } |
| 34 | 34 | |
| 35 | - public function getColCount(){ |
|
| 35 | + public function getColCount() { |
|
| 36 | 36 | return $this->count(); |
| 37 | 37 | } |
| 38 | 38 | |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | * @param mixed $values |
| 69 | 69 | */ |
| 70 | 70 | public function setValues($values=array()) { |
| 71 | - return $this->_addOrSetValues($values, function(HtmlTD &$cell,$value){$cell->setValue($value);}); |
|
| 71 | + return $this->_addOrSetValues($values, function(HtmlTD &$cell, $value) {$cell->setValue($value); }); |
|
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | /** |
@@ -76,27 +76,27 @@ discard block |
||
| 76 | 76 | * @param mixed $values |
| 77 | 77 | */ |
| 78 | 78 | public function addValues($values=array()) { |
| 79 | - return $this->_addOrSetValues($values, function(HtmlTD &$cell,$value){$cell->addValue($value);}); |
|
| 79 | + return $this->_addOrSetValues($values, function(HtmlTD &$cell, $value) {$cell->addValue($value); }); |
|
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | /** |
| 83 | 83 | * Sets or adds values to the row cols |
| 84 | 84 | * @param mixed $values |
| 85 | 85 | */ |
| 86 | - protected function _addOrSetValues($values,$callback) { |
|
| 86 | + protected function _addOrSetValues($values, $callback) { |
|
| 87 | 87 | $count=$this->count(); |
| 88 | 88 | if (!\is_array($values)) { |
| 89 | 89 | $values=\array_fill(0, $count, $values); |
| 90 | 90 | } else { |
| 91 | - if (JArray::isAssociative($values) === true) { |
|
| 91 | + if (JArray::isAssociative($values)===true) { |
|
| 92 | 92 | $values=\array_values($values); |
| 93 | 93 | } |
| 94 | 94 | } |
| 95 | 95 | $count=\min(\sizeof($values), $count); |
| 96 | 96 | |
| 97 | - for($i=0; $i < $count; $i++) { |
|
| 97 | + for ($i=0; $i<$count; $i++) { |
|
| 98 | 98 | $cell=$this->content[$i]; |
| 99 | - $callback($cell,$values[$i]); |
|
| 99 | + $callback($cell, $values[$i]); |
|
| 100 | 100 | } |
| 101 | 101 | return $this; |
| 102 | 102 | } |
@@ -120,24 +120,24 @@ discard block |
||
| 120 | 120 | } |
| 121 | 121 | |
| 122 | 122 | public function getColPosition($colIndex) { |
| 123 | - if($this->_container->_isMerged()!==true) |
|
| 123 | + if ($this->_container->_isMerged()!==true) |
|
| 124 | 124 | return $colIndex; |
| 125 | 125 | $pos=0; |
| 126 | 126 | $rows=$this->_container->getContent(); |
| 127 | - for($i=0; $i < $this->_row; $i++) { |
|
| 127 | + for ($i=0; $i<$this->_row; $i++) { |
|
| 128 | 128 | $max=\min($colIndex, $rows[$i]->count()); |
| 129 | - for($j=0; $j < $max; $j++) { |
|
| 129 | + for ($j=0; $j<$max; $j++) { |
|
| 130 | 130 | $rowspan=$rows[$i]->getItem($j)->getRowspan(); |
| 131 | - if ($rowspan + $i > $this->_row) |
|
| 131 | + if ($rowspan+$i>$this->_row) |
|
| 132 | 132 | $pos++; |
| 133 | 133 | } |
| 134 | 134 | } |
| 135 | - if ($pos > $colIndex) |
|
| 135 | + if ($pos>$colIndex) |
|
| 136 | 136 | return NULL; |
| 137 | 137 | $count=$this->count(); |
| 138 | - for($i=0; $i < $count; $i++) { |
|
| 138 | + for ($i=0; $i<$count; $i++) { |
|
| 139 | 139 | $pos+=$this->content[$i]->getColspan(); |
| 140 | - if ($pos >= $colIndex + 1) |
|
| 140 | + if ($pos>=$colIndex+1) |
|
| 141 | 141 | return $i; |
| 142 | 142 | } |
| 143 | 143 | return null; |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | |
| 146 | 146 | public function conditionalCellFormat($callback, $format) { |
| 147 | 147 | $cells=$this->content; |
| 148 | - foreach ( $cells as $cell ) { |
|
| 148 | + foreach ($cells as $cell) { |
|
| 149 | 149 | $cell->conditionalCellFormat($callback, $format); |
| 150 | 150 | } |
| 151 | 151 | return $this; |
@@ -160,8 +160,8 @@ discard block |
||
| 160 | 160 | |
| 161 | 161 | public function containsStr($needle) { |
| 162 | 162 | $cells=$this->content; |
| 163 | - foreach ( $cells as $cell ) { |
|
| 164 | - if (\strpos($cell->getContent(), $needle) !== false) |
|
| 163 | + foreach ($cells as $cell) { |
|
| 164 | + if (\strpos($cell->getContent(), $needle)!==false) |
|
| 165 | 165 | return true; |
| 166 | 166 | } |
| 167 | 167 | return false; |
@@ -174,13 +174,13 @@ discard block |
||
| 174 | 174 | |
| 175 | 175 | public function applyCells($callback) { |
| 176 | 176 | $cells=$this->content; |
| 177 | - foreach ( $cells as $cell ) { |
|
| 177 | + foreach ($cells as $cell) { |
|
| 178 | 178 | $cell->apply($callback); |
| 179 | 179 | } |
| 180 | 180 | return $this; |
| 181 | 181 | } |
| 182 | 182 | |
| 183 | - public function toDelete($colIndex){ |
|
| 183 | + public function toDelete($colIndex) { |
|
| 184 | 184 | $this->getItem($colIndex)->toDelete(); |
| 185 | 185 | return $this; |
| 186 | 186 | } |
@@ -18,11 +18,11 @@ discard block |
||
| 18 | 18 | protected $_dropdown; |
| 19 | 19 | public function __construct($identifier, $elements=array(), $asIcons=false) { |
| 20 | 20 | parent::__construct($identifier, "div", "ui buttons"); |
| 21 | - if ($asIcons === true) |
|
| 21 | + if ($asIcons===true) |
|
| 22 | 22 | $this->asIcons(); |
| 23 | 23 | $this->addElements($elements, $asIcons); |
| 24 | 24 | } |
| 25 | - protected function createItem($value){ |
|
| 25 | + protected function createItem($value) { |
|
| 26 | 26 | return new HtmlButton("", $value); |
| 27 | 27 | } |
| 28 | 28 | |
@@ -31,10 +31,10 @@ discard block |
||
| 31 | 31 | * @param boolean $asCombo |
| 32 | 32 | * @return HtmlDropdown |
| 33 | 33 | */ |
| 34 | - public function addDropdown($items,$asCombo=false){ |
|
| 35 | - $dd= new HtmlDropdown("dd-".$this->identifier,null,$items); |
|
| 34 | + public function addDropdown($items, $asCombo=false) { |
|
| 35 | + $dd=new HtmlDropdown("dd-".$this->identifier, null, $items); |
|
| 36 | 36 | $dd->asButton(); |
| 37 | - if($asCombo){ |
|
| 37 | + if ($asCombo) { |
|
| 38 | 38 | $dd->setAction("combo"); |
| 39 | 39 | $dd->addToProperty("class", "combo"); |
| 40 | 40 | } |
@@ -50,13 +50,13 @@ discard block |
||
| 50 | 50 | */ |
| 51 | 51 | public function addElement($element, $asIcon=false) { |
| 52 | 52 | $item=$this->addItem($element); |
| 53 | - if($asIcon) |
|
| 53 | + if ($asIcon) |
|
| 54 | 54 | $item->asIcon($element); |
| 55 | 55 | return $item; |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | public function addElements($elements, $asIcons=false) { |
| 59 | - foreach ( $elements as $element ) { |
|
| 59 | + foreach ($elements as $element) { |
|
| 60 | 60 | $this->addElement($element, $asIcons); |
| 61 | 61 | } |
| 62 | 62 | return $this; |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | public function insertOr($aferIndex=0, $or="or") { |
| 66 | 66 | $orElement=new HtmlSemDoubleElement("", "div", "or"); |
| 67 | 67 | $orElement->setProperty("data-text", $or); |
| 68 | - array_splice($this->content, $aferIndex + 1, 0, array ($orElement )); |
|
| 68 | + array_splice($this->content, $aferIndex+1, 0, array($orElement)); |
|
| 69 | 69 | return $this; |
| 70 | 70 | } |
| 71 | 71 | |
@@ -78,8 +78,8 @@ discard block |
||
| 78 | 78 | } |
| 79 | 79 | |
| 80 | 80 | public function asIcons() { |
| 81 | - foreach ( $this->content as $item ) { |
|
| 82 | - if($item instanceof HtmlButton) |
|
| 81 | + foreach ($this->content as $item) { |
|
| 82 | + if ($item instanceof HtmlButton) |
|
| 83 | 83 | $item->asIcon($item->getContent()); |
| 84 | 84 | } |
| 85 | 85 | return $this->addToProperty("class", "icons"); |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | * @see \Ajax\bootstrap\html\base\BaseHtml::on() |
| 113 | 113 | */ |
| 114 | 114 | public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) { |
| 115 | - foreach ( $this->content as $element ) { |
|
| 115 | + foreach ($this->content as $element) { |
|
| 116 | 116 | $element->on($event, $jsCode, $stopPropagation, $preventDefault); |
| 117 | 117 | } |
| 118 | 118 | return $this; |
@@ -124,10 +124,10 @@ discard block |
||
| 124 | 124 | |
| 125 | 125 | public function addClasses($classes=array()) { |
| 126 | 126 | $i=0; |
| 127 | - if(!\is_array($classes)){ |
|
| 128 | - $classes=array_fill (0,$this->count(),$classes); |
|
| 127 | + if (!\is_array($classes)) { |
|
| 128 | + $classes=array_fill(0, $this->count(), $classes); |
|
| 129 | 129 | } |
| 130 | - foreach ( $this->content as $button ) { |
|
| 130 | + foreach ($this->content as $button) { |
|
| 131 | 131 | $button->addToProperty("class", $classes[$i++]); |
| 132 | 132 | } |
| 133 | 133 | return $this; |
@@ -141,8 +141,8 @@ discard block |
||
| 141 | 141 | $this->addElement($function($object)); |
| 142 | 142 | } |
| 143 | 143 | |
| 144 | - public function run(JsUtils $js){ |
|
| 145 | - $result= parent::run($js); |
|
| 144 | + public function run(JsUtils $js) { |
|
| 145 | + $result=parent::run($js); |
|
| 146 | 146 | return $result->setItemSelector(".ui.button"); |
| 147 | 147 | } |
| 148 | 148 | |
@@ -18,8 +18,9 @@ discard block |
||
| 18 | 18 | protected $_dropdown; |
| 19 | 19 | public function __construct($identifier, $elements=array(), $asIcons=false) { |
| 20 | 20 | parent::__construct($identifier, "div", "ui buttons"); |
| 21 | - if ($asIcons === true) |
|
| 22 | - $this->asIcons(); |
|
| 21 | + if ($asIcons === true) { |
|
| 22 | + $this->asIcons(); |
|
| 23 | + } |
|
| 23 | 24 | $this->addElements($elements, $asIcons); |
| 24 | 25 | } |
| 25 | 26 | protected function createItem($value){ |
@@ -50,8 +51,9 @@ discard block |
||
| 50 | 51 | */ |
| 51 | 52 | public function addElement($element, $asIcon=false) { |
| 52 | 53 | $item=$this->addItem($element); |
| 53 | - if($asIcon) |
|
| 54 | - $item->asIcon($element); |
|
| 54 | + if($asIcon) { |
|
| 55 | + $item->asIcon($element); |
|
| 56 | + } |
|
| 55 | 57 | return $item; |
| 56 | 58 | } |
| 57 | 59 | |
@@ -79,8 +81,9 @@ discard block |
||
| 79 | 81 | |
| 80 | 82 | public function asIcons() { |
| 81 | 83 | foreach ( $this->content as $item ) { |
| 82 | - if($item instanceof HtmlButton) |
|
| 83 | - $item->asIcon($item->getContent()); |
|
| 84 | + if($item instanceof HtmlButton) { |
|
| 85 | + $item->asIcon($item->getContent()); |
|
| 86 | + } |
|
| 84 | 87 | } |
| 85 | 88 | return $this->addToProperty("class", "icons"); |
| 86 | 89 | } |
@@ -19,221 +19,221 @@ discard block |
||
| 19 | 19 | |
| 20 | 20 | public static $index=0; |
| 21 | 21 | |
| 22 | - public function __construct($identifier,$instance=NULL,$captions=NULL){ |
|
| 22 | + public function __construct($identifier, $instance=NULL, $captions=NULL) { |
|
| 23 | 23 | $this->widgetIdentifier=$identifier; |
| 24 | 24 | $this->values=[]; |
| 25 | 25 | $this->afterCompile=[]; |
| 26 | - if(isset($instance)) |
|
| 26 | + if (isset($instance)) |
|
| 27 | 27 | $this->setInstance($instance); |
| 28 | 28 | $this->setCaptions($captions); |
| 29 | 29 | $this->captionCallback=NULL; |
| 30 | - $this->defaultValueFunction=function($name,$value){return $value;}; |
|
| 30 | + $this->defaultValueFunction=function($name, $value) {return $value; }; |
|
| 31 | 31 | } |
| 32 | 32 | |
| 33 | - public function moveFieldTo($from,$to){ |
|
| 34 | - if(JArray::moveElementTo($this->visibleProperties, $from, $to)){ |
|
| 33 | + public function moveFieldTo($from, $to) { |
|
| 34 | + if (JArray::moveElementTo($this->visibleProperties, $from, $to)) { |
|
| 35 | 35 | return JArray::moveElementTo($this->values, $from, $to); |
| 36 | 36 | } |
| 37 | 37 | return false; |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | - public function swapFields($index1,$index2){ |
|
| 41 | - if(JArray::swapElements($this->visibleProperties, $index1, $index2)){ |
|
| 40 | + public function swapFields($index1, $index2) { |
|
| 41 | + if (JArray::swapElements($this->visibleProperties, $index1, $index2)) { |
|
| 42 | 42 | return JArray::swapElements($this->values, $index1, $index2); |
| 43 | 43 | } |
| 44 | 44 | return false; |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | - public function removeField($index){ |
|
| 48 | - \array_splice($this->visibleProperties,$index,1); |
|
| 49 | - \array_splice($this->values,$index,1); |
|
| 50 | - \array_splice($this->captions,$index,1); |
|
| 47 | + public function removeField($index) { |
|
| 48 | + \array_splice($this->visibleProperties, $index, 1); |
|
| 49 | + \array_splice($this->values, $index, 1); |
|
| 50 | + \array_splice($this->captions, $index, 1); |
|
| 51 | 51 | return $this; |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | - public function getValues(){ |
|
| 54 | + public function getValues() { |
|
| 55 | 55 | $values=[]; |
| 56 | 56 | $index=0; |
| 57 | 57 | $count=$this->count(); |
| 58 | - while($index<$count){ |
|
| 58 | + while ($index<$count) { |
|
| 59 | 59 | $values[]=$this->getValue($index++); |
| 60 | 60 | } |
| 61 | 61 | return $values; |
| 62 | 62 | } |
| 63 | 63 | |
| 64 | - public function getIdentifier($index=NULL){ |
|
| 65 | - if(!isset($index)) |
|
| 64 | + public function getIdentifier($index=NULL) { |
|
| 65 | + if (!isset($index)) |
|
| 66 | 66 | $index=self::$index; |
| 67 | 67 | $value=$index; |
| 68 | - if(isset($this->values["identifier"])){ |
|
| 69 | - if(\is_string($this->values["identifier"])) |
|
| 68 | + if (isset($this->values["identifier"])) { |
|
| 69 | + if (\is_string($this->values["identifier"])) |
|
| 70 | 70 | $value=JReflection::callMethod($this->instance, $this->values["identifier"], []); |
| 71 | 71 | else |
| 72 | - $value=$this->values["identifier"]($index,$this->instance); |
|
| 72 | + $value=$this->values["identifier"]($index, $this->instance); |
|
| 73 | 73 | } |
| 74 | 74 | return $value; |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | - public function getValue($index){ |
|
| 77 | + public function getValue($index) { |
|
| 78 | 78 | $property=$this->properties[$index]; |
| 79 | 79 | return $this->_getValue($property, $index); |
| 80 | 80 | } |
| 81 | 81 | |
| 82 | - protected function _beforeAddProperty($index,&$field){ |
|
| 82 | + protected function _beforeAddProperty($index, &$field) { |
|
| 83 | 83 | |
| 84 | 84 | } |
| 85 | 85 | |
| 86 | - protected function _getDefaultValue($name,$value,$index){ |
|
| 86 | + protected function _getDefaultValue($name, $value, $index) { |
|
| 87 | 87 | $func=$this->defaultValueFunction; |
| 88 | 88 | //TODO Check bug on index |
| 89 | - return $func($name,$value,$index,$this->instance); |
|
| 89 | + return $func($name, $value, $index, $this->instance); |
|
| 90 | 90 | } |
| 91 | 91 | |
| 92 | - protected function _getPropertyValue(\ReflectionProperty $property,$index){ |
|
| 92 | + protected function _getPropertyValue(\ReflectionProperty $property, $index) { |
|
| 93 | 93 | $property->setAccessible(true); |
| 94 | 94 | return $property->getValue($this->instance); |
| 95 | 95 | } |
| 96 | 96 | |
| 97 | - protected function _getValue($property,$index){ |
|
| 97 | + protected function _getValue($property, $index) { |
|
| 98 | 98 | $value=null; |
| 99 | 99 | $propertyName=$property; |
| 100 | - if($property instanceof \ReflectionProperty){ |
|
| 100 | + if ($property instanceof \ReflectionProperty) { |
|
| 101 | 101 | $value=$this->_getPropertyValue($property, $index); |
| 102 | 102 | $propertyName=$property->getName(); |
| 103 | - }elseif(\is_callable($property)) |
|
| 103 | + }elseif (\is_callable($property)) |
|
| 104 | 104 | $value=$property($this->instance); |
| 105 | - elseif(\is_array($property)){ |
|
| 106 | - $values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property); |
|
| 105 | + elseif (\is_array($property)) { |
|
| 106 | + $values=\array_map(function($v) use ($index){return $this->_getValue($v, $index); }, $property); |
|
| 107 | 107 | $value=\implode("", $values); |
| 108 | - }elseif(\is_string($property)){ |
|
| 108 | + }elseif (\is_string($property)) { |
|
| 109 | 109 | $value=$property; |
| 110 | - if(isset($this->instance->{$property})){ |
|
| 110 | + if (isset($this->instance->{$property})) { |
|
| 111 | 111 | $value=$this->instance->{$property}; |
| 112 | - }elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){ |
|
| 112 | + }elseif (\method_exists($this->instance, $getter=JReflection::getterName($property))) { |
|
| 113 | 113 | $value=JReflection::callMethod($this->instance, $getter, []); |
| 114 | 114 | } |
| 115 | 115 | } |
| 116 | 116 | return $this->_postGetValue($index, $propertyName, $value); |
| 117 | 117 | } |
| 118 | 118 | |
| 119 | - protected function _postGetValue($index,$propertyName,$value){ |
|
| 120 | - if(isset($this->values[$index])){ |
|
| 121 | - $value= $this->values[$index]($value,$this->instance,$index,self::$index); |
|
| 122 | - }else{ |
|
| 123 | - $value=$this->_getDefaultValue($propertyName,$value, $index,self::$index); |
|
| 119 | + protected function _postGetValue($index, $propertyName, $value) { |
|
| 120 | + if (isset($this->values[$index])) { |
|
| 121 | + $value=$this->values[$index]($value, $this->instance, $index, self::$index); |
|
| 122 | + } else { |
|
| 123 | + $value=$this->_getDefaultValue($propertyName, $value, $index, self::$index); |
|
| 124 | 124 | } |
| 125 | - if(isset($this->afterCompile[$index])){ |
|
| 126 | - if(\is_callable($this->afterCompile[$index])){ |
|
| 127 | - $this->afterCompile[$index]($value,$this->instance,self::$index); |
|
| 125 | + if (isset($this->afterCompile[$index])) { |
|
| 126 | + if (\is_callable($this->afterCompile[$index])) { |
|
| 127 | + $this->afterCompile[$index]($value, $this->instance, self::$index); |
|
| 128 | 128 | } |
| 129 | 129 | } |
| 130 | 130 | return $value; |
| 131 | 131 | } |
| 132 | 132 | |
| 133 | - public function insertField($index,$field){ |
|
| 134 | - array_splice( $this->visibleProperties, $index, 0, $field ); |
|
| 133 | + public function insertField($index, $field) { |
|
| 134 | + array_splice($this->visibleProperties, $index, 0, $field); |
|
| 135 | 135 | return $this; |
| 136 | 136 | } |
| 137 | 137 | |
| 138 | - public function insertInField($index,$field){ |
|
| 138 | + public function insertInField($index, $field) { |
|
| 139 | 139 | $vb=$this->visibleProperties; |
| 140 | - if(isset($vb[$index])){ |
|
| 141 | - if(\is_array($vb[$index])){ |
|
| 140 | + if (isset($vb[$index])) { |
|
| 141 | + if (\is_array($vb[$index])) { |
|
| 142 | 142 | $this->visibleProperties[$index][]=$field; |
| 143 | - }else{ |
|
| 144 | - $this->visibleProperties[$index]=[$vb[$index],$field]; |
|
| 143 | + } else { |
|
| 144 | + $this->visibleProperties[$index]=[$vb[$index], $field]; |
|
| 145 | 145 | } |
| 146 | - }else{ |
|
| 146 | + } else { |
|
| 147 | 147 | return $this->insertField($index, $field); |
| 148 | 148 | } |
| 149 | 149 | return $this; |
| 150 | 150 | } |
| 151 | 151 | |
| 152 | - public function addField($field){ |
|
| 152 | + public function addField($field) { |
|
| 153 | 153 | $this->visibleProperties[]=$field; |
| 154 | 154 | return $this; |
| 155 | 155 | } |
| 156 | 156 | |
| 157 | - public function addFields($fields){ |
|
| 158 | - $this->visibleProperties=\array_merge($this->visibleProperties,$fields); |
|
| 157 | + public function addFields($fields) { |
|
| 158 | + $this->visibleProperties=\array_merge($this->visibleProperties, $fields); |
|
| 159 | 159 | return $this; |
| 160 | 160 | } |
| 161 | 161 | |
| 162 | - public function count(){ |
|
| 162 | + public function count() { |
|
| 163 | 163 | return \sizeof($this->properties); |
| 164 | 164 | } |
| 165 | 165 | |
| 166 | - public function visiblePropertiesCount(){ |
|
| 166 | + public function visiblePropertiesCount() { |
|
| 167 | 167 | return \sizeof($this->visibleProperties); |
| 168 | 168 | } |
| 169 | 169 | |
| 170 | - public function getProperty($index){ |
|
| 170 | + public function getProperty($index) { |
|
| 171 | 171 | return $this->properties[$index]; |
| 172 | 172 | } |
| 173 | 173 | |
| 174 | - public function getFieldName($index){ |
|
| 174 | + public function getFieldName($index) { |
|
| 175 | 175 | $property=$this->getProperty($index); |
| 176 | - if($property instanceof \ReflectionProperty){ |
|
| 176 | + if ($property instanceof \ReflectionProperty) { |
|
| 177 | 177 | $result=$property->getName(); |
| 178 | - }elseif(\is_callable($property)){ |
|
| 178 | + }elseif (\is_callable($property)) { |
|
| 179 | 179 | $result=$this->visibleProperties[$index]; |
| 180 | - }else{ |
|
| 180 | + } else { |
|
| 181 | 181 | $result=$property; |
| 182 | 182 | } |
| 183 | 183 | return $result; |
| 184 | 184 | } |
| 185 | 185 | |
| 186 | 186 | |
| 187 | - protected function showableProperty(\ReflectionProperty $rProperty){ |
|
| 188 | - return JString::startswith($rProperty->getName(),"_")===false; |
|
| 187 | + protected function showableProperty(\ReflectionProperty $rProperty) { |
|
| 188 | + return JString::startswith($rProperty->getName(), "_")===false; |
|
| 189 | 189 | } |
| 190 | 190 | |
| 191 | 191 | public function setInstance($instance) { |
| 192 | - if(\is_string($instance)){ |
|
| 192 | + if (\is_string($instance)) { |
|
| 193 | 193 | $instance=new $instance(); |
| 194 | 194 | } |
| 195 | 195 | $this->instance=$instance; |
| 196 | 196 | $this->properties=[]; |
| 197 | 197 | $this->reflect=new \ReflectionClass($instance); |
| 198 | - if(\sizeof($this->visibleProperties)===0){ |
|
| 198 | + if (\sizeof($this->visibleProperties)===0) { |
|
| 199 | 199 | $this->properties=$this->getDefaultProperties(); |
| 200 | - }else{ |
|
| 201 | - foreach ($this->visibleProperties as $property){ |
|
| 200 | + } else { |
|
| 201 | + foreach ($this->visibleProperties as $property) { |
|
| 202 | 202 | $this->setInstanceProperty($property); |
| 203 | 203 | } |
| 204 | 204 | } |
| 205 | 205 | return $this; |
| 206 | 206 | } |
| 207 | 207 | |
| 208 | - private function setInstanceProperty($property){ |
|
| 209 | - if(\is_callable($property)){ |
|
| 208 | + private function setInstanceProperty($property) { |
|
| 209 | + if (\is_callable($property)) { |
|
| 210 | 210 | $this->properties[]=$property; |
| 211 | - }elseif(\is_string($property)){ |
|
| 212 | - try{ |
|
| 211 | + }elseif (\is_string($property)) { |
|
| 212 | + try { |
|
| 213 | 213 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
| 214 | 214 | $rProperty=$this->reflect->getProperty($property); |
| 215 | 215 | $this->properties[]=$rProperty; |
| 216 | - }catch(\Exception $e){ |
|
| 216 | + }catch (\Exception $e) { |
|
| 217 | 217 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
| 218 | 218 | $this->properties[]=$property; |
| 219 | 219 | } |
| 220 | - }elseif(\is_int($property)){ |
|
| 220 | + }elseif (\is_int($property)) { |
|
| 221 | 221 | $props=$this->getDefaultProperties(); |
| 222 | - if(isset($props[$property])) |
|
| 222 | + if (isset($props[$property])) |
|
| 223 | 223 | $this->properties[]=$props[$property]; |
| 224 | 224 | else |
| 225 | 225 | $this->properties[]=$property; |
| 226 | - }else{ |
|
| 226 | + } else { |
|
| 227 | 227 | $this->properties[]=$property; |
| 228 | 228 | } |
| 229 | 229 | } |
| 230 | 230 | |
| 231 | - protected function getDefaultProperties(){ |
|
| 231 | + protected function getDefaultProperties() { |
|
| 232 | 232 | $result=[]; |
| 233 | 233 | $properties=$this->reflect->getProperties(); |
| 234 | - foreach ($properties as $property){ |
|
| 234 | + foreach ($properties as $property) { |
|
| 235 | 235 | $showable=$this->showableProperty($property); |
| 236 | - if($showable!==false){ |
|
| 236 | + if ($showable!==false) { |
|
| 237 | 237 | $result[]=$property; |
| 238 | 238 | } |
| 239 | 239 | } |
@@ -245,12 +245,12 @@ discard block |
||
| 245 | 245 | return $this; |
| 246 | 246 | } |
| 247 | 247 | |
| 248 | - public function setValueFunction($index,$callback){ |
|
| 248 | + public function setValueFunction($index, $callback) { |
|
| 249 | 249 | $this->values[$index]=$callback; |
| 250 | 250 | return $this; |
| 251 | 251 | } |
| 252 | 252 | |
| 253 | - public function setIdentifierFunction($callback){ |
|
| 253 | + public function setIdentifierFunction($callback) { |
|
| 254 | 254 | $this->values["identifier"]=$callback; |
| 255 | 255 | return $this; |
| 256 | 256 | } |
@@ -263,42 +263,42 @@ discard block |
||
| 263 | 263 | return $this->properties; |
| 264 | 264 | } |
| 265 | 265 | |
| 266 | - public function getCaption($index){ |
|
| 267 | - if(isset($this->captions[$index])){ |
|
| 266 | + public function getCaption($index) { |
|
| 267 | + if (isset($this->captions[$index])) { |
|
| 268 | 268 | return $this->captions[$index]; |
| 269 | 269 | } |
| 270 | - if($this->properties[$index] instanceof \ReflectionProperty) |
|
| 270 | + if ($this->properties[$index] instanceof \ReflectionProperty) |
|
| 271 | 271 | return $this->properties[$index]->getName(); |
| 272 | - elseif(\is_callable($this->properties[$index])) |
|
| 272 | + elseif (\is_callable($this->properties[$index])) |
|
| 273 | 273 | return ""; |
| 274 | 274 | else |
| 275 | 275 | return $this->properties[$index]; |
| 276 | 276 | } |
| 277 | 277 | |
| 278 | - public function getCaptions(){ |
|
| 278 | + public function getCaptions() { |
|
| 279 | 279 | $count=$this->count(); |
| 280 | - if(isset($this->captions)){ |
|
| 281 | - $captions= \array_values($this->captions); |
|
| 280 | + if (isset($this->captions)) { |
|
| 281 | + $captions=\array_values($this->captions); |
|
| 282 | 282 | $captionsSize=\sizeof($captions); |
| 283 | - for($i=$captionsSize;$i<$count;$i++){ |
|
| 283 | + for ($i=$captionsSize; $i<$count; $i++) { |
|
| 284 | 284 | $captions[]=""; |
| 285 | 285 | } |
| 286 | - }else{ |
|
| 286 | + } else { |
|
| 287 | 287 | $captions=[]; |
| 288 | 288 | $index=0; |
| 289 | - while($index<$count){ |
|
| 289 | + while ($index<$count) { |
|
| 290 | 290 | $captions[]=$this->getCaption($index++); |
| 291 | 291 | } |
| 292 | 292 | } |
| 293 | - if(isset($this->captionCallback) && \is_callable($this->captionCallback)){ |
|
| 293 | + if (isset($this->captionCallback) && \is_callable($this->captionCallback)) { |
|
| 294 | 294 | $callback=$this->captionCallback; |
| 295 | - $callback($captions,$this->instance); |
|
| 295 | + $callback($captions, $this->instance); |
|
| 296 | 296 | } |
| 297 | 297 | return $captions; |
| 298 | 298 | } |
| 299 | 299 | |
| 300 | - public function setCaption($index,$caption){ |
|
| 301 | - if(isset($this->captions)===false) |
|
| 300 | + public function setCaption($index, $caption) { |
|
| 301 | + if (isset($this->captions)===false) |
|
| 302 | 302 | $this->captions=[]; |
| 303 | 303 | $this->captions[$index]=$caption; |
| 304 | 304 | return $this; |
@@ -316,7 +316,7 @@ discard block |
||
| 316 | 316 | * @param callable $callback function called after the field compilation |
| 317 | 317 | * @return \Ajax\semantic\widgets\datatable\InstanceViewer |
| 318 | 318 | */ |
| 319 | - public function afterCompile($index,$callback){ |
|
| 319 | + public function afterCompile($index, $callback) { |
|
| 320 | 320 | $this->afterCompile[$index]=$callback; |
| 321 | 321 | return $this; |
| 322 | 322 | } |
@@ -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 | } |
@@ -100,16 +103,16 @@ discard block |
||
| 100 | 103 | if($property instanceof \ReflectionProperty){ |
| 101 | 104 | $value=$this->_getPropertyValue($property, $index); |
| 102 | 105 | $propertyName=$property->getName(); |
| 103 | - }elseif(\is_callable($property)) |
|
| 104 | - $value=$property($this->instance); |
|
| 105 | - elseif(\is_array($property)){ |
|
| 106 | + } elseif(\is_callable($property)) { |
|
| 107 | + $value=$property($this->instance); |
|
| 108 | + } elseif(\is_array($property)){ |
|
| 106 | 109 | $values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property); |
| 107 | 110 | $value=\implode("", $values); |
| 108 | - }elseif(\is_string($property)){ |
|
| 111 | + } elseif(\is_string($property)){ |
|
| 109 | 112 | $value=$property; |
| 110 | 113 | if(isset($this->instance->{$property})){ |
| 111 | 114 | $value=$this->instance->{$property}; |
| 112 | - }elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){ |
|
| 115 | + } elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){ |
|
| 113 | 116 | $value=JReflection::callMethod($this->instance, $getter, []); |
| 114 | 117 | } |
| 115 | 118 | } |
@@ -119,7 +122,7 @@ discard block |
||
| 119 | 122 | protected function _postGetValue($index,$propertyName,$value){ |
| 120 | 123 | if(isset($this->values[$index])){ |
| 121 | 124 | $value= $this->values[$index]($value,$this->instance,$index,self::$index); |
| 122 | - }else{ |
|
| 125 | + } else{ |
|
| 123 | 126 | $value=$this->_getDefaultValue($propertyName,$value, $index,self::$index); |
| 124 | 127 | } |
| 125 | 128 | if(isset($this->afterCompile[$index])){ |
@@ -140,10 +143,10 @@ discard block |
||
| 140 | 143 | if(isset($vb[$index])){ |
| 141 | 144 | if(\is_array($vb[$index])){ |
| 142 | 145 | $this->visibleProperties[$index][]=$field; |
| 143 | - }else{ |
|
| 146 | + } else{ |
|
| 144 | 147 | $this->visibleProperties[$index]=[$vb[$index],$field]; |
| 145 | 148 | } |
| 146 | - }else{ |
|
| 149 | + } else{ |
|
| 147 | 150 | return $this->insertField($index, $field); |
| 148 | 151 | } |
| 149 | 152 | return $this; |
@@ -175,9 +178,9 @@ discard block |
||
| 175 | 178 | $property=$this->getProperty($index); |
| 176 | 179 | if($property instanceof \ReflectionProperty){ |
| 177 | 180 | $result=$property->getName(); |
| 178 | - }elseif(\is_callable($property)){ |
|
| 181 | + } elseif(\is_callable($property)){ |
|
| 179 | 182 | $result=$this->visibleProperties[$index]; |
| 180 | - }else{ |
|
| 183 | + } else{ |
|
| 181 | 184 | $result=$property; |
| 182 | 185 | } |
| 183 | 186 | return $result; |
@@ -197,7 +200,7 @@ discard block |
||
| 197 | 200 | $this->reflect=new \ReflectionClass($instance); |
| 198 | 201 | if(\sizeof($this->visibleProperties)===0){ |
| 199 | 202 | $this->properties=$this->getDefaultProperties(); |
| 200 | - }else{ |
|
| 203 | + } else{ |
|
| 201 | 204 | foreach ($this->visibleProperties as $property){ |
| 202 | 205 | $this->setInstanceProperty($property); |
| 203 | 206 | } |
@@ -208,22 +211,23 @@ discard block |
||
| 208 | 211 | private function setInstanceProperty($property){ |
| 209 | 212 | if(\is_callable($property)){ |
| 210 | 213 | $this->properties[]=$property; |
| 211 | - }elseif(\is_string($property)){ |
|
| 214 | + } elseif(\is_string($property)){ |
|
| 212 | 215 | try{ |
| 213 | 216 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
| 214 | 217 | $rProperty=$this->reflect->getProperty($property); |
| 215 | 218 | $this->properties[]=$rProperty; |
| 216 | - }catch(\Exception $e){ |
|
| 219 | + } catch(\Exception $e){ |
|
| 217 | 220 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
| 218 | 221 | $this->properties[]=$property; |
| 219 | 222 | } |
| 220 | - }elseif(\is_int($property)){ |
|
| 223 | + } elseif(\is_int($property)){ |
|
| 221 | 224 | $props=$this->getDefaultProperties(); |
| 222 | - if(isset($props[$property])) |
|
| 223 | - $this->properties[]=$props[$property]; |
|
| 224 | - else |
|
| 225 | - $this->properties[]=$property; |
|
| 226 | - }else{ |
|
| 225 | + if(isset($props[$property])) { |
|
| 226 | + $this->properties[]=$props[$property]; |
|
| 227 | + } else { |
|
| 228 | + $this->properties[]=$property; |
|
| 229 | + } |
|
| 230 | + } else{ |
|
| 227 | 231 | $this->properties[]=$property; |
| 228 | 232 | } |
| 229 | 233 | } |
@@ -267,12 +271,13 @@ discard block |
||
| 267 | 271 | if(isset($this->captions[$index])){ |
| 268 | 272 | return $this->captions[$index]; |
| 269 | 273 | } |
| 270 | - if($this->properties[$index] instanceof \ReflectionProperty) |
|
| 271 | - return $this->properties[$index]->getName(); |
|
| 272 | - elseif(\is_callable($this->properties[$index])) |
|
| 273 | - return ""; |
|
| 274 | - else |
|
| 275 | - return $this->properties[$index]; |
|
| 274 | + if($this->properties[$index] instanceof \ReflectionProperty) { |
|
| 275 | + return $this->properties[$index]->getName(); |
|
| 276 | + } elseif(\is_callable($this->properties[$index])) { |
|
| 277 | + return ""; |
|
| 278 | + } else { |
|
| 279 | + return $this->properties[$index]; |
|
| 280 | + } |
|
| 276 | 281 | } |
| 277 | 282 | |
| 278 | 283 | public function getCaptions(){ |
@@ -283,7 +288,7 @@ discard block |
||
| 283 | 288 | for($i=$captionsSize;$i<$count;$i++){ |
| 284 | 289 | $captions[]=""; |
| 285 | 290 | } |
| 286 | - }else{ |
|
| 291 | + } else{ |
|
| 287 | 292 | $captions=[]; |
| 288 | 293 | $index=0; |
| 289 | 294 | while($index<$count){ |
@@ -298,8 +303,9 @@ discard block |
||
| 298 | 303 | } |
| 299 | 304 | |
| 300 | 305 | public function setCaption($index,$caption){ |
| 301 | - if(isset($this->captions)===false) |
|
| 302 | - $this->captions=[]; |
|
| 306 | + if(isset($this->captions)===false) { |
|
| 307 | + $this->captions=[]; |
|
| 308 | + } |
|
| 303 | 309 | $this->captions[$index]=$caption; |
| 304 | 310 | return $this; |
| 305 | 311 | } |
@@ -12,13 +12,13 @@ |
||
| 12 | 12 | * @param array $parameters |
| 13 | 13 | * @return Response |
| 14 | 14 | */ |
| 15 | - public function renderView($viewName,$parameters=[]){ |
|
| 15 | + public function renderView($viewName, $parameters=[]) { |
|
| 16 | 16 | $twig=$this->container->get("twig"); |
| 17 | 17 | $this->compile($parameters); |
| 18 | 18 | return new Response($twig->render($viewName, $parameters)); |
| 19 | 19 | } |
| 20 | 20 | |
| 21 | - public function generateUrl($path){ |
|
| 21 | + public function generateUrl($path) { |
|
| 22 | 22 | $request=Request::createFromGlobals(); |
| 23 | 23 | return $request->getBaseUrl().$path; |
| 24 | 24 | } |
@@ -6,8 +6,8 @@ |
||
| 6 | 6 | |
| 7 | 7 | class JquerySemantic extends Jquery_ { |
| 8 | 8 | |
| 9 | - public function __construct(RouterInterface $router,ContainerInterface $container ){ |
|
| 10 | - parent::__construct(["semantic"=>true,"defer"=>true],$router); |
|
| 9 | + public function __construct(RouterInterface $router, ContainerInterface $container) { |
|
| 10 | + parent::__construct(["semantic"=>true, "defer"=>true], $router); |
|
| 11 | 11 | $this->container=$container; |
| 12 | 12 | } |
| 13 | 13 | } |
@@ -6,8 +6,8 @@ |
||
| 6 | 6 | |
| 7 | 7 | class JqueryBootstrap extends Jquery_ { |
| 8 | 8 | |
| 9 | - public function __construct(RouterInterface $router,ContainerInterface $container ){ |
|
| 10 | - parent::__construct(["bootstrap"=>true,"defer"=>true],$router); |
|
| 9 | + public function __construct(RouterInterface $router, ContainerInterface $container) { |
|
| 10 | + parent::__construct(["bootstrap"=>true, "defer"=>true], $router); |
|
| 11 | 11 | $this->container=$container; |
| 12 | 12 | } |
| 13 | 13 | } |