@@ -20,7 +20,7 @@ |
||
| 20 | 20 | $this->params["onUnchecked"]="%function(){".$value."}%"; |
| 21 | 21 | } |
| 22 | 22 | |
| 23 | - public function setOnChange($value){ |
|
| 23 | + public function setOnChange($value) { |
|
| 24 | 24 | $this->params["onChange"]="%function(){".$value."}%"; |
| 25 | 25 | } |
| 26 | 26 | //TODO other events implementation |
@@ -19,28 +19,28 @@ discard block |
||
| 19 | 19 | |
| 20 | 20 | public function __construct(JsUtils $js=NULL) { |
| 21 | 21 | parent::__construct($js); |
| 22 | - $this->events=array (); |
|
| 22 | + $this->events=array(); |
|
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | protected function compileEvents() { |
| 26 | - foreach ( $this->events as $event => $jsCode ) { |
|
| 26 | + foreach ($this->events as $event => $jsCode) { |
|
| 27 | 27 | $itemSelector=JString::getValueBetween($event); |
| 28 | 28 | //echo $itemSelector.":::".$jsCode."<br>"; |
| 29 | - if($event=="execute"){ |
|
| 29 | + if ($event=="execute") { |
|
| 30 | 30 | $this->jquery_code_for_compile []=$jsCode; |
| 31 | - }else if($event=="beforeExecute"){ |
|
| 31 | + } else if ($event=="beforeExecute") { |
|
| 32 | 32 | \array_unshift($this->jquery_code_for_compile, $jsCode); |
| 33 | - }else{ |
|
| 33 | + } else { |
|
| 34 | 34 | $selector=$this->_createSelector($itemSelector, $this->attachTo); |
| 35 | 35 | $this->jquery_code_for_compile []="$( \"".$selector."\" ).on(\"".$event."\" , function( event, data ) {".$jsCode."});"; |
| 36 | 36 | } |
| 37 | 37 | } |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | - protected function _createSelector($itemSelector,$selector){ |
|
| 41 | - if(!isset($itemSelector)) |
|
| 40 | + protected function _createSelector($itemSelector, $selector) { |
|
| 41 | + if (!isset($itemSelector)) |
|
| 42 | 42 | $itemSelector=$this->itemSelector; |
| 43 | - if(isset($itemSelector) && $itemSelector!=="") |
|
| 43 | + if (isset($itemSelector) && $itemSelector!=="") |
|
| 44 | 44 | $selector.=" ".$itemSelector; |
| 45 | 45 | return $selector; |
| 46 | 46 | } |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | $result=implode("\n", $this->jquery_code_for_compile); |
| 50 | 50 | $result=str_ireplace("\"%", "", $result); |
| 51 | 51 | $result=str_ireplace("%\"", "", $result); |
| 52 | - $result=str_replace(array ( |
|
| 52 | + $result=str_replace(array( |
|
| 53 | 53 | "\\n", |
| 54 | 54 | "\\r", |
| 55 | 55 | "\\t" |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | |
| 60 | 60 | public function getScript() { |
| 61 | 61 | $allParams=$this->params; |
| 62 | - $this->jquery_code_for_compile=array (); |
|
| 62 | + $this->jquery_code_for_compile=array(); |
|
| 63 | 63 | $this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).{$this->uiName}(".$this->getParamsAsJSON($allParams).");"; |
| 64 | 64 | $this->compileEvents(); |
| 65 | 65 | return $this->compileJQueryCode(); |
@@ -28,9 +28,9 @@ discard block |
||
| 28 | 28 | //echo $itemSelector.":::".$jsCode."<br>"; |
| 29 | 29 | if($event=="execute"){ |
| 30 | 30 | $this->jquery_code_for_compile []=$jsCode; |
| 31 | - }else if($event=="beforeExecute"){ |
|
| 31 | + } else if($event=="beforeExecute"){ |
|
| 32 | 32 | \array_unshift($this->jquery_code_for_compile, $jsCode); |
| 33 | - }else{ |
|
| 33 | + } else{ |
|
| 34 | 34 | $selector=$this->_createSelector($itemSelector, $this->attachTo); |
| 35 | 35 | $this->jquery_code_for_compile []="$( \"".$selector."\" ).on(\"".$event."\" , function( event, data ) {".$jsCode."});"; |
| 36 | 36 | } |
@@ -38,10 +38,12 @@ discard block |
||
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | protected function _createSelector($itemSelector,$selector){ |
| 41 | - if(!isset($itemSelector)) |
|
| 42 | - $itemSelector=$this->itemSelector; |
|
| 43 | - if(isset($itemSelector) && $itemSelector!=="") |
|
| 44 | - $selector.=" ".$itemSelector; |
|
| 41 | + if(!isset($itemSelector)) { |
|
| 42 | + $itemSelector=$this->itemSelector; |
|
| 43 | + } |
|
| 44 | + if(isset($itemSelector) && $itemSelector!=="") { |
|
| 45 | + $selector.=" ".$itemSelector; |
|
| 46 | + } |
|
| 45 | 47 | return $selector; |
| 46 | 48 | } |
| 47 | 49 | |
@@ -84,8 +86,9 @@ discard block |
||
| 84 | 86 | |
| 85 | 87 | protected function setParamCtrl($key, $value, $typeCtrl) { |
| 86 | 88 | if (\is_array($typeCtrl)) { |
| 87 | - if (array_search($value, $typeCtrl)===false) |
|
| 88 | - throw new \Exception("La valeur passée a propriété `".$key."` pour le composant `".$this->uiName."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}"); |
|
| 89 | + if (array_search($value, $typeCtrl)===false) { |
|
| 90 | + throw new \Exception("La valeur passée a propriété `".$key."` pour le composant `".$this->uiName."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}"); |
|
| 91 | + } |
|
| 89 | 92 | } else { |
| 90 | 93 | if (!$typeCtrl($value)) { |
| 91 | 94 | throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$key." au composant ".$this->uiName); |
@@ -2,63 +2,63 @@ |
||
| 2 | 2 | namespace Ajax\service; |
| 3 | 3 | class JString { |
| 4 | 4 | |
| 5 | - public static function contains($hay,$needle){ |
|
| 6 | - return strpos($hay, $needle) !== false; |
|
| 5 | + public static function contains($hay, $needle) { |
|
| 6 | + return strpos($hay, $needle)!==false; |
|
| 7 | 7 | } |
| 8 | 8 | public static function startswith($hay, $needle) { |
| 9 | - return substr($hay, 0, strlen($needle)) === $needle; |
|
| 9 | + return substr($hay, 0, strlen($needle))===$needle; |
|
| 10 | 10 | } |
| 11 | 11 | |
| 12 | 12 | public static function endswith($hay, $needle) { |
| 13 | - return substr($hay, -strlen($needle)) === $needle; |
|
| 13 | + return substr($hay, -strlen($needle))===$needle; |
|
| 14 | 14 | } |
| 15 | 15 | |
| 16 | - public static function isNull($s){ |
|
| 16 | + public static function isNull($s) { |
|
| 17 | 17 | return (!isset($s) || NULL===$s || ""===$s); |
| 18 | 18 | } |
| 19 | - public static function isNotNull($s){ |
|
| 19 | + public static function isNotNull($s) { |
|
| 20 | 20 | return (isset($s) && NULL!==$s && ""!==$s); |
| 21 | 21 | } |
| 22 | 22 | |
| 23 | - public static function isBoolean($value){ |
|
| 23 | + public static function isBoolean($value) { |
|
| 24 | 24 | return \is_bool($value) || $value==1 || $value==0; |
| 25 | 25 | } |
| 26 | 26 | |
| 27 | - public static function isBooleanTrue($value){ |
|
| 27 | + public static function isBooleanTrue($value) { |
|
| 28 | 28 | return $value==1 || $value; |
| 29 | 29 | } |
| 30 | 30 | |
| 31 | - public static function isBooleanFalse($value){ |
|
| 31 | + public static function isBooleanFalse($value) { |
|
| 32 | 32 | return $value==0 || !$value; |
| 33 | 33 | } |
| 34 | 34 | |
| 35 | - public static function camelCaseToSeparated($input,$separator=" "){ |
|
| 35 | + public static function camelCaseToSeparated($input, $separator=" ") { |
|
| 36 | 36 | return strtolower(preg_replace('/(?<!^)[A-Z]/', $separator.'$0', $input)); |
| 37 | 37 | } |
| 38 | 38 | |
| 39 | - public static function replaceAtFirst($subject,$from, $to){ |
|
| 40 | - $from = '/\A'.preg_quote($from, '/').'/'; |
|
| 39 | + public static function replaceAtFirst($subject, $from, $to) { |
|
| 40 | + $from='/\A'.preg_quote($from, '/').'/'; |
|
| 41 | 41 | return \preg_replace($from, $to, $subject, 1); |
| 42 | 42 | } |
| 43 | 43 | |
| 44 | - public static function replaceAtLast($subject,$from, $to){ |
|
| 45 | - $from = '/'.preg_quote($from, '/').'\z/'; |
|
| 44 | + public static function replaceAtLast($subject, $from, $to) { |
|
| 45 | + $from='/'.preg_quote($from, '/').'\z/'; |
|
| 46 | 46 | return \preg_replace($from, $to, $subject, 1); |
| 47 | 47 | } |
| 48 | 48 | |
| 49 | - public static function replaceAtFirstAndLast($subject,$fromFirst,$toFirst,$fromLast,$toLast){ |
|
| 49 | + public static function replaceAtFirstAndLast($subject, $fromFirst, $toFirst, $fromLast, $toLast) { |
|
| 50 | 50 | $s=self::replaceAtFirst($subject, $fromFirst, $toFirst); |
| 51 | 51 | return self::replaceAtLast($s, $fromLast, $toLast); |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | - public static function getValueBetween(&$str,$before="{{",$after="}}"){ |
|
| 54 | + public static function getValueBetween(&$str, $before="{{", $after="}}") { |
|
| 55 | 55 | $matches=[]; |
| 56 | 56 | $result=null; |
| 57 | 57 | $_before=\preg_quote($before); |
| 58 | 58 | $_after=\preg_quote($after); |
| 59 | - if(\preg_match('/'.$_before.'(.*?)'.$_after.'/s', $str, $matches)===1){ |
|
| 59 | + if (\preg_match('/'.$_before.'(.*?)'.$_after.'/s', $str, $matches)===1) { |
|
| 60 | 60 | $result=$matches[1]; |
| 61 | - $str=\str_replace($before.$result.$after,"", $str); |
|
| 61 | + $str=\str_replace($before.$result.$after, "", $str); |
|
| 62 | 62 | } |
| 63 | 63 | return $result; |
| 64 | 64 | } |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | * @param string $event |
| 22 | 22 | * @param boolean $multiple |
| 23 | 23 | */ |
| 24 | - public function __construct($table,$class="active",$event="click",$multiple=false){ |
|
| 24 | + public function __construct($table, $class="active", $event="click", $multiple=false) { |
|
| 25 | 25 | $this->table=$table; |
| 26 | 26 | $this->class=$class; |
| 27 | 27 | $this->event=$event; |
@@ -55,12 +55,12 @@ discard block |
||
| 55 | 55 | return $this; |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | - public function compile(){ |
|
| 58 | + public function compile() { |
|
| 59 | 59 | $multiple=""; |
| 60 | - if(!$this->multiple){ |
|
| 60 | + if (!$this->multiple) { |
|
| 61 | 61 | $multiple="$(this).closest('tbody').children('tr').removeClass('".$this->class."');"; |
| 62 | 62 | } |
| 63 | - $this->table->onRow($this->event, $multiple."$(this).toggleClass('".$this->class."');",false,false); |
|
| 63 | + $this->table->onRow($this->event, $multiple."$(this).toggleClass('".$this->class."');", false, false); |
|
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | } |
| 67 | 67 | \ No newline at end of file |
@@ -62,6 +62,9 @@ discard block |
||
| 62 | 62 | return $tr; |
| 63 | 63 | } |
| 64 | 64 | |
| 65 | + /** |
|
| 66 | + * @param integer $value |
|
| 67 | + */ |
|
| 65 | 68 | public function newRow($value) { |
| 66 | 69 | return $this->createItem($value); |
| 67 | 70 | } |
@@ -160,6 +163,9 @@ discard block |
||
| 160 | 163 | return $this; |
| 161 | 164 | } |
| 162 | 165 | |
| 166 | + /** |
|
| 167 | + * @param integer $colIndex |
|
| 168 | + */ |
|
| 163 | 169 | public function setColValues($colIndex, $values=array()) { |
| 164 | 170 | $count=$this->count(); |
| 165 | 171 | if (!\is_array($values)) { |
@@ -180,6 +186,9 @@ discard block |
||
| 180 | 186 | return $this; |
| 181 | 187 | } |
| 182 | 188 | |
| 189 | + /** |
|
| 190 | + * @param integer $rowIndex |
|
| 191 | + */ |
|
| 183 | 192 | public function setRowValues($rowIndex, $values=array()) { |
| 184 | 193 | $count=$this->count(); |
| 185 | 194 | if (!\is_array($values)) { |
@@ -189,6 +198,9 @@ discard block |
||
| 189 | 198 | return $this; |
| 190 | 199 | } |
| 191 | 200 | |
| 201 | + /** |
|
| 202 | + * @param string $function |
|
| 203 | + */ |
|
| 192 | 204 | private function colAlign($colIndex, $function) { |
| 193 | 205 | $count=$this->count(); |
| 194 | 206 | for($i=0; $i < $count; $i++) { |
@@ -266,7 +278,7 @@ discard block |
||
| 266 | 278 | } |
| 267 | 279 | |
| 268 | 280 | /** |
| 269 | - * @param mixed $callback |
|
| 281 | + * @param callable $callback |
|
| 270 | 282 | * @param string $format |
| 271 | 283 | * @return HtmlTableContent |
| 272 | 284 | */ |
@@ -279,7 +291,7 @@ discard block |
||
| 279 | 291 | } |
| 280 | 292 | |
| 281 | 293 | /** |
| 282 | - * @param mixed $callback |
|
| 294 | + * @param callable $callback |
|
| 283 | 295 | * @param string $format |
| 284 | 296 | * @return HtmlTableContent |
| 285 | 297 | */ |
@@ -292,7 +304,7 @@ discard block |
||
| 292 | 304 | } |
| 293 | 305 | |
| 294 | 306 | /** |
| 295 | - * @param mixed $callback |
|
| 307 | + * @param callable $callback |
|
| 296 | 308 | * @return HtmlTableContent |
| 297 | 309 | */ |
| 298 | 310 | public function applyCells($callback) { |
@@ -304,7 +316,7 @@ discard block |
||
| 304 | 316 | } |
| 305 | 317 | |
| 306 | 318 | /** |
| 307 | - * @param mixed $callback |
|
| 319 | + * @param callable $callback |
|
| 308 | 320 | * @return HtmlTableContent |
| 309 | 321 | */ |
| 310 | 322 | public function applyRows($callback) { |
@@ -11,7 +11,7 @@ discard block |
||
| 11 | 11 | * |
| 12 | 12 | */ |
| 13 | 13 | class HtmlTableContent extends HtmlSemCollection { |
| 14 | - protected $_tdTagNames=[ "thead" => "th","tbody" => "td","tfoot" => "th" ]; |
|
| 14 | + protected $_tdTagNames=["thead" => "th", "tbody" => "td", "tfoot" => "th"]; |
|
| 15 | 15 | |
| 16 | 16 | /** |
| 17 | 17 | * |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | */ |
| 35 | 35 | public function setRowCount($rowCount, $colCount) { |
| 36 | 36 | $count=$this->count(); |
| 37 | - for($i=$count; $i < $rowCount; $i++) { |
|
| 37 | + for ($i=$count; $i<$rowCount; $i++) { |
|
| 38 | 38 | $this->addItem($colCount); |
| 39 | 39 | } |
| 40 | 40 | return $this; |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | $tr=new HtmlTR("", $value); |
| 57 | 57 | $tr->setContainer($this, $count); |
| 58 | 58 | $tr->setTdTagName($this->_tdTagNames[$this->tagName]); |
| 59 | - if (isset($value) === true) { |
|
| 59 | + if (isset($value)===true) { |
|
| 60 | 60 | $tr->setColCount($value); |
| 61 | 61 | } |
| 62 | 62 | return $tr; |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | */ |
| 115 | 115 | public function setCellValue($row, $col, $value="") { |
| 116 | 116 | $cell=$this->getCell($row, $col); |
| 117 | - if (isset($cell) === true) { |
|
| 117 | + if (isset($cell)===true) { |
|
| 118 | 118 | $cell->setValue($value); |
| 119 | 119 | } |
| 120 | 120 | return $this; |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | * @param mixed $values |
| 126 | 126 | */ |
| 127 | 127 | public function setValues($values=array()) { |
| 128 | - return $this->_addOrSetValues($values, function($row,$_values){$row->setValues($_values);}); |
|
| 128 | + return $this->_addOrSetValues($values, function($row, $_values) {$row->setValues($_values); }); |
|
| 129 | 129 | } |
| 130 | 130 | |
| 131 | 131 | /** |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | * @param mixed $values |
| 134 | 134 | */ |
| 135 | 135 | public function addValues($values=array()) { |
| 136 | - return $this->_addOrSetValues($values, function($row,$_values){$row->addValues($_values);}); |
|
| 136 | + return $this->_addOrSetValues($values, function($row, $_values) {$row->addValues($_values); }); |
|
| 137 | 137 | } |
| 138 | 138 | |
| 139 | 139 | /** |
@@ -141,21 +141,21 @@ discard block |
||
| 141 | 141 | * @param mixed $values |
| 142 | 142 | * @param callable $callback |
| 143 | 143 | */ |
| 144 | - protected function _addOrSetValues($values,$callback) { |
|
| 144 | + protected function _addOrSetValues($values, $callback) { |
|
| 145 | 145 | $count=$this->count(); |
| 146 | 146 | $isArray=true; |
| 147 | 147 | if (!\is_array($values)) { |
| 148 | 148 | $values=\array_fill(0, $count, $values); |
| 149 | 149 | $isArray=false; |
| 150 | 150 | } |
| 151 | - if (JArray::dimension($values) == 1 && $isArray) |
|
| 152 | - $values=[ $values ]; |
|
| 151 | + if (JArray::dimension($values)==1 && $isArray) |
|
| 152 | + $values=[$values]; |
|
| 153 | 153 | |
| 154 | 154 | $count=\min(\sizeof($values), $count); |
| 155 | 155 | |
| 156 | - for($i=0; $i < $count; $i++) { |
|
| 156 | + for ($i=0; $i<$count; $i++) { |
|
| 157 | 157 | $row=$this->content[$i]; |
| 158 | - $callback($row,$values[$i]); |
|
| 158 | + $callback($row, $values[$i]); |
|
| 159 | 159 | } |
| 160 | 160 | return $this; |
| 161 | 161 | } |
@@ -166,7 +166,7 @@ discard block |
||
| 166 | 166 | $values=\array_fill(0, $count, $values); |
| 167 | 167 | } |
| 168 | 168 | $count=\min(\sizeof($values), $count); |
| 169 | - for($i=0; $i < $count; $i++) { |
|
| 169 | + for ($i=0; $i<$count; $i++) { |
|
| 170 | 170 | $this->getCell($i, $colIndex)->setValue($values[$i]); |
| 171 | 171 | } |
| 172 | 172 | return $this; |
@@ -174,7 +174,7 @@ discard block |
||
| 174 | 174 | |
| 175 | 175 | public function addColVariations($colIndex, $variations=array()) { |
| 176 | 176 | $count=$this->count(); |
| 177 | - for($i=0; $i < $count; $i++) { |
|
| 177 | + for ($i=0; $i<$count; $i++) { |
|
| 178 | 178 | $this->getCell($i, $colIndex)->addVariations($variations); |
| 179 | 179 | } |
| 180 | 180 | return $this; |
@@ -191,9 +191,9 @@ discard block |
||
| 191 | 191 | |
| 192 | 192 | private function colAlign($colIndex, $function) { |
| 193 | 193 | $count=$this->count(); |
| 194 | - for($i=0; $i < $count; $i++) { |
|
| 194 | + for ($i=0; $i<$count; $i++) { |
|
| 195 | 195 | $index=$this->content[$i]->getColPosition($colIndex); |
| 196 | - if ($index !== NULL) |
|
| 196 | + if ($index!==NULL) |
|
| 197 | 197 | $this->getCell($i, $index)->$function(); |
| 198 | 198 | } |
| 199 | 199 | return $this; |
@@ -225,7 +225,7 @@ discard block |
||
| 225 | 225 | */ |
| 226 | 226 | public function getColCount() { |
| 227 | 227 | $result=0; |
| 228 | - if ($this->count() > 0) |
|
| 228 | + if ($this->count()>0) |
|
| 229 | 229 | $result=$this->getItem(0)->count(); |
| 230 | 230 | return $result; |
| 231 | 231 | } |
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | public function delete($rowIndex, $colIndex=NULL) { |
| 240 | 240 | if (isset($colIndex)) { |
| 241 | 241 | $row=$this->getItem($rowIndex); |
| 242 | - if (isset($row) === true) { |
|
| 242 | + if (isset($row)===true) { |
|
| 243 | 243 | $row->delete($colIndex); |
| 244 | 244 | } |
| 245 | 245 | } else { |
@@ -272,17 +272,17 @@ discard block |
||
| 272 | 272 | */ |
| 273 | 273 | public function conditionalCellFormat($callback, $format) { |
| 274 | 274 | $rows=$this->content; |
| 275 | - foreach ( $rows as $row ) { |
|
| 275 | + foreach ($rows as $row) { |
|
| 276 | 276 | $row->conditionalCellFormat($callback, $format); |
| 277 | 277 | } |
| 278 | 278 | return $this; |
| 279 | 279 | } |
| 280 | 280 | |
| 281 | - public function conditionalColFormat($colIndex,$callback,$format){ |
|
| 281 | + public function conditionalColFormat($colIndex, $callback, $format) { |
|
| 282 | 282 | $rows=$this->content; |
| 283 | - foreach ( $rows as $row ) { |
|
| 283 | + foreach ($rows as $row) { |
|
| 284 | 284 | $cell=$row->getItem($colIndex); |
| 285 | - $cell->conditionnalCellFormat($callback,$format); |
|
| 285 | + $cell->conditionnalCellFormat($callback, $format); |
|
| 286 | 286 | } |
| 287 | 287 | return $this; |
| 288 | 288 | } |
@@ -294,17 +294,17 @@ discard block |
||
| 294 | 294 | */ |
| 295 | 295 | public function conditionalRowFormat($callback, $format) { |
| 296 | 296 | $rows=$this->content; |
| 297 | - foreach ( $rows as $row ) { |
|
| 297 | + foreach ($rows as $row) { |
|
| 298 | 298 | $row->conditionalRowFormat($callback, $format); |
| 299 | 299 | } |
| 300 | 300 | return $this; |
| 301 | 301 | } |
| 302 | 302 | |
| 303 | - public function hideColumn($colIndex){ |
|
| 303 | + public function hideColumn($colIndex) { |
|
| 304 | 304 | $rows=$this->content; |
| 305 | - foreach ( $rows as $row ) { |
|
| 305 | + foreach ($rows as $row) { |
|
| 306 | 306 | $cell=$row->getItem($colIndex); |
| 307 | - $cell->addToProperty("style","display:none;"); |
|
| 307 | + $cell->addToProperty("style", "display:none;"); |
|
| 308 | 308 | } |
| 309 | 309 | return $this; |
| 310 | 310 | } |
@@ -315,7 +315,7 @@ discard block |
||
| 315 | 315 | */ |
| 316 | 316 | public function applyCells($callback) { |
| 317 | 317 | $rows=$this->content; |
| 318 | - foreach ( $rows as $row ) { |
|
| 318 | + foreach ($rows as $row) { |
|
| 319 | 319 | $row->applyCells($callback); |
| 320 | 320 | } |
| 321 | 321 | return $this; |
@@ -327,7 +327,7 @@ discard block |
||
| 327 | 327 | */ |
| 328 | 328 | public function applyRows($callback) { |
| 329 | 329 | $rows=$this->content; |
| 330 | - foreach ( $rows as $row ) { |
|
| 330 | + foreach ($rows as $row) { |
|
| 331 | 331 | $row->apply($callback); |
| 332 | 332 | } |
| 333 | 333 | return $this; |
@@ -22,8 +22,9 @@ discard block |
||
| 22 | 22 | */ |
| 23 | 23 | public function __construct($identifier, $tagName="tbody", $rowCount=NULL, $colCount=NULL) { |
| 24 | 24 | parent::__construct($identifier, $tagName, ""); |
| 25 | - if (isset($rowCount) && isset($colCount)) |
|
| 26 | - $this->setRowCount($rowCount, $colCount); |
|
| 25 | + if (isset($rowCount) && isset($colCount)) { |
|
| 26 | + $this->setRowCount($rowCount, $colCount); |
|
| 27 | + } |
|
| 27 | 28 | } |
| 28 | 29 | |
| 29 | 30 | /** |
@@ -148,8 +149,9 @@ discard block |
||
| 148 | 149 | $values=\array_fill(0, $count, $values); |
| 149 | 150 | $isArray=false; |
| 150 | 151 | } |
| 151 | - if (JArray::dimension($values) == 1 && $isArray) |
|
| 152 | - $values=[ $values ]; |
|
| 152 | + if (JArray::dimension($values) == 1 && $isArray) { |
|
| 153 | + $values=[ $values ]; |
|
| 154 | + } |
|
| 153 | 155 | |
| 154 | 156 | $count=\min(\sizeof($values), $count); |
| 155 | 157 | |
@@ -193,8 +195,9 @@ discard block |
||
| 193 | 195 | $count=$this->count(); |
| 194 | 196 | for($i=0; $i < $count; $i++) { |
| 195 | 197 | $index=$this->content[$i]->getColPosition($colIndex); |
| 196 | - if ($index !== NULL) |
|
| 197 | - $this->getCell($i, $index)->$function(); |
|
| 198 | + if ($index !== NULL) { |
|
| 199 | + $this->getCell($i, $index)->$function(); |
|
| 200 | + } |
|
| 198 | 201 | } |
| 199 | 202 | return $this; |
| 200 | 203 | } |
@@ -225,8 +228,9 @@ discard block |
||
| 225 | 228 | */ |
| 226 | 229 | public function getColCount() { |
| 227 | 230 | $result=0; |
| 228 | - if ($this->count() > 0) |
|
| 229 | - $result=$this->getItem(0)->count(); |
|
| 231 | + if ($this->count() > 0) { |
|
| 232 | + $result=$this->getItem(0)->count(); |
|
| 233 | + } |
|
| 230 | 234 | return $result; |
| 231 | 235 | } |
| 232 | 236 | |
@@ -30,9 +30,17 @@ discard block |
||
| 30 | 30 | trait FieldAsTrait{ |
| 31 | 31 | |
| 32 | 32 | abstract protected function _getFieldIdentifier($prefix,$name=""); |
| 33 | + |
|
| 34 | + /** |
|
| 35 | + * @param \Closure $callback |
|
| 36 | + */ |
|
| 33 | 37 | abstract public function setValueFunction($index,$callback); |
| 34 | 38 | abstract protected function _getFieldName($index); |
| 35 | 39 | abstract protected function _getFieldCaption($index); |
| 40 | + |
|
| 41 | + /** |
|
| 42 | + * @param string $event |
|
| 43 | + */ |
|
| 36 | 44 | abstract protected function _buttonAsSubmit(BaseHtml &$button,$event,$url,$responseElement=NULL,$parameters=NULL); |
| 37 | 45 | |
| 38 | 46 | /** |
@@ -243,6 +251,9 @@ discard block |
||
| 243 | 251 | } |
| 244 | 252 | } |
| 245 | 253 | |
| 254 | + /** |
|
| 255 | + * @param integer $index |
|
| 256 | + */ |
|
| 246 | 257 | public function fieldAs($index,$type,$attributes=NULL){ |
| 247 | 258 | $method="fieldAs".\ucfirst($type); |
| 248 | 259 | if(\method_exists($this, $method)){ |
@@ -27,23 +27,23 @@ discard block |
||
| 27 | 27 | * @property boolean $_edition |
| 28 | 28 | * @property mixed _modelInstance |
| 29 | 29 | */ |
| 30 | -trait FieldAsTrait{ |
|
| 30 | +trait FieldAsTrait { |
|
| 31 | 31 | |
| 32 | - abstract protected function _getFieldIdentifier($prefix,$name=""); |
|
| 33 | - abstract public function setValueFunction($index,$callback); |
|
| 32 | + abstract protected function _getFieldIdentifier($prefix, $name=""); |
|
| 33 | + abstract public function setValueFunction($index, $callback); |
|
| 34 | 34 | abstract protected function _getFieldName($index); |
| 35 | 35 | abstract protected function _getFieldCaption($index); |
| 36 | - abstract protected function _buttonAsSubmit(BaseHtml &$button,$event,$url,$responseElement=NULL,$parameters=NULL); |
|
| 36 | + abstract protected function _buttonAsSubmit(BaseHtml&$button, $event, $url, $responseElement=NULL, $parameters=NULL); |
|
| 37 | 37 | |
| 38 | 38 | /** |
| 39 | 39 | * @param HtmlFormField $element |
| 40 | 40 | * @param array $attributes |
| 41 | 41 | */ |
| 42 | - protected function _applyAttributes($element,&$attributes,$index){ |
|
| 43 | - if(isset($attributes["jsCallback"])){ |
|
| 42 | + protected function _applyAttributes($element, &$attributes, $index) { |
|
| 43 | + if (isset($attributes["jsCallback"])) { |
|
| 44 | 44 | $callback=$attributes["jsCallback"]; |
| 45 | - if(\is_callable($callback)){ |
|
| 46 | - $callback($element,$this->_modelInstance,$index); |
|
| 45 | + if (\is_callable($callback)) { |
|
| 46 | + $callback($element, $this->_modelInstance, $index); |
|
| 47 | 47 | unset($attributes["jsCallback"]); |
| 48 | 48 | } |
| 49 | 49 | } |
@@ -53,43 +53,43 @@ discard block |
||
| 53 | 53 | $element->fromArray($attributes); |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | - private function _getLabelField($caption,$icon=NULL){ |
|
| 57 | - $label=new HtmlLabel($this->_getFieldIdentifier("lbl"),$caption,$icon); |
|
| 56 | + private function _getLabelField($caption, $icon=NULL) { |
|
| 57 | + $label=new HtmlLabel($this->_getFieldIdentifier("lbl"), $caption, $icon); |
|
| 58 | 58 | return $label; |
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | |
| 62 | - protected function _addRules($element,&$attributes){ |
|
| 63 | - if(isset($attributes["rules"])){ |
|
| 62 | + protected function _addRules($element, &$attributes) { |
|
| 63 | + if (isset($attributes["rules"])) { |
|
| 64 | 64 | $rules=$attributes["rules"]; |
| 65 | - if(\is_array($rules)){ |
|
| 65 | + if (\is_array($rules)) { |
|
| 66 | 66 | $element->addRules($rules); |
| 67 | 67 | } |
| 68 | - else{ |
|
| 68 | + else { |
|
| 69 | 69 | $element->addRule($rules); |
| 70 | 70 | } |
| 71 | 71 | unset($attributes["rules"]); |
| 72 | 72 | } |
| 73 | 73 | } |
| 74 | 74 | |
| 75 | - protected function _prepareFormFields(&$field,$name,&$attributes){ |
|
| 75 | + protected function _prepareFormFields(&$field, $name, &$attributes) { |
|
| 76 | 76 | $field->setName($name); |
| 77 | 77 | $this->_addRules($field, $attributes); |
| 78 | 78 | return $field; |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | - protected function _fieldAs($elementCallback,&$index,$attributes=NULL,$prefix=null){ |
|
| 82 | - $this->setValueFunction($index,function($value,$instance,$index) use (&$attributes,$elementCallback,$prefix){ |
|
| 81 | + protected function _fieldAs($elementCallback, &$index, $attributes=NULL, $prefix=null) { |
|
| 82 | + $this->setValueFunction($index, function($value, $instance, $index) use (&$attributes, $elementCallback, $prefix){ |
|
| 83 | 83 | $caption=$this->_getFieldCaption($index); |
| 84 | 84 | $name=$this->_getFieldName($index); |
| 85 | - $id=$this->_getFieldIdentifier($prefix,$name); |
|
| 86 | - if(isset($attributes["name"])){ |
|
| 85 | + $id=$this->_getFieldIdentifier($prefix, $name); |
|
| 86 | + if (isset($attributes["name"])) { |
|
| 87 | 87 | $name=$attributes["name"]; |
| 88 | 88 | unset($attributes["name"]); |
| 89 | 89 | } |
| 90 | - $element=$elementCallback($id,$name,$value,$caption); |
|
| 91 | - if(\is_array($attributes)){ |
|
| 92 | - $this->_applyAttributes($element, $attributes,$index); |
|
| 90 | + $element=$elementCallback($id, $name, $value, $caption); |
|
| 91 | + if (\is_array($attributes)) { |
|
| 92 | + $this->_applyAttributes($element, $attributes, $index); |
|
| 93 | 93 | } |
| 94 | 94 | $element->setDisabled(!$this->_edition); |
| 95 | 95 | return $element; |
@@ -98,176 +98,176 @@ discard block |
||
| 98 | 98 | } |
| 99 | 99 | |
| 100 | 100 | |
| 101 | - public function fieldAsProgress($index,$label=NULL, $attributes=array()){ |
|
| 102 | - $this->setValueFunction($index,function($value) use($label,$attributes){ |
|
| 103 | - $pb=new HtmlProgress($this->_getFieldIdentifier("pb"),$value,$label,$attributes); |
|
| 101 | + public function fieldAsProgress($index, $label=NULL, $attributes=array()) { |
|
| 102 | + $this->setValueFunction($index, function($value) use($label, $attributes){ |
|
| 103 | + $pb=new HtmlProgress($this->_getFieldIdentifier("pb"), $value, $label, $attributes); |
|
| 104 | 104 | return $pb; |
| 105 | 105 | }); |
| 106 | 106 | return $this; |
| 107 | 107 | } |
| 108 | 108 | |
| 109 | - public function fieldAsRating($index,$max=5, $icon=""){ |
|
| 110 | - $this->setValueFunction($index,function($value) use($max,$icon){ |
|
| 111 | - $rating=new HtmlRating($this->_getFieldIdentifier("rat"),$value,$max,$icon); |
|
| 109 | + public function fieldAsRating($index, $max=5, $icon="") { |
|
| 110 | + $this->setValueFunction($index, function($value) use($max, $icon){ |
|
| 111 | + $rating=new HtmlRating($this->_getFieldIdentifier("rat"), $value, $max, $icon); |
|
| 112 | 112 | return $rating; |
| 113 | 113 | }); |
| 114 | 114 | return $this; |
| 115 | 115 | } |
| 116 | 116 | |
| 117 | - public function fieldAsLabel($index,$icon=NULL,$attributes=NULL){ |
|
| 118 | - return $this->_fieldAs(function($id,$name,$value) use($icon){ |
|
| 119 | - $lbl=new HtmlLabel($id,$value); |
|
| 120 | - if(isset($icon)) |
|
| 117 | + public function fieldAsLabel($index, $icon=NULL, $attributes=NULL) { |
|
| 118 | + return $this->_fieldAs(function($id, $name, $value) use($icon){ |
|
| 119 | + $lbl=new HtmlLabel($id, $value); |
|
| 120 | + if (isset($icon)) |
|
| 121 | 121 | $lbl->addIcon($icon); |
| 122 | 122 | return $lbl; |
| 123 | - }, $index,$attributes,"label"); |
|
| 123 | + }, $index, $attributes, "label"); |
|
| 124 | 124 | } |
| 125 | 125 | |
| 126 | - public function fieldAsHeader($index,$niveau=1,$icon=NULL,$attributes=NULL){ |
|
| 127 | - return $this->_fieldAs(function($id,$name,$value) use($niveau,$icon){ |
|
| 128 | - $header=new HtmlHeader($id,$niveau,$value); |
|
| 129 | - if(isset($icon)) |
|
| 126 | + public function fieldAsHeader($index, $niveau=1, $icon=NULL, $attributes=NULL) { |
|
| 127 | + return $this->_fieldAs(function($id, $name, $value) use($niveau, $icon){ |
|
| 128 | + $header=new HtmlHeader($id, $niveau, $value); |
|
| 129 | + if (isset($icon)) |
|
| 130 | 130 | $header->asIcon($icon, $value); |
| 131 | 131 | return $header; |
| 132 | - }, $index,$attributes,"header"); |
|
| 132 | + }, $index, $attributes, "header"); |
|
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | |
| 136 | - public function fieldAsImage($index,$size=Size::MINI,$circular=false){ |
|
| 137 | - $this->setValueFunction($index,function($img) use($size,$circular){ |
|
| 138 | - $image=new HtmlImage($this->_getFieldIdentifier("image"),$img);$image->setSize($size);if($circular)$image->setCircular(); |
|
| 136 | + public function fieldAsImage($index, $size=Size::MINI, $circular=false) { |
|
| 137 | + $this->setValueFunction($index, function($img) use($size, $circular){ |
|
| 138 | + $image=new HtmlImage($this->_getFieldIdentifier("image"), $img); $image->setSize($size); if ($circular)$image->setCircular(); |
|
| 139 | 139 | return $image; |
| 140 | 140 | }); |
| 141 | 141 | return $this; |
| 142 | 142 | } |
| 143 | 143 | |
| 144 | - public function fieldAsFlag($index){ |
|
| 145 | - $this->setValueFunction($index,function($flag){ |
|
| 146 | - $flag=new HtmlFlag($this->_getFieldIdentifier("flag"),$flag); |
|
| 144 | + public function fieldAsFlag($index) { |
|
| 145 | + $this->setValueFunction($index, function($flag) { |
|
| 146 | + $flag=new HtmlFlag($this->_getFieldIdentifier("flag"), $flag); |
|
| 147 | 147 | return $flag; |
| 148 | 148 | }); |
| 149 | 149 | return $this; |
| 150 | 150 | } |
| 151 | 151 | |
| 152 | - public function fieldAsAvatar($index,$attributes=NULL){ |
|
| 153 | - return $this->_fieldAs(function($id,$name,$value){ |
|
| 154 | - $img=new HtmlImage($id,$value); |
|
| 152 | + public function fieldAsAvatar($index, $attributes=NULL) { |
|
| 153 | + return $this->_fieldAs(function($id, $name, $value) { |
|
| 154 | + $img=new HtmlImage($id, $value); |
|
| 155 | 155 | $img->asAvatar(); |
| 156 | 156 | return $img; |
| 157 | - }, $index,$attributes,"avatar"); |
|
| 157 | + }, $index, $attributes, "avatar"); |
|
| 158 | 158 | } |
| 159 | 159 | |
| 160 | - public function fieldAsRadio($index,$attributes=NULL){ |
|
| 161 | - return $this->_fieldAs(function($id,$name,$value) use($attributes){ |
|
| 162 | - $input= new HtmlRadio($id,$name,$value,$value); |
|
| 160 | + public function fieldAsRadio($index, $attributes=NULL) { |
|
| 161 | + return $this->_fieldAs(function($id, $name, $value) use($attributes){ |
|
| 162 | + $input=new HtmlRadio($id, $name, $value, $value); |
|
| 163 | 163 | return $this->_prepareFormFields($input, $name, $attributes); |
| 164 | - }, $index,$attributes,"radio"); |
|
| 164 | + }, $index, $attributes, "radio"); |
|
| 165 | 165 | } |
| 166 | 166 | |
| 167 | - public function fieldAsRadios($index,$elements=[],$attributes=NULL){ |
|
| 168 | - return $this->_fieldAs(function($id,$name,$value,$caption) use ($elements){ |
|
| 169 | - return HtmlFormFields::radios($name,$elements,$caption,$value); |
|
| 170 | - }, $index,$attributes,"radios"); |
|
| 167 | + public function fieldAsRadios($index, $elements=[], $attributes=NULL) { |
|
| 168 | + return $this->_fieldAs(function($id, $name, $value, $caption) use ($elements){ |
|
| 169 | + return HtmlFormFields::radios($name, $elements, $caption, $value); |
|
| 170 | + }, $index, $attributes, "radios"); |
|
| 171 | 171 | } |
| 172 | 172 | |
| 173 | - public function fieldAsInput($index,$attributes=NULL){ |
|
| 174 | - return $this->_fieldAs(function($id,$name,$value,$caption) use ($attributes){ |
|
| 175 | - $input= new HtmlFormInput($id,$caption,"text",$value); |
|
| 173 | + public function fieldAsInput($index, $attributes=NULL) { |
|
| 174 | + return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes){ |
|
| 175 | + $input=new HtmlFormInput($id, $caption, "text", $value); |
|
| 176 | 176 | return $this->_prepareFormFields($input, $name, $attributes); |
| 177 | - }, $index,$attributes,"input"); |
|
| 177 | + }, $index, $attributes, "input"); |
|
| 178 | 178 | } |
| 179 | 179 | |
| 180 | - public function fieldAsTextarea($index,$attributes=NULL){ |
|
| 181 | - return $this->_fieldAs(function($id,$name,$value,$caption) use ($attributes){ |
|
| 182 | - $textarea=new HtmlFormTextarea($id,$caption,$value); |
|
| 180 | + public function fieldAsTextarea($index, $attributes=NULL) { |
|
| 181 | + return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes){ |
|
| 182 | + $textarea=new HtmlFormTextarea($id, $caption, $value); |
|
| 183 | 183 | return $this->_prepareFormFields($textarea, $name, $attributes); |
| 184 | - }, $index,$attributes,"textarea"); |
|
| 184 | + }, $index, $attributes, "textarea"); |
|
| 185 | 185 | } |
| 186 | 186 | |
| 187 | - public function fieldAsHidden($index,$attributes=NULL){ |
|
| 188 | - if(!\is_array($attributes)){ |
|
| 187 | + public function fieldAsHidden($index, $attributes=NULL) { |
|
| 188 | + if (!\is_array($attributes)) { |
|
| 189 | 189 | $attributes=[]; |
| 190 | 190 | } |
| 191 | 191 | $attributes["inputType"]="hidden"; |
| 192 | - return $this->fieldAsInput($index,$attributes); |
|
| 192 | + return $this->fieldAsInput($index, $attributes); |
|
| 193 | 193 | } |
| 194 | 194 | |
| 195 | - public function fieldAsCheckbox($index,$attributes=NULL){ |
|
| 196 | - return $this->_fieldAs(function($id,$name,$value,$caption) use($attributes){ |
|
| 197 | - $input=new HtmlFormCheckbox($id,$caption,$this->_instanceViewer->getIdentifier()); |
|
| 195 | + public function fieldAsCheckbox($index, $attributes=NULL) { |
|
| 196 | + return $this->_fieldAs(function($id, $name, $value, $caption) use($attributes){ |
|
| 197 | + $input=new HtmlFormCheckbox($id, $caption, $this->_instanceViewer->getIdentifier()); |
|
| 198 | 198 | $input->setChecked(JString::isBooleanTrue($value)); |
| 199 | 199 | return $this->_prepareFormFields($input, $name, $attributes); |
| 200 | - }, $index,$attributes,"ck"); |
|
| 200 | + }, $index, $attributes, "ck"); |
|
| 201 | 201 | } |
| 202 | 202 | |
| 203 | - public function fieldAsDropDown($index,$elements=[],$multiple=false,$attributes=NULL){ |
|
| 204 | - return $this->_fieldAs(function($id,$name,$value,$caption) use($elements,$multiple,$attributes){ |
|
| 205 | - $dd=new HtmlFormDropdown($id,$elements,$caption,$value); |
|
| 206 | - $dd->asSelect($name,$multiple); |
|
| 203 | + public function fieldAsDropDown($index, $elements=[], $multiple=false, $attributes=NULL) { |
|
| 204 | + return $this->_fieldAs(function($id, $name, $value, $caption) use($elements, $multiple, $attributes){ |
|
| 205 | + $dd=new HtmlFormDropdown($id, $elements, $caption, $value); |
|
| 206 | + $dd->asSelect($name, $multiple); |
|
| 207 | 207 | return $this->_prepareFormFields($dd, $name, $attributes); |
| 208 | - }, $index,$attributes,"dd"); |
|
| 208 | + }, $index, $attributes, "dd"); |
|
| 209 | 209 | } |
| 210 | 210 | |
| 211 | - public function fieldAsMessage($index,$attributes=NULL){ |
|
| 212 | - return $this->_fieldAs(function($id,$name,$value,$caption){ |
|
| 213 | - $mess= new HtmlMessage("message-".$id,$caption); |
|
| 211 | + public function fieldAsMessage($index, $attributes=NULL) { |
|
| 212 | + return $this->_fieldAs(function($id, $name, $value, $caption) { |
|
| 213 | + $mess=new HtmlMessage("message-".$id, $caption); |
|
| 214 | 214 | $mess->addHeader($value); |
| 215 | 215 | return $mess; |
| 216 | - }, $index,$attributes,"message"); |
|
| 216 | + }, $index, $attributes, "message"); |
|
| 217 | 217 | } |
| 218 | 218 | |
| 219 | - public function fieldAsLink($index,$attributes=NULL){ |
|
| 220 | - return $this->_fieldAs(function($id,$name,$value,$caption){ |
|
| 221 | - $lnk= new HtmlLink("message-".$id,"#",$caption); |
|
| 219 | + public function fieldAsLink($index, $attributes=NULL) { |
|
| 220 | + return $this->_fieldAs(function($id, $name, $value, $caption) { |
|
| 221 | + $lnk=new HtmlLink("message-".$id, "#", $caption); |
|
| 222 | 222 | return $lnk; |
| 223 | - }, $index,$attributes,"link"); |
|
| 223 | + }, $index, $attributes, "link"); |
|
| 224 | 224 | } |
| 225 | 225 | |
| 226 | 226 | /**Change fields type |
| 227 | 227 | * @param array $types an array or associative array $type=>$attributes |
| 228 | 228 | */ |
| 229 | - public function fieldsAs(array $types){ |
|
| 229 | + public function fieldsAs(array $types) { |
|
| 230 | 230 | $i=0; |
| 231 | - if(JArray::isAssociative($types)){ |
|
| 232 | - foreach ($types as $type=>$attributes){ |
|
| 233 | - if(\is_int($type)) |
|
| 234 | - $this->fieldAs($i++,$attributes,[]); |
|
| 235 | - else{ |
|
| 236 | - $type=preg_replace('/\d/', '', $type ); |
|
| 237 | - $this->fieldAs($i++,$type,$attributes); |
|
| 231 | + if (JArray::isAssociative($types)) { |
|
| 232 | + foreach ($types as $type=>$attributes) { |
|
| 233 | + if (\is_int($type)) |
|
| 234 | + $this->fieldAs($i++, $attributes, []); |
|
| 235 | + else { |
|
| 236 | + $type=preg_replace('/\d/', '', $type); |
|
| 237 | + $this->fieldAs($i++, $type, $attributes); |
|
| 238 | 238 | } |
| 239 | 239 | } |
| 240 | - }else{ |
|
| 241 | - foreach ($types as $type){ |
|
| 242 | - $this->fieldAs($i++,$type); |
|
| 240 | + } else { |
|
| 241 | + foreach ($types as $type) { |
|
| 242 | + $this->fieldAs($i++, $type); |
|
| 243 | 243 | } |
| 244 | 244 | } |
| 245 | 245 | } |
| 246 | 246 | |
| 247 | - public function fieldAs($index,$type,$attributes=NULL){ |
|
| 247 | + public function fieldAs($index, $type, $attributes=NULL) { |
|
| 248 | 248 | $method="fieldAs".\ucfirst($type); |
| 249 | - if(\method_exists($this, $method)){ |
|
| 250 | - if(!\is_array($attributes)){ |
|
| 249 | + if (\method_exists($this, $method)) { |
|
| 250 | + if (!\is_array($attributes)) { |
|
| 251 | 251 | $attributes=[$index]; |
| 252 | - }else{ |
|
| 252 | + } else { |
|
| 253 | 253 | \array_unshift($attributes, $index); |
| 254 | 254 | } |
| 255 | - \call_user_func_array([$this,$method], $attributes); |
|
| 255 | + \call_user_func_array([$this, $method], $attributes); |
|
| 256 | 256 | } |
| 257 | 257 | } |
| 258 | 258 | |
| 259 | - public function fieldAsSubmit($index,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$attributes=NULL){ |
|
| 260 | - return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle,$attributes){ |
|
| 261 | - $button=new HtmlButton($id,$caption,$cssStyle); |
|
| 262 | - $this->_buttonAsSubmit($button,"click",$url,$responseElement,@$attributes["ajax"]); |
|
| 259 | + public function fieldAsSubmit($index, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $attributes=NULL) { |
|
| 260 | + return $this->_fieldAs(function($id, $name, $value, $caption) use ($url, $responseElement, $cssStyle, $attributes){ |
|
| 261 | + $button=new HtmlButton($id, $caption, $cssStyle); |
|
| 262 | + $this->_buttonAsSubmit($button, "click", $url, $responseElement, @$attributes["ajax"]); |
|
| 263 | 263 | return $button; |
| 264 | - }, $index,$attributes,"submit"); |
|
| 264 | + }, $index, $attributes, "submit"); |
|
| 265 | 265 | } |
| 266 | 266 | |
| 267 | - public function fieldAsButton($index,$cssStyle=NULL,$attributes=NULL){ |
|
| 268 | - return $this->_fieldAs(function($id,$name,$value,$caption) use ($cssStyle){ |
|
| 269 | - $button=new HtmlButton($id,$value,$cssStyle); |
|
| 267 | + public function fieldAsButton($index, $cssStyle=NULL, $attributes=NULL) { |
|
| 268 | + return $this->_fieldAs(function($id, $name, $value, $caption) use ($cssStyle){ |
|
| 269 | + $button=new HtmlButton($id, $value, $cssStyle); |
|
| 270 | 270 | return $button; |
| 271 | - }, $index,$attributes,"button"); |
|
| 271 | + }, $index, $attributes, "button"); |
|
| 272 | 272 | } |
| 273 | 273 | } |
| 274 | 274 | \ No newline at end of file |
@@ -64,8 +64,7 @@ discard block |
||
| 64 | 64 | $rules=$attributes["rules"]; |
| 65 | 65 | if(\is_array($rules)){ |
| 66 | 66 | $element->addRules($rules); |
| 67 | - } |
|
| 68 | - else{ |
|
| 67 | + } else{ |
|
| 69 | 68 | $element->addRule($rules); |
| 70 | 69 | } |
| 71 | 70 | unset($attributes["rules"]); |
@@ -117,8 +116,9 @@ discard block |
||
| 117 | 116 | public function fieldAsLabel($index,$icon=NULL,$attributes=NULL){ |
| 118 | 117 | return $this->_fieldAs(function($id,$name,$value) use($icon){ |
| 119 | 118 | $lbl=new HtmlLabel($id,$value); |
| 120 | - if(isset($icon)) |
|
| 121 | - $lbl->addIcon($icon); |
|
| 119 | + if(isset($icon)) { |
|
| 120 | + $lbl->addIcon($icon); |
|
| 121 | + } |
|
| 122 | 122 | return $lbl; |
| 123 | 123 | }, $index,$attributes,"label"); |
| 124 | 124 | } |
@@ -126,8 +126,9 @@ discard block |
||
| 126 | 126 | public function fieldAsHeader($index,$niveau=1,$icon=NULL,$attributes=NULL){ |
| 127 | 127 | return $this->_fieldAs(function($id,$name,$value) use($niveau,$icon){ |
| 128 | 128 | $header=new HtmlHeader($id,$niveau,$value); |
| 129 | - if(isset($icon)) |
|
| 130 | - $header->asIcon($icon, $value); |
|
| 129 | + if(isset($icon)) { |
|
| 130 | + $header->asIcon($icon, $value); |
|
| 131 | + } |
|
| 131 | 132 | return $header; |
| 132 | 133 | }, $index,$attributes,"header"); |
| 133 | 134 | } |
@@ -135,7 +136,9 @@ discard block |
||
| 135 | 136 | |
| 136 | 137 | public function fieldAsImage($index,$size=Size::MINI,$circular=false){ |
| 137 | 138 | $this->setValueFunction($index,function($img) use($size,$circular){ |
| 138 | - $image=new HtmlImage($this->_getFieldIdentifier("image"),$img);$image->setSize($size);if($circular)$image->setCircular(); |
|
| 139 | + $image=new HtmlImage($this->_getFieldIdentifier("image"),$img);$image->setSize($size);if($circular) { |
|
| 140 | + $image->setCircular(); |
|
| 141 | + } |
|
| 139 | 142 | return $image; |
| 140 | 143 | }); |
| 141 | 144 | return $this; |
@@ -230,14 +233,14 @@ discard block |
||
| 230 | 233 | $i=0; |
| 231 | 234 | if(JArray::isAssociative($types)){ |
| 232 | 235 | foreach ($types as $type=>$attributes){ |
| 233 | - if(\is_int($type)) |
|
| 234 | - $this->fieldAs($i++,$attributes,[]); |
|
| 235 | - else{ |
|
| 236 | + if(\is_int($type)) { |
|
| 237 | + $this->fieldAs($i++,$attributes,[]); |
|
| 238 | + } else{ |
|
| 236 | 239 | $type=preg_replace('/\d/', '', $type ); |
| 237 | 240 | $this->fieldAs($i++,$type,$attributes); |
| 238 | 241 | } |
| 239 | 242 | } |
| 240 | - }else{ |
|
| 243 | + } else{ |
|
| 241 | 244 | foreach ($types as $type){ |
| 242 | 245 | $this->fieldAs($i++,$type); |
| 243 | 246 | } |
@@ -249,7 +252,7 @@ discard block |
||
| 249 | 252 | if(\method_exists($this, $method)){ |
| 250 | 253 | if(!\is_array($attributes)){ |
| 251 | 254 | $attributes=[$index]; |
| 252 | - }else{ |
|
| 255 | + } else{ |
|
| 253 | 256 | \array_unshift($attributes, $index); |
| 254 | 257 | } |
| 255 | 258 | \call_user_func_array([$this,$method], $attributes); |
@@ -21,7 +21,7 @@ |
||
| 21 | 21 | return $this->setParam("context", $value); |
| 22 | 22 | } |
| 23 | 23 | |
| 24 | - public function setOffset($offset=0){ |
|
| 24 | + public function setOffset($offset=0) { |
|
| 25 | 25 | return $this->setParam("offset", $offset); |
| 26 | 26 | } |
| 27 | 27 | |
@@ -7,50 +7,50 @@ |
||
| 7 | 7 | |
| 8 | 8 | class HtmlSticky extends HtmlSemDoubleElement { |
| 9 | 9 | |
| 10 | - public function __construct($identifier,$context=NULL,$content=NULL) { |
|
| 10 | + public function __construct($identifier, $context=NULL, $content=NULL) { |
|
| 11 | 11 | parent::__construct($identifier, "div", "ui sticky", $content); |
| 12 | - if(isset($content)) |
|
| 12 | + if (isset($content)) |
|
| 13 | 13 | $this->setContext($context); |
| 14 | 14 | } |
| 15 | 15 | |
| 16 | - public function setContext($context){ |
|
| 16 | + public function setContext($context) { |
|
| 17 | 17 | $this->_params["context"]=$context; |
| 18 | 18 | return $this; |
| 19 | 19 | } |
| 20 | 20 | |
| 21 | - public function setFixed($value=NULL){ |
|
| 21 | + public function setFixed($value=NULL) { |
|
| 22 | 22 | $fixed="fixed"; |
| 23 | - if(isset($value)) |
|
| 23 | + if (isset($value)) |
|
| 24 | 24 | $fixed.=" ".$value; |
| 25 | - return $this->addToProperty("class",$fixed); |
|
| 25 | + return $this->addToProperty("class", $fixed); |
|
| 26 | 26 | } |
| 27 | 27 | |
| 28 | - public function setBound($value=NULL){ |
|
| 28 | + public function setBound($value=NULL) { |
|
| 29 | 29 | $bound="bound"; |
| 30 | - if(isset($value)) |
|
| 30 | + if (isset($value)) |
|
| 31 | 31 | $bound.=" ".$value; |
| 32 | - return $this->addToProperty("class",$bound); |
|
| 32 | + return $this->addToProperty("class", $bound); |
|
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | /** |
| 36 | 36 | * {@inheritDoc} |
| 37 | 37 | * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::run() |
| 38 | 38 | */ |
| 39 | - public function run(JsUtils $js){ |
|
| 39 | + public function run(JsUtils $js) { |
|
| 40 | 40 | parent::run($js); |
| 41 | - return $js->semantic()->sticky("#".$this->identifier,$this->_params); |
|
| 41 | + return $js->semantic()->sticky("#".$this->identifier, $this->_params); |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | - public function setOffset($offset=0){ |
|
| 44 | + public function setOffset($offset=0) { |
|
| 45 | 45 | $this->_params["offset"]=$offset; |
| 46 | 46 | return $this; |
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | |
| 50 | 50 | |
| 51 | - public function setDebug($verbose=NULL){ |
|
| 51 | + public function setDebug($verbose=NULL) { |
|
| 52 | 52 | $this->_params["debug"]=true; |
| 53 | - if(isset($verbose)) |
|
| 53 | + if (isset($verbose)) |
|
| 54 | 54 | $this->_params["verbose"]=true; |
| 55 | 55 | return $this; |
| 56 | 56 | } |
@@ -9,8 +9,9 @@ discard block |
||
| 9 | 9 | |
| 10 | 10 | public function __construct($identifier,$context=NULL,$content=NULL) { |
| 11 | 11 | parent::__construct($identifier, "div", "ui sticky", $content); |
| 12 | - if(isset($content)) |
|
| 13 | - $this->setContext($context); |
|
| 12 | + if(isset($content)) { |
|
| 13 | + $this->setContext($context); |
|
| 14 | + } |
|
| 14 | 15 | } |
| 15 | 16 | |
| 16 | 17 | public function setContext($context){ |
@@ -20,15 +21,17 @@ discard block |
||
| 20 | 21 | |
| 21 | 22 | public function setFixed($value=NULL){ |
| 22 | 23 | $fixed="fixed"; |
| 23 | - if(isset($value)) |
|
| 24 | - $fixed.=" ".$value; |
|
| 24 | + if(isset($value)) { |
|
| 25 | + $fixed.=" ".$value; |
|
| 26 | + } |
|
| 25 | 27 | return $this->addToProperty("class",$fixed); |
| 26 | 28 | } |
| 27 | 29 | |
| 28 | 30 | public function setBound($value=NULL){ |
| 29 | 31 | $bound="bound"; |
| 30 | - if(isset($value)) |
|
| 31 | - $bound.=" ".$value; |
|
| 32 | + if(isset($value)) { |
|
| 33 | + $bound.=" ".$value; |
|
| 34 | + } |
|
| 32 | 35 | return $this->addToProperty("class",$bound); |
| 33 | 36 | } |
| 34 | 37 | |
@@ -50,8 +53,9 @@ discard block |
||
| 50 | 53 | |
| 51 | 54 | public function setDebug($verbose=NULL){ |
| 52 | 55 | $this->_params["debug"]=true; |
| 53 | - if(isset($verbose)) |
|
| 54 | - $this->_params["verbose"]=true; |
|
| 56 | + if(isset($verbose)) { |
|
| 57 | + $this->_params["verbose"]=true; |
|
| 58 | + } |
|
| 55 | 59 | return $this; |
| 56 | 60 | } |
| 57 | 61 | } |
| 58 | 62 | \ No newline at end of file |
@@ -19,10 +19,10 @@ discard block |
||
| 19 | 19 | $this->setLabel($label); |
| 20 | 20 | } |
| 21 | 21 | |
| 22 | - public function setChecked($value=true){ |
|
| 23 | - if($value===true){ |
|
| 22 | + public function setChecked($value=true) { |
|
| 23 | + if ($value===true) { |
|
| 24 | 24 | $this->getField()->setProperty("checked", "checked"); |
| 25 | - }else{ |
|
| 25 | + } else { |
|
| 26 | 26 | $this->getField()->removeProperty("checked"); |
| 27 | 27 | } |
| 28 | 28 | return $this; |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | * @return \Ajax\semantic\html\collections\form\AbstractHtmlFormRadioCheckbox |
| 85 | 85 | */ |
| 86 | 86 | public function attachEvent($selector, $action=NULL) { |
| 87 | - if (isset($action)||\is_numeric($action)===true) { |
|
| 87 | + if (isset($action) || \is_numeric($action)===true) { |
|
| 88 | 88 | $js='$("#%identifier%").checkbox("attach events", "'.$selector.'", "'.$action.'");'; |
| 89 | 89 | } else { |
| 90 | 90 | $js='$("#%identifier%").checkbox("attach events", "'.$selector.'");'; |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | */ |
| 101 | 101 | public function attachEvents($events=array()) { |
| 102 | 102 | if (\is_array($events)) { |
| 103 | - foreach ( $events as $action => $selector ) { |
|
| 103 | + foreach ($events as $action => $selector) { |
|
| 104 | 104 | $this->attachEvent($selector, $action); |
| 105 | 105 | } |
| 106 | 106 | } |
@@ -111,24 +111,24 @@ discard block |
||
| 111 | 111 | return $this->addToProperty("class", "fitted"); |
| 112 | 112 | } |
| 113 | 113 | |
| 114 | - public function setOnChecked($jsCode){ |
|
| 114 | + public function setOnChecked($jsCode) { |
|
| 115 | 115 | $this->_params["onChecked"]=$jsCode; |
| 116 | 116 | return $this; |
| 117 | 117 | } |
| 118 | 118 | |
| 119 | - public function setOnUnchecked($jsCode){ |
|
| 119 | + public function setOnUnchecked($jsCode) { |
|
| 120 | 120 | $this->_params["onUnchecked"]=$jsCode; |
| 121 | 121 | return $this; |
| 122 | 122 | } |
| 123 | 123 | |
| 124 | - public function setOnChange($jsCode){ |
|
| 124 | + public function setOnChange($jsCode) { |
|
| 125 | 125 | $this->_params["onChange"]=$jsCode; |
| 126 | 126 | return $this; |
| 127 | 127 | } |
| 128 | 128 | |
| 129 | 129 | public function run(JsUtils $js) { |
| 130 | - if(!isset($this->_bsComponent)) |
|
| 131 | - $this->_bsComponent=$js->semantic()->checkbox("#" . $this->identifier, $this->_params); |
|
| 130 | + if (!isset($this->_bsComponent)) |
|
| 131 | + $this->_bsComponent=$js->semantic()->checkbox("#".$this->identifier, $this->_params); |
|
| 132 | 132 | return parent::run($js); |
| 133 | 133 | } |
| 134 | 134 | } |
| 135 | 135 | \ No newline at end of file |
@@ -15,14 +15,15 @@ discard block |
||
| 15 | 15 | $field=new \Ajax\common\html\html5\HtmlInput($identifier, $inputType, $value); |
| 16 | 16 | $field->setProperty("name", $name); |
| 17 | 17 | $this->setField($field); |
| 18 | - if (isset($label)) |
|
| 19 | - $this->setLabel($label); |
|
| 18 | + if (isset($label)) { |
|
| 19 | + $this->setLabel($label); |
|
| 20 | + } |
|
| 20 | 21 | } |
| 21 | 22 | |
| 22 | 23 | public function setChecked($value=true){ |
| 23 | 24 | if($value===true){ |
| 24 | 25 | $this->getField()->setProperty("checked", "checked"); |
| 25 | - }else{ |
|
| 26 | + } else{ |
|
| 26 | 27 | $this->getField()->removeProperty("checked"); |
| 27 | 28 | } |
| 28 | 29 | return $this; |
@@ -51,8 +52,9 @@ discard block |
||
| 51 | 52 | * @return mixed |
| 52 | 53 | */ |
| 53 | 54 | public function getLabel() { |
| 54 | - if (\array_key_exists("label", $this->content)) |
|
| 55 | - return $this->content["label"]; |
|
| 55 | + if (\array_key_exists("label", $this->content)) { |
|
| 56 | + return $this->content["label"]; |
|
| 57 | + } |
|
| 56 | 58 | } |
| 57 | 59 | |
| 58 | 60 | /** |
@@ -127,8 +129,9 @@ discard block |
||
| 127 | 129 | } |
| 128 | 130 | |
| 129 | 131 | public function run(JsUtils $js) { |
| 130 | - if(!isset($this->_bsComponent)) |
|
| 131 | - $this->_bsComponent=$js->semantic()->checkbox("#" . $this->identifier, $this->_params); |
|
| 132 | + if(!isset($this->_bsComponent)) { |
|
| 133 | + $this->_bsComponent=$js->semantic()->checkbox("#" . $this->identifier, $this->_params); |
|
| 134 | + } |
|
| 132 | 135 | return parent::run($js); |
| 133 | 136 | } |
| 134 | 137 | } |
| 135 | 138 | \ No newline at end of file |