@@ -8,12 +8,12 @@ discard block |
||
| 8 | 8 | * @author jc |
| 9 | 9 | * @property BaseWidget $_self |
| 10 | 10 | */ |
| 11 | -trait BaseHtmlPropertiesTrait{ |
|
| 11 | +trait BaseHtmlPropertiesTrait { |
|
| 12 | 12 | |
| 13 | - protected $properties=array (); |
|
| 13 | + protected $properties=array(); |
|
| 14 | 14 | abstract protected function ctrl($name, $value, $typeCtrl); |
| 15 | 15 | abstract protected function removeOldValues(&$oldValue, $allValues); |
| 16 | - abstract protected function _getElementBy($callback,$elements); |
|
| 16 | + abstract protected function _getElementBy($callback, $elements); |
|
| 17 | 17 | public function getProperties() { |
| 18 | 18 | return $this->_self->properties; |
| 19 | 19 | } |
@@ -45,14 +45,14 @@ discard block |
||
| 45 | 45 | */ |
| 46 | 46 | public function addToProperty($name, $value, $separator=" ") { |
| 47 | 47 | if (\is_array($value)) { |
| 48 | - foreach ( $value as $v ) { |
|
| 48 | + foreach ($value as $v) { |
|
| 49 | 49 | $this->_self->addToProperty($name, $v, $separator); |
| 50 | 50 | } |
| 51 | - } else if ($value !== "" && $this->_self->propertyContains($name, $value) === false) { |
|
| 52 | - if(isset($this->_self->properties[$name])){ |
|
| 51 | + } else if ($value!=="" && $this->_self->propertyContains($name, $value)===false) { |
|
| 52 | + if (isset($this->_self->properties[$name])) { |
|
| 53 | 53 | $v=$this->_self->properties[$name]; |
| 54 | - if (isset($v) && $v !== ""){ |
|
| 55 | - $value=$v . $separator . $value; |
|
| 54 | + if (isset($v) && $v!=="") { |
|
| 55 | + $value=$v.$separator.$value; |
|
| 56 | 56 | } |
| 57 | 57 | } |
| 58 | 58 | return $this->_self->setProperty($name, $value); |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | public function addToPropertyCtrlCheck($name, $value, $typeCtrl) { |
| 92 | - if ($this->_self->ctrl($name, $value, $typeCtrl) === true) { |
|
| 92 | + if ($this->_self->ctrl($name, $value, $typeCtrl)===true) { |
|
| 93 | 93 | return $this->_self->addToProperty($name, $value); |
| 94 | 94 | } |
| 95 | 95 | return $this; |
@@ -110,12 +110,12 @@ discard block |
||
| 110 | 110 | } |
| 111 | 111 | |
| 112 | 112 | protected function setPropertyCtrl($name, $value, $typeCtrl) { |
| 113 | - if ($this->_self->ctrl($name, $value, $typeCtrl) === true) |
|
| 113 | + if ($this->_self->ctrl($name, $value, $typeCtrl)===true) |
|
| 114 | 114 | return $this->_self->setProperty($name, $value); |
| 115 | 115 | return $this; |
| 116 | 116 | } |
| 117 | 117 | |
| 118 | - protected function getElementByPropertyValue($propertyName,$value, $elements) { |
|
| 119 | - return $this->_self->_getElementBy(function(BaseHtml $element) use ($propertyName,$value){return $element->propertyContains($propertyName, $value) === true;}, $elements); |
|
| 118 | + protected function getElementByPropertyValue($propertyName, $value, $elements) { |
|
| 119 | + return $this->_self->_getElementBy(function(BaseHtml $element) use ($propertyName, $value){return $element->propertyContains($propertyName, $value)===true; }, $elements); |
|
| 120 | 120 | } |
| 121 | 121 | } |
@@ -33,8 +33,9 @@ discard block |
||
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | public function getProperty($name) { |
| 36 | - if (array_key_exists($name, $this->_self->properties)) |
|
| 37 | - return $this->_self->properties[$name]; |
|
| 36 | + if (array_key_exists($name, $this->_self->properties)) { |
|
| 37 | + return $this->_self->properties[$name]; |
|
| 38 | + } |
|
| 38 | 39 | } |
| 39 | 40 | |
| 40 | 41 | /** |
@@ -76,8 +77,9 @@ discard block |
||
| 76 | 77 | } |
| 77 | 78 | |
| 78 | 79 | protected function addToPropertyUnique($name, $value, $typeCtrl) { |
| 79 | - if (is_string($typeCtrl) && @class_exists($typeCtrl, true)) |
|
| 80 | - $typeCtrl=$typeCtrl::getConstants(); |
|
| 80 | + if (is_string($typeCtrl) && @class_exists($typeCtrl, true)) { |
|
| 81 | + $typeCtrl=$typeCtrl::getConstants(); |
|
| 82 | + } |
|
| 81 | 83 | if (\is_array($typeCtrl)) { |
| 82 | 84 | $this->_self->removeOldValues($this->_self->properties[$name], $typeCtrl); |
| 83 | 85 | } |
@@ -96,8 +98,9 @@ discard block |
||
| 96 | 98 | } |
| 97 | 99 | |
| 98 | 100 | public function removeProperty($name) { |
| 99 | - if (\array_key_exists($name, $this->_self->properties)) |
|
| 100 | - unset($this->_self->properties[$name]); |
|
| 101 | + if (\array_key_exists($name, $this->_self->properties)) { |
|
| 102 | + unset($this->_self->properties[$name]); |
|
| 103 | + } |
|
| 101 | 104 | return $this; |
| 102 | 105 | } |
| 103 | 106 | |
@@ -110,8 +113,9 @@ discard block |
||
| 110 | 113 | } |
| 111 | 114 | |
| 112 | 115 | protected function setPropertyCtrl($name, $value, $typeCtrl) { |
| 113 | - if ($this->_self->ctrl($name, $value, $typeCtrl) === true) |
|
| 114 | - return $this->_self->setProperty($name, $value); |
|
| 116 | + if ($this->_self->ctrl($name, $value, $typeCtrl) === true) { |
|
| 117 | + return $this->_self->setProperty($name, $value); |
|
| 118 | + } |
|
| 115 | 119 | return $this; |
| 116 | 120 | } |
| 117 | 121 | |
@@ -19,8 +19,8 @@ discard block |
||
| 19 | 19 | * @param array $instances |
| 20 | 20 | * @return DataTable |
| 21 | 21 | */ |
| 22 | - public function dataTable($identifier,$model, $instances=null){ |
|
| 23 | - return $this->addHtmlComponent(new DataTable($identifier,$model,$instances)); |
|
| 22 | + public function dataTable($identifier, $model, $instances=null) { |
|
| 23 | + return $this->addHtmlComponent(new DataTable($identifier, $model, $instances)); |
|
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | /** |
@@ -29,8 +29,8 @@ discard block |
||
| 29 | 29 | * @param array $instances |
| 30 | 30 | * @return JsonDataTable |
| 31 | 31 | */ |
| 32 | - public function jsonDataTable($identifier,$model, $instances=null){ |
|
| 33 | - return $this->addHtmlComponent(new JsonDataTable($identifier,$model,$instances)); |
|
| 32 | + public function jsonDataTable($identifier, $model, $instances=null) { |
|
| 33 | + return $this->addHtmlComponent(new JsonDataTable($identifier, $model, $instances)); |
|
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | /** |
@@ -38,8 +38,8 @@ discard block |
||
| 38 | 38 | * @param object $instance |
| 39 | 39 | * @return DataElement |
| 40 | 40 | */ |
| 41 | - public function dataElement($identifier, $instance=null){ |
|
| 42 | - return $this->addHtmlComponent(new DataElement($identifier,$instance)); |
|
| 41 | + public function dataElement($identifier, $instance=null) { |
|
| 42 | + return $this->addHtmlComponent(new DataElement($identifier, $instance)); |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | /** |
@@ -47,8 +47,8 @@ discard block |
||
| 47 | 47 | * @param object $instance |
| 48 | 48 | * @return DataForm |
| 49 | 49 | */ |
| 50 | - public function dataForm($identifier, $instance){ |
|
| 51 | - return $this->addHtmlComponent(new DataForm($identifier,$instance)); |
|
| 50 | + public function dataForm($identifier, $instance) { |
|
| 51 | + return $this->addHtmlComponent(new DataForm($identifier, $instance)); |
|
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | /** |
@@ -56,8 +56,8 @@ discard block |
||
| 56 | 56 | * @param object $instance |
| 57 | 57 | * @return FormLogin |
| 58 | 58 | */ |
| 59 | - public function defaultLogin($identifier,$instance=null){ |
|
| 60 | - return $this->addHtmlComponent(FormLogin::regular($identifier,$instance)); |
|
| 59 | + public function defaultLogin($identifier, $instance=null) { |
|
| 60 | + return $this->addHtmlComponent(FormLogin::regular($identifier, $instance)); |
|
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | /** |
@@ -65,8 +65,8 @@ discard block |
||
| 65 | 65 | * @param object $instance |
| 66 | 66 | * @return FormLogin |
| 67 | 67 | */ |
| 68 | - public function smallLogin($identifier,$instance=null){ |
|
| 69 | - return $this->addHtmlComponent(FormLogin::small($identifier,$instance)); |
|
| 68 | + public function smallLogin($identifier, $instance=null) { |
|
| 69 | + return $this->addHtmlComponent(FormLogin::small($identifier, $instance)); |
|
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | /** |
@@ -74,8 +74,8 @@ discard block |
||
| 74 | 74 | * @param object $instance |
| 75 | 75 | * @return FormLogin |
| 76 | 76 | */ |
| 77 | - public function segmentedLogin($identifier,$instance=null){ |
|
| 78 | - return $this->addHtmlComponent(FormLogin::attachedSegment($identifier,$instance)); |
|
| 77 | + public function segmentedLogin($identifier, $instance=null) { |
|
| 78 | + return $this->addHtmlComponent(FormLogin::attachedSegment($identifier, $instance)); |
|
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | /** |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | * @param object $instance |
| 84 | 84 | * @return FormAccount |
| 85 | 85 | */ |
| 86 | - public function defaultAccount($identifier,$instance=null){ |
|
| 87 | - return $this->addHtmlComponent(FormAccount::regular($identifier,$instance)); |
|
| 86 | + public function defaultAccount($identifier, $instance=null) { |
|
| 87 | + return $this->addHtmlComponent(FormAccount::regular($identifier, $instance)); |
|
| 88 | 88 | } |
| 89 | 89 | } |
@@ -22,25 +22,25 @@ discard block |
||
| 22 | 22 | $this->_rowClass="_json _element"; |
| 23 | 23 | } |
| 24 | 24 | |
| 25 | - protected function _generateContent($table){ |
|
| 25 | + protected function _generateContent($table) { |
|
| 26 | 26 | $this->_addRowModel($table); |
| 27 | 27 | parent::_generateContent($table); |
| 28 | 28 | } |
| 29 | 29 | |
| 30 | - protected function _addRowModel($table){ |
|
| 30 | + protected function _addRowModel($table) { |
|
| 31 | 31 | $fields=$this->_instanceViewer->getSimpleProperties(); |
| 32 | - $row=$this->_createRow($table, $this->_modelClass,$fields); |
|
| 33 | - $row->setProperty("style","display:none;"); |
|
| 32 | + $row=$this->_createRow($table, $this->_modelClass, $fields); |
|
| 33 | + $row->setProperty("style", "display:none;"); |
|
| 34 | 34 | $table->getBody()->_addRow($row); |
| 35 | 35 | } |
| 36 | 36 | |
| 37 | - protected function _createRow($table,$rowClass,$fields){ |
|
| 37 | + protected function _createRow($table, $rowClass, $fields) { |
|
| 38 | 38 | $object=JReflection::jsonObject($this->_model); |
| 39 | - if(isset($this->_rowModelCallback)){ |
|
| 39 | + if (isset($this->_rowModelCallback)) { |
|
| 40 | 40 | $callback=$this->_rowModelCallback; |
| 41 | 41 | $callback($object); |
| 42 | 42 | } |
| 43 | - $row=$this->_generateRow($object, $fields,$table,"_jsonArrayChecked"); |
|
| 43 | + $row=$this->_generateRow($object, $fields, $table, "_jsonArrayChecked"); |
|
| 44 | 44 | $row->setClass($rowClass." _element"); |
| 45 | 45 | return $row; |
| 46 | 46 | } |
@@ -49,24 +49,24 @@ discard block |
||
| 49 | 49 | * {@inheritDoc} |
| 50 | 50 | * @see DataTable::_associatePaginationBehavior() |
| 51 | 51 | */ |
| 52 | - protected function _associatePaginationBehavior(JsUtils $js=NULL,$offset=null){ |
|
| 52 | + protected function _associatePaginationBehavior(JsUtils $js=NULL, $offset=null) { |
|
| 53 | 53 | $callback=null; |
| 54 | 54 | $menu=$this->_pagination->getMenu(); |
| 55 | 55 | |
| 56 | - if(isset($js)){ |
|
| 56 | + if (isset($js)) { |
|
| 57 | 57 | $id=$this->identifier; |
| 58 | 58 | $callback=$js->getScript($offset).$this->getHtmlComponent()->getInnerScript(); |
| 59 | - $callback.=$js->trigger("#".$id." [name='selection[]']","change",false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js)); |
|
| 59 | + $callback.=$js->trigger("#".$id." [name='selection[]']", "change", false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js)); |
|
| 60 | 60 | $callback.=$this->_generatePaginationScript($id); |
| 61 | - if(isset($this->_urls["refresh"])){ |
|
| 62 | - if(isset($menu)) |
|
| 63 | - $js->jsonArrayOn("click", "#".$menu->getIdentifier()." a","#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"],"post",["params"=>"{'p':$(this).attr('data-page'),'_model':'".JString::doubleBackSlashes($this->_model)."'}","jsCallback"=>$callback]); |
|
| 61 | + if (isset($this->_urls["refresh"])) { |
|
| 62 | + if (isset($menu)) |
|
| 63 | + $js->jsonArrayOn("click", "#".$menu->getIdentifier()." a", "#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"], "post", ["params"=>"{'p':$(this).attr('data-page'),'_model':'".JString::doubleBackSlashes($this->_model)."'}", "jsCallback"=>$callback]); |
|
| 64 | 64 | } |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | } |
| 68 | 68 | |
| 69 | - protected function _generatePaginationScript($id){ |
|
| 69 | + protected function _generatePaginationScript($id) { |
|
| 70 | 70 | return ";var page=parseInt($(self).attr('data-page')) || 1;var pages_visibles=$('#pagination-{$id} .item').length-2; |
| 71 | 71 | var lastPage=$('#pagination-{$id} ._lastPage'); |
| 72 | 72 | var middle= Math.ceil((pages_visibles-1)/ 2); |
@@ -86,16 +86,16 @@ discard block |
||
| 86 | 86 | lastPage.attr('data-page',Math.min(lastPage.attr('data-max'),page+1)); |
| 87 | 87 | $('#{$id}').trigger('pageChange');$('#{$id}').trigger('activeRowChange');$('#pagination-{$id}').show();"; |
| 88 | 88 | } |
| 89 | - protected function _compileSearchFieldBehavior(JsUtils $js=NULL){ |
|
| 89 | + protected function _compileSearchFieldBehavior(JsUtils $js=NULL) { |
|
| 90 | 90 | |
| 91 | 91 | } |
| 92 | - protected function _associateSearchFieldBehavior(JsUtils $js=NULL,$offset=null){ |
|
| 93 | - if(isset($this->_searchField) && isset($js) && isset($this->_urls["refresh"])){ |
|
| 92 | + protected function _associateSearchFieldBehavior(JsUtils $js=NULL, $offset=null) { |
|
| 93 | + if (isset($this->_searchField) && isset($js) && isset($this->_urls["refresh"])) { |
|
| 94 | 94 | $id=$this->identifier; |
| 95 | 95 | $callback=$js->getScript($offset).$this->getHtmlComponent()->getInnerScript(); |
| 96 | - $callback.=$js->trigger("#".$id." [name='selection[]']","change",false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js)); |
|
| 96 | + $callback.=$js->trigger("#".$id." [name='selection[]']", "change", false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js)); |
|
| 97 | 97 | $callback.="$('#pagination-{$id}').hide();$('#".$this->identifier."').trigger('searchTerminate',[$(self).val()]);"; |
| 98 | - $js->jsonArrayOn("change", "#".$this->_searchField->getDataField()->getIdentifier(),"#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"],"post",["params"=>"{'s':$(self).val(),'_model':'".JString::doubleBackSlashes($this->_model)."'}","jsCallback"=>$callback]); |
|
| 98 | + $js->jsonArrayOn("change", "#".$this->_searchField->getDataField()->getIdentifier(), "#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"], "post", ["params"=>"{'s':$(self).val(),'_model':'".JString::doubleBackSlashes($this->_model)."'}", "jsCallback"=>$callback]); |
|
| 99 | 99 | } |
| 100 | 100 | } |
| 101 | 101 | |
@@ -109,29 +109,29 @@ discard block |
||
| 109 | 109 | * @param string $jsCallback |
| 110 | 110 | * @return AjaxCall |
| 111 | 111 | */ |
| 112 | - public function jsJsonArray($url, $method="get", $params="{}", $jsCallback=NULL,$parameters=[]){ |
|
| 113 | - $parameters=\array_merge($parameters,["modelSelector"=>"#".$this->_identifier." tr.".$this->_modelClass,"url"=>$url,"method"=>$method,"params"=>$params,"jsCallback"=>$jsCallback]); |
|
| 112 | + public function jsJsonArray($url, $method="get", $params="{}", $jsCallback=NULL, $parameters=[]) { |
|
| 113 | + $parameters=\array_merge($parameters, ["modelSelector"=>"#".$this->_identifier." tr.".$this->_modelClass, "url"=>$url, "method"=>$method, "params"=>$params, "jsCallback"=>$jsCallback]); |
|
| 114 | 114 | return new AjaxCall("jsonArray", $parameters); |
| 115 | 115 | } |
| 116 | 116 | |
| 117 | - public function jsClear(){ |
|
| 117 | + public function jsClear() { |
|
| 118 | 118 | return "$('#{$this->identifier} tbody').find('._json').remove();"; |
| 119 | 119 | } |
| 120 | 120 | |
| 121 | - public function clearOn(BaseHtml $element,$event, $stopPropagation=false, $preventDefault=false){ |
|
| 122 | - return $element->addEvent($event, $this->jsClear(),$stopPropagation,$preventDefault); |
|
| 121 | + public function clearOn(BaseHtml $element, $event, $stopPropagation=false, $preventDefault=false) { |
|
| 122 | + return $element->addEvent($event, $this->jsClear(), $stopPropagation, $preventDefault); |
|
| 123 | 123 | } |
| 124 | 124 | |
| 125 | - public function clearOnClick(BaseHtml $element,$stopPropagation=false, $preventDefault=false){ |
|
| 126 | - return $this->clearOn($element, "click",$stopPropagation,$preventDefault); |
|
| 125 | + public function clearOnClick(BaseHtml $element, $stopPropagation=false, $preventDefault=false) { |
|
| 126 | + return $this->clearOn($element, "click", $stopPropagation, $preventDefault); |
|
| 127 | 127 | } |
| 128 | 128 | |
| 129 | - public function jsonArrayOn(BaseHtml $element,$event,$url, $method="get", $params="{}", $jsCallback=NULL,$parameters=[]){ |
|
| 130 | - return $element->_addEvent($event, $this->jsJsonArray($url,$method,$params,$jsCallback,$parameters)); |
|
| 129 | + public function jsonArrayOn(BaseHtml $element, $event, $url, $method="get", $params="{}", $jsCallback=NULL, $parameters=[]) { |
|
| 130 | + return $element->_addEvent($event, $this->jsJsonArray($url, $method, $params, $jsCallback, $parameters)); |
|
| 131 | 131 | } |
| 132 | 132 | |
| 133 | - public function jsonArrayOnClick(BaseHtml $element,$url, $method="get", $params="{}", $jsCallback=NULL,$parameters=[]){ |
|
| 134 | - return $this->jsonArrayOn($element, "click", $url,$method,$params,$jsCallback,$parameters); |
|
| 133 | + public function jsonArrayOnClick(BaseHtml $element, $url, $method="get", $params="{}", $jsCallback=NULL, $parameters=[]) { |
|
| 134 | + return $this->jsonArrayOn($element, "click", $url, $method, $params, $jsCallback, $parameters); |
|
| 135 | 135 | } |
| 136 | 136 | |
| 137 | 137 | /** |
@@ -142,8 +142,8 @@ discard block |
||
| 142 | 142 | * @param number $pages_visibles The number of visible pages in the Pagination component |
| 143 | 143 | * @return DataTable |
| 144 | 144 | */ |
| 145 | - public function paginate($page,$total_rowcount,$items_per_page=10,$pages_visibles=null){ |
|
| 146 | - return parent::paginate($page, $total_rowcount,$items_per_page,$pages_visibles); |
|
| 145 | + public function paginate($page, $total_rowcount, $items_per_page=10, $pages_visibles=null) { |
|
| 146 | + return parent::paginate($page, $total_rowcount, $items_per_page, $pages_visibles); |
|
| 147 | 147 | } |
| 148 | 148 | |
| 149 | 149 | public function setRowModelCallback($_rowModelCallback) { |
@@ -59,8 +59,9 @@ |
||
| 59 | 59 | $callback.=$js->trigger("#".$id." [name='selection[]']","change",false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js)); |
| 60 | 60 | $callback.=$this->_generatePaginationScript($id); |
| 61 | 61 | if(isset($this->_urls["refresh"])){ |
| 62 | - if(isset($menu)) |
|
| 63 | - $js->jsonArrayOn("click", "#".$menu->getIdentifier()." a","#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"],"post",["params"=>"{'p':$(this).attr('data-page'),'_model':'".JString::doubleBackSlashes($this->_model)."'}","jsCallback"=>$callback]); |
|
| 62 | + if(isset($menu)) { |
|
| 63 | + $js->jsonArrayOn("click", "#".$menu->getIdentifier()." a","#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"],"post",["params"=>"{'p':$(this).attr('data-page'),'_model':'".JString::doubleBackSlashes($this->_model)."'}","jsCallback"=>$callback]); |
|
| 64 | + } |
|
| 64 | 65 | } |
| 65 | 66 | } |
| 66 | 67 | |
@@ -43,8 +43,8 @@ discard block |
||
| 43 | 43 | * @param string $type |
| 44 | 44 | * @return HtmlFormFields |
| 45 | 45 | */ |
| 46 | - public function htmlRadios($identifier, $items=[], $label=NULL,$value=NULL, $type=NULL) { |
|
| 47 | - return $this->addHtmlComponent(HtmlFormFields::radios($identifier,$items,$label,$value,$type)); |
|
| 46 | + public function htmlRadios($identifier, $items=[], $label=NULL, $value=NULL, $type=NULL) { |
|
| 47 | + return $this->addHtmlComponent(HtmlFormFields::radios($identifier, $items, $label, $value, $type)); |
|
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | /** |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | * @return HtmlModal |
| 101 | 101 | */ |
| 102 | 102 | public function htmlModal($identifier, $header="", $content="", $actions=array()) { |
| 103 | - return $this->addHtmlComponent(new HtmlModal($identifier, $header,$content,$actions)); |
|
| 103 | + return $this->addHtmlComponent(new HtmlModal($identifier, $header, $content, $actions)); |
|
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | /** |
@@ -131,8 +131,8 @@ discard block |
||
| 131 | 131 | * @param boolean $associative |
| 132 | 132 | * @return HtmlDropdown |
| 133 | 133 | */ |
| 134 | - public function htmlDropdown($identifier, $value="", $items=array(),$associative=true) { |
|
| 135 | - return $this->addHtmlComponent(new HtmlDropdown($identifier, $value, $items,$associative)); |
|
| 134 | + public function htmlDropdown($identifier, $value="", $items=array(), $associative=true) { |
|
| 135 | + return $this->addHtmlComponent(new HtmlDropdown($identifier, $value, $items, $associative)); |
|
| 136 | 136 | } |
| 137 | 137 | |
| 138 | 138 | /** |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | * @return mixed |
| 38 | 38 | */ |
| 39 | 39 | public function getLibraryId() { |
| 40 | - if( isset($this->_libraryId)){ |
|
| 40 | + if (isset($this->_libraryId)) { |
|
| 41 | 41 | return $this->_libraryId; |
| 42 | 42 | } |
| 43 | 43 | return $this->identifier; |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | * @param mixed $_libraryId |
| 48 | 48 | */ |
| 49 | 49 | public function setLibraryId($_libraryId) { |
| 50 | - $this->_libraryId = $_libraryId; |
|
| 50 | + $this->_libraryId=$_libraryId; |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | } |
@@ -30,15 +30,15 @@ discard block |
||
| 30 | 30 | return $this->content; |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | - public function addContent($content,$before=false) { |
|
| 33 | + public function addContent($content, $before=false) { |
|
| 34 | 34 | if (!\is_array($this->content)) { |
| 35 | - if(isset($this->content)) |
|
| 36 | - $this->content=array ($this->content); |
|
| 35 | + if (isset($this->content)) |
|
| 36 | + $this->content=array($this->content); |
|
| 37 | 37 | else |
| 38 | 38 | $this->content=array(); |
| 39 | 39 | } |
| 40 | - if($before) |
|
| 41 | - array_unshift($this->content,$content); |
|
| 40 | + if ($before) |
|
| 41 | + array_unshift($this->content, $content); |
|
| 42 | 42 | else |
| 43 | 43 | $this->content []=$content; |
| 44 | 44 | return $this; |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | if ($this->content instanceof HtmlDoubleElement) { |
| 54 | 54 | $this->content->run($js); |
| 55 | 55 | } else if (\is_array($this->content)) { |
| 56 | - foreach ( $this->content as $itemContent ) { |
|
| 56 | + foreach ($this->content as $itemContent) { |
|
| 57 | 57 | if ($itemContent instanceof HtmlDoubleElement) { |
| 58 | 58 | $itemContent->run($js); |
| 59 | 59 | } |
@@ -70,19 +70,19 @@ discard block |
||
| 70 | 70 | return $this; |
| 71 | 71 | } |
| 72 | 72 | |
| 73 | - public function getContentInstances($class){ |
|
| 74 | - return $this->_getContentInstances($class,$this->content); |
|
| 73 | + public function getContentInstances($class) { |
|
| 74 | + return $this->_getContentInstances($class, $this->content); |
|
| 75 | 75 | } |
| 76 | 76 | |
| 77 | - protected function _getContentInstances($class,$content){ |
|
| 77 | + protected function _getContentInstances($class, $content) { |
|
| 78 | 78 | $instances=[]; |
| 79 | - if($content instanceof $class){ |
|
| 79 | + if ($content instanceof $class) { |
|
| 80 | 80 | $instances[]=$content; |
| 81 | - }elseif($content instanceof HtmlDoubleElement){ |
|
| 82 | - $instances=\array_merge($instances,$content->getContentInstances($class)); |
|
| 83 | - }elseif (\is_array($content)){ |
|
| 84 | - foreach ($content as $element){ |
|
| 85 | - $instances=\array_merge($instances,$this->_getContentInstances($class, $element)); |
|
| 81 | + }elseif ($content instanceof HtmlDoubleElement) { |
|
| 82 | + $instances=\array_merge($instances, $content->getContentInstances($class)); |
|
| 83 | + }elseif (\is_array($content)) { |
|
| 84 | + foreach ($content as $element) { |
|
| 85 | + $instances=\array_merge($instances, $this->_getContentInstances($class, $element)); |
|
| 86 | 86 | } |
| 87 | 87 | } |
| 88 | 88 | return $instances; |
@@ -92,36 +92,36 @@ discard block |
||
| 92 | 92 | * Transforms the element into a link |
| 93 | 93 | * @return HtmlDoubleElement |
| 94 | 94 | */ |
| 95 | - public function asLink($href=NULL,$target=NULL) { |
|
| 95 | + public function asLink($href=NULL, $target=NULL) { |
|
| 96 | 96 | if (isset($href)) |
| 97 | 97 | $this->setProperty("href", $href); |
| 98 | - if(isset($target)) |
|
| 98 | + if (isset($target)) |
|
| 99 | 99 | $this->setProperty("target", $target); |
| 100 | 100 | return $this->setTagName("a"); |
| 101 | 101 | } |
| 102 | 102 | |
| 103 | - public function getTextContent(){ |
|
| 104 | - if(is_array($this->content)){ |
|
| 103 | + public function getTextContent() { |
|
| 104 | + if (is_array($this->content)) { |
|
| 105 | 105 | return strip_tags(implode("", $this->content)); |
| 106 | 106 | } |
| 107 | 107 | return strip_tags($this->content); |
| 108 | 108 | } |
| 109 | 109 | |
| 110 | - public function asEditable(HtmlFormField $field,$asForm=false,$setValueProperty="val()"){ |
|
| 110 | + public function asEditable(HtmlFormField $field, $asForm=false, $setValueProperty="val()") { |
|
| 111 | 111 | $idF=$field->getIdentifier(); |
| 112 | 112 | $idE=$idF; |
| 113 | - if($asForm){ |
|
| 113 | + if ($asForm) { |
|
| 114 | 114 | $frm=new HtmlForm("frm-".$field->getIdentifier()); |
| 115 | 115 | $frm->setProperty("onsubmit", "return false;"); |
| 116 | 116 | $fields=$frm->addFields(); |
| 117 | 117 | $idE=$frm->getIdentifier(); |
| 118 | 118 | $fields->addItem($field); |
| 119 | - $fields->addButtonIcon("bt-okay", "check","green mini","\$('#".$idE."').trigger('validate',{value: $('#'+idF+' input').val()});"); |
|
| 120 | - $fields->addButtonIcon("bt-cancel", "close","mini","\$('#".$idE."').trigger('endEdit');"); |
|
| 119 | + $fields->addButtonIcon("bt-okay", "check", "green mini", "\$('#".$idE."').trigger('validate',{value: $('#'+idF+' input').val()});"); |
|
| 120 | + $fields->addButtonIcon("bt-cancel", "close", "mini", "\$('#".$idE."').trigger('endEdit');"); |
|
| 121 | 121 | $this->_editableContent=$frm; |
| 122 | 122 | $keypress=""; |
| 123 | 123 | $focusOut=""; |
| 124 | - }else{ |
|
| 124 | + } else { |
|
| 125 | 125 | $focusOut="if(e.relatedTarget==null)elm.trigger('endEdit');"; |
| 126 | 126 | $this->_editableContent=$field; |
| 127 | 127 | $keypress="$('#".$idF."').keyup(function(e){if(e.which == 13) {\$('#".$idE."').trigger('validate',{value: $('#'+idF+' input').val()});}if(e.keyCode===27) {\$('#".$idE."').trigger('endEdit');}});"; |
@@ -134,11 +134,11 @@ discard block |
||
| 134 | 134 | * {@inheritDoc} |
| 135 | 135 | * @see \Ajax\common\html\BaseHtml::compile_once() |
| 136 | 136 | */ |
| 137 | - protected function compile_once(\Ajax\JsUtils $js = NULL, &$view = NULL) { |
|
| 138 | - if(!$this->_compiled && isset($this->_editableContent)){ |
|
| 139 | - $this->wrap("",$this->_editableContent); |
|
| 137 | + protected function compile_once(\Ajax\JsUtils $js=NULL, &$view=NULL) { |
|
| 138 | + if (!$this->_compiled && isset($this->_editableContent)) { |
|
| 139 | + $this->wrap("", $this->_editableContent); |
|
| 140 | 140 | } |
| 141 | - parent::compile_once($js,$view); |
|
| 141 | + parent::compile_once($js, $view); |
|
| 142 | 142 | |
| 143 | 143 | } |
| 144 | 144 | |
@@ -32,15 +32,17 @@ discard block |
||
| 32 | 32 | |
| 33 | 33 | public function addContent($content,$before=false) { |
| 34 | 34 | if (!\is_array($this->content)) { |
| 35 | - if(isset($this->content)) |
|
| 36 | - $this->content=array ($this->content); |
|
| 37 | - else |
|
| 38 | - $this->content=array(); |
|
| 35 | + if(isset($this->content)) { |
|
| 36 | + $this->content=array ($this->content); |
|
| 37 | + } else { |
|
| 38 | + $this->content=array(); |
|
| 39 | + } |
|
| 40 | + } |
|
| 41 | + if($before) { |
|
| 42 | + array_unshift($this->content,$content); |
|
| 43 | + } else { |
|
| 44 | + $this->content []=$content; |
|
| 39 | 45 | } |
| 40 | - if($before) |
|
| 41 | - array_unshift($this->content,$content); |
|
| 42 | - else |
|
| 43 | - $this->content []=$content; |
|
| 44 | 46 | return $this; |
| 45 | 47 | } |
| 46 | 48 | |
@@ -78,9 +80,9 @@ discard block |
||
| 78 | 80 | $instances=[]; |
| 79 | 81 | if($content instanceof $class){ |
| 80 | 82 | $instances[]=$content; |
| 81 | - }elseif($content instanceof HtmlDoubleElement){ |
|
| 83 | + } elseif($content instanceof HtmlDoubleElement){ |
|
| 82 | 84 | $instances=\array_merge($instances,$content->getContentInstances($class)); |
| 83 | - }elseif (\is_array($content)){ |
|
| 85 | + } elseif (\is_array($content)){ |
|
| 84 | 86 | foreach ($content as $element){ |
| 85 | 87 | $instances=\array_merge($instances,$this->_getContentInstances($class, $element)); |
| 86 | 88 | } |
@@ -93,10 +95,12 @@ discard block |
||
| 93 | 95 | * @return HtmlDoubleElement |
| 94 | 96 | */ |
| 95 | 97 | public function asLink($href=NULL,$target=NULL) { |
| 96 | - if (isset($href)) |
|
| 97 | - $this->setProperty("href", $href); |
|
| 98 | - if(isset($target)) |
|
| 99 | - $this->setProperty("target", $target); |
|
| 98 | + if (isset($href)) { |
|
| 99 | + $this->setProperty("href", $href); |
|
| 100 | + } |
|
| 101 | + if(isset($target)) { |
|
| 102 | + $this->setProperty("target", $target); |
|
| 103 | + } |
|
| 100 | 104 | return $this->setTagName("a"); |
| 101 | 105 | } |
| 102 | 106 | |
@@ -121,7 +125,7 @@ discard block |
||
| 121 | 125 | $this->_editableContent=$frm; |
| 122 | 126 | $keypress=""; |
| 123 | 127 | $focusOut=""; |
| 124 | - }else{ |
|
| 128 | + } else{ |
|
| 125 | 129 | $focusOut="if(e.relatedTarget==null)elm.trigger('endEdit');"; |
| 126 | 130 | $this->_editableContent=$field; |
| 127 | 131 | $keypress="$('#".$idF."').keyup(function(e){if(e.which == 13) {\$('#".$idE."').trigger('validate',{value: $('#'+idF+' input').val()});}if(e.keyCode===27) {\$('#".$idE."').trigger('endEdit');}});"; |
@@ -9,7 +9,7 @@ discard block |
||
| 9 | 9 | * @param string $hookKey |
| 10 | 10 | * @return boolean |
| 11 | 11 | */ |
| 12 | - public function hookExists($hookKey){ |
|
| 12 | + public function hookExists($hookKey) { |
|
| 13 | 13 | return isset($this->_hooks[$hookKey]); |
| 14 | 14 | } |
| 15 | 15 | |
@@ -17,8 +17,8 @@ discard block |
||
| 17 | 17 | * @param string $hookKey |
| 18 | 18 | * @return callable|NULL |
| 19 | 19 | */ |
| 20 | - public function getHook($hookKey){ |
|
| 21 | - if(isset($this->_hooks[$hookKey])){ |
|
| 20 | + public function getHook($hookKey) { |
|
| 21 | + if (isset($this->_hooks[$hookKey])) { |
|
| 22 | 22 | return $this->_hooks[$hookKey]; |
| 23 | 23 | } |
| 24 | 24 | return null; |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | * @param String $hookKey |
| 30 | 30 | * @param callable $callable |
| 31 | 31 | */ |
| 32 | - public function addHook($hookKey,$callable){ |
|
| 32 | + public function addHook($hookKey, $callable) { |
|
| 33 | 33 | $this->_hooks[$hookKey]=$callable; |
| 34 | 34 | } |
| 35 | 35 | |
@@ -39,9 +39,9 @@ discard block |
||
| 39 | 39 | * @param mixed|null $variable |
| 40 | 40 | * @return void|mixed |
| 41 | 41 | */ |
| 42 | - public function execHook($hookKey,...$variables){ |
|
| 43 | - if(($hook=$this->getHook($hookKey))!=null){ |
|
| 44 | - return call_user_func_array($hook,$variables); |
|
| 42 | + public function execHook($hookKey, ...$variables) { |
|
| 43 | + if (($hook=$this->getHook($hookKey))!=null) { |
|
| 44 | + return call_user_func_array($hook, $variables); |
|
| 45 | 45 | } |
| 46 | 46 | return; |
| 47 | 47 | } |
@@ -2,8 +2,8 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Ajax\common\html; |
| 4 | 4 | |
| 5 | -class HtmlContentOnly extends HtmlDoubleElement{ |
|
| 6 | - public function __construct($content,$identifier=""){ |
|
| 5 | +class HtmlContentOnly extends HtmlDoubleElement { |
|
| 6 | + public function __construct($content, $identifier="") { |
|
| 7 | 7 | parent::__construct($identifier); |
| 8 | 8 | $this->_template='%wrapContentBefore%%content%%wrapContentAfter%'; |
| 9 | 9 | $this->setContent($content); |
@@ -21,36 +21,36 @@ discard block |
||
| 21 | 21 | use BaseTrait; |
| 22 | 22 | |
| 23 | 23 | public function __construct($identifier, $modelInstance=NULL) { |
| 24 | - parent::__construct($identifier, null,$modelInstance); |
|
| 24 | + parent::__construct($identifier, null, $modelInstance); |
|
| 25 | 25 | $this->_form=new HtmlForm($identifier); |
| 26 | 26 | $this->_init(new FormInstanceViewer($identifier), "form", $this->_form, true); |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | - protected function _getFieldIdentifier($prefix,$name=""){ |
|
| 29 | + protected function _getFieldIdentifier($prefix, $name="") { |
|
| 30 | 30 | return $this->identifier."-{$name}-".$this->_instanceViewer->getIdentifier(); |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | - public function compile(JsUtils $js=NULL,&$view=NULL){ |
|
| 34 | - if(!$this->_generated){ |
|
| 33 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
| 34 | + if (!$this->_generated) { |
|
| 35 | 35 | $this->_instanceViewer->setInstance($this->_modelInstance); |
| 36 | 36 | |
| 37 | 37 | $form=$this->content["form"]; |
| 38 | 38 | $this->_generateContent($form); |
| 39 | 39 | |
| 40 | - if(isset($this->_toolbar)){ |
|
| 40 | + if (isset($this->_toolbar)) { |
|
| 41 | 41 | $this->_setToolbarPosition($form); |
| 42 | 42 | } |
| 43 | - $this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"form",PositionInTable::AFTERTABLE]); |
|
| 43 | + $this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "form", PositionInTable::AFTERTABLE]); |
|
| 44 | 44 | $this->_generated=true; |
| 45 | 45 | } |
| 46 | - return parent::compile($js,$view); |
|
| 46 | + return parent::compile($js, $view); |
|
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | /** |
| 50 | 50 | * @param HtmlForm $form |
| 51 | 51 | */ |
| 52 | - protected function _generateContent($form){ |
|
| 53 | - $values= $this->_instanceViewer->getValues(); |
|
| 52 | + protected function _generateContent($form) { |
|
| 53 | + $values=$this->_instanceViewer->getValues(); |
|
| 54 | 54 | $count=$this->_instanceViewer->count(); |
| 55 | 55 | $separators=$this->_instanceViewer->getSeparators(); |
| 56 | 56 | $headers=$this->_instanceViewer->getHeaders(); |
@@ -58,41 +58,41 @@ discard block |
||
| 58 | 58 | \sort($separators); |
| 59 | 59 | $size=\sizeof($separators); |
| 60 | 60 | $nb=0; |
| 61 | - if($size===1){ |
|
| 61 | + if ($size===1) { |
|
| 62 | 62 | $i=-1; |
| 63 | - foreach ($values as $v){ |
|
| 64 | - $this->_generateFields($form, [$v], $headers, $i, $wrappers,$nb++); |
|
| 63 | + foreach ($values as $v) { |
|
| 64 | + $this->_generateFields($form, [$v], $headers, $i, $wrappers, $nb++); |
|
| 65 | 65 | $i++; |
| 66 | 66 | } |
| 67 | - }else{ |
|
| 67 | + } else { |
|
| 68 | 68 | $separators[]=$count; |
| 69 | - for($i=0;$i<$size;$i++){ |
|
| 70 | - $fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]); |
|
| 71 | - $this->_generateFields($form, $fields, $headers, $separators[$i], $wrappers,$nb++); |
|
| 69 | + for ($i=0; $i<$size; $i++) { |
|
| 70 | + $fields=\array_slice($values, $separators[$i]+1, $separators[$i+1]-$separators[$i]); |
|
| 71 | + $this->_generateFields($form, $fields, $headers, $separators[$i], $wrappers, $nb++); |
|
| 72 | 72 | } |
| 73 | 73 | } |
| 74 | - if($this->_hasRules && !$this->getForm()->hasValidationParams()){ |
|
| 74 | + if ($this->_hasRules && !$this->getForm()->hasValidationParams()) { |
|
| 75 | 75 | $this->setValidationParams(["inline"=>true]); |
| 76 | 76 | } |
| 77 | 77 | } |
| 78 | 78 | |
| 79 | - protected function _generateFields($form,$values,$headers,$sepFirst,$wrappers,$nb){ |
|
| 79 | + protected function _generateFields($form, $values, $headers, $sepFirst, $wrappers, $nb) { |
|
| 80 | 80 | $wrapper=null; |
| 81 | - if(isset($headers[$sepFirst+1])) |
|
| 82 | - $form->addHeader($headers[$sepFirst+1],4,true); |
|
| 83 | - if(isset($wrappers[$sepFirst+1])){ |
|
| 81 | + if (isset($headers[$sepFirst+1])) |
|
| 82 | + $form->addHeader($headers[$sepFirst+1], 4, true); |
|
| 83 | + if (isset($wrappers[$sepFirst+1])) { |
|
| 84 | 84 | $wrapper=$wrappers[$sepFirst+1]; |
| 85 | 85 | } |
| 86 | - if(\sizeof($values)===1){ |
|
| 86 | + if (\sizeof($values)===1) { |
|
| 87 | 87 | $added=$form->addField($values[0]); |
| 88 | - }elseif(\sizeof($values)>1){ |
|
| 88 | + }elseif (\sizeof($values)>1) { |
|
| 89 | 89 | $added=$form->addFields($values); |
| 90 | - }else |
|
| 90 | + } else |
|
| 91 | 91 | return; |
| 92 | - if(isset($wrapper)){ |
|
| 93 | - $added->wrap($wrapper[0],$wrapper[1]); |
|
| 92 | + if (isset($wrapper)) { |
|
| 93 | + $added->wrap($wrapper[0], $wrapper[1]); |
|
| 94 | 94 | } |
| 95 | - $this->execHook("onGenerateFields",$added,$nb); |
|
| 95 | + $this->execHook("onGenerateFields", $added, $nb); |
|
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | /** |
@@ -100,18 +100,18 @@ discard block |
||
| 100 | 100 | * the generated field is the first parameter |
| 101 | 101 | * @param callable $callback the fonction to call when a field is generated |
| 102 | 102 | */ |
| 103 | - public function onGenerateField($callback){ |
|
| 104 | - $this->addHook("onGenerateFields",$callback); |
|
| 103 | + public function onGenerateField($callback) { |
|
| 104 | + $this->addHook("onGenerateFields", $callback); |
|
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | /** |
| 108 | 108 | * @return HtmlForm |
| 109 | 109 | */ |
| 110 | - public function getForm(){ |
|
| 110 | + public function getForm() { |
|
| 111 | 111 | return $this->content["form"]; |
| 112 | 112 | } |
| 113 | 113 | |
| 114 | - public function addSeparatorAfter($fieldNum){ |
|
| 114 | + public function addSeparatorAfter($fieldNum) { |
|
| 115 | 115 | $fieldNum=$this->_getIndex($fieldNum); |
| 116 | 116 | $this->_instanceViewer->addSeparatorAfter($fieldNum); |
| 117 | 117 | return $this; |
@@ -126,12 +126,12 @@ discard block |
||
| 126 | 126 | return $this; |
| 127 | 127 | } |
| 128 | 128 | |
| 129 | - public function fieldAsReset($index,$cssStyle=NULL,$attributes=NULL){ |
|
| 130 | - return $this->_fieldAs(function($id,$name,$value) use ($cssStyle){ |
|
| 131 | - $button=new HtmlButton($id,$value,$cssStyle); |
|
| 129 | + public function fieldAsReset($index, $cssStyle=NULL, $attributes=NULL) { |
|
| 130 | + return $this->_fieldAs(function($id, $name, $value) use ($cssStyle){ |
|
| 131 | + $button=new HtmlButton($id, $value, $cssStyle); |
|
| 132 | 132 | $button->setProperty("type", "reset"); |
| 133 | 133 | return $button; |
| 134 | - }, $index,$attributes); |
|
| 134 | + }, $index, $attributes); |
|
| 135 | 135 | } |
| 136 | 136 | |
| 137 | 137 | /** |
@@ -150,19 +150,19 @@ discard block |
||
| 150 | 150 | $this->content[$this->_toolbarPosition]=$this->_toolbar; |
| 151 | 151 | } |
| 152 | 152 | |
| 153 | - public function addDividerBefore($index,$title){ |
|
| 153 | + public function addDividerBefore($index, $title) { |
|
| 154 | 154 | $index=$this->_getIndex($index); |
| 155 | 155 | $this->_instanceViewer->addHeaderDividerBefore($index, $title); |
| 156 | 156 | return $this; |
| 157 | 157 | } |
| 158 | 158 | |
| 159 | - public function addWrapper($index,$contentBefore,$contentAfter=null){ |
|
| 159 | + public function addWrapper($index, $contentBefore, $contentAfter=null) { |
|
| 160 | 160 | $index=$this->_getIndex($index); |
| 161 | - $this->_instanceViewer->addWrapper($index, $contentBefore,$contentAfter); |
|
| 161 | + $this->_instanceViewer->addWrapper($index, $contentBefore, $contentAfter); |
|
| 162 | 162 | return $this; |
| 163 | 163 | } |
| 164 | 164 | |
| 165 | - public function run(JsUtils $js){ |
|
| 165 | + public function run(JsUtils $js) { |
|
| 166 | 166 | parent::run($js); |
| 167 | 167 | } |
| 168 | 168 | } |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | $this->_generateFields($form, [$v], $headers, $i, $wrappers,$nb++); |
| 65 | 65 | $i++; |
| 66 | 66 | } |
| 67 | - }else{ |
|
| 67 | + } else{ |
|
| 68 | 68 | $separators[]=$count; |
| 69 | 69 | for($i=0;$i<$size;$i++){ |
| 70 | 70 | $fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]); |
@@ -78,17 +78,19 @@ discard block |
||
| 78 | 78 | |
| 79 | 79 | protected function _generateFields($form,$values,$headers,$sepFirst,$wrappers,$nb){ |
| 80 | 80 | $wrapper=null; |
| 81 | - if(isset($headers[$sepFirst+1])) |
|
| 82 | - $form->addHeader($headers[$sepFirst+1],4,true); |
|
| 81 | + if(isset($headers[$sepFirst+1])) { |
|
| 82 | + $form->addHeader($headers[$sepFirst+1],4,true); |
|
| 83 | + } |
|
| 83 | 84 | if(isset($wrappers[$sepFirst+1])){ |
| 84 | 85 | $wrapper=$wrappers[$sepFirst+1]; |
| 85 | 86 | } |
| 86 | 87 | if(\sizeof($values)===1){ |
| 87 | 88 | $added=$form->addField($values[0]); |
| 88 | - }elseif(\sizeof($values)>1){ |
|
| 89 | + } elseif(\sizeof($values)>1){ |
|
| 89 | 90 | $added=$form->addFields($values); |
| 90 | - }else |
|
| 91 | - return; |
|
| 91 | + } else { |
|
| 92 | + return; |
|
| 93 | + } |
|
| 92 | 94 | if(isset($wrapper)){ |
| 93 | 95 | $added->wrap($wrapper[0],$wrapper[1]); |
| 94 | 96 | } |