@@ -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)->getColCount(); |
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 { |
@@ -271,7 +271,7 @@ discard block |
||
271 | 271 | */ |
272 | 272 | public function conditionalCellFormat($callback, $format) { |
273 | 273 | $rows=$this->content; |
274 | - foreach ( $rows as $row ) { |
|
274 | + foreach ($rows as $row) { |
|
275 | 275 | $row->conditionalCellFormat($callback, $format); |
276 | 276 | } |
277 | 277 | return $this; |
@@ -284,7 +284,7 @@ discard block |
||
284 | 284 | */ |
285 | 285 | public function conditionalRowFormat($callback, $format) { |
286 | 286 | $rows=$this->content; |
287 | - foreach ( $rows as $row ) { |
|
287 | + foreach ($rows as $row) { |
|
288 | 288 | $row->conditionalRowFormat($callback, $format); |
289 | 289 | } |
290 | 290 | return $this; |
@@ -296,7 +296,7 @@ discard block |
||
296 | 296 | */ |
297 | 297 | public function applyCells($callback) { |
298 | 298 | $rows=$this->content; |
299 | - foreach ( $rows as $row ) { |
|
299 | + foreach ($rows as $row) { |
|
300 | 300 | $row->applyCells($callback); |
301 | 301 | } |
302 | 302 | return $this; |
@@ -308,7 +308,7 @@ discard block |
||
308 | 308 | */ |
309 | 309 | public function applyRows($callback) { |
310 | 310 | $rows=$this->content; |
311 | - foreach ( $rows as $row ) { |
|
311 | + foreach ($rows as $row) { |
|
312 | 312 | $row->apply($callback); |
313 | 313 | } |
314 | 314 | return $this; |
@@ -40,12 +40,12 @@ discard block |
||
40 | 40 | * @return \Ajax\semantic\html\collections\HtmlMenu |
41 | 41 | */ |
42 | 42 | public function setType($type="") { |
43 | - return $this->addToPropertyCtrl("class", $type, array ("","item","text" )); |
|
43 | + return $this->addToPropertyCtrl("class", $type, array("", "item", "text")); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | public function setActiveItem($index) { |
47 | 47 | $item=$this->getItem($index); |
48 | - if ($item !== null) { |
|
48 | + if ($item!==null) { |
|
49 | 49 | $item->addToProperty("class", "active"); |
50 | 50 | } |
51 | 51 | return $this; |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | |
54 | 54 | private function getItemToInsert($item) { |
55 | 55 | if ($item instanceof HtmlInput || $item instanceof HtmlImg || $item instanceof HtmlIcon || $item instanceof HtmlButtonGroups || $item instanceof HtmlButton || $item instanceof HtmlLabel) { |
56 | - $itemO=new HtmlMenuItem("item-" . $this->identifier . "-" . \sizeof($this->content) , $item); |
|
56 | + $itemO=new HtmlMenuItem("item-".$this->identifier."-".\sizeof($this->content), $item); |
|
57 | 57 | $item=$itemO; |
58 | 58 | } |
59 | 59 | return $item; |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | |
62 | 62 | private function afterInsert($item) { |
63 | 63 | if (!$item instanceof HtmlMenu && $item->propertyContains("class", "header")===false) |
64 | - $item->addToPropertyCtrl("class", "item", array ("item" )); |
|
64 | + $item->addToPropertyCtrl("class", "item", array("item")); |
|
65 | 65 | else { |
66 | 66 | $this->setSecondary(); |
67 | 67 | } |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | public function addItem($item) { |
78 | 78 | $number=$item; |
79 | 79 | $item=parent::addItem($this->getItemToInsert($item)); |
80 | - if(\is_int($number)) |
|
80 | + if (\is_int($number)) |
|
81 | 81 | $item->setProperty("data-page", $number); |
82 | 82 | return $this->afterInsert($item); |
83 | 83 | } |
@@ -95,15 +95,15 @@ discard block |
||
95 | 95 | |
96 | 96 | public function generateMenuAsItem($menu, $header=null) { |
97 | 97 | $count=$this->count(); |
98 | - $item=new HtmlSemDoubleElement("item-" . $this->identifier . "-" . $count, "div"); |
|
98 | + $item=new HtmlSemDoubleElement("item-".$this->identifier."-".$count, "div"); |
|
99 | 99 | if (isset($header)) { |
100 | - $headerItem=new HtmlSemDoubleElement("item-header-" . $this->identifier . "-" . $count, "div", "header"); |
|
100 | + $headerItem=new HtmlSemDoubleElement("item-header-".$this->identifier."-".$count, "div", "header"); |
|
101 | 101 | $headerItem->setContent($header); |
102 | 102 | $item->addContent($headerItem); |
103 | 103 | $this->_itemHeader=$headerItem; |
104 | 104 | } |
105 | - if(\is_array($menu)){ |
|
106 | - $menu=new HtmlMenu("menu-" . $this->identifier . "-" . $count,$menu); |
|
105 | + if (\is_array($menu)) { |
|
106 | + $menu=new HtmlMenu("menu-".$this->identifier."-".$count, $menu); |
|
107 | 107 | } |
108 | 108 | $menu->setClass("menu"); |
109 | 109 | $item->addContent($menu); |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | $value=new HtmlSemDoubleElement($identifier, "a", "browse item", $value); |
119 | 119 | $value->addContent(new HtmlIcon("", "dropdown")); |
120 | 120 | $value=$this->addItem($value); |
121 | - $popup=new HtmlPopup($value, "popup-" . $this->identifier . "-" . $this->count(), $content); |
|
121 | + $popup=new HtmlPopup($value, "popup-".$this->identifier."-".$this->count(), $content); |
|
122 | 122 | $popup->setFlowing()->setPosition("bottom left")->setOn("click"); |
123 | 123 | $this->wrap("", $popup); |
124 | 124 | return $popup; |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | public function addDropdownAsItem($value, $items=NULL) { |
128 | 128 | $dd=$value; |
129 | 129 | if (\is_string($value)) { |
130 | - $dd=new HtmlDropdown("dropdown-" . $this->identifier . "-" . $this->count(), $value, $items); |
|
130 | + $dd=new HtmlDropdown("dropdown-".$this->identifier."-".$this->count(), $value, $items); |
|
131 | 131 | } |
132 | 132 | $this->addItem($dd); |
133 | 133 | return $dd; |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | * @see \Ajax\common\html\html5\HtmlCollection::createItem() |
141 | 141 | */ |
142 | 142 | protected function createItem($value) { |
143 | - $itemO=new HtmlMenuItem($this->identifier."-item-" . \sizeof($this->content),""); |
|
143 | + $itemO=new HtmlMenuItem($this->identifier."-item-".\sizeof($this->content), ""); |
|
144 | 144 | $itemO->setTagName("a"); |
145 | 145 | $itemO->setContent($value); |
146 | 146 | return $itemO; |
@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | } |
152 | 152 | |
153 | 153 | public function setSecondary($value=true) { |
154 | - if($value) |
|
154 | + if ($value) |
|
155 | 155 | $this->addToProperty("class", "secondary"); |
156 | 156 | else |
157 | 157 | $this->removePropertyValue("class", "secondary"); |
@@ -159,28 +159,28 @@ discard block |
||
159 | 159 | } |
160 | 160 | |
161 | 161 | public function setVertical() { |
162 | - return $this->addToPropertyCtrl("class", "vertical", array ("vertical" )); |
|
162 | + return $this->addToPropertyCtrl("class", "vertical", array("vertical")); |
|
163 | 163 | } |
164 | 164 | |
165 | 165 | public function setPosition($value="right") { |
166 | - return $this->addToPropertyCtrl("class", $value, array ("right","left" )); |
|
166 | + return $this->addToPropertyCtrl("class", $value, array("right", "left")); |
|
167 | 167 | } |
168 | 168 | |
169 | 169 | public function setPointing($value=Direction::NONE) { |
170 | - return $this->addToPropertyCtrl("class", $value . " pointing", Direction::getConstantValues("pointing")); |
|
170 | + return $this->addToPropertyCtrl("class", $value." pointing", Direction::getConstantValues("pointing")); |
|
171 | 171 | } |
172 | 172 | |
173 | 173 | public function asTab($vertical=false) { |
174 | - $this->apply(function (HtmlDoubleElement &$item) { |
|
174 | + $this->apply(function(HtmlDoubleElement&$item) { |
|
175 | 175 | $item->setTagName("a"); |
176 | 176 | }); |
177 | - if ($vertical === true) |
|
177 | + if ($vertical===true) |
|
178 | 178 | $this->setVertical(); |
179 | 179 | return $this->addToProperty("class", "tabular"); |
180 | 180 | } |
181 | 181 | |
182 | 182 | public function asPagination() { |
183 | - $this->apply(function (HtmlDoubleElement &$item) { |
|
183 | + $this->apply(function(HtmlDoubleElement&$item) { |
|
184 | 184 | $item->setTagName("a"); |
185 | 185 | }); |
186 | 186 | return $this->addToProperty("class", "pagination"); |
@@ -217,10 +217,10 @@ discard block |
||
217 | 217 | */ |
218 | 218 | public function setWidth($width) { |
219 | 219 | if (\is_int($width)) { |
220 | - $width=Wide::getConstants()["W" . $width]; |
|
220 | + $width=Wide::getConstants()["W".$width]; |
|
221 | 221 | } |
222 | 222 | $this->addToPropertyCtrl("class", $width, Wide::getConstants()); |
223 | - return $this->addToPropertyCtrl("class", "item", array ("item" )); |
|
223 | + return $this->addToPropertyCtrl("class", "item", array("item")); |
|
224 | 224 | } |
225 | 225 | |
226 | 226 | public function addImage($identifier, $src="", $alt="") { |
@@ -235,9 +235,9 @@ discard block |
||
235 | 235 | return $this->_itemHeader; |
236 | 236 | } |
237 | 237 | |
238 | - public function run(JsUtils $js){ |
|
239 | - $this->onClick('if(!$(this).hasClass("dropdown")&&!$(this).hasClass("no-active")){$(this).addClass("active").siblings().removeClass("active");}',false,false); |
|
240 | - $result= parent::run($js); |
|
238 | + public function run(JsUtils $js) { |
|
239 | + $this->onClick('if(!$(this).hasClass("dropdown")&&!$(this).hasClass("no-active")){$(this).addClass("active").siblings().removeClass("active");}', false, false); |
|
240 | + $result=parent::run($js); |
|
241 | 241 | return $result->setItemSelector(".item"); |
242 | 242 | } |
243 | 243 | } |
244 | 244 | \ No newline at end of file |
@@ -7,21 +7,21 @@ |
||
7 | 7 | |
8 | 8 | use Ajax\semantic\html\elements\HtmlIcon; |
9 | 9 | |
10 | -class HtmlPaginationMenu extends HtmlMenu{ |
|
10 | +class HtmlPaginationMenu extends HtmlMenu { |
|
11 | 11 | private $_page; |
12 | - public function __construct( $identifier, $items=array() ){ |
|
13 | - parent::__construct( $identifier,$items); |
|
12 | + public function __construct($identifier, $items=array()) { |
|
13 | + parent::__construct($identifier, $items); |
|
14 | 14 | } |
15 | 15 | /** |
16 | 16 | * {@inheritDoc} |
17 | 17 | * @see \Ajax\common\html\BaseHtml::compile() |
18 | 18 | */ |
19 | - public function compile(JsUtils $js=NULL,&$view=NULL){ |
|
19 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
20 | 20 | $max=\sizeof($this->content); |
21 | - $this->insertItem(new HtmlIcon("", "left chevron"))->setProperty("data-page", \max([1,$this->_page-1]))->addToProperty("class","_firstPage no-active"); |
|
22 | - $this->addItem(new HtmlIcon("", "right chevron"))->setProperty("data-page", \min([$max,$this->_page+1]))->setProperty("data-max", $max)->addToProperty("class","_lastPage no-active"); |
|
21 | + $this->insertItem(new HtmlIcon("", "left chevron"))->setProperty("data-page", \max([1, $this->_page-1]))->addToProperty("class", "_firstPage no-active"); |
|
22 | + $this->addItem(new HtmlIcon("", "right chevron"))->setProperty("data-page", \min([$max, $this->_page+1]))->setProperty("data-max", $max)->addToProperty("class", "_lastPage no-active"); |
|
23 | 23 | $this->asPagination(); |
24 | - return parent::compile($js,$view); |
|
24 | + return parent::compile($js, $view); |
|
25 | 25 | } |
26 | 26 | |
27 | 27 | public function setActiveItem($index) { |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | * @param int $max |
14 | 14 | * @param string $icon star or heart |
15 | 15 | */ |
16 | - public function __construct($identifier, $value,$max=5,$icon="") { |
|
16 | + public function __construct($identifier, $value, $max=5, $icon="") { |
|
17 | 17 | parent::__construct($identifier, "div", "ui {$icon} rating"); |
18 | 18 | $this->setValue($value); |
19 | 19 | $this->setMax($max); |
@@ -23,11 +23,11 @@ discard block |
||
23 | 23 | * {@inheritDoc} |
24 | 24 | * @see \Ajax\common\html\HtmlDoubleElement::setValue() |
25 | 25 | */ |
26 | - public function setValue($value){ |
|
26 | + public function setValue($value) { |
|
27 | 27 | $this->setProperty("data-rating", $value); |
28 | 28 | } |
29 | 29 | |
30 | - public function setMax($max){ |
|
30 | + public function setMax($max) { |
|
31 | 31 | $this->setProperty("data-max-rating", $max); |
32 | 32 | } |
33 | 33 | |
@@ -35,21 +35,21 @@ discard block |
||
35 | 35 | * {@inheritDoc} |
36 | 36 | * @see HtmlSemDoubleElement::run() |
37 | 37 | */ |
38 | - public function run(JsUtils $js){ |
|
38 | + public function run(JsUtils $js) { |
|
39 | 39 | parent::run($js); |
40 | - return $js->semantic()->rating("#".$this->identifier,$this->_params); |
|
40 | + return $js->semantic()->rating("#".$this->identifier, $this->_params); |
|
41 | 41 | } |
42 | 42 | |
43 | - public function asStar(){ |
|
43 | + public function asStar() { |
|
44 | 44 | return $this->setIcon(); |
45 | 45 | } |
46 | 46 | |
47 | - public function asHeart(){ |
|
47 | + public function asHeart() { |
|
48 | 48 | return $this->setIcon("heart"); |
49 | 49 | } |
50 | 50 | |
51 | - public function setIcon($icon="star"){ |
|
52 | - return $this->addToPropertyCtrl("class", $icon, ["star","heart",""]); |
|
51 | + public function setIcon($icon="star") { |
|
52 | + return $this->addToPropertyCtrl("class", $icon, ["star", "heart", ""]); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | } |
56 | 56 | \ No newline at end of file |
@@ -25,23 +25,23 @@ discard block |
||
25 | 25 | * @property boolean $_edition |
26 | 26 | * @property mixed _modelInstance |
27 | 27 | */ |
28 | -trait FieldAsTrait{ |
|
28 | +trait FieldAsTrait { |
|
29 | 29 | |
30 | - abstract protected function _getFieldIdentifier($prefix,$name=""); |
|
31 | - abstract public function setValueFunction($index,$callback); |
|
30 | + abstract protected function _getFieldIdentifier($prefix, $name=""); |
|
31 | + abstract public function setValueFunction($index, $callback); |
|
32 | 32 | abstract protected function _getFieldName($index); |
33 | 33 | abstract protected function _getFieldCaption($index); |
34 | - abstract protected function _buttonAsSubmit(HtmlButton &$button,$event,$url,$responseElement=NULL,$parameters=NULL); |
|
34 | + abstract protected function _buttonAsSubmit(HtmlButton&$button, $event, $url, $responseElement=NULL, $parameters=NULL); |
|
35 | 35 | |
36 | 36 | /** |
37 | 37 | * @param HtmlFormField $element |
38 | 38 | * @param array $attributes |
39 | 39 | */ |
40 | - protected function _applyAttributes($element,&$attributes,$index){ |
|
41 | - if(isset($attributes["jsCallback"])){ |
|
40 | + protected function _applyAttributes($element, &$attributes, $index) { |
|
41 | + if (isset($attributes["jsCallback"])) { |
|
42 | 42 | $callback=$attributes["jsCallback"]; |
43 | - if(\is_callable($callback)){ |
|
44 | - $callback($element,$this->_modelInstance,$index); |
|
43 | + if (\is_callable($callback)) { |
|
44 | + $callback($element, $this->_modelInstance, $index); |
|
45 | 45 | unset($attributes["jsCallback"]); |
46 | 46 | } |
47 | 47 | } |
@@ -51,43 +51,43 @@ discard block |
||
51 | 51 | $element->fromArray($attributes); |
52 | 52 | } |
53 | 53 | |
54 | - private function _getLabelField($caption,$icon=NULL){ |
|
55 | - $label=new HtmlLabel($this->_getFieldIdentifier("lbl"),$caption,$icon); |
|
54 | + private function _getLabelField($caption, $icon=NULL) { |
|
55 | + $label=new HtmlLabel($this->_getFieldIdentifier("lbl"), $caption, $icon); |
|
56 | 56 | return $label; |
57 | 57 | } |
58 | 58 | |
59 | 59 | |
60 | - protected function _addRules($element,&$attributes){ |
|
61 | - if(isset($attributes["rules"])){ |
|
60 | + protected function _addRules($element, &$attributes) { |
|
61 | + if (isset($attributes["rules"])) { |
|
62 | 62 | $rules=$attributes["rules"]; |
63 | - if(\is_array($rules)){ |
|
63 | + if (\is_array($rules)) { |
|
64 | 64 | $element->addRules($rules); |
65 | 65 | } |
66 | - else{ |
|
66 | + else { |
|
67 | 67 | $element->addRule($rules); |
68 | 68 | } |
69 | 69 | unset($attributes["rules"]); |
70 | 70 | } |
71 | 71 | } |
72 | 72 | |
73 | - protected function _prepareFormFields(&$field,$name,&$attributes){ |
|
73 | + protected function _prepareFormFields(&$field, $name, &$attributes) { |
|
74 | 74 | $field->setName($name); |
75 | 75 | $this->_addRules($field, $attributes); |
76 | 76 | return $field; |
77 | 77 | } |
78 | 78 | |
79 | - protected function _fieldAs($elementCallback,&$index,$attributes=NULL,$prefix=null){ |
|
80 | - $this->setValueFunction($index,function($value,$instance,$index) use (&$attributes,$elementCallback,$prefix){ |
|
79 | + protected function _fieldAs($elementCallback, &$index, $attributes=NULL, $prefix=null) { |
|
80 | + $this->setValueFunction($index, function($value, $instance, $index) use (&$attributes, $elementCallback, $prefix){ |
|
81 | 81 | $caption=$this->_getFieldCaption($index); |
82 | 82 | $name=$this->_getFieldName($index); |
83 | - $id=$this->_getFieldIdentifier($prefix,$name); |
|
84 | - if(isset($attributes["name"])){ |
|
83 | + $id=$this->_getFieldIdentifier($prefix, $name); |
|
84 | + if (isset($attributes["name"])) { |
|
85 | 85 | $name=$attributes["name"]; |
86 | 86 | unset($attributes["name"]); |
87 | 87 | } |
88 | - $element=$elementCallback($id,$name,$value,$caption); |
|
89 | - if(\is_array($attributes)){ |
|
90 | - $this->_applyAttributes($element, $attributes,$index); |
|
88 | + $element=$elementCallback($id, $name, $value, $caption); |
|
89 | + if (\is_array($attributes)) { |
|
90 | + $this->_applyAttributes($element, $attributes, $index); |
|
91 | 91 | } |
92 | 92 | $element->setDisabled(!$this->_edition); |
93 | 93 | return $element; |
@@ -96,169 +96,169 @@ discard block |
||
96 | 96 | } |
97 | 97 | |
98 | 98 | |
99 | - public function fieldAsProgress($index,$label=NULL, $attributes=array()){ |
|
100 | - $this->setValueFunction($index,function($value) use($label,$attributes){ |
|
101 | - $pb=new HtmlProgress($this->_getFieldIdentifier("pb"),$value,$label,$attributes); |
|
99 | + public function fieldAsProgress($index, $label=NULL, $attributes=array()) { |
|
100 | + $this->setValueFunction($index, function($value) use($label, $attributes){ |
|
101 | + $pb=new HtmlProgress($this->_getFieldIdentifier("pb"), $value, $label, $attributes); |
|
102 | 102 | return $pb; |
103 | 103 | }); |
104 | 104 | return $this; |
105 | 105 | } |
106 | 106 | |
107 | - public function fieldAsRating($index,$max=5, $icon=""){ |
|
108 | - $this->setValueFunction($index,function($value) use($max,$icon){ |
|
109 | - $rating=new HtmlRating($this->_getFieldIdentifier("rat"),$value,$max,$icon); |
|
107 | + public function fieldAsRating($index, $max=5, $icon="") { |
|
108 | + $this->setValueFunction($index, function($value) use($max, $icon){ |
|
109 | + $rating=new HtmlRating($this->_getFieldIdentifier("rat"), $value, $max, $icon); |
|
110 | 110 | return $rating; |
111 | 111 | }); |
112 | 112 | return $this; |
113 | 113 | } |
114 | 114 | |
115 | - public function fieldAsLabel($index,$icon=NULL){ |
|
116 | - $this->setValueFunction($index,function($caption) use($icon){ |
|
117 | - $lbl=$this->_getLabelField($caption,$icon); |
|
115 | + public function fieldAsLabel($index, $icon=NULL) { |
|
116 | + $this->setValueFunction($index, function($caption) use($icon){ |
|
117 | + $lbl=$this->_getLabelField($caption, $icon); |
|
118 | 118 | return $lbl; |
119 | 119 | }); |
120 | 120 | return $this; |
121 | 121 | } |
122 | 122 | |
123 | - public function fieldAsHeader($index,$niveau=1,$icon=NULL,$attributes=NULL){ |
|
124 | - return $this->_fieldAs(function($id,$name,$value) use($niveau,$icon){ |
|
125 | - $header=new HtmlHeader($id,$niveau,$value); |
|
126 | - if(isset($icon)) |
|
123 | + public function fieldAsHeader($index, $niveau=1, $icon=NULL, $attributes=NULL) { |
|
124 | + return $this->_fieldAs(function($id, $name, $value) use($niveau, $icon){ |
|
125 | + $header=new HtmlHeader($id, $niveau, $value); |
|
126 | + if (isset($icon)) |
|
127 | 127 | $header->asIcon($icon, $value); |
128 | 128 | return $header; |
129 | - }, $index,$attributes,"header"); |
|
129 | + }, $index, $attributes, "header"); |
|
130 | 130 | } |
131 | 131 | |
132 | 132 | |
133 | - public function fieldAsImage($index,$size=Size::MINI,$circular=false){ |
|
134 | - $this->setValueFunction($index,function($img) use($size,$circular){ |
|
135 | - $image=new HtmlImage($this->_getFieldIdentifier("image"),$img);$image->setSize($size);if($circular)$image->setCircular(); |
|
133 | + public function fieldAsImage($index, $size=Size::MINI, $circular=false) { |
|
134 | + $this->setValueFunction($index, function($img) use($size, $circular){ |
|
135 | + $image=new HtmlImage($this->_getFieldIdentifier("image"), $img); $image->setSize($size); if ($circular)$image->setCircular(); |
|
136 | 136 | return $image; |
137 | 137 | }); |
138 | 138 | return $this; |
139 | 139 | } |
140 | 140 | |
141 | - public function fieldAsAvatar($index,$attributes=NULL){ |
|
142 | - return $this->_fieldAs(function($id,$name,$value){ |
|
143 | - $img=new HtmlImage($id,$value); |
|
141 | + public function fieldAsAvatar($index, $attributes=NULL) { |
|
142 | + return $this->_fieldAs(function($id, $name, $value) { |
|
143 | + $img=new HtmlImage($id, $value); |
|
144 | 144 | $img->asAvatar(); |
145 | 145 | return $img; |
146 | - }, $index,$attributes,"avatar"); |
|
146 | + }, $index, $attributes, "avatar"); |
|
147 | 147 | } |
148 | 148 | |
149 | - public function fieldAsRadio($index,$attributes=NULL){ |
|
150 | - return $this->_fieldAs(function($id,$name,$value){ |
|
151 | - $input= new HtmlRadio($id,$name,$value,$value); |
|
149 | + public function fieldAsRadio($index, $attributes=NULL) { |
|
150 | + return $this->_fieldAs(function($id, $name, $value) { |
|
151 | + $input=new HtmlRadio($id, $name, $value, $value); |
|
152 | 152 | return $input; |
153 | - }, $index,$attributes,"radio"); |
|
153 | + }, $index, $attributes, "radio"); |
|
154 | 154 | } |
155 | 155 | |
156 | - public function fieldAsRadios($index,$elements=[],$attributes=NULL){ |
|
157 | - return $this->_fieldAs(function($id,$name,$value,$caption) use ($elements){ |
|
158 | - return HtmlFormFields::radios($name,$elements,$caption,$value); |
|
159 | - }, $index,$attributes,"radios"); |
|
156 | + public function fieldAsRadios($index, $elements=[], $attributes=NULL) { |
|
157 | + return $this->_fieldAs(function($id, $name, $value, $caption) use ($elements){ |
|
158 | + return HtmlFormFields::radios($name, $elements, $caption, $value); |
|
159 | + }, $index, $attributes, "radios"); |
|
160 | 160 | } |
161 | 161 | |
162 | - public function fieldAsInput($index,$attributes=NULL){ |
|
163 | - return $this->_fieldAs(function($id,$name,$value,$caption) use ($attributes){ |
|
164 | - $input= new HtmlFormInput($id,$caption,"text",$value); |
|
162 | + public function fieldAsInput($index, $attributes=NULL) { |
|
163 | + return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes){ |
|
164 | + $input=new HtmlFormInput($id, $caption, "text", $value); |
|
165 | 165 | return $this->_prepareFormFields($input, $name, $attributes); |
166 | - }, $index,$attributes,"input"); |
|
166 | + }, $index, $attributes, "input"); |
|
167 | 167 | } |
168 | 168 | |
169 | - public function fieldAsTextarea($index,$attributes=NULL){ |
|
170 | - return $this->_fieldAs(function($id,$name,$value,$caption){ |
|
171 | - $textarea=new HtmlFormTextarea($id,$caption,$value); |
|
169 | + public function fieldAsTextarea($index, $attributes=NULL) { |
|
170 | + return $this->_fieldAs(function($id, $name, $value, $caption) { |
|
171 | + $textarea=new HtmlFormTextarea($id, $caption, $value); |
|
172 | 172 | $textarea->setName($name); |
173 | 173 | return $textarea; |
174 | - }, $index,$attributes,"textarea"); |
|
174 | + }, $index, $attributes, "textarea"); |
|
175 | 175 | } |
176 | 176 | |
177 | - public function fieldAsHidden($index,$attributes=NULL){ |
|
178 | - if(!\is_array($attributes)){ |
|
177 | + public function fieldAsHidden($index, $attributes=NULL) { |
|
178 | + if (!\is_array($attributes)) { |
|
179 | 179 | $attributes=[]; |
180 | 180 | } |
181 | 181 | $attributes["imputType"]="hidden"; |
182 | - return $this->fieldAsInput($index,$attributes); |
|
182 | + return $this->fieldAsInput($index, $attributes); |
|
183 | 183 | } |
184 | 184 | |
185 | - public function fieldAsCheckbox($index,$attributes=NULL){ |
|
186 | - return $this->_fieldAs(function($id,$name,$value,$caption){ |
|
187 | - $input=new HtmlFormCheckbox($id,$caption,$this->_instanceViewer->getIdentifier()); |
|
185 | + public function fieldAsCheckbox($index, $attributes=NULL) { |
|
186 | + return $this->_fieldAs(function($id, $name, $value, $caption) { |
|
187 | + $input=new HtmlFormCheckbox($id, $caption, $this->_instanceViewer->getIdentifier()); |
|
188 | 188 | $input->setChecked(JString::isBooleanTrue($value)); |
189 | 189 | $input->setName($name); |
190 | 190 | return $input; |
191 | - }, $index,$attributes,"ck"); |
|
191 | + }, $index, $attributes, "ck"); |
|
192 | 192 | } |
193 | 193 | |
194 | - public function fieldAsDropDown($index,$elements=[],$multiple=false,$attributes=NULL){ |
|
195 | - return $this->_fieldAs(function($id,$name,$value,$caption) use($elements,$multiple){ |
|
196 | - $dd=new HtmlFormDropdown($id,$elements,$caption,$value); |
|
197 | - $dd->asSelect($name,$multiple); |
|
194 | + public function fieldAsDropDown($index, $elements=[], $multiple=false, $attributes=NULL) { |
|
195 | + return $this->_fieldAs(function($id, $name, $value, $caption) use($elements, $multiple){ |
|
196 | + $dd=new HtmlFormDropdown($id, $elements, $caption, $value); |
|
197 | + $dd->asSelect($name, $multiple); |
|
198 | 198 | return $dd; |
199 | - }, $index,$attributes,"dd"); |
|
199 | + }, $index, $attributes, "dd"); |
|
200 | 200 | } |
201 | 201 | |
202 | - public function fieldAsMessage($index,$attributes=NULL){ |
|
203 | - return $this->_fieldAs(function($id,$name,$value,$caption){ |
|
204 | - $mess= new HtmlMessage("message-".$id,$caption); |
|
202 | + public function fieldAsMessage($index, $attributes=NULL) { |
|
203 | + return $this->_fieldAs(function($id, $name, $value, $caption) { |
|
204 | + $mess=new HtmlMessage("message-".$id, $caption); |
|
205 | 205 | $mess->addHeader($value); |
206 | 206 | return $mess; |
207 | - }, $index,$attributes,"message"); |
|
207 | + }, $index, $attributes, "message"); |
|
208 | 208 | } |
209 | 209 | |
210 | - public function fieldAsLink($index,$attributes=NULL){ |
|
211 | - return $this->_fieldAs(function($id,$name,$value,$caption){ |
|
212 | - $lnk= new HtmlLink("message-".$id,"#",$caption); |
|
210 | + public function fieldAsLink($index, $attributes=NULL) { |
|
211 | + return $this->_fieldAs(function($id, $name, $value, $caption) { |
|
212 | + $lnk=new HtmlLink("message-".$id, "#", $caption); |
|
213 | 213 | return $lnk; |
214 | - }, $index,$attributes,"link"); |
|
214 | + }, $index, $attributes, "link"); |
|
215 | 215 | } |
216 | 216 | |
217 | 217 | /**Change fields type |
218 | 218 | * @param array $types an array or associative array $type=>$attributes |
219 | 219 | */ |
220 | - public function fieldsAs(array $types){ |
|
220 | + public function fieldsAs(array $types) { |
|
221 | 221 | $i=0; |
222 | - if(JArray::isAssociative($types)){ |
|
223 | - foreach ($types as $type=>$attributes){ |
|
224 | - if(\is_int($type)) |
|
225 | - $this->fieldAs($i++,$attributes,[]); |
|
226 | - else{ |
|
227 | - $type=preg_replace('/\d/', '', $type ); |
|
228 | - $this->fieldAs($i++,$type,$attributes); |
|
222 | + if (JArray::isAssociative($types)) { |
|
223 | + foreach ($types as $type=>$attributes) { |
|
224 | + if (\is_int($type)) |
|
225 | + $this->fieldAs($i++, $attributes, []); |
|
226 | + else { |
|
227 | + $type=preg_replace('/\d/', '', $type); |
|
228 | + $this->fieldAs($i++, $type, $attributes); |
|
229 | 229 | } |
230 | 230 | } |
231 | - }else{ |
|
232 | - foreach ($types as $type){ |
|
233 | - $this->fieldAs($i++,$type); |
|
231 | + } else { |
|
232 | + foreach ($types as $type) { |
|
233 | + $this->fieldAs($i++, $type); |
|
234 | 234 | } |
235 | 235 | } |
236 | 236 | } |
237 | 237 | |
238 | - public function fieldAs($index,$type,$attributes=NULL){ |
|
238 | + public function fieldAs($index, $type, $attributes=NULL) { |
|
239 | 239 | $method="fieldAs".\ucfirst($type); |
240 | - if(\method_exists($this, $method)){ |
|
241 | - if(!\is_array($attributes)){ |
|
240 | + if (\method_exists($this, $method)) { |
|
241 | + if (!\is_array($attributes)) { |
|
242 | 242 | $attributes=[$index]; |
243 | - }else{ |
|
243 | + } else { |
|
244 | 244 | \array_unshift($attributes, $index); |
245 | 245 | } |
246 | - \call_user_func_array([$this,$method], $attributes); |
|
246 | + \call_user_func_array([$this, $method], $attributes); |
|
247 | 247 | } |
248 | 248 | } |
249 | 249 | |
250 | - public function fieldAsSubmit($index,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$attributes=NULL){ |
|
251 | - return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle,$attributes){ |
|
252 | - $button=new HtmlButton($id,$caption,$cssStyle); |
|
253 | - $this->_buttonAsSubmit($button,"click",$url,$responseElement,@$attributes["ajax"]); |
|
250 | + public function fieldAsSubmit($index, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $attributes=NULL) { |
|
251 | + return $this->_fieldAs(function($id, $name, $value, $caption) use ($url, $responseElement, $cssStyle, $attributes){ |
|
252 | + $button=new HtmlButton($id, $caption, $cssStyle); |
|
253 | + $this->_buttonAsSubmit($button, "click", $url, $responseElement, @$attributes["ajax"]); |
|
254 | 254 | return $button; |
255 | - }, $index,$attributes,"submit"); |
|
255 | + }, $index, $attributes, "submit"); |
|
256 | 256 | } |
257 | 257 | |
258 | - public function fieldAsButton($index,$cssStyle=NULL,$attributes=NULL){ |
|
259 | - return $this->_fieldAs(function($id,$name,$value,$caption) use ($cssStyle){ |
|
260 | - $button=new HtmlButton($id,$value,$cssStyle); |
|
258 | + public function fieldAsButton($index, $cssStyle=NULL, $attributes=NULL) { |
|
259 | + return $this->_fieldAs(function($id, $name, $value, $caption) use ($cssStyle){ |
|
260 | + $button=new HtmlButton($id, $value, $cssStyle); |
|
261 | 261 | return $button; |
262 | - }, $index,$attributes,"button"); |
|
262 | + }, $index, $attributes, "button"); |
|
263 | 263 | } |
264 | 264 | } |
265 | 265 | \ No newline at end of file |
@@ -19,211 +19,211 @@ discard block |
||
19 | 19 | |
20 | 20 | public static $index=0; |
21 | 21 | |
22 | - public function __construct($identifier,$instance=NULL,$captions=NULL){ |
|
22 | + public function __construct($identifier, $instance=NULL, $captions=NULL) { |
|
23 | 23 | $this->widgetIdentifier=$identifier; |
24 | 24 | $this->values=[]; |
25 | 25 | $this->afterCompile=[]; |
26 | - if(isset($instance)) |
|
26 | + if (isset($instance)) |
|
27 | 27 | $this->setInstance($instance); |
28 | 28 | $this->setCaptions($captions); |
29 | 29 | $this->captionCallback=NULL; |
30 | - $this->defaultValueFunction=function($name,$value){return $value;}; |
|
30 | + $this->defaultValueFunction=function($name, $value) {return $value; }; |
|
31 | 31 | } |
32 | 32 | |
33 | - public function moveFieldTo($from,$to){ |
|
34 | - if(JArray::moveElementTo($this->visibleProperties, $from, $to)){ |
|
33 | + public function moveFieldTo($from, $to) { |
|
34 | + if (JArray::moveElementTo($this->visibleProperties, $from, $to)) { |
|
35 | 35 | return JArray::moveElementTo($this->values, $from, $to); |
36 | 36 | } |
37 | 37 | return false; |
38 | 38 | } |
39 | 39 | |
40 | - public function swapFields($index1,$index2){ |
|
41 | - if(JArray::swapElements($this->visibleProperties, $index1, $index2)){ |
|
40 | + public function swapFields($index1, $index2) { |
|
41 | + if (JArray::swapElements($this->visibleProperties, $index1, $index2)) { |
|
42 | 42 | return JArray::swapElements($this->values, $index1, $index2); |
43 | 43 | } |
44 | 44 | return false; |
45 | 45 | } |
46 | 46 | |
47 | - public function removeField($index){ |
|
48 | - \array_splice($this->visibleProperties,$index,1); |
|
49 | - \array_splice($this->values,$index,1); |
|
50 | - \array_splice($this->captions,$index,1); |
|
47 | + public function removeField($index) { |
|
48 | + \array_splice($this->visibleProperties, $index, 1); |
|
49 | + \array_splice($this->values, $index, 1); |
|
50 | + \array_splice($this->captions, $index, 1); |
|
51 | 51 | return $this; |
52 | 52 | } |
53 | 53 | |
54 | - public function getValues(){ |
|
54 | + public function getValues() { |
|
55 | 55 | $values=[]; |
56 | 56 | $index=0; |
57 | 57 | $count=$this->count(); |
58 | - while($index<$count){ |
|
58 | + while ($index<$count) { |
|
59 | 59 | $values[]=$this->getValue($index++); |
60 | 60 | } |
61 | 61 | return $values; |
62 | 62 | } |
63 | 63 | |
64 | - public function getIdentifier($index=NULL){ |
|
65 | - if(!isset($index)) |
|
64 | + public function getIdentifier($index=NULL) { |
|
65 | + if (!isset($index)) |
|
66 | 66 | $index=self::$index; |
67 | 67 | $value=$index; |
68 | - if(isset($this->values["identifier"])){ |
|
69 | - if(\is_string($this->values["identifier"])) |
|
68 | + if (isset($this->values["identifier"])) { |
|
69 | + if (\is_string($this->values["identifier"])) |
|
70 | 70 | $value=JReflection::callMethod($this->instance, $this->values["identifier"], []); |
71 | 71 | else |
72 | - $value=$this->values["identifier"]($index,$this->instance); |
|
72 | + $value=$this->values["identifier"]($index, $this->instance); |
|
73 | 73 | } |
74 | 74 | return $value; |
75 | 75 | } |
76 | 76 | |
77 | - public function getValue($index){ |
|
77 | + public function getValue($index) { |
|
78 | 78 | $property=$this->properties[$index]; |
79 | 79 | return $this->_getValue($property, $index); |
80 | 80 | } |
81 | 81 | |
82 | - protected function _beforeAddProperty($index,&$field){ |
|
82 | + protected function _beforeAddProperty($index, &$field) { |
|
83 | 83 | |
84 | 84 | } |
85 | 85 | |
86 | - protected function _getDefaultValue($name,$value,$index){ |
|
86 | + protected function _getDefaultValue($name, $value, $index) { |
|
87 | 87 | $func=$this->defaultValueFunction; |
88 | - return $func($name,$value,$index,$this->instance); |
|
88 | + return $func($name, $value, $index, $this->instance); |
|
89 | 89 | } |
90 | 90 | |
91 | - protected function _getPropertyValue(\ReflectionProperty $property,$index){ |
|
91 | + protected function _getPropertyValue(\ReflectionProperty $property, $index) { |
|
92 | 92 | $property->setAccessible(true); |
93 | 93 | $value=$property->getValue($this->instance); |
94 | - if(isset($this->values[$index])){ |
|
95 | - $value= $this->values[$index]($value,$this->instance,$index); |
|
96 | - }else{ |
|
97 | - $value=$this->_getDefaultValue($property->getName(),$value, $index); |
|
94 | + if (isset($this->values[$index])) { |
|
95 | + $value=$this->values[$index]($value, $this->instance, $index); |
|
96 | + } else { |
|
97 | + $value=$this->_getDefaultValue($property->getName(), $value, $index); |
|
98 | 98 | } |
99 | 99 | return $value; |
100 | 100 | } |
101 | 101 | |
102 | - protected function _getValue($property,$index){ |
|
102 | + protected function _getValue($property, $index) { |
|
103 | 103 | $value=null; |
104 | - if($property instanceof \ReflectionProperty){ |
|
104 | + if ($property instanceof \ReflectionProperty) { |
|
105 | 105 | $value=$this->_getPropertyValue($property, $index); |
106 | - }else{ |
|
107 | - if(\is_callable($property)) |
|
106 | + } else { |
|
107 | + if (\is_callable($property)) |
|
108 | 108 | $value=$property($this->instance); |
109 | - elseif(\is_array($property)){ |
|
110 | - $values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property); |
|
109 | + elseif (\is_array($property)) { |
|
110 | + $values=\array_map(function($v) use ($index){return $this->_getValue($v, $index); }, $property); |
|
111 | 111 | $value=\implode("", $values); |
112 | - }else{ |
|
113 | - if(isset($this->values[$index])){ |
|
114 | - $value= $this->values[$index]($property,$this->instance,$index); |
|
115 | - }elseif(isset($this->instance->{$property})){ |
|
112 | + } else { |
|
113 | + if (isset($this->values[$index])) { |
|
114 | + $value=$this->values[$index]($property, $this->instance, $index); |
|
115 | + }elseif (isset($this->instance->{$property})) { |
|
116 | 116 | $value=$this->instance->{$property}; |
117 | 117 | } |
118 | 118 | } |
119 | 119 | } |
120 | - if(isset($this->afterCompile[$index])){ |
|
121 | - if(\is_callable($this->afterCompile[$index])){ |
|
122 | - $this->afterCompile[$index]($value,$this->instance,$index); |
|
120 | + if (isset($this->afterCompile[$index])) { |
|
121 | + if (\is_callable($this->afterCompile[$index])) { |
|
122 | + $this->afterCompile[$index]($value, $this->instance, $index); |
|
123 | 123 | } |
124 | 124 | } |
125 | 125 | return $value; |
126 | 126 | } |
127 | 127 | |
128 | - public function insertField($index,$field){ |
|
129 | - array_splice( $this->visibleProperties, $index, 0, $field ); |
|
128 | + public function insertField($index, $field) { |
|
129 | + array_splice($this->visibleProperties, $index, 0, $field); |
|
130 | 130 | return $this; |
131 | 131 | } |
132 | 132 | |
133 | - public function insertInField($index,$field){ |
|
133 | + public function insertInField($index, $field) { |
|
134 | 134 | $vb=$this->visibleProperties; |
135 | - if(isset($vb[$index])){ |
|
136 | - if(\is_array($vb[$index])){ |
|
135 | + if (isset($vb[$index])) { |
|
136 | + if (\is_array($vb[$index])) { |
|
137 | 137 | $this->visibleProperties[$index][]=$field; |
138 | - }else{ |
|
139 | - $this->visibleProperties[$index]=[$vb[$index],$field]; |
|
138 | + } else { |
|
139 | + $this->visibleProperties[$index]=[$vb[$index], $field]; |
|
140 | 140 | } |
141 | - }else{ |
|
141 | + } else { |
|
142 | 142 | return $this->insertField($index, $field); |
143 | 143 | } |
144 | 144 | return $this; |
145 | 145 | } |
146 | 146 | |
147 | - public function addField($field){ |
|
147 | + public function addField($field) { |
|
148 | 148 | $this->visibleProperties[]=$field; |
149 | 149 | return $this; |
150 | 150 | } |
151 | 151 | |
152 | - public function count(){ |
|
152 | + public function count() { |
|
153 | 153 | return \sizeof($this->properties); |
154 | 154 | } |
155 | 155 | |
156 | - public function visiblePropertiesCount(){ |
|
156 | + public function visiblePropertiesCount() { |
|
157 | 157 | return \sizeof($this->visibleProperties); |
158 | 158 | } |
159 | 159 | |
160 | - public function getProperty($index){ |
|
160 | + public function getProperty($index) { |
|
161 | 161 | return $this->properties[$index]; |
162 | 162 | } |
163 | 163 | |
164 | - public function getFieldName($index){ |
|
164 | + public function getFieldName($index) { |
|
165 | 165 | $property=$this->getProperty($index); |
166 | - if($property instanceof \ReflectionProperty){ |
|
166 | + if ($property instanceof \ReflectionProperty) { |
|
167 | 167 | $result=$property->getName(); |
168 | - }elseif(\is_callable($property)){ |
|
168 | + }elseif (\is_callable($property)) { |
|
169 | 169 | $result=$this->visibleProperties[$index]; |
170 | - }else{ |
|
170 | + } else { |
|
171 | 171 | $result=$property; |
172 | 172 | } |
173 | 173 | return $result; |
174 | 174 | } |
175 | 175 | |
176 | 176 | |
177 | - protected function showableProperty(\ReflectionProperty $rProperty){ |
|
178 | - return JString::startswith($rProperty->getName(),"_")===false; |
|
177 | + protected function showableProperty(\ReflectionProperty $rProperty) { |
|
178 | + return JString::startswith($rProperty->getName(), "_")===false; |
|
179 | 179 | } |
180 | 180 | |
181 | 181 | public function setInstance($instance) { |
182 | - if(\is_string($instance)){ |
|
182 | + if (\is_string($instance)) { |
|
183 | 183 | $instance=new $instance(); |
184 | 184 | } |
185 | 185 | $this->instance=$instance; |
186 | 186 | $this->properties=[]; |
187 | 187 | $this->reflect=new \ReflectionClass($instance); |
188 | - if(\sizeof($this->visibleProperties)===0){ |
|
188 | + if (\sizeof($this->visibleProperties)===0) { |
|
189 | 189 | $this->properties=$this->getDefaultProperties(); |
190 | - }else{ |
|
191 | - foreach ($this->visibleProperties as $property){ |
|
190 | + } else { |
|
191 | + foreach ($this->visibleProperties as $property) { |
|
192 | 192 | $this->setInstanceProperty($property); |
193 | 193 | } |
194 | 194 | } |
195 | 195 | return $this; |
196 | 196 | } |
197 | 197 | |
198 | - private function setInstanceProperty($property){ |
|
199 | - if(\is_callable($property)){ |
|
198 | + private function setInstanceProperty($property) { |
|
199 | + if (\is_callable($property)) { |
|
200 | 200 | $this->properties[]=$property; |
201 | - }elseif(\is_string($property)){ |
|
202 | - try{ |
|
201 | + }elseif (\is_string($property)) { |
|
202 | + try { |
|
203 | 203 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
204 | 204 | $rProperty=$this->reflect->getProperty($property); |
205 | 205 | $this->properties[]=$rProperty; |
206 | - }catch(\Exception $e){ |
|
206 | + }catch (\Exception $e) { |
|
207 | 207 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
208 | 208 | $this->properties[]=$property; |
209 | 209 | } |
210 | - }elseif(\is_int($property)){ |
|
210 | + }elseif (\is_int($property)) { |
|
211 | 211 | $props=$this->getDefaultProperties(); |
212 | - if(isset($props[$property])) |
|
212 | + if (isset($props[$property])) |
|
213 | 213 | $this->properties[]=$props[$property]; |
214 | 214 | else |
215 | 215 | $this->properties[]=$property; |
216 | - }else{ |
|
216 | + } else { |
|
217 | 217 | $this->properties[]=$property; |
218 | 218 | } |
219 | 219 | } |
220 | 220 | |
221 | - protected function getDefaultProperties(){ |
|
221 | + protected function getDefaultProperties() { |
|
222 | 222 | $result=[]; |
223 | 223 | $properties=$this->reflect->getProperties(); |
224 | - foreach ($properties as $property){ |
|
224 | + foreach ($properties as $property) { |
|
225 | 225 | $showable=$this->showableProperty($property); |
226 | - if($showable!==false){ |
|
226 | + if ($showable!==false) { |
|
227 | 227 | $result[]=$property; |
228 | 228 | } |
229 | 229 | } |
@@ -235,12 +235,12 @@ discard block |
||
235 | 235 | return $this; |
236 | 236 | } |
237 | 237 | |
238 | - public function setValueFunction($index,$callback){ |
|
238 | + public function setValueFunction($index, $callback) { |
|
239 | 239 | $this->values[$index]=$callback; |
240 | 240 | return $this; |
241 | 241 | } |
242 | 242 | |
243 | - public function setIdentifierFunction($callback){ |
|
243 | + public function setIdentifierFunction($callback) { |
|
244 | 244 | $this->values["identifier"]=$callback; |
245 | 245 | return $this; |
246 | 246 | } |
@@ -253,41 +253,41 @@ discard block |
||
253 | 253 | return $this->properties; |
254 | 254 | } |
255 | 255 | |
256 | - public function getCaption($index){ |
|
257 | - if(isset($this->captions[$index])){ |
|
256 | + public function getCaption($index) { |
|
257 | + if (isset($this->captions[$index])) { |
|
258 | 258 | return $this->captions[$index]; |
259 | 259 | } |
260 | - if($this->properties[$index] instanceof \ReflectionProperty) |
|
260 | + if ($this->properties[$index] instanceof \ReflectionProperty) |
|
261 | 261 | return $this->properties[$index]->getName(); |
262 | - elseif(\is_callable($this->properties[$index])) |
|
262 | + elseif (\is_callable($this->properties[$index])) |
|
263 | 263 | return ""; |
264 | 264 | else |
265 | 265 | return $this->properties[$index]; |
266 | 266 | } |
267 | 267 | |
268 | - public function getCaptions(){ |
|
269 | - if(isset($this->captions)){ |
|
270 | - $captions= \array_values($this->captions); |
|
271 | - for($i=\sizeof($captions);$i<$this->count();$i++){ |
|
268 | + public function getCaptions() { |
|
269 | + if (isset($this->captions)) { |
|
270 | + $captions=\array_values($this->captions); |
|
271 | + for ($i=\sizeof($captions); $i<$this->count(); $i++) { |
|
272 | 272 | $captions[]=""; |
273 | 273 | } |
274 | - }else{ |
|
274 | + } else { |
|
275 | 275 | $captions=[]; |
276 | 276 | $index=0; |
277 | 277 | $count=$this->count(); |
278 | - while($index<$count){ |
|
278 | + while ($index<$count) { |
|
279 | 279 | $captions[]=$this->getCaption($index++); |
280 | 280 | } |
281 | 281 | } |
282 | - if(isset($this->captionCallback) && \is_callable($this->captionCallback)){ |
|
282 | + if (isset($this->captionCallback) && \is_callable($this->captionCallback)) { |
|
283 | 283 | $callback=$this->captionCallback; |
284 | - $callback($captions,$this->instance); |
|
284 | + $callback($captions, $this->instance); |
|
285 | 285 | } |
286 | 286 | return $captions; |
287 | 287 | } |
288 | 288 | |
289 | - public function setCaption($index,$caption){ |
|
290 | - if(isset($this->captions)===false) |
|
289 | + public function setCaption($index, $caption) { |
|
290 | + if (isset($this->captions)===false) |
|
291 | 291 | $this->captions=[]; |
292 | 292 | $this->captions[$index]=$caption; |
293 | 293 | return $this; |
@@ -305,7 +305,7 @@ discard block |
||
305 | 305 | * @param callable $callback function called after the field compilation |
306 | 306 | * @return \Ajax\semantic\widgets\datatable\InstanceViewer |
307 | 307 | */ |
308 | - public function afterCompile($index,$callback){ |
|
308 | + public function afterCompile($index, $callback) { |
|
309 | 309 | $this->afterCompile[$index]=$callback; |
310 | 310 | return $this; |
311 | 311 | } |
@@ -23,8 +23,9 @@ discard block |
||
23 | 23 | $this->widgetIdentifier=$identifier; |
24 | 24 | $this->values=[]; |
25 | 25 | $this->afterCompile=[]; |
26 | - if(isset($instance)) |
|
27 | - $this->setInstance($instance); |
|
26 | + if(isset($instance)) { |
|
27 | + $this->setInstance($instance); |
|
28 | + } |
|
28 | 29 | $this->setCaptions($captions); |
29 | 30 | $this->captionCallback=NULL; |
30 | 31 | $this->defaultValueFunction=function($name,$value){return $value;}; |
@@ -62,14 +63,16 @@ discard block |
||
62 | 63 | } |
63 | 64 | |
64 | 65 | public function getIdentifier($index=NULL){ |
65 | - if(!isset($index)) |
|
66 | - $index=self::$index; |
|
66 | + if(!isset($index)) { |
|
67 | + $index=self::$index; |
|
68 | + } |
|
67 | 69 | $value=$index; |
68 | 70 | if(isset($this->values["identifier"])){ |
69 | - if(\is_string($this->values["identifier"])) |
|
70 | - $value=JReflection::callMethod($this->instance, $this->values["identifier"], []); |
|
71 | - else |
|
72 | - $value=$this->values["identifier"]($index,$this->instance); |
|
71 | + if(\is_string($this->values["identifier"])) { |
|
72 | + $value=JReflection::callMethod($this->instance, $this->values["identifier"], []); |
|
73 | + } else { |
|
74 | + $value=$this->values["identifier"]($index,$this->instance); |
|
75 | + } |
|
73 | 76 | } |
74 | 77 | return $value; |
75 | 78 | } |
@@ -93,7 +96,7 @@ discard block |
||
93 | 96 | $value=$property->getValue($this->instance); |
94 | 97 | if(isset($this->values[$index])){ |
95 | 98 | $value= $this->values[$index]($value,$this->instance,$index); |
96 | - }else{ |
|
99 | + } else{ |
|
97 | 100 | $value=$this->_getDefaultValue($property->getName(),$value, $index); |
98 | 101 | } |
99 | 102 | return $value; |
@@ -103,16 +106,16 @@ discard block |
||
103 | 106 | $value=null; |
104 | 107 | if($property instanceof \ReflectionProperty){ |
105 | 108 | $value=$this->_getPropertyValue($property, $index); |
106 | - }else{ |
|
107 | - if(\is_callable($property)) |
|
108 | - $value=$property($this->instance); |
|
109 | - elseif(\is_array($property)){ |
|
109 | + } else{ |
|
110 | + if(\is_callable($property)) { |
|
111 | + $value=$property($this->instance); |
|
112 | + } elseif(\is_array($property)){ |
|
110 | 113 | $values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property); |
111 | 114 | $value=\implode("", $values); |
112 | - }else{ |
|
115 | + } else{ |
|
113 | 116 | if(isset($this->values[$index])){ |
114 | 117 | $value= $this->values[$index]($property,$this->instance,$index); |
115 | - }elseif(isset($this->instance->{$property})){ |
|
118 | + } elseif(isset($this->instance->{$property})){ |
|
116 | 119 | $value=$this->instance->{$property}; |
117 | 120 | } |
118 | 121 | } |
@@ -135,10 +138,10 @@ discard block |
||
135 | 138 | if(isset($vb[$index])){ |
136 | 139 | if(\is_array($vb[$index])){ |
137 | 140 | $this->visibleProperties[$index][]=$field; |
138 | - }else{ |
|
141 | + } else{ |
|
139 | 142 | $this->visibleProperties[$index]=[$vb[$index],$field]; |
140 | 143 | } |
141 | - }else{ |
|
144 | + } else{ |
|
142 | 145 | return $this->insertField($index, $field); |
143 | 146 | } |
144 | 147 | return $this; |
@@ -165,9 +168,9 @@ discard block |
||
165 | 168 | $property=$this->getProperty($index); |
166 | 169 | if($property instanceof \ReflectionProperty){ |
167 | 170 | $result=$property->getName(); |
168 | - }elseif(\is_callable($property)){ |
|
171 | + } elseif(\is_callable($property)){ |
|
169 | 172 | $result=$this->visibleProperties[$index]; |
170 | - }else{ |
|
173 | + } else{ |
|
171 | 174 | $result=$property; |
172 | 175 | } |
173 | 176 | return $result; |
@@ -187,7 +190,7 @@ discard block |
||
187 | 190 | $this->reflect=new \ReflectionClass($instance); |
188 | 191 | if(\sizeof($this->visibleProperties)===0){ |
189 | 192 | $this->properties=$this->getDefaultProperties(); |
190 | - }else{ |
|
193 | + } else{ |
|
191 | 194 | foreach ($this->visibleProperties as $property){ |
192 | 195 | $this->setInstanceProperty($property); |
193 | 196 | } |
@@ -198,22 +201,23 @@ discard block |
||
198 | 201 | private function setInstanceProperty($property){ |
199 | 202 | if(\is_callable($property)){ |
200 | 203 | $this->properties[]=$property; |
201 | - }elseif(\is_string($property)){ |
|
204 | + } elseif(\is_string($property)){ |
|
202 | 205 | try{ |
203 | 206 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
204 | 207 | $rProperty=$this->reflect->getProperty($property); |
205 | 208 | $this->properties[]=$rProperty; |
206 | - }catch(\Exception $e){ |
|
209 | + } catch(\Exception $e){ |
|
207 | 210 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
208 | 211 | $this->properties[]=$property; |
209 | 212 | } |
210 | - }elseif(\is_int($property)){ |
|
213 | + } elseif(\is_int($property)){ |
|
211 | 214 | $props=$this->getDefaultProperties(); |
212 | - if(isset($props[$property])) |
|
213 | - $this->properties[]=$props[$property]; |
|
214 | - else |
|
215 | - $this->properties[]=$property; |
|
216 | - }else{ |
|
215 | + if(isset($props[$property])) { |
|
216 | + $this->properties[]=$props[$property]; |
|
217 | + } else { |
|
218 | + $this->properties[]=$property; |
|
219 | + } |
|
220 | + } else{ |
|
217 | 221 | $this->properties[]=$property; |
218 | 222 | } |
219 | 223 | } |
@@ -257,12 +261,13 @@ discard block |
||
257 | 261 | if(isset($this->captions[$index])){ |
258 | 262 | return $this->captions[$index]; |
259 | 263 | } |
260 | - if($this->properties[$index] instanceof \ReflectionProperty) |
|
261 | - return $this->properties[$index]->getName(); |
|
262 | - elseif(\is_callable($this->properties[$index])) |
|
263 | - return ""; |
|
264 | - else |
|
265 | - return $this->properties[$index]; |
|
264 | + if($this->properties[$index] instanceof \ReflectionProperty) { |
|
265 | + return $this->properties[$index]->getName(); |
|
266 | + } elseif(\is_callable($this->properties[$index])) { |
|
267 | + return ""; |
|
268 | + } else { |
|
269 | + return $this->properties[$index]; |
|
270 | + } |
|
266 | 271 | } |
267 | 272 | |
268 | 273 | public function getCaptions(){ |
@@ -271,7 +276,7 @@ discard block |
||
271 | 276 | for($i=\sizeof($captions);$i<$this->count();$i++){ |
272 | 277 | $captions[]=""; |
273 | 278 | } |
274 | - }else{ |
|
279 | + } else{ |
|
275 | 280 | $captions=[]; |
276 | 281 | $index=0; |
277 | 282 | $count=$this->count(); |
@@ -287,8 +292,9 @@ discard block |
||
287 | 292 | } |
288 | 293 | |
289 | 294 | public function setCaption($index,$caption){ |
290 | - if(isset($this->captions)===false) |
|
291 | - $this->captions=[]; |
|
295 | + if(isset($this->captions)===false) { |
|
296 | + $this->captions=[]; |
|
297 | + } |
|
292 | 298 | $this->captions[$index]=$caption; |
293 | 299 | return $this; |
294 | 300 | } |
@@ -9,7 +9,7 @@ discard block |
||
9 | 9 | private $pages_visibles; |
10 | 10 | private $row_count; |
11 | 11 | |
12 | - public function __construct($items_per_page=10,$pages_visibles=null,$page=1,$row_count=null){ |
|
12 | + public function __construct($items_per_page=10, $pages_visibles=null, $page=1, $row_count=null) { |
|
13 | 13 | $this->items_per_page=$items_per_page; |
14 | 14 | $this->row_count=$row_count; |
15 | 15 | $this->page=$page; |
@@ -17,29 +17,29 @@ discard block |
||
17 | 17 | $this->visible=true; |
18 | 18 | } |
19 | 19 | |
20 | - public function getObjects($objects){ |
|
20 | + public function getObjects($objects) { |
|
21 | 21 | $auto=(!isset($this->row_count)); |
22 | 22 | $os=$objects; |
23 | - if(!\is_array($os)){ |
|
23 | + if (!\is_array($os)) { |
|
24 | 24 | $os=[]; |
25 | - foreach ($objects as $o){ |
|
25 | + foreach ($objects as $o) { |
|
26 | 26 | $os[]=$o; |
27 | 27 | } |
28 | 28 | } |
29 | - $this->page_count = 0; |
|
30 | - $row_count=($auto)?\sizeof($os):$this->row_count; |
|
31 | - if (0 === $row_count) { |
|
29 | + $this->page_count=0; |
|
30 | + $row_count=($auto) ? \sizeof($os) : $this->row_count; |
|
31 | + if (0===$row_count) { |
|
32 | 32 | $this->visible=false; |
33 | 33 | } else { |
34 | 34 | $this->visible=true; |
35 | - $this->page_count = (int)ceil($row_count / $this->items_per_page); |
|
36 | - if($this->page > $this->page_count+1) { |
|
37 | - $this->page = 1; |
|
35 | + $this->page_count=(int)ceil($row_count/$this->items_per_page); |
|
36 | + if ($this->page>$this->page_count+1) { |
|
37 | + $this->page=1; |
|
38 | 38 | } |
39 | 39 | } |
40 | - if($auto){ |
|
41 | - $offset = ($this->page - 1) * $this->items_per_page; |
|
42 | - return array_slice($os, $offset,$this->items_per_page); |
|
40 | + if ($auto) { |
|
41 | + $offset=($this->page-1)*$this->items_per_page; |
|
42 | + return array_slice($os, $offset, $this->items_per_page); |
|
43 | 43 | } |
44 | 44 | return $os; |
45 | 45 | } |
@@ -75,22 +75,22 @@ discard block |
||
75 | 75 | return $this->page_count; |
76 | 76 | } |
77 | 77 | |
78 | - public function getPagesNumbers(){ |
|
79 | - $middle= (int)ceil(($this->pages_visibles-1)/ 2); |
|
78 | + public function getPagesNumbers() { |
|
79 | + $middle=(int)ceil(($this->pages_visibles-1)/2); |
|
80 | 80 | $first=$this->page-$middle; |
81 | - if($first<1){ |
|
81 | + if ($first<1) { |
|
82 | 82 | $first=1; |
83 | 83 | } |
84 | 84 | $last=$first+$this->pages_visibles-1; |
85 | - if($last>$this->page_count){ |
|
85 | + if ($last>$this->page_count) { |
|
86 | 86 | $last=$this->page_count; |
87 | 87 | } |
88 | 88 | return \range($first, $last); |
89 | 89 | } |
90 | 90 | |
91 | 91 | public function setPagesVisibles($pages_visibles) { |
92 | - if(!isset($pages_visibles)) |
|
93 | - $pages_visibles=(int)ceil($this->row_count / $this->items_per_page)+1; |
|
92 | + if (!isset($pages_visibles)) |
|
93 | + $pages_visibles=(int)ceil($this->row_count/$this->items_per_page)+1; |
|
94 | 94 | $this->pages_visibles=$pages_visibles; |
95 | 95 | return $this; |
96 | 96 | } |
@@ -89,8 +89,9 @@ |
||
89 | 89 | } |
90 | 90 | |
91 | 91 | public function setPagesVisibles($pages_visibles) { |
92 | - if(!isset($pages_visibles)) |
|
93 | - $pages_visibles=(int)ceil($this->row_count / $this->items_per_page)+1; |
|
92 | + if(!isset($pages_visibles)) { |
|
93 | + $pages_visibles=(int)ceil($this->row_count / $this->items_per_page)+1; |
|
94 | + } |
|
94 | 95 | $this->pages_visibles=$pages_visibles; |
95 | 96 | return $this; |
96 | 97 | } |
@@ -16,17 +16,17 @@ discard block |
||
16 | 16 | parent::__construct($identifier, $model, $modelInstance); |
17 | 17 | } |
18 | 18 | |
19 | - protected function _generateContent($table){ |
|
19 | + protected function _generateContent($table) { |
|
20 | 20 | $this->_addRowModel($table); |
21 | 21 | $this->_rowClass="_json"; |
22 | 22 | parent::_generateContent($table); |
23 | 23 | } |
24 | 24 | |
25 | - protected function _addRowModel($table){ |
|
25 | + protected function _addRowModel($table) { |
|
26 | 26 | $object=JReflection::jsonObject($this->_model); |
27 | - $row=$this->_generateRow($object, $table,"_jsonArrayChecked"); |
|
27 | + $row=$this->_generateRow($object, $table, "_jsonArrayChecked"); |
|
28 | 28 | $row->setClass($this->_modelClass); |
29 | - $row->addToProperty("style","display:none;"); |
|
29 | + $row->addToProperty("style", "display:none;"); |
|
30 | 30 | $table->getBody()->_addRow($row); |
31 | 31 | } |
32 | 32 | |
@@ -34,22 +34,22 @@ discard block |
||
34 | 34 | * {@inheritDoc} |
35 | 35 | * @see DataTable::_associatePaginationBehavior() |
36 | 36 | */ |
37 | - protected function _associatePaginationBehavior(HtmlMenu $menu,JsUtils $js=NULL){ |
|
37 | + protected function _associatePaginationBehavior(HtmlMenu $menu, JsUtils $js=NULL) { |
|
38 | 38 | $callback=null; |
39 | - if(isset($js)){ |
|
39 | + if (isset($js)) { |
|
40 | 40 | $id=$this->identifier; |
41 | 41 | $offset=$js->scriptCount(); |
42 | 42 | $this->run($js); |
43 | 43 | $callback=$js->getScript($offset); |
44 | - $callback.=$js->trigger("#".$id." [name='selection[]']","change",false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js)); |
|
44 | + $callback.=$js->trigger("#".$id." [name='selection[]']", "change", false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js)); |
|
45 | 45 | $callback.=";var page=parseInt($(self).attr('data-page')); |
46 | 46 | $('#pagination-{$id} .item').removeClass('active'); |
47 | 47 | $('#pagination-{$id} [data-page='+page+']:not(.no-active)').addClass('active'); |
48 | 48 | $('#pagination-{$id} ._firstPage').attr('data-page',Math.max(1,page-1)); |
49 | 49 | var lastPage=$('#pagination-{$id} ._lastPage');lastPage.attr('data-page',Math.min(lastPage.attr('data-max'),page+1));"; |
50 | 50 | } |
51 | - if(isset($this->_urls["refresh"])) |
|
52 | - $this->jsonArrayOnClick($menu, $this->_urls["refresh"],"post","{'p':$(this).attr('data-page')}",$callback); |
|
51 | + if (isset($this->_urls["refresh"])) |
|
52 | + $this->jsonArrayOnClick($menu, $this->_urls["refresh"], "post", "{'p':$(this).attr('data-page')}", $callback); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | /** |
@@ -60,17 +60,17 @@ discard block |
||
60 | 60 | * @param callable $jsCallback |
61 | 61 | * @return AjaxCall |
62 | 62 | */ |
63 | - public function jsJsonArray($url, $method="get", $params="{}", $jsCallback=NULL,$parameters=[]){ |
|
64 | - $parameters=\array_merge($parameters,["modelSelector"=>"#".$this->_identifier." tr.".$this->_modelClass,"url"=>$url,"method"=>$method,"params"=>$params,"jsCallback"=>$jsCallback]); |
|
63 | + public function jsJsonArray($url, $method="get", $params="{}", $jsCallback=NULL, $parameters=[]) { |
|
64 | + $parameters=\array_merge($parameters, ["modelSelector"=>"#".$this->_identifier." tr.".$this->_modelClass, "url"=>$url, "method"=>$method, "params"=>$params, "jsCallback"=>$jsCallback]); |
|
65 | 65 | return new AjaxCall("jsonArray", $parameters); |
66 | 66 | } |
67 | 67 | |
68 | - public function jsonArrayOn(BaseHtml $element,$event,$url, $method="get", $params="{}", $jsCallback=NULL,$parameters=[]){ |
|
69 | - return $element->_addEvent($event, $this->jsJsonArray($url,$method,$params,$jsCallback,$parameters)); |
|
68 | + public function jsonArrayOn(BaseHtml $element, $event, $url, $method="get", $params="{}", $jsCallback=NULL, $parameters=[]) { |
|
69 | + return $element->_addEvent($event, $this->jsJsonArray($url, $method, $params, $jsCallback, $parameters)); |
|
70 | 70 | } |
71 | 71 | |
72 | - public function jsonArrayOnClick(BaseHtml $element,$url, $method="get", $params="{}", $jsCallback=NULL,$parameters=[]){ |
|
73 | - return $this->jsonArrayOn($element, "click", $url,$method,$params,$jsCallback,$parameters); |
|
72 | + public function jsonArrayOnClick(BaseHtml $element, $url, $method="get", $params="{}", $jsCallback=NULL, $parameters=[]) { |
|
73 | + return $this->jsonArrayOn($element, "click", $url, $method, $params, $jsCallback, $parameters); |
|
74 | 74 | } |
75 | 75 | |
76 | 76 | /** |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | * @param number $pages_visibles The number of visible pages in the Pagination component |
82 | 82 | * @return DataTable |
83 | 83 | */ |
84 | - public function paginate($page,$total_rowcount,$items_per_page=10,$pages_visibles=null){ |
|
85 | - return parent::paginate($page, $total_rowcount,$items_per_page,null); |
|
84 | + public function paginate($page, $total_rowcount, $items_per_page=10, $pages_visibles=null) { |
|
85 | + return parent::paginate($page, $total_rowcount, $items_per_page, null); |
|
86 | 86 | } |
87 | 87 | } |
88 | 88 | \ No newline at end of file |
@@ -48,8 +48,9 @@ |
||
48 | 48 | $('#pagination-{$id} ._firstPage').attr('data-page',Math.max(1,page-1)); |
49 | 49 | var lastPage=$('#pagination-{$id} ._lastPage');lastPage.attr('data-page',Math.min(lastPage.attr('data-max'),page+1));"; |
50 | 50 | } |
51 | - if(isset($this->_urls["refresh"])) |
|
52 | - $this->jsonArrayOnClick($menu, $this->_urls["refresh"],"post","{'p':$(this).attr('data-page')}",$callback); |
|
51 | + if(isset($this->_urls["refresh"])) { |
|
52 | + $this->jsonArrayOnClick($menu, $this->_urls["refresh"],"post","{'p':$(this).attr('data-page')}",$callback); |
|
53 | + } |
|
53 | 54 | } |
54 | 55 | |
55 | 56 | /** |
@@ -17,8 +17,8 @@ discard block |
||
17 | 17 | * @param array $instances |
18 | 18 | * @return DataTable |
19 | 19 | */ |
20 | - public function dataTable($identifier,$model, $instances){ |
|
21 | - return $this->addHtmlComponent(new DataTable($identifier,$model,$instances)); |
|
20 | + public function dataTable($identifier, $model, $instances) { |
|
21 | + return $this->addHtmlComponent(new DataTable($identifier, $model, $instances)); |
|
22 | 22 | } |
23 | 23 | |
24 | 24 | /** |
@@ -27,8 +27,8 @@ discard block |
||
27 | 27 | * @param array $instances |
28 | 28 | * @return JsonDataTable |
29 | 29 | */ |
30 | - public function jsonDataTable($identifier,$model, $instances){ |
|
31 | - return $this->addHtmlComponent(new JsonDataTable($identifier,$model,$instances)); |
|
30 | + public function jsonDataTable($identifier, $model, $instances) { |
|
31 | + return $this->addHtmlComponent(new JsonDataTable($identifier, $model, $instances)); |
|
32 | 32 | } |
33 | 33 | |
34 | 34 | /** |
@@ -36,8 +36,8 @@ discard block |
||
36 | 36 | * @param object $instance |
37 | 37 | * @return DataElement |
38 | 38 | */ |
39 | - public function dataElement($identifier, $instance){ |
|
40 | - return $this->addHtmlComponent(new DataElement($identifier,$instance)); |
|
39 | + public function dataElement($identifier, $instance) { |
|
40 | + return $this->addHtmlComponent(new DataElement($identifier, $instance)); |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | /** |
@@ -45,19 +45,19 @@ discard block |
||
45 | 45 | * @param object $instance |
46 | 46 | * @return DataForm |
47 | 47 | */ |
48 | - public function dataForm($identifier, $instance){ |
|
49 | - return $this->addHtmlComponent(new DataForm($identifier,$instance)); |
|
48 | + public function dataForm($identifier, $instance) { |
|
49 | + return $this->addHtmlComponent(new DataForm($identifier, $instance)); |
|
50 | 50 | } |
51 | 51 | |
52 | - public function defaultLogin($identifier,$instance=null){ |
|
53 | - return $this->addHtmlComponent(FormLogin::regular($identifier,$instance)); |
|
52 | + public function defaultLogin($identifier, $instance=null) { |
|
53 | + return $this->addHtmlComponent(FormLogin::regular($identifier, $instance)); |
|
54 | 54 | } |
55 | 55 | |
56 | - public function smallLogin($identifier,$instance=null){ |
|
57 | - return $this->addHtmlComponent(FormLogin::small($identifier,$instance)); |
|
56 | + public function smallLogin($identifier, $instance=null) { |
|
57 | + return $this->addHtmlComponent(FormLogin::small($identifier, $instance)); |
|
58 | 58 | } |
59 | 59 | |
60 | - public function segmentedLogin($identifier,$instance=null){ |
|
61 | - return $this->addHtmlComponent(FormLogin::attachedSegment($identifier,$instance)); |
|
60 | + public function segmentedLogin($identifier, $instance=null) { |
|
61 | + return $this->addHtmlComponent(FormLogin::attachedSegment($identifier, $instance)); |
|
62 | 62 | } |
63 | 63 | } |
64 | 64 | \ No newline at end of file |