@@ -14,44 +14,44 @@ discard block |
||
14 | 14 | */ |
15 | 15 | abstract class HtmlCollection extends HtmlDoubleElement { |
16 | 16 | |
17 | - public function __construct($identifier,$tagName="div"){ |
|
18 | - parent::__construct($identifier,$tagName); |
|
17 | + public function __construct($identifier, $tagName="div") { |
|
18 | + parent::__construct($identifier, $tagName); |
|
19 | 19 | $this->content=array(); |
20 | 20 | } |
21 | 21 | |
22 | - public function addItems($items){ |
|
23 | - if(JArray::isAssociative($items)){ |
|
24 | - foreach ($items as $k=>$v){ |
|
25 | - $this->addItem([$k,$v]); |
|
22 | + public function addItems($items) { |
|
23 | + if (JArray::isAssociative($items)) { |
|
24 | + foreach ($items as $k=>$v) { |
|
25 | + $this->addItem([$k, $v]); |
|
26 | 26 | } |
27 | - }else{ |
|
28 | - foreach ($items as $item){ |
|
27 | + } else { |
|
28 | + foreach ($items as $item) { |
|
29 | 29 | $this->addItem($item); |
30 | 30 | } |
31 | 31 | } |
32 | 32 | return $this; |
33 | 33 | } |
34 | 34 | |
35 | - public function setItems($items){ |
|
35 | + public function setItems($items) { |
|
36 | 36 | $this->content=$items; |
37 | 37 | return $this; |
38 | 38 | } |
39 | 39 | |
40 | - public function getItems(){ |
|
40 | + public function getItems() { |
|
41 | 41 | return $this->content; |
42 | 42 | } |
43 | 43 | |
44 | - protected function getItemToAdd($item){ |
|
44 | + protected function getItemToAdd($item) { |
|
45 | 45 | $itemO=$item; |
46 | - if($this->createCondition($item)===true){ |
|
46 | + if ($this->createCondition($item)===true) { |
|
47 | 47 | $itemO=$this->createItem($item); |
48 | 48 | } |
49 | 49 | return $itemO; |
50 | 50 | } |
51 | 51 | |
52 | - protected function setItemIdentifier($item,$classname,$index){ |
|
53 | - if($item instanceof BaseWidget){ |
|
54 | - if(JString::isNull($item->getIdentifier())){ |
|
52 | + protected function setItemIdentifier($item, $classname, $index) { |
|
53 | + if ($item instanceof BaseWidget) { |
|
54 | + if (JString::isNull($item->getIdentifier())) { |
|
55 | 55 | $item->setIdentifier($classname."-".$this->identifier."-".$index); |
56 | 56 | } |
57 | 57 | } |
@@ -62,15 +62,15 @@ discard block |
||
62 | 62 | * @param HtmlDoubleElement|string|array $item |
63 | 63 | * @return \Ajax\common\html\HtmlDoubleElement |
64 | 64 | */ |
65 | - public function addItem($item){ |
|
65 | + public function addItem($item) { |
|
66 | 66 | $itemO=$this->getItemToAdd($item); |
67 | 67 | $this->addContent($itemO); |
68 | 68 | return $itemO; |
69 | 69 | } |
70 | 70 | |
71 | - public function insertItem($item,$position=0){ |
|
71 | + public function insertItem($item, $position=0) { |
|
72 | 72 | $itemO=$this->getItemToAdd($item); |
73 | - \array_splice( $this->content, $position, 0, array($itemO)); |
|
73 | + \array_splice($this->content, $position, 0, array($itemO)); |
|
74 | 74 | return $itemO; |
75 | 75 | } |
76 | 76 | |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | * @return \Ajax\common\html\HtmlDoubleElement |
81 | 81 | */ |
82 | 82 | public function getItem($index) { |
83 | - if (is_int($index)&& isset($this->content[$index])) |
|
83 | + if (is_int($index) && isset($this->content[$index])) |
|
84 | 84 | return $this->content[$index]; |
85 | 85 | else { |
86 | 86 | $elm=$this->getElementById($index, $this->content); |
@@ -93,11 +93,11 @@ discard block |
||
93 | 93 | return $this; |
94 | 94 | } |
95 | 95 | |
96 | - public function removeItem($index){ |
|
96 | + public function removeItem($index) { |
|
97 | 97 | return array_splice($this->content, $index, 1); |
98 | 98 | } |
99 | 99 | |
100 | - public function count(){ |
|
100 | + public function count() { |
|
101 | 101 | return \sizeof($this->content); |
102 | 102 | } |
103 | 103 | |
@@ -108,8 +108,8 @@ discard block |
||
108 | 108 | return $this->addItem($function($object)); |
109 | 109 | } |
110 | 110 | |
111 | - public function apply($callBack){ |
|
112 | - foreach ($this->content as $item){ |
|
111 | + public function apply($callBack) { |
|
112 | + foreach ($this->content as $item) { |
|
113 | 113 | $callBack($item); |
114 | 114 | } |
115 | 115 | return $this; |
@@ -129,23 +129,23 @@ discard block |
||
129 | 129 | */ |
130 | 130 | abstract protected function createItem($value); |
131 | 131 | |
132 | - protected function createCondition($value){ |
|
132 | + protected function createCondition($value) { |
|
133 | 133 | return \is_object($value)===false; |
134 | 134 | } |
135 | 135 | |
136 | - protected function contentAs($tagName){ |
|
137 | - foreach ($this->content as $item){ |
|
136 | + protected function contentAs($tagName) { |
|
137 | + foreach ($this->content as $item) { |
|
138 | 138 | $item->setTagName($tagName); |
139 | 139 | } |
140 | 140 | return $this; |
141 | 141 | } |
142 | 142 | |
143 | - public function setProperties($properties){ |
|
143 | + public function setProperties($properties) { |
|
144 | 144 | $i=0; |
145 | - foreach ($properties as $k=>$v){ |
|
145 | + foreach ($properties as $k=>$v) { |
|
146 | 146 | $c=$this->content[$i++]; |
147 | - if(isset($c)) |
|
148 | - $c->setProperty($k,$v); |
|
147 | + if (isset($c)) |
|
148 | + $c->setProperty($k, $v); |
|
149 | 149 | else |
150 | 150 | return $this; |
151 | 151 | } |
@@ -158,15 +158,15 @@ discard block |
||
158 | 158 | * @param array|mixed $values |
159 | 159 | * @return $this |
160 | 160 | */ |
161 | - public function setPropertyValues($property,$values){ |
|
162 | - if(\is_array($values)===false){ |
|
163 | - $values=\array_fill(0, $this->count(),$values); |
|
161 | + public function setPropertyValues($property, $values) { |
|
162 | + if (\is_array($values)===false) { |
|
163 | + $values=\array_fill(0, $this->count(), $values); |
|
164 | 164 | } |
165 | - foreach ($values as $i=>$value){ |
|
166 | - if(isset($this->content[$i])){ |
|
167 | - $this->content[$i]->setProperty($property,$value); |
|
165 | + foreach ($values as $i=>$value) { |
|
166 | + if (isset($this->content[$i])) { |
|
167 | + $this->content[$i]->setProperty($property, $value); |
|
168 | 168 | } |
169 | - else{ |
|
169 | + else { |
|
170 | 170 | return $this; |
171 | 171 | } |
172 | 172 | } |
@@ -179,15 +179,15 @@ discard block |
||
179 | 179 | * @param array|mixed $values |
180 | 180 | * @return $this |
181 | 181 | */ |
182 | - public function addPropertyValues($property,$values){ |
|
183 | - if(\is_array($values)===false){ |
|
184 | - $values=\array_fill(0, $this->count(),$values); |
|
182 | + public function addPropertyValues($property, $values) { |
|
183 | + if (\is_array($values)===false) { |
|
184 | + $values=\array_fill(0, $this->count(), $values); |
|
185 | 185 | } |
186 | - foreach ($values as $i=>$value){ |
|
187 | - if(isset($this->content[$i])){ |
|
188 | - $this->content[$i++]->addToProperty($property,$value); |
|
186 | + foreach ($values as $i=>$value) { |
|
187 | + if (isset($this->content[$i])) { |
|
188 | + $this->content[$i++]->addToProperty($property, $value); |
|
189 | 189 | } |
190 | - else{ |
|
190 | + else { |
|
191 | 191 | return $this; |
192 | 192 | } |
193 | 193 | } |
@@ -197,13 +197,13 @@ discard block |
||
197 | 197 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
198 | 198 | $index=0; |
199 | 199 | $classname=\strtolower(JReflection::shortClassName($this)); |
200 | - foreach ($this->content as $item){ |
|
201 | - $this->setItemIdentifier($item,$classname,$index++); |
|
200 | + foreach ($this->content as $item) { |
|
201 | + $this->setItemIdentifier($item, $classname, $index++); |
|
202 | 202 | } |
203 | - return parent::compile($js,$view); |
|
203 | + return parent::compile($js, $view); |
|
204 | 204 | } |
205 | 205 | |
206 | - public function getItemById($identifier){ |
|
206 | + public function getItemById($identifier) { |
|
207 | 207 | return $this->getElementById($identifier, $this->content); |
208 | 208 | } |
209 | 209 | |
@@ -212,13 +212,13 @@ discard block |
||
212 | 212 | * @param string $target |
213 | 213 | * @return HtmlCollection |
214 | 214 | */ |
215 | - public function asLinks($hrefs=[],$target=NUll) { |
|
216 | - foreach ( $this->content as $index=>$item ) { |
|
217 | - if($item instanceof HtmlDoubleElement){ |
|
215 | + public function asLinks($hrefs=[], $target=NUll) { |
|
216 | + foreach ($this->content as $index=>$item) { |
|
217 | + if ($item instanceof HtmlDoubleElement) { |
|
218 | 218 | $href=""; |
219 | - if(isset($hrefs[$index])) |
|
219 | + if (isset($hrefs[$index])) |
|
220 | 220 | $href=$hrefs[$index]; |
221 | - $item->asLink($href,$target); |
|
221 | + $item->asLink($href, $target); |
|
222 | 222 | } |
223 | 223 | } |
224 | 224 | return $this; |
@@ -230,8 +230,8 @@ discard block |
||
230 | 230 | * @param int $length If length is omitted, removes everything from offset to the end of the array. If length is specified and is positive, then that many elements will be removed. If length is specified and is negative then the end of the removed portion will be that many elements from the end of the array. If length is specified and is zero, no elements will be removed. Tip: to remove everything from offset to the end of the array when replacement is also specified, use count($input) for length. |
231 | 231 | * @return $this |
232 | 232 | */ |
233 | - public function splice($offset,$length=null){ |
|
234 | - $this->content=array_slice($this->content, $offset,$length); |
|
233 | + public function splice($offset, $length=null) { |
|
234 | + $this->content=array_slice($this->content, $offset, $length); |
|
235 | 235 | return $this; |
236 | 236 | } |
237 | 237 | } |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | foreach ($items as $k=>$v){ |
25 | 25 | $this->addItem([$k,$v]); |
26 | 26 | } |
27 | - }else{ |
|
27 | + } else{ |
|
28 | 28 | foreach ($items as $item){ |
29 | 29 | $this->addItem($item); |
30 | 30 | } |
@@ -80,9 +80,9 @@ discard block |
||
80 | 80 | * @return \Ajax\common\html\HtmlDoubleElement |
81 | 81 | */ |
82 | 82 | public function getItem($index) { |
83 | - if (is_int($index)&& isset($this->content[$index])) |
|
84 | - return $this->content[$index]; |
|
85 | - else { |
|
83 | + if (is_int($index)&& isset($this->content[$index])) { |
|
84 | + return $this->content[$index]; |
|
85 | + } else { |
|
86 | 86 | $elm=$this->getElementById($index, $this->content); |
87 | 87 | return $elm; |
88 | 88 | } |
@@ -144,10 +144,11 @@ discard block |
||
144 | 144 | $i=0; |
145 | 145 | foreach ($properties as $k=>$v){ |
146 | 146 | $c=$this->content[$i++]; |
147 | - if(isset($c)) |
|
148 | - $c->setProperty($k,$v); |
|
149 | - else |
|
150 | - return $this; |
|
147 | + if(isset($c)) { |
|
148 | + $c->setProperty($k,$v); |
|
149 | + } else { |
|
150 | + return $this; |
|
151 | + } |
|
151 | 152 | } |
152 | 153 | return $this; |
153 | 154 | } |
@@ -165,8 +166,7 @@ discard block |
||
165 | 166 | foreach ($values as $i=>$value){ |
166 | 167 | if(isset($this->content[$i])){ |
167 | 168 | $this->content[$i]->setProperty($property,$value); |
168 | - } |
|
169 | - else{ |
|
169 | + } else{ |
|
170 | 170 | return $this; |
171 | 171 | } |
172 | 172 | } |
@@ -186,8 +186,7 @@ discard block |
||
186 | 186 | foreach ($values as $i=>$value){ |
187 | 187 | if(isset($this->content[$i])){ |
188 | 188 | $this->content[$i++]->addToProperty($property,$value); |
189 | - } |
|
190 | - else{ |
|
189 | + } else{ |
|
191 | 190 | return $this; |
192 | 191 | } |
193 | 192 | } |
@@ -216,8 +215,9 @@ discard block |
||
216 | 215 | foreach ( $this->content as $index=>$item ) { |
217 | 216 | if($item instanceof HtmlDoubleElement){ |
218 | 217 | $href=""; |
219 | - if(isset($hrefs[$index])) |
|
220 | - $href=$hrefs[$index]; |
|
218 | + if(isset($hrefs[$index])) { |
|
219 | + $href=$hrefs[$index]; |
|
220 | + } |
|
221 | 221 | $item->asLink($href,$target); |
222 | 222 | } |
223 | 223 | } |
@@ -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 |
@@ -26,8 +26,9 @@ discard block |
||
26 | 26 | */ |
27 | 27 | public function __construct($identifier, $tagName="tbody", $rowCount=NULL, $colCount=NULL) { |
28 | 28 | parent::__construct($identifier, $tagName, ""); |
29 | - if (isset($rowCount) && isset($colCount)) |
|
30 | - $this->setRowCount($rowCount, $colCount); |
|
29 | + if (isset($rowCount) && isset($colCount)) { |
|
30 | + $this->setRowCount($rowCount, $colCount); |
|
31 | + } |
|
31 | 32 | } |
32 | 33 | |
33 | 34 | /** |
@@ -112,7 +113,7 @@ discard block |
||
112 | 113 | $row=$this->getItem($row); |
113 | 114 | if (isset($row) && $row instanceof HtmlCollection) { |
114 | 115 | $col=$row->getItem($col); |
115 | - }else{ |
|
116 | + } else{ |
|
116 | 117 | $col=$row; |
117 | 118 | } |
118 | 119 | return $col; |
@@ -170,8 +171,9 @@ discard block |
||
170 | 171 | $values=\array_fill(0, $count, $values); |
171 | 172 | $isArray=false; |
172 | 173 | } |
173 | - if (JArray::dimension($values) == 1 && $isArray) |
|
174 | - $values=[ $values ]; |
|
174 | + if (JArray::dimension($values) == 1 && $isArray) { |
|
175 | + $values=[ $values ]; |
|
176 | + } |
|
175 | 177 | |
176 | 178 | $count=\min(\sizeof($values), $count); |
177 | 179 | |
@@ -198,8 +200,9 @@ discard block |
||
198 | 200 | $count=$this->count(); |
199 | 201 | for($i=0; $i < $count; $i++) { |
200 | 202 | $cell=$this->getCell($i, $colIndex); |
201 | - if($cell instanceof BaseTrait) |
|
202 | - $cell->addVariations($variations); |
|
203 | + if($cell instanceof BaseTrait) { |
|
204 | + $cell->addVariations($variations); |
|
205 | + } |
|
203 | 206 | } |
204 | 207 | return $this; |
205 | 208 | } |
@@ -208,8 +211,9 @@ discard block |
||
208 | 211 | $count=$this->count(); |
209 | 212 | for($i=0; $i < $count; $i++) { |
210 | 213 | $cell=$this->getCell($i, $colIndex); |
211 | - if(isset($cell)) |
|
212 | - $cell->addToProperty($name,$value); |
|
214 | + if(isset($cell)) { |
|
215 | + $cell->addToProperty($name,$value); |
|
216 | + } |
|
213 | 217 | } |
214 | 218 | return $this; |
215 | 219 | } |
@@ -227,8 +231,9 @@ discard block |
||
227 | 231 | $count=$this->count(); |
228 | 232 | for($i=0; $i < $count; $i++) { |
229 | 233 | $index=$this->content[$i]->getColPosition($colIndex); |
230 | - if ($index !== NULL) |
|
231 | - $this->getCell($i, $index)->$function(); |
|
234 | + if ($index !== NULL) { |
|
235 | + $this->getCell($i, $index)->$function(); |
|
236 | + } |
|
232 | 237 | } |
233 | 238 | return $this; |
234 | 239 | } |
@@ -239,8 +244,9 @@ discard block |
||
239 | 244 | $maxRow=$this->content[$i]->count(); |
240 | 245 | $index=$maxRow-$colIndex-1; |
241 | 246 | if (($cell=$this->getCell($i, $index))!== NULL){ |
242 | - if($cell->getColspan()==1) |
|
243 | - $cell->$function(); |
|
247 | + if($cell->getColspan()==1) { |
|
248 | + $cell->$function(); |
|
249 | + } |
|
244 | 250 | } |
245 | 251 | } |
246 | 252 | return $this; |
@@ -284,8 +290,9 @@ discard block |
||
284 | 290 | */ |
285 | 291 | public function getColCount() { |
286 | 292 | $result=0; |
287 | - if ($this->count() > 0) |
|
288 | - $result=$this->getItem(0)->count(); |
|
293 | + if ($this->count() > 0) { |
|
294 | + $result=$this->getItem(0)->count(); |
|
295 | + } |
|
289 | 296 | return $result; |
290 | 297 | } |
291 | 298 | |
@@ -309,8 +316,9 @@ discard block |
||
309 | 316 | |
310 | 317 | public function toDelete($rowIndex, $colIndex){ |
311 | 318 | $row=$this->getItem($rowIndex); |
312 | - if (isset($row) === true) |
|
313 | - $row->toDelete($colIndex); |
|
319 | + if (isset($row) === true) { |
|
320 | + $row->toDelete($colIndex); |
|
321 | + } |
|
314 | 322 | return $this; |
315 | 323 | } |
316 | 324 | |
@@ -408,8 +416,9 @@ discard block |
||
408 | 416 | foreach ( $rows as $row ) { |
409 | 417 | $cell=$row->getItem($colIndex); |
410 | 418 | $value=$cell->getContent(); |
411 | - if($functionExists) |
|
412 | - $value=\call_user_func($function,$value); |
|
419 | + if($functionExists) { |
|
420 | + $value=\call_user_func($function,$value); |
|
421 | + } |
|
413 | 422 | if($value!==$identiqual){ |
414 | 423 | if($counter>0 && isset($cellToMerge)){ |
415 | 424 | $cellToMerge->setRowspan($counter); |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | * |
15 | 15 | */ |
16 | 16 | class HtmlTableContent extends HtmlSemCollection { |
17 | - protected $_tdTagNames=[ "thead" => "th","tbody" => "td","tfoot" => "th" ]; |
|
17 | + protected $_tdTagNames=["thead" => "th", "tbody" => "td", "tfoot" => "th"]; |
|
18 | 18 | protected $_merged=false; |
19 | 19 | |
20 | 20 | /** |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | */ |
39 | 39 | public function setRowCount($rowCount, $colCount) { |
40 | 40 | $count=$this->count(); |
41 | - for($i=$count; $i < $rowCount; $i++) { |
|
41 | + for ($i=$count; $i<$rowCount; $i++) { |
|
42 | 42 | $this->addItem($colCount); |
43 | 43 | } |
44 | 44 | return $this; |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | return $this->_tdTagNames[$this->tagName]; |
49 | 49 | } |
50 | 50 | |
51 | - public function refreshTR(){ |
|
51 | + public function refreshTR() { |
|
52 | 52 | $this->_template="%wrapContentBefore%%content%%wrapContentAfter%"; |
53 | 53 | } |
54 | 54 | |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | $tr=new HtmlTR(""); |
65 | 65 | $tr->setContainer($this, $count); |
66 | 66 | $tr->setTdTagName($this->_tdTagNames[$this->tagName]); |
67 | - if (isset($value) === true) { |
|
67 | + if (isset($value)===true) { |
|
68 | 68 | $tr->setColCount($value); |
69 | 69 | } |
70 | 70 | return $tr; |
@@ -90,10 +90,10 @@ discard block |
||
90 | 90 | return $this->addItem($row); |
91 | 91 | } |
92 | 92 | |
93 | - public function addMergeRow($colCount,$value=null){ |
|
93 | + public function addMergeRow($colCount, $value=null) { |
|
94 | 94 | $row=$this->addRow($colCount); |
95 | 95 | $row->mergeCol(); |
96 | - if(isset($value)){ |
|
96 | + if (isset($value)) { |
|
97 | 97 | $row->setValues([$value]); |
98 | 98 | } |
99 | 99 | return $row; |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | /** |
103 | 103 | * @return HtmlTR |
104 | 104 | */ |
105 | - public function getItem($index){ |
|
105 | + public function getItem($index) { |
|
106 | 106 | return parent::getItem($index); |
107 | 107 | } |
108 | 108 | |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | $row=$this->getItem($row); |
117 | 117 | if (isset($row) && $row instanceof HtmlCollection) { |
118 | 118 | $col=$row->getItem($col); |
119 | - }else{ |
|
119 | + } else { |
|
120 | 120 | $col=$row; |
121 | 121 | } |
122 | 122 | return $col; |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | */ |
141 | 141 | public function setCellValue($row, $col, $value="") { |
142 | 142 | $cell=$this->getCell($row, $col); |
143 | - if (isset($cell) === true) { |
|
143 | + if (isset($cell)===true) { |
|
144 | 144 | $cell->setValue($value); |
145 | 145 | } |
146 | 146 | return $this; |
@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | * @param mixed $values |
152 | 152 | */ |
153 | 153 | public function setValues($values=array()) { |
154 | - return $this->_addOrSetValues($values, function(HtmlTR $row,$_values){$row->setValues($_values);}); |
|
154 | + return $this->_addOrSetValues($values, function(HtmlTR $row, $_values) {$row->setValues($_values); }); |
|
155 | 155 | } |
156 | 156 | |
157 | 157 | /** |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | * @param mixed $values |
160 | 160 | */ |
161 | 161 | public function addValues($values=array()) { |
162 | - return $this->_addOrSetValues($values, function(HtmlTR $row,$_values){$row->addValues($_values);}); |
|
162 | + return $this->_addOrSetValues($values, function(HtmlTR $row, $_values) {$row->addValues($_values); }); |
|
163 | 163 | } |
164 | 164 | |
165 | 165 | /** |
@@ -167,21 +167,21 @@ discard block |
||
167 | 167 | * @param mixed $values |
168 | 168 | * @param callable $callback |
169 | 169 | */ |
170 | - protected function _addOrSetValues($values,$callback) { |
|
170 | + protected function _addOrSetValues($values, $callback) { |
|
171 | 171 | $count=$this->count(); |
172 | 172 | $isArray=true; |
173 | 173 | if (!\is_array($values)) { |
174 | 174 | $values=\array_fill(0, $count, $values); |
175 | 175 | $isArray=false; |
176 | 176 | } |
177 | - if (JArray::dimension($values) == 1 && $isArray) |
|
178 | - $values=[ $values ]; |
|
177 | + if (JArray::dimension($values)==1 && $isArray) |
|
178 | + $values=[$values]; |
|
179 | 179 | |
180 | 180 | $count=\min(\sizeof($values), $count); |
181 | 181 | |
182 | - for($i=0; $i < $count; $i++) { |
|
182 | + for ($i=0; $i<$count; $i++) { |
|
183 | 183 | $row=$this->content[$i]; |
184 | - $callback($row,$values[$i]); |
|
184 | + $callback($row, $values[$i]); |
|
185 | 185 | } |
186 | 186 | return $this; |
187 | 187 | } |
@@ -192,7 +192,7 @@ discard block |
||
192 | 192 | $values=\array_fill(0, $count, $values); |
193 | 193 | } |
194 | 194 | $count=\min(\sizeof($values), $count); |
195 | - for($i=0; $i < $count; $i++) { |
|
195 | + for ($i=0; $i<$count; $i++) { |
|
196 | 196 | $this->getCell($i, $colIndex)->setValue($values[$i]); |
197 | 197 | } |
198 | 198 | return $this; |
@@ -200,20 +200,20 @@ discard block |
||
200 | 200 | |
201 | 201 | public function addColVariations($colIndex, $variations=array()) { |
202 | 202 | $count=$this->count(); |
203 | - for($i=0; $i < $count; $i++) { |
|
203 | + for ($i=0; $i<$count; $i++) { |
|
204 | 204 | $cell=$this->getCell($i, $colIndex); |
205 | - if($cell instanceof BaseTrait) |
|
205 | + if ($cell instanceof BaseTrait) |
|
206 | 206 | $cell->addVariations($variations); |
207 | 207 | } |
208 | 208 | return $this; |
209 | 209 | } |
210 | 210 | |
211 | - public function addPropertyCol($colIndex, $name,$value) { |
|
211 | + public function addPropertyCol($colIndex, $name, $value) { |
|
212 | 212 | $count=$this->count(); |
213 | - for($i=0; $i < $count; $i++) { |
|
213 | + for ($i=0; $i<$count; $i++) { |
|
214 | 214 | $cell=$this->getCell($i, $colIndex); |
215 | - if(isset($cell)) |
|
216 | - $cell->addToProperty($name,$value); |
|
215 | + if (isset($cell)) |
|
216 | + $cell->addToProperty($name, $value); |
|
217 | 217 | } |
218 | 218 | return $this; |
219 | 219 | } |
@@ -229,9 +229,9 @@ discard block |
||
229 | 229 | |
230 | 230 | private function colAlign($colIndex, $function) { |
231 | 231 | $count=$this->count(); |
232 | - for($i=0; $i < $count; $i++) { |
|
232 | + for ($i=0; $i<$count; $i++) { |
|
233 | 233 | $index=$this->content[$i]->getColPosition($colIndex); |
234 | - if ($index !== NULL) |
|
234 | + if ($index!==NULL) |
|
235 | 235 | $this->getCell($i, $index)->$function(); |
236 | 236 | } |
237 | 237 | return $this; |
@@ -239,11 +239,11 @@ discard block |
||
239 | 239 | |
240 | 240 | private function colAlignFromRight($colIndex, $function) { |
241 | 241 | $count=$this->count(); |
242 | - for($i=0; $i < $count; $i++) { |
|
242 | + for ($i=0; $i<$count; $i++) { |
|
243 | 243 | $maxRow=$this->content[$i]->count(); |
244 | 244 | $index=$maxRow-$colIndex-1; |
245 | - if (($cell=$this->getCell($i, $index))!== NULL){ |
|
246 | - if($cell->getColspan()==1) |
|
245 | + if (($cell=$this->getCell($i, $index))!==NULL) { |
|
246 | + if ($cell->getColspan()==1) |
|
247 | 247 | $cell->$function(); |
248 | 248 | } |
249 | 249 | } |
@@ -288,7 +288,7 @@ discard block |
||
288 | 288 | */ |
289 | 289 | public function getColCount() { |
290 | 290 | $result=0; |
291 | - if ($this->count() > 0) |
|
291 | + if ($this->count()>0) |
|
292 | 292 | $result=$this->getItem(0)->count(); |
293 | 293 | return $result; |
294 | 294 | } |
@@ -302,7 +302,7 @@ discard block |
||
302 | 302 | public function delete($rowIndex, $colIndex=NULL) { |
303 | 303 | if (isset($colIndex)) { |
304 | 304 | $row=$this->getItem($rowIndex); |
305 | - if (isset($row) === true) { |
|
305 | + if (isset($row)===true) { |
|
306 | 306 | $row->delete($colIndex); |
307 | 307 | } |
308 | 308 | } else { |
@@ -311,9 +311,9 @@ discard block |
||
311 | 311 | return $this; |
312 | 312 | } |
313 | 313 | |
314 | - public function toDelete($rowIndex, $colIndex){ |
|
314 | + public function toDelete($rowIndex, $colIndex) { |
|
315 | 315 | $row=$this->getItem($rowIndex); |
316 | - if (isset($row) === true) |
|
316 | + if (isset($row)===true) |
|
317 | 317 | $row->toDelete($colIndex); |
318 | 318 | return $this; |
319 | 319 | } |
@@ -342,17 +342,17 @@ discard block |
||
342 | 342 | */ |
343 | 343 | public function conditionalCellFormat($callback, $format) { |
344 | 344 | $rows=$this->content; |
345 | - foreach ( $rows as $row ) { |
|
345 | + foreach ($rows as $row) { |
|
346 | 346 | $row->conditionalCellFormat($callback, $format); |
347 | 347 | } |
348 | 348 | return $this; |
349 | 349 | } |
350 | 350 | |
351 | - public function conditionalColFormat($colIndex,$callback,$format){ |
|
351 | + public function conditionalColFormat($colIndex, $callback, $format) { |
|
352 | 352 | $rows=$this->content; |
353 | - foreach ( $rows as $row ) { |
|
353 | + foreach ($rows as $row) { |
|
354 | 354 | $cell=$row->getItem($colIndex); |
355 | - $cell->conditionnalCellFormat($callback,$format); |
|
355 | + $cell->conditionnalCellFormat($callback, $format); |
|
356 | 356 | } |
357 | 357 | return $this; |
358 | 358 | } |
@@ -364,17 +364,17 @@ discard block |
||
364 | 364 | */ |
365 | 365 | public function conditionalRowFormat($callback, $format) { |
366 | 366 | $rows=$this->content; |
367 | - foreach ( $rows as $row ) { |
|
367 | + foreach ($rows as $row) { |
|
368 | 368 | $row->conditionalRowFormat($callback, $format); |
369 | 369 | } |
370 | 370 | return $this; |
371 | 371 | } |
372 | 372 | |
373 | - public function hideColumn($colIndex){ |
|
373 | + public function hideColumn($colIndex) { |
|
374 | 374 | $rows=$this->content; |
375 | - foreach ( $rows as $row ) { |
|
375 | + foreach ($rows as $row) { |
|
376 | 376 | $cell=$row->getItem($colIndex); |
377 | - $cell->addToProperty("style","display:none;"); |
|
377 | + $cell->addToProperty("style", "display:none;"); |
|
378 | 378 | } |
379 | 379 | return $this; |
380 | 380 | } |
@@ -385,7 +385,7 @@ discard block |
||
385 | 385 | */ |
386 | 386 | public function applyCells($callback) { |
387 | 387 | $rows=$this->content; |
388 | - foreach ( $rows as $row ) { |
|
388 | + foreach ($rows as $row) { |
|
389 | 389 | $row->applyCells($callback); |
390 | 390 | } |
391 | 391 | return $this; |
@@ -397,25 +397,25 @@ discard block |
||
397 | 397 | */ |
398 | 398 | public function applyRows($callback) { |
399 | 399 | $rows=$this->content; |
400 | - foreach ( $rows as $row ) { |
|
400 | + foreach ($rows as $row) { |
|
401 | 401 | $row->apply($callback); |
402 | 402 | } |
403 | 403 | return $this; |
404 | 404 | } |
405 | 405 | |
406 | - public function mergeIdentiqualValues($colIndex,$function="strip_tags"){ |
|
406 | + public function mergeIdentiqualValues($colIndex, $function="strip_tags") { |
|
407 | 407 | $rows=$this->content; |
408 | 408 | $identiqual=null; |
409 | 409 | $counter=0; |
410 | 410 | $cellToMerge=null; |
411 | 411 | $functionExists=\function_exists($function); |
412 | - foreach ( $rows as $row ) { |
|
412 | + foreach ($rows as $row) { |
|
413 | 413 | $cell=$row->getItem($colIndex); |
414 | 414 | $value=$cell->getContent(); |
415 | - if($functionExists) |
|
416 | - $value=\call_user_func($function,$value); |
|
417 | - if($value!==$identiqual){ |
|
418 | - if($counter>0 && isset($cellToMerge)){ |
|
415 | + if ($functionExists) |
|
416 | + $value=\call_user_func($function, $value); |
|
417 | + if ($value!==$identiqual) { |
|
418 | + if ($counter>0 && isset($cellToMerge)) { |
|
419 | 419 | $cellToMerge->setRowspan($counter); |
420 | 420 | } |
421 | 421 | $counter=0; |
@@ -424,17 +424,17 @@ discard block |
||
424 | 424 | } |
425 | 425 | $counter++; |
426 | 426 | } |
427 | - if($counter>0 && isset($cellToMerge)){ |
|
427 | + if ($counter>0 && isset($cellToMerge)) { |
|
428 | 428 | $cellToMerge->setRowspan($counter); |
429 | 429 | } |
430 | 430 | return $this; |
431 | 431 | } |
432 | 432 | |
433 | - public function _isMerged(){ |
|
433 | + public function _isMerged() { |
|
434 | 434 | return $this->_merged; |
435 | 435 | } |
436 | 436 | |
437 | - public function _setMerged($value){ |
|
437 | + public function _setMerged($value) { |
|
438 | 438 | $this->_merged=$value; |
439 | 439 | return $this; |
440 | 440 | } |
@@ -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 | } |