@@ -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 | } |
@@ -99,16 +102,16 @@ discard block |
||
99 | 102 | if($property instanceof \ReflectionProperty){ |
100 | 103 | $value=$this->_getPropertyValue($property); |
101 | 104 | $propertyName=$property->getName(); |
102 | - }elseif(\is_callable($property) && array_search($property, ["system"])===false) |
|
103 | - $value=$property($this->instance); |
|
104 | - elseif(\is_array($property)){ |
|
105 | + } elseif(\is_callable($property) && array_search($property, ["system"])===false) { |
|
106 | + $value=$property($this->instance); |
|
107 | + } elseif(\is_array($property)){ |
|
105 | 108 | $values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property); |
106 | 109 | $value=\implode("", $values); |
107 | - }elseif(\is_string($property)){ |
|
110 | + } elseif(\is_string($property)){ |
|
108 | 111 | $value=$property; |
109 | 112 | if(isset($this->instance->{$property})){ |
110 | 113 | $value=$this->instance->{$property}; |
111 | - }elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){ |
|
114 | + } elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){ |
|
112 | 115 | $value=JReflection::callMethod($this->instance, $getter, []); |
113 | 116 | } |
114 | 117 | } |
@@ -118,7 +121,7 @@ discard block |
||
118 | 121 | protected function _postGetValue($index,$propertyName,$value){ |
119 | 122 | if(isset($this->values[$index])){ |
120 | 123 | $value= $this->values[$index]($value,$this->instance,$index,self::$index); |
121 | - }else{ |
|
124 | + } else{ |
|
122 | 125 | $value=$this->_getDefaultValue($propertyName,$value, $index); |
123 | 126 | } |
124 | 127 | if(isset($this->afterCompile[$index])){ |
@@ -132,7 +135,7 @@ discard block |
||
132 | 135 | public function insertField($index,$field,$key=null){ |
133 | 136 | if(isset($key)){ |
134 | 137 | array_splice( $this->visibleProperties, $index, 0, [$key=>$field] ); |
135 | - }else{ |
|
138 | + } else{ |
|
136 | 139 | array_splice( $this->visibleProperties, $index, 0, $field ); |
137 | 140 | } |
138 | 141 | return $this; |
@@ -153,17 +156,17 @@ discard block |
||
153 | 156 | if(isset($key)){ |
154 | 157 | if(\is_array($vb[$index])){ |
155 | 158 | $this->visibleProperties[$index][$key]=$field; |
156 | - }else{ |
|
159 | + } else{ |
|
157 | 160 | $this->visibleProperties[$index]=[$vb[$index],$key=>$field]; |
158 | 161 | } |
159 | - }else{ |
|
162 | + } else{ |
|
160 | 163 | if(\is_array($vb[$index])){ |
161 | 164 | $this->visibleProperties[$index][]=$field; |
162 | - }else{ |
|
165 | + } else{ |
|
163 | 166 | $this->visibleProperties[$index]=[$vb[$index],$field]; |
164 | 167 | } |
165 | 168 | } |
166 | - }else{ |
|
169 | + } else{ |
|
167 | 170 | return $this->insertField($index, $field); |
168 | 171 | } |
169 | 172 | return $this; |
@@ -172,7 +175,7 @@ discard block |
||
172 | 175 | public function addField($field,$key=null){ |
173 | 176 | if(isset($key)){ |
174 | 177 | $this->visibleProperties[]=[$key=>$field]; |
175 | - }else{ |
|
178 | + } else{ |
|
176 | 179 | $this->visibleProperties[]=$field; |
177 | 180 | } |
178 | 181 | return $this; |
@@ -199,9 +202,9 @@ discard block |
||
199 | 202 | $property=$this->getProperty($index); |
200 | 203 | if($property instanceof \ReflectionProperty){ |
201 | 204 | $result=$property->getName(); |
202 | - }elseif(\is_callable($property)){ |
|
205 | + } elseif(\is_callable($property)){ |
|
203 | 206 | $result=$this->visibleProperties[$index]; |
204 | - }else{ |
|
207 | + } else{ |
|
205 | 208 | $result=$property; |
206 | 209 | } |
207 | 210 | return $result; |
@@ -221,7 +224,7 @@ discard block |
||
221 | 224 | $this->reflect=new \ReflectionClass($instance); |
222 | 225 | if(JArray::count($this->visibleProperties)===0){ |
223 | 226 | $this->properties=$this->getDefaultProperties(); |
224 | - }else{ |
|
227 | + } else{ |
|
225 | 228 | foreach ($this->visibleProperties as $property){ |
226 | 229 | $this->setInstanceProperty($property); |
227 | 230 | } |
@@ -232,22 +235,23 @@ discard block |
||
232 | 235 | private function setInstanceProperty($property){ |
233 | 236 | if(\is_callable($property)){ |
234 | 237 | $this->properties[]=$property; |
235 | - }elseif(\is_string($property)){ |
|
238 | + } elseif(\is_string($property)){ |
|
236 | 239 | try{ |
237 | 240 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
238 | 241 | $rProperty=$this->reflect->getProperty($property); |
239 | 242 | $this->properties[]=$rProperty; |
240 | - }catch(\Exception $e){ |
|
243 | + } catch(\Exception $e){ |
|
241 | 244 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
242 | 245 | $this->properties[]=$property; |
243 | 246 | } |
244 | - }elseif(\is_int($property)){ |
|
247 | + } elseif(\is_int($property)){ |
|
245 | 248 | $props=$this->getDefaultProperties(); |
246 | - if(isset($props[$property])) |
|
247 | - $this->properties[]=$props[$property]; |
|
248 | - else |
|
249 | - $this->properties[]=$property; |
|
250 | - }else{ |
|
249 | + if(isset($props[$property])) { |
|
250 | + $this->properties[]=$props[$property]; |
|
251 | + } else { |
|
252 | + $this->properties[]=$property; |
|
253 | + } |
|
254 | + } else{ |
|
251 | 255 | $this->properties[]=$property; |
252 | 256 | } |
253 | 257 | } |
@@ -291,12 +295,13 @@ discard block |
||
291 | 295 | if(isset($this->captions[$index])){ |
292 | 296 | return $this->captions[$index]; |
293 | 297 | } |
294 | - if($this->properties[$index] instanceof \ReflectionProperty) |
|
295 | - return $this->properties[$index]->getName(); |
|
296 | - elseif(\is_callable($this->properties[$index])) |
|
297 | - return ""; |
|
298 | - else |
|
299 | - return $this->properties[$index]; |
|
298 | + if($this->properties[$index] instanceof \ReflectionProperty) { |
|
299 | + return $this->properties[$index]->getName(); |
|
300 | + } elseif(\is_callable($this->properties[$index])) { |
|
301 | + return ""; |
|
302 | + } else { |
|
303 | + return $this->properties[$index]; |
|
304 | + } |
|
300 | 305 | } |
301 | 306 | |
302 | 307 | public function getCaptions(){ |
@@ -307,7 +312,7 @@ discard block |
||
307 | 312 | for($i=$captionsSize;$i<$count;$i++){ |
308 | 313 | $captions[]=""; |
309 | 314 | } |
310 | - }else{ |
|
315 | + } else{ |
|
311 | 316 | $captions=[]; |
312 | 317 | $index=0; |
313 | 318 | while($index<$count){ |
@@ -322,8 +327,9 @@ discard block |
||
322 | 327 | } |
323 | 328 | |
324 | 329 | public function setCaption($index,$caption){ |
325 | - if(isset($this->captions)===false) |
|
326 | - $this->captions=[]; |
|
330 | + if(isset($this->captions)===false) { |
|
331 | + $this->captions=[]; |
|
332 | + } |
|
327 | 333 | $this->captions[$index]=$caption; |
328 | 334 | return $this; |
329 | 335 | } |
@@ -19,245 +19,245 @@ 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){ |
|
91 | + protected function _getPropertyValue(\ReflectionProperty $property) { |
|
92 | 92 | $property->setAccessible(true); |
93 | 93 | return $property->getValue($this->instance); |
94 | 94 | } |
95 | 95 | |
96 | - protected function _getValue($property,$index){ |
|
96 | + protected function _getValue($property, $index) { |
|
97 | 97 | $value=null; |
98 | 98 | $propertyName=$property; |
99 | - if($property instanceof \ReflectionProperty){ |
|
99 | + if ($property instanceof \ReflectionProperty) { |
|
100 | 100 | $value=$this->_getPropertyValue($property); |
101 | 101 | $propertyName=$property->getName(); |
102 | - }elseif(\is_callable($property) && array_search($property, ["system"])===false) |
|
102 | + }elseif (\is_callable($property) && array_search($property, ["system"])===false) |
|
103 | 103 | $value=$property($this->instance); |
104 | - elseif(\is_array($property)){ |
|
105 | - $values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property); |
|
104 | + elseif (\is_array($property)) { |
|
105 | + $values=\array_map(function($v) use ($index){return $this->_getValue($v, $index); }, $property); |
|
106 | 106 | $value=\implode("", $values); |
107 | - }elseif(\is_string($property)){ |
|
107 | + }elseif (\is_string($property)) { |
|
108 | 108 | $value=$property; |
109 | - if(isset($this->instance->{$property})){ |
|
109 | + if (isset($this->instance->{$property})) { |
|
110 | 110 | $value=$this->instance->{$property}; |
111 | - }elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){ |
|
111 | + }elseif (\method_exists($this->instance, $getter=JReflection::getterName($property))) { |
|
112 | 112 | $value=JReflection::callMethod($this->instance, $getter, []); |
113 | 113 | } |
114 | 114 | } |
115 | 115 | return $this->_postGetValue($index, $propertyName, $value); |
116 | 116 | } |
117 | 117 | |
118 | - protected function _postGetValue($index,$propertyName,$value){ |
|
119 | - if(isset($this->values[$index])){ |
|
120 | - $value= $this->values[$index]($value,$this->instance,$index,self::$index); |
|
121 | - }else{ |
|
122 | - $value=$this->_getDefaultValue($propertyName,$value, $index); |
|
118 | + protected function _postGetValue($index, $propertyName, $value) { |
|
119 | + if (isset($this->values[$index])) { |
|
120 | + $value=$this->values[$index]($value, $this->instance, $index, self::$index); |
|
121 | + } else { |
|
122 | + $value=$this->_getDefaultValue($propertyName, $value, $index); |
|
123 | 123 | } |
124 | - if(isset($this->afterCompile[$index])){ |
|
125 | - if(\is_callable($this->afterCompile[$index])){ |
|
126 | - $this->afterCompile[$index]($value,$this->instance,self::$index); |
|
124 | + if (isset($this->afterCompile[$index])) { |
|
125 | + if (\is_callable($this->afterCompile[$index])) { |
|
126 | + $this->afterCompile[$index]($value, $this->instance, self::$index); |
|
127 | 127 | } |
128 | 128 | } |
129 | 129 | return $value; |
130 | 130 | } |
131 | 131 | |
132 | - public function insertField($index,$field,$key=null){ |
|
133 | - if(isset($key)){ |
|
134 | - array_splice( $this->visibleProperties, $index, 0, [$key=>$field] ); |
|
135 | - }else{ |
|
136 | - array_splice( $this->visibleProperties, $index, 0, $field ); |
|
132 | + public function insertField($index, $field, $key=null) { |
|
133 | + if (isset($key)) { |
|
134 | + array_splice($this->visibleProperties, $index, 0, [$key=>$field]); |
|
135 | + } else { |
|
136 | + array_splice($this->visibleProperties, $index, 0, $field); |
|
137 | 137 | } |
138 | 138 | return $this; |
139 | 139 | } |
140 | 140 | |
141 | - public function sortColumnContent($index,$array){ |
|
142 | - if(isset($this->visibleProperties[$index])){ |
|
143 | - if(is_array($this->visibleProperties[$index])){ |
|
144 | - $this->visibleProperties[$index]=JArray::sortAssociative($this->visibleProperties[$index],$array); |
|
141 | + public function sortColumnContent($index, $array) { |
|
142 | + if (isset($this->visibleProperties[$index])) { |
|
143 | + if (is_array($this->visibleProperties[$index])) { |
|
144 | + $this->visibleProperties[$index]=JArray::sortAssociative($this->visibleProperties[$index], $array); |
|
145 | 145 | } |
146 | 146 | } |
147 | 147 | return $this; |
148 | 148 | } |
149 | 149 | |
150 | - public function insertInField($index,$field,$key=null){ |
|
150 | + public function insertInField($index, $field, $key=null) { |
|
151 | 151 | $vb=$this->visibleProperties; |
152 | - if(isset($vb[$index])){ |
|
153 | - if(isset($key)){ |
|
154 | - if(\is_array($vb[$index])){ |
|
152 | + if (isset($vb[$index])) { |
|
153 | + if (isset($key)) { |
|
154 | + if (\is_array($vb[$index])) { |
|
155 | 155 | $this->visibleProperties[$index][$key]=$field; |
156 | - }else{ |
|
157 | - $this->visibleProperties[$index]=[$vb[$index],$key=>$field]; |
|
156 | + } else { |
|
157 | + $this->visibleProperties[$index]=[$vb[$index], $key=>$field]; |
|
158 | 158 | } |
159 | - }else{ |
|
160 | - if(\is_array($vb[$index])){ |
|
159 | + } else { |
|
160 | + if (\is_array($vb[$index])) { |
|
161 | 161 | $this->visibleProperties[$index][]=$field; |
162 | - }else{ |
|
163 | - $this->visibleProperties[$index]=[$vb[$index],$field]; |
|
162 | + } else { |
|
163 | + $this->visibleProperties[$index]=[$vb[$index], $field]; |
|
164 | 164 | } |
165 | 165 | } |
166 | - }else{ |
|
166 | + } else { |
|
167 | 167 | return $this->insertField($index, $field); |
168 | 168 | } |
169 | 169 | return $this; |
170 | 170 | } |
171 | 171 | |
172 | - public function addField($field,$key=null){ |
|
173 | - if(isset($key)){ |
|
172 | + public function addField($field, $key=null) { |
|
173 | + if (isset($key)) { |
|
174 | 174 | $this->visibleProperties[]=[$key=>$field]; |
175 | - }else{ |
|
175 | + } else { |
|
176 | 176 | $this->visibleProperties[]=$field; |
177 | 177 | } |
178 | 178 | return $this; |
179 | 179 | } |
180 | 180 | |
181 | - public function addFields($fields){ |
|
182 | - $this->visibleProperties=\array_merge($this->visibleProperties,$fields); |
|
181 | + public function addFields($fields) { |
|
182 | + $this->visibleProperties=\array_merge($this->visibleProperties, $fields); |
|
183 | 183 | return $this; |
184 | 184 | } |
185 | 185 | |
186 | - public function count(){ |
|
186 | + public function count() { |
|
187 | 187 | return \sizeof($this->properties); |
188 | 188 | } |
189 | 189 | |
190 | - public function visiblePropertiesCount(){ |
|
190 | + public function visiblePropertiesCount() { |
|
191 | 191 | return \sizeof($this->visibleProperties); |
192 | 192 | } |
193 | 193 | |
194 | - public function getProperty($index){ |
|
194 | + public function getProperty($index) { |
|
195 | 195 | return $this->properties[$index]; |
196 | 196 | } |
197 | 197 | |
198 | - public function getFieldName($index){ |
|
198 | + public function getFieldName($index) { |
|
199 | 199 | $property=$this->getProperty($index); |
200 | - if($property instanceof \ReflectionProperty){ |
|
200 | + if ($property instanceof \ReflectionProperty) { |
|
201 | 201 | $result=$property->getName(); |
202 | - }elseif(\is_callable($property)){ |
|
202 | + }elseif (\is_callable($property)) { |
|
203 | 203 | $result=$this->visibleProperties[$index]; |
204 | - }else{ |
|
204 | + } else { |
|
205 | 205 | $result=$property; |
206 | 206 | } |
207 | 207 | return $result; |
208 | 208 | } |
209 | 209 | |
210 | 210 | |
211 | - protected function showableProperty(\ReflectionProperty $rProperty){ |
|
212 | - return JString::startswith($rProperty->getName(),"_")===false; |
|
211 | + protected function showableProperty(\ReflectionProperty $rProperty) { |
|
212 | + return JString::startswith($rProperty->getName(), "_")===false; |
|
213 | 213 | } |
214 | 214 | |
215 | 215 | public function setInstance($instance) { |
216 | - if(\is_string($instance)){ |
|
216 | + if (\is_string($instance)) { |
|
217 | 217 | $instance=new $instance(); |
218 | 218 | } |
219 | 219 | $this->instance=$instance; |
220 | 220 | $this->properties=[]; |
221 | 221 | $this->reflect=new \ReflectionClass($instance); |
222 | - if(JArray::count($this->visibleProperties)===0){ |
|
222 | + if (JArray::count($this->visibleProperties)===0) { |
|
223 | 223 | $this->properties=$this->getDefaultProperties(); |
224 | - }else{ |
|
225 | - foreach ($this->visibleProperties as $property){ |
|
224 | + } else { |
|
225 | + foreach ($this->visibleProperties as $property) { |
|
226 | 226 | $this->setInstanceProperty($property); |
227 | 227 | } |
228 | 228 | } |
229 | 229 | return $this; |
230 | 230 | } |
231 | 231 | |
232 | - private function setInstanceProperty($property){ |
|
233 | - if(\is_callable($property)){ |
|
232 | + private function setInstanceProperty($property) { |
|
233 | + if (\is_callable($property)) { |
|
234 | 234 | $this->properties[]=$property; |
235 | - }elseif(\is_string($property)){ |
|
236 | - try{ |
|
235 | + }elseif (\is_string($property)) { |
|
236 | + try { |
|
237 | 237 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
238 | 238 | $rProperty=$this->reflect->getProperty($property); |
239 | 239 | $this->properties[]=$rProperty; |
240 | - }catch(\Exception $e){ |
|
240 | + }catch (\Exception $e) { |
|
241 | 241 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
242 | 242 | $this->properties[]=$property; |
243 | 243 | } |
244 | - }elseif(\is_int($property)){ |
|
244 | + }elseif (\is_int($property)) { |
|
245 | 245 | $props=$this->getDefaultProperties(); |
246 | - if(isset($props[$property])) |
|
246 | + if (isset($props[$property])) |
|
247 | 247 | $this->properties[]=$props[$property]; |
248 | 248 | else |
249 | 249 | $this->properties[]=$property; |
250 | - }else{ |
|
250 | + } else { |
|
251 | 251 | $this->properties[]=$property; |
252 | 252 | } |
253 | 253 | } |
254 | 254 | |
255 | - protected function getDefaultProperties(){ |
|
255 | + protected function getDefaultProperties() { |
|
256 | 256 | $result=[]; |
257 | 257 | $properties=$this->reflect->getProperties(); |
258 | - foreach ($properties as $property){ |
|
258 | + foreach ($properties as $property) { |
|
259 | 259 | $showable=$this->showableProperty($property); |
260 | - if($showable!==false){ |
|
260 | + if ($showable!==false) { |
|
261 | 261 | $result[]=$property; |
262 | 262 | } |
263 | 263 | } |
@@ -269,12 +269,12 @@ discard block |
||
269 | 269 | return $this; |
270 | 270 | } |
271 | 271 | |
272 | - public function setValueFunction($index,$callback){ |
|
272 | + public function setValueFunction($index, $callback) { |
|
273 | 273 | $this->values[$index]=$callback; |
274 | 274 | return $this; |
275 | 275 | } |
276 | 276 | |
277 | - public function setIdentifierFunction($callback){ |
|
277 | + public function setIdentifierFunction($callback) { |
|
278 | 278 | $this->values["identifier"]=$callback; |
279 | 279 | return $this; |
280 | 280 | } |
@@ -287,42 +287,42 @@ discard block |
||
287 | 287 | return $this->properties; |
288 | 288 | } |
289 | 289 | |
290 | - public function getCaption($index){ |
|
291 | - if(isset($this->captions[$index])){ |
|
290 | + public function getCaption($index) { |
|
291 | + if (isset($this->captions[$index])) { |
|
292 | 292 | return $this->captions[$index]; |
293 | 293 | } |
294 | - if($this->properties[$index] instanceof \ReflectionProperty) |
|
294 | + if ($this->properties[$index] instanceof \ReflectionProperty) |
|
295 | 295 | return $this->properties[$index]->getName(); |
296 | - elseif(\is_callable($this->properties[$index])) |
|
296 | + elseif (\is_callable($this->properties[$index])) |
|
297 | 297 | return ""; |
298 | 298 | else |
299 | 299 | return $this->properties[$index]; |
300 | 300 | } |
301 | 301 | |
302 | - public function getCaptions(){ |
|
302 | + public function getCaptions() { |
|
303 | 303 | $count=$this->count(); |
304 | - if(isset($this->captions)){ |
|
305 | - $captions= \array_values($this->captions); |
|
304 | + if (isset($this->captions)) { |
|
305 | + $captions=\array_values($this->captions); |
|
306 | 306 | $captionsSize=\sizeof($captions); |
307 | - for($i=$captionsSize;$i<$count;$i++){ |
|
307 | + for ($i=$captionsSize; $i<$count; $i++) { |
|
308 | 308 | $captions[]=""; |
309 | 309 | } |
310 | - }else{ |
|
310 | + } else { |
|
311 | 311 | $captions=[]; |
312 | 312 | $index=0; |
313 | - while($index<$count){ |
|
313 | + while ($index<$count) { |
|
314 | 314 | $captions[]=$this->getCaption($index++); |
315 | 315 | } |
316 | 316 | } |
317 | - if(isset($this->captionCallback) && \is_callable($this->captionCallback)){ |
|
317 | + if (isset($this->captionCallback) && \is_callable($this->captionCallback)) { |
|
318 | 318 | $callback=$this->captionCallback; |
319 | - $callback($captions,$this->instance); |
|
319 | + $callback($captions, $this->instance); |
|
320 | 320 | } |
321 | 321 | return $captions; |
322 | 322 | } |
323 | 323 | |
324 | - public function setCaption($index,$caption){ |
|
325 | - if(isset($this->captions)===false) |
|
324 | + public function setCaption($index, $caption) { |
|
325 | + if (isset($this->captions)===false) |
|
326 | 326 | $this->captions=[]; |
327 | 327 | $this->captions[$index]=$caption; |
328 | 328 | return $this; |
@@ -340,7 +340,7 @@ discard block |
||
340 | 340 | * @param callable $callback function called after the field compilation |
341 | 341 | * @return InstanceViewer |
342 | 342 | */ |
343 | - public function afterCompile($index,$callback){ |
|
343 | + public function afterCompile($index, $callback) { |
|
344 | 344 | $this->afterCompile[$index]=$callback; |
345 | 345 | return $this; |
346 | 346 | } |
@@ -371,7 +371,7 @@ discard block |
||
371 | 371 | } |
372 | 372 | |
373 | 373 | public function getSimpleProperties() { |
374 | - return array_filter($this->visibleProperties,function($item){ |
|
374 | + return array_filter($this->visibleProperties, function($item) { |
|
375 | 375 | return !(is_array($item) || is_object($item)); |
376 | 376 | }); |
377 | 377 | } |
@@ -10,12 +10,12 @@ |
||
10 | 10 | * @author jc |
11 | 11 | * |
12 | 12 | */ |
13 | -class Visibility extends SimpleSemExtComponent{ |
|
13 | +class Visibility extends SimpleSemExtComponent { |
|
14 | 14 | |
15 | 15 | public function __construct(JsUtils $js) { |
16 | 16 | parent::__construct($js); |
17 | 17 | $this->uiName="visibility"; |
18 | - $this->params=["once"=>false,"observeChanges"=>true]; |
|
18 | + $this->params=["once"=>false, "observeChanges"=>true]; |
|
19 | 19 | } |
20 | 20 | |
21 | 21 | public function setOnce($value=false) { |
@@ -5,20 +5,20 @@ |
||
5 | 5 | use Ajax\common\html\HtmlDoubleElement; |
6 | 6 | use Ajax\common\html\HtmlCollection; |
7 | 7 | |
8 | -class HtmlDatalist extends HtmlCollection{ |
|
8 | +class HtmlDatalist extends HtmlCollection { |
|
9 | 9 | |
10 | - public function __construct($identifier){ |
|
11 | - parent::__construct($identifier,"datalist"); |
|
10 | + public function __construct($identifier) { |
|
11 | + parent::__construct($identifier, "datalist"); |
|
12 | 12 | } |
13 | 13 | |
14 | 14 | protected function createItem($value) { |
15 | - $elm= new HtmlDoubleElement("","option"); |
|
15 | + $elm=new HtmlDoubleElement("", "option"); |
|
16 | 16 | $elm->setProperty("value", $value->getContent()); |
17 | 17 | $elm->setContent($value); |
18 | 18 | return $elm; |
19 | 19 | } |
20 | 20 | |
21 | - protected function createCondition($value){ |
|
21 | + protected function createCondition($value) { |
|
22 | 22 | return true; |
23 | 23 | } |
24 | 24 | } |
@@ -15,11 +15,11 @@ discard block |
||
15 | 15 | * @version 1.3 |
16 | 16 | */ |
17 | 17 | abstract class BaseHtml extends BaseWidget { |
18 | - use BaseHtmlEventsTrait,BaseHtmlPropertiesTrait; |
|
18 | + use BaseHtmlEventsTrait, BaseHtmlPropertiesTrait; |
|
19 | 19 | protected $_template; |
20 | 20 | protected $tagName; |
21 | - protected $_wrapBefore=array (); |
|
22 | - protected $_wrapAfter=array (); |
|
21 | + protected $_wrapBefore=array(); |
|
22 | + protected $_wrapAfter=array(); |
|
23 | 23 | protected $_bsComponent; |
24 | 24 | protected $_compiled=false; |
25 | 25 | protected $_runned=false; |
@@ -33,32 +33,32 @@ discard block |
||
33 | 33 | */ |
34 | 34 | abstract public function run(JsUtils $js); |
35 | 35 | |
36 | - private function _callSetter($setter,$key,$value,&$array){ |
|
36 | + private function _callSetter($setter, $key, $value, &$array) { |
|
37 | 37 | $result=false; |
38 | - if (method_exists($this, $setter) && substr($setter, 0, 1) !== "_") { |
|
38 | + if (method_exists($this, $setter) && substr($setter, 0, 1)!=="_") { |
|
39 | 39 | try { |
40 | 40 | $this->$setter($value); |
41 | 41 | unset($array[$key]); |
42 | 42 | $result=true; |
43 | - } catch ( \Exception $e ) { |
|
43 | + }catch (\Exception $e) { |
|
44 | 44 | $result=false; |
45 | 45 | } |
46 | 46 | } |
47 | 47 | return $result; |
48 | 48 | } |
49 | 49 | |
50 | - protected function getTemplate(JsUtils $js=NULL,$view=null) { |
|
51 | - return PropertyWrapper::wrap($this->_wrapBefore, $js,$view) . $this->_template . PropertyWrapper::wrap($this->_wrapAfter, $js,$view); |
|
50 | + protected function getTemplate(JsUtils $js=NULL, $view=null) { |
|
51 | + return PropertyWrapper::wrap($this->_wrapBefore, $js, $view).$this->_template.PropertyWrapper::wrap($this->_wrapAfter, $js, $view); |
|
52 | 52 | } |
53 | 53 | |
54 | 54 | protected function ctrl($name, $value, $typeCtrl) { |
55 | 55 | if (\is_array($typeCtrl)) { |
56 | - if (array_search($value, $typeCtrl) === false) { |
|
57 | - throw new \Exception("La valeur passée `" . $value . "` à la propriété `" . $name . "` ne fait pas partie des valeurs possibles : {" . implode(",", $typeCtrl) . "}"); |
|
56 | + if (array_search($value, $typeCtrl)===false) { |
|
57 | + throw new \Exception("La valeur passée `".$value."` à la propriété `".$name."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}"); |
|
58 | 58 | } |
59 | 59 | } else { |
60 | 60 | if (!$typeCtrl($value)) { |
61 | - throw new \Exception("La fonction " . $typeCtrl . " a retourné faux pour l'affectation de la propriété " . $name); |
|
61 | + throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$name); |
|
62 | 62 | } |
63 | 63 | } |
64 | 64 | return true; |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | protected function addToMemberUnique(&$name, $value, $typeCtrl, $separator=" ") { |
76 | 76 | if (\is_array($typeCtrl)) { |
77 | 77 | $this->removeOldValues($name, $typeCtrl); |
78 | - $name.=$separator . $value; |
|
78 | + $name.=$separator.$value; |
|
79 | 79 | } |
80 | 80 | return $this; |
81 | 81 | } |
@@ -87,12 +87,12 @@ discard block |
||
87 | 87 | if (\is_array($typeCtrl)) { |
88 | 88 | $this->removeOldValues($name, $typeCtrl); |
89 | 89 | } |
90 | - $name.=$separator . $value; |
|
90 | + $name.=$separator.$value; |
|
91 | 91 | return $this; |
92 | 92 | } |
93 | 93 | |
94 | 94 | protected function addToMember(&$name, $value, $separator=" ") { |
95 | - $name=str_ireplace($value, "", $name) . $separator . $value; |
|
95 | + $name=str_ireplace($value, "", $name).$separator.$value; |
|
96 | 96 | return $this; |
97 | 97 | } |
98 | 98 | |
@@ -103,18 +103,18 @@ discard block |
||
103 | 103 | $oldValue=trim($oldValue); |
104 | 104 | } |
105 | 105 | |
106 | - protected function _getElementBy($callback,$elements){ |
|
106 | + protected function _getElementBy($callback, $elements) { |
|
107 | 107 | if (\is_array($elements)) { |
108 | 108 | $elements=\array_values($elements); |
109 | 109 | $flag=false; |
110 | 110 | $index=0; |
111 | - while ( !$flag && $index < sizeof($elements) ) { |
|
111 | + while (!$flag && $index<sizeof($elements)) { |
|
112 | 112 | if ($elements[$index] instanceof BaseHtml) |
113 | 113 | $flag=($callback($elements[$index])); |
114 | 114 | $index++; |
115 | 115 | } |
116 | - if ($flag === true) |
|
117 | - return $elements[$index - 1]; |
|
116 | + if ($flag===true) |
|
117 | + return $elements[$index-1]; |
|
118 | 118 | } elseif ($elements instanceof BaseHtml) { |
119 | 119 | if ($callback($elements)) |
120 | 120 | return $elements; |
@@ -142,13 +142,13 @@ discard block |
||
142 | 142 | } |
143 | 143 | |
144 | 144 | public function fromArray($array) { |
145 | - foreach ( $this as $key => $value ) { |
|
146 | - if(array_key_exists($key, $array)===true) |
|
147 | - $this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array); |
|
145 | + foreach ($this as $key => $value) { |
|
146 | + if (array_key_exists($key, $array)===true) |
|
147 | + $this->_callSetter("set".ucfirst($key), $key, $array[$key], $array); |
|
148 | 148 | } |
149 | - foreach ( $array as $key => $value ) { |
|
150 | - if($this->_callSetter($key, $key, $value, $array)===false){ |
|
151 | - $this->_callSetter("set" . ucfirst($key), $key, $value, $array); |
|
149 | + foreach ($array as $key => $value) { |
|
150 | + if ($this->_callSetter($key, $key, $value, $array)===false) { |
|
151 | + $this->_callSetter("set".ucfirst($key), $key, $value, $array); |
|
152 | 152 | } |
153 | 153 | } |
154 | 154 | return $array; |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | |
157 | 157 | public function fromDatabaseObjects($objects, $function) { |
158 | 158 | if (isset($objects)) { |
159 | - foreach ( $objects as $object ) { |
|
159 | + foreach ($objects as $object) { |
|
160 | 160 | $this->fromDatabaseObject($object, $function); |
161 | 161 | } |
162 | 162 | } |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | |
178 | 178 | |
179 | 179 | public function getElementById($identifier, $elements) { |
180 | - return $this->_getElementBy(function(BaseWidget $element) use ($identifier){return $element->getIdentifier()===$identifier;}, $elements); |
|
180 | + return $this->_getElementBy(function(BaseWidget $element) use ($identifier){return $element->getIdentifier()===$identifier; }, $elements); |
|
181 | 181 | } |
182 | 182 | |
183 | 183 | public function getBsComponent() { |
@@ -190,14 +190,14 @@ discard block |
||
190 | 190 | } |
191 | 191 | |
192 | 192 | protected function compile_once(JsUtils $js=NULL, &$view=NULL) { |
193 | - if(!$this->_compiled){ |
|
194 | - if(isset($js)){ |
|
193 | + if (!$this->_compiled) { |
|
194 | + if (isset($js)) { |
|
195 | 195 | $beforeCompile=$js->getParam("beforeCompileHtml"); |
196 | - if(\is_callable($beforeCompile)){ |
|
197 | - $beforeCompile($this,$js,$view); |
|
196 | + if (\is_callable($beforeCompile)) { |
|
197 | + $beforeCompile($this, $js, $view); |
|
198 | 198 | } |
199 | 199 | } |
200 | - if(\is_callable($this->_preCompile)){ |
|
200 | + if (\is_callable($this->_preCompile)) { |
|
201 | 201 | $pc=$this->_preCompile; |
202 | 202 | $pc($this); |
203 | 203 | } |
@@ -207,17 +207,17 @@ discard block |
||
207 | 207 | } |
208 | 208 | |
209 | 209 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
210 | - $this->compile_once($js,$view); |
|
211 | - $result=$this->getTemplate($js,$view); |
|
212 | - foreach ( $this as $key => $value ) { |
|
213 | - if(\strstr($result, "%{$key}%")!==false){ |
|
210 | + $this->compile_once($js, $view); |
|
211 | + $result=$this->getTemplate($js, $view); |
|
212 | + foreach ($this as $key => $value) { |
|
213 | + if (\strstr($result, "%{$key}%")!==false) { |
|
214 | 214 | if (\is_array($value)) { |
215 | - $v=PropertyWrapper::wrap($value, $js,$view); |
|
216 | - }elseif($value instanceof \stdClass){ |
|
217 | - $v=\print_r($value,true); |
|
218 | - }elseif ($value instanceof BaseHtml){ |
|
219 | - $v=$value->compile($js,$view); |
|
220 | - }else{ |
|
215 | + $v=PropertyWrapper::wrap($value, $js, $view); |
|
216 | + }elseif ($value instanceof \stdClass) { |
|
217 | + $v=\print_r($value, true); |
|
218 | + }elseif ($value instanceof BaseHtml) { |
|
219 | + $v=$value->compile($js, $view); |
|
220 | + } else { |
|
221 | 221 | $v=$value; |
222 | 222 | } |
223 | 223 | $result=str_replace("%{$key}%", $v, $result); |
@@ -225,12 +225,12 @@ discard block |
||
225 | 225 | } |
226 | 226 | if (isset($js)===true) { |
227 | 227 | $this->run($js); |
228 | - if (isset($view) === true) { |
|
228 | + if (isset($view)===true) { |
|
229 | 229 | $js->addViewElement($this->_identifier, $result, $view); |
230 | 230 | } |
231 | 231 | } |
232 | 232 | |
233 | - if(\is_callable($this->_postCompile)){ |
|
233 | + if (\is_callable($this->_postCompile)) { |
|
234 | 234 | $pc=$this->_postCompile; |
235 | 235 | $pc($this); |
236 | 236 | } |
@@ -244,13 +244,13 @@ discard block |
||
244 | 244 | * @param array $parameters default: ["jsCallback"=>"","jqueryDone"=>"append"] |
245 | 245 | * @return \Ajax\common\html\BaseHtml |
246 | 246 | */ |
247 | - public function setDraggable($attr="id",$dropZone=null,$parameters=[]){ |
|
247 | + public function setDraggable($attr="id", $dropZone=null, $parameters=[]) { |
|
248 | 248 | $this->setProperty("draggable", "true"); |
249 | - $this->addEvent("dragstart",Javascript::draggable($attr)); |
|
250 | - if(isset($dropZone)&& $dropZone instanceof BaseHtml){ |
|
251 | - $jqueryDone="append";$jsCallback=""; |
|
249 | + $this->addEvent("dragstart", Javascript::draggable($attr)); |
|
250 | + if (isset($dropZone) && $dropZone instanceof BaseHtml) { |
|
251 | + $jqueryDone="append"; $jsCallback=""; |
|
252 | 252 | extract($parameters); |
253 | - $dropZone->asDropZone($jsCallback,$jqueryDone,$parameters); |
|
253 | + $dropZone->asDropZone($jsCallback, $jqueryDone, $parameters); |
|
254 | 254 | } |
255 | 255 | return $this; |
256 | 256 | } |
@@ -262,11 +262,11 @@ discard block |
||
262 | 262 | * @param array $parameters |
263 | 263 | * @return \Ajax\common\html\BaseHtml |
264 | 264 | */ |
265 | - public function asDropZone($jsCallback="",$jqueryDone="append",$parameters=[]){ |
|
265 | + public function asDropZone($jsCallback="", $jqueryDone="append", $parameters=[]) { |
|
266 | 266 | $stopPropagation=false; |
267 | - $this->addEvent("dragover", '', $stopPropagation,true); |
|
267 | + $this->addEvent("dragover", '', $stopPropagation, true); |
|
268 | 268 | extract($parameters); |
269 | - $this->addEvent("drop",Javascript::dropZone($jqueryDone,$jsCallback),$stopPropagation,true); |
|
269 | + $this->addEvent("drop", Javascript::dropZone($jqueryDone, $jsCallback), $stopPropagation, true); |
|
270 | 270 | return $this; |
271 | 271 | } |
272 | 272 | |
@@ -274,11 +274,11 @@ discard block |
||
274 | 274 | return $this->compile(); |
275 | 275 | } |
276 | 276 | |
277 | - public function onPostCompile($callback){ |
|
277 | + public function onPostCompile($callback) { |
|
278 | 278 | $this->_postCompile=$callback; |
279 | 279 | } |
280 | 280 | |
281 | - public function onPreCompile($callback){ |
|
281 | + public function onPreCompile($callback) { |
|
282 | 282 | $this->_preCompile=$callback; |
283 | 283 | } |
284 | 284 | } |
@@ -109,15 +109,18 @@ discard block |
||
109 | 109 | $flag=false; |
110 | 110 | $index=0; |
111 | 111 | while ( !$flag && $index < sizeof($elements) ) { |
112 | - if ($elements[$index] instanceof BaseHtml) |
|
113 | - $flag=($callback($elements[$index])); |
|
112 | + if ($elements[$index] instanceof BaseHtml) { |
|
113 | + $flag=($callback($elements[$index])); |
|
114 | + } |
|
114 | 115 | $index++; |
115 | 116 | } |
116 | - if ($flag === true) |
|
117 | - return $elements[$index - 1]; |
|
117 | + if ($flag === true) { |
|
118 | + return $elements[$index - 1]; |
|
119 | + } |
|
118 | 120 | } elseif ($elements instanceof BaseHtml) { |
119 | - if ($callback($elements)) |
|
120 | - return $elements; |
|
121 | + if ($callback($elements)) { |
|
122 | + return $elements; |
|
123 | + } |
|
121 | 124 | } |
122 | 125 | return null; |
123 | 126 | } |
@@ -143,8 +146,9 @@ discard block |
||
143 | 146 | |
144 | 147 | public function fromArray($array) { |
145 | 148 | foreach ( $this as $key => $value ) { |
146 | - if(array_key_exists($key, $array)===true) |
|
147 | - $this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array); |
|
149 | + if(array_key_exists($key, $array)===true) { |
|
150 | + $this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array); |
|
151 | + } |
|
148 | 152 | } |
149 | 153 | foreach ( $array as $key => $value ) { |
150 | 154 | if($this->_callSetter($key, $key, $value, $array)===false){ |
@@ -213,11 +217,11 @@ discard block |
||
213 | 217 | if(\strstr($result, "%{$key}%")!==false){ |
214 | 218 | if (\is_array($value)) { |
215 | 219 | $v=PropertyWrapper::wrap($value, $js,$view); |
216 | - }elseif($value instanceof \stdClass){ |
|
220 | + } elseif($value instanceof \stdClass){ |
|
217 | 221 | $v=\print_r($value,true); |
218 | - }elseif ($value instanceof BaseHtml){ |
|
222 | + } elseif ($value instanceof BaseHtml){ |
|
219 | 223 | $v=$value->compile($js,$view); |
220 | - }else{ |
|
224 | + } else{ |
|
221 | 225 | $v=$value; |
222 | 226 | } |
223 | 227 | $result=str_replace("%{$key}%", $v, $result); |
@@ -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 | |
@@ -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)) |
|
84 | - return $this->content[$index]; |
|
85 | - else { |
|
83 | + if (is_int($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 | } |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | * @param string $event |
22 | 22 | * @param boolean $multiple |
23 | 23 | */ |
24 | - public function __construct($table,$class="active",$event="click",$multiple=false){ |
|
24 | + public function __construct($table, $class="active", $event="click", $multiple=false) { |
|
25 | 25 | $this->table=$table; |
26 | 26 | $this->class=$class; |
27 | 27 | $this->event=$event; |
@@ -55,12 +55,12 @@ discard block |
||
55 | 55 | return $this; |
56 | 56 | } |
57 | 57 | |
58 | - public function run(){ |
|
58 | + public function run() { |
|
59 | 59 | $multiple=""; |
60 | - if(!$this->multiple){ |
|
60 | + if (!$this->multiple) { |
|
61 | 61 | $multiple="$(this).closest('tbody').children('tr').removeClass('".$this->class."');"; |
62 | 62 | } |
63 | - $this->table->onRow($this->event, $multiple."$(this).toggleClass('".$this->class."');".$this->table->jsTrigger("activeRowChange","[this]"),false,false); |
|
63 | + $this->table->onRow($this->event, $multiple."$(this).toggleClass('".$this->class."');".$this->table->jsTrigger("activeRowChange", "[this]"), false, false); |
|
64 | 64 | } |
65 | 65 | |
66 | 66 | } |
@@ -31,10 +31,10 @@ discard block |
||
31 | 31 | |
32 | 32 | public function __construct($identifier, $rowCount, $colCount) { |
33 | 33 | parent::__construct($identifier, "table", "ui table"); |
34 | - $this->content=array (); |
|
34 | + $this->content=array(); |
|
35 | 35 | $this->setRowCount($rowCount, $colCount); |
36 | - $this->_variations=[ Variation::CELLED,Variation::PADDED,Variation::COMPACT ]; |
|
37 | - $this->_compileParts=["thead","tbody","tfoot"]; |
|
36 | + $this->_variations=[Variation::CELLED, Variation::PADDED, Variation::COMPACT]; |
|
37 | + $this->_compileParts=["thead", "tbody", "tfoot"]; |
|
38 | 38 | $this->_afterCompileEvents=[]; |
39 | 39 | } |
40 | 40 | |
@@ -44,17 +44,17 @@ discard block |
||
44 | 44 | * @return HtmlTableContent |
45 | 45 | */ |
46 | 46 | public function getPart($key) { |
47 | - if (\array_key_exists($key, $this->content) === false) { |
|
47 | + if (\array_key_exists($key, $this->content)===false) { |
|
48 | 48 | $this->content[$key]=new HtmlTableContent("", $key); |
49 | - if ($key !== "tbody") { |
|
49 | + if ($key!=="tbody") { |
|
50 | 50 | $this->content[$key]->setRowCount(1, $this->_colCount); |
51 | 51 | } |
52 | 52 | } |
53 | 53 | return $this->content[$key]; |
54 | 54 | } |
55 | 55 | |
56 | - protected function _getFirstPart(){ |
|
57 | - if(isset($this->content["thead"])){ |
|
56 | + protected function _getFirstPart() { |
|
57 | + if (isset($this->content["thead"])) { |
|
58 | 58 | return $this->content["thead"]; |
59 | 59 | } |
60 | 60 | return $this->content["tbody"]; |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | * @return boolean |
100 | 100 | */ |
101 | 101 | public function hasPart($key) { |
102 | - return \array_key_exists($key, $this->content) === true; |
|
102 | + return \array_key_exists($key, $this->content)===true; |
|
103 | 103 | } |
104 | 104 | |
105 | 105 | /** |
@@ -232,8 +232,8 @@ discard block |
||
232 | 232 | return $this->colAlign($colIndex, "colLeft"); |
233 | 233 | } |
234 | 234 | |
235 | - public function setColAlignment($colIndex,$alignment){ |
|
236 | - switch ($alignment){ |
|
235 | + public function setColAlignment($colIndex, $alignment) { |
|
236 | + switch ($alignment) { |
|
237 | 237 | case TextAlignment::LEFT: |
238 | 238 | $function="colLeft"; |
239 | 239 | break; |
@@ -255,7 +255,7 @@ discard block |
||
255 | 255 | |
256 | 256 | private function colAlign($colIndex, $function) { |
257 | 257 | if (\is_array($colIndex)) { |
258 | - foreach ( $colIndex as $cIndex ) { |
|
258 | + foreach ($colIndex as $cIndex) { |
|
259 | 259 | $this->colAlign($cIndex, $function); |
260 | 260 | } |
261 | 261 | } else { |
@@ -316,7 +316,7 @@ discard block |
||
316 | 316 | * @see HtmlSemDoubleElement::compile() |
317 | 317 | */ |
318 | 318 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
319 | - if(\sizeof($this->_compileParts)<3){ |
|
319 | + if (\sizeof($this->_compileParts)<3) { |
|
320 | 320 | $this->_template="%content%"; |
321 | 321 | $this->refresh($js); |
322 | 322 | } |
@@ -325,9 +325,9 @@ discard block |
||
325 | 325 | } |
326 | 326 | |
327 | 327 | protected function compile_once(JsUtils $js=NULL, &$view=NULL) { |
328 | - parent::compile_once($js,$view); |
|
328 | + parent::compile_once($js, $view); |
|
329 | 329 | if ($this->propertyContains("class", "sortable")) { |
330 | - $this->addEvent("execute", "$('#" . $this->identifier . "').tablesort().data('tablesort').sort($('th.default-sort'));"); |
|
330 | + $this->addEvent("execute", "$('#".$this->identifier."').tablesort().data('tablesort').sort($('th.default-sort'));"); |
|
331 | 331 | } |
332 | 332 | } |
333 | 333 | |
@@ -340,13 +340,13 @@ discard block |
||
340 | 340 | public function fromDatabaseObject($object, $function) { |
341 | 341 | $result=$function($object); |
342 | 342 | if (\is_array($result)) { |
343 | - $result= $this->addRow($function($object)); |
|
343 | + $result=$this->addRow($function($object)); |
|
344 | 344 | } else { |
345 | - $result= $this->getBody()->_addRow($result); |
|
345 | + $result=$this->getBody()->_addRow($result); |
|
346 | 346 | } |
347 | - if(isset($this->_afterCompileEvents["onNewRow"])){ |
|
348 | - if(\is_callable($this->_afterCompileEvents["onNewRow"])) |
|
349 | - $this->_afterCompileEvents["onNewRow"]($result,$object); |
|
347 | + if (isset($this->_afterCompileEvents["onNewRow"])) { |
|
348 | + if (\is_callable($this->_afterCompileEvents["onNewRow"])) |
|
349 | + $this->_afterCompileEvents["onNewRow"]($result, $object); |
|
350 | 350 | } |
351 | 351 | return $result; |
352 | 352 | } |
@@ -361,21 +361,21 @@ discard block |
||
361 | 361 | return $this; |
362 | 362 | } |
363 | 363 | |
364 | - public function refresh($js){ |
|
364 | + public function refresh($js) { |
|
365 | 365 | $this->_footer=$this->getFooter(); |
366 | - if(isset($js)){ |
|
367 | - $js->exec('$("#'.$this->identifier.' tfoot").replaceWith("'.\addslashes($this->_footer).'");',true); |
|
366 | + if (isset($js)) { |
|
367 | + $js->exec('$("#'.$this->identifier.' tfoot").replaceWith("'.\addslashes($this->_footer).'");', true); |
|
368 | 368 | } |
369 | 369 | } |
370 | 370 | |
371 | - public function run(JsUtils $js){ |
|
372 | - if(!$this->_runned){ |
|
373 | - if(isset($this->_activeRowSelector)){ |
|
371 | + public function run(JsUtils $js) { |
|
372 | + if (!$this->_runned) { |
|
373 | + if (isset($this->_activeRowSelector)) { |
|
374 | 374 | $this->_activeRowSelector->run(); |
375 | 375 | } |
376 | 376 | } |
377 | - $result= parent::run($js); |
|
378 | - if(isset($this->_footer)) |
|
377 | + $result=parent::run($js); |
|
378 | + if (isset($this->_footer)) |
|
379 | 379 | $this->_footer->run($js); |
380 | 380 | $this->_runned=true; |
381 | 381 | return $result; |
@@ -399,47 +399,47 @@ discard block |
||
399 | 399 | * @param boolean $multiple |
400 | 400 | * @return HtmlTable |
401 | 401 | */ |
402 | - public function setActiveRowSelector($class="active",$event="click",$multiple=false){ |
|
403 | - $this->_activeRowSelector=new ActiveRow($this,$class,$event,$multiple); |
|
402 | + public function setActiveRowSelector($class="active", $event="click", $multiple=false) { |
|
403 | + $this->_activeRowSelector=new ActiveRow($this, $class, $event, $multiple); |
|
404 | 404 | return $this; |
405 | 405 | } |
406 | 406 | |
407 | - public function hideColumn($colIndex){ |
|
408 | - if(isset($this->content["thead"])){ |
|
407 | + public function hideColumn($colIndex) { |
|
408 | + if (isset($this->content["thead"])) { |
|
409 | 409 | $this->content["thead"]->hideColumn($colIndex); |
410 | 410 | } |
411 | 411 | $this->content["tbody"]->hideColumn($colIndex); |
412 | - if(isset($this->content["tfoot"])){ |
|
412 | + if (isset($this->content["tfoot"])) { |
|
413 | 413 | $this->content["tfoot"]->hideColumn($colIndex); |
414 | 414 | } |
415 | 415 | return $this; |
416 | 416 | } |
417 | 417 | |
418 | - public function setColWidth($colIndex,$width){ |
|
418 | + public function setColWidth($colIndex, $width) { |
|
419 | 419 | $part=$this->_getFirstPart(); |
420 | - if($part!==null && $part->count()>0) |
|
420 | + if ($part!==null && $part->count()>0) |
|
421 | 421 | $part->getCell(0, $colIndex)->setWidth($width); |
422 | 422 | return $this; |
423 | 423 | } |
424 | 424 | |
425 | - public function setColWidths($widths){ |
|
425 | + public function setColWidths($widths) { |
|
426 | 426 | $part=$this->_getFirstPart(); |
427 | - if($part!==null && $part->count()>0){ |
|
427 | + if ($part!==null && $part->count()>0) { |
|
428 | 428 | $count=$part->getColCount(); |
429 | - if(!\is_array($widths)){ |
|
429 | + if (!\is_array($widths)) { |
|
430 | 430 | $widths=\array_fill(0, $count, $widths); |
431 | 431 | } |
432 | - $max=\min(\sizeof($widths),$count); |
|
433 | - for($i=0;$i<$max;$i++){ |
|
432 | + $max=\min(\sizeof($widths), $count); |
|
433 | + for ($i=0; $i<$max; $i++) { |
|
434 | 434 | $part->getCell(0, $i)->setWidth($widths[$i]); |
435 | 435 | } |
436 | 436 | } |
437 | 437 | return $this; |
438 | 438 | } |
439 | 439 | |
440 | - public function mergeIdentiqualValues($colIndex,$function="strip_tags"){ |
|
440 | + public function mergeIdentiqualValues($colIndex, $function="strip_tags") { |
|
441 | 441 | $body=$this->getBody(); |
442 | - $body->mergeIdentiqualValues($colIndex,$function); |
|
442 | + $body->mergeIdentiqualValues($colIndex, $function); |
|
443 | 443 | return $this; |
444 | 444 | } |
445 | 445 | /** |
@@ -453,11 +453,11 @@ discard block |
||
453 | 453 | * @param mixed $_innerScript |
454 | 454 | */ |
455 | 455 | public function setInnerScript($_innerScript) { |
456 | - $this->_innerScript = $_innerScript; |
|
456 | + $this->_innerScript=$_innerScript; |
|
457 | 457 | } |
458 | 458 | |
459 | - public function onActiveRowChange($jsCode){ |
|
460 | - $this->on("activeRowChange",$jsCode); |
|
459 | + public function onActiveRowChange($jsCode) { |
|
460 | + $this->on("activeRowChange", $jsCode); |
|
461 | 461 | return $this; |
462 | 462 | } |
463 | 463 |
@@ -345,8 +345,9 @@ discard block |
||
345 | 345 | $result= $this->getBody()->_addRow($result); |
346 | 346 | } |
347 | 347 | if(isset($this->_afterCompileEvents["onNewRow"])){ |
348 | - if(\is_callable($this->_afterCompileEvents["onNewRow"])) |
|
349 | - $this->_afterCompileEvents["onNewRow"]($result,$object); |
|
348 | + if(\is_callable($this->_afterCompileEvents["onNewRow"])) { |
|
349 | + $this->_afterCompileEvents["onNewRow"]($result,$object); |
|
350 | + } |
|
350 | 351 | } |
351 | 352 | return $result; |
352 | 353 | } |
@@ -375,8 +376,9 @@ discard block |
||
375 | 376 | } |
376 | 377 | } |
377 | 378 | $result= parent::run($js); |
378 | - if(isset($this->_footer)) |
|
379 | - $this->_footer->run($js); |
|
379 | + if(isset($this->_footer)) { |
|
380 | + $this->_footer->run($js); |
|
381 | + } |
|
380 | 382 | $this->_runned=true; |
381 | 383 | return $result; |
382 | 384 | } |
@@ -417,8 +419,9 @@ discard block |
||
417 | 419 | |
418 | 420 | public function setColWidth($colIndex,$width){ |
419 | 421 | $part=$this->_getFirstPart(); |
420 | - if($part!==null && $part->count()>0) |
|
421 | - $part->getCell(0, $colIndex)->setWidth($width); |
|
422 | + if($part!==null && $part->count()>0) { |
|
423 | + $part->getCell(0, $colIndex)->setWidth($width); |
|
424 | + } |
|
422 | 425 | return $this; |
423 | 426 | } |
424 | 427 |
@@ -6,32 +6,32 @@ discard block |
||
6 | 6 | |
7 | 7 | use Ajax\semantic\html\elements\HtmlIcon; |
8 | 8 | |
9 | -class HtmlPaginationMenu extends HtmlMenu{ |
|
9 | +class HtmlPaginationMenu extends HtmlMenu { |
|
10 | 10 | private $_page; |
11 | 11 | private $_pages; |
12 | 12 | private $_max; |
13 | - public function __construct( $identifier, $items=array() ){ |
|
14 | - parent::__construct( $identifier,$items); |
|
13 | + public function __construct($identifier, $items=array()) { |
|
14 | + parent::__construct($identifier, $items); |
|
15 | 15 | $this->_pages=$items; |
16 | 16 | } |
17 | 17 | /** |
18 | 18 | * {@inheritDoc} |
19 | 19 | * @see \Ajax\common\html\BaseHtml::compile() |
20 | 20 | */ |
21 | - public function compile(JsUtils $js=NULL,&$view=NULL){ |
|
21 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
22 | 22 | $max=$this->_max; |
23 | - if(!$this->_compiled){ |
|
24 | - foreach ($this->content as $item){ |
|
23 | + if (!$this->_compiled) { |
|
24 | + foreach ($this->content as $item) { |
|
25 | 25 | $item->addClass("pageNum"); |
26 | 26 | } |
27 | - $this->insertItem(new HtmlIcon("", "left chevron"))->setProperty("data-page", \max([1,$this->_page-1]))->addToProperty("class","_firstPage no-active"); |
|
28 | - $this->addItem(new HtmlIcon("", "right chevron"))->setProperty("data-page", \min([$max,$this->_page+1]))->setProperty("data-max", $max)->addToProperty("class","_lastPage no-active"); |
|
27 | + $this->insertItem(new HtmlIcon("", "left chevron"))->setProperty("data-page", \max([1, $this->_page-1]))->addToProperty("class", "_firstPage no-active"); |
|
28 | + $this->addItem(new HtmlIcon("", "right chevron"))->setProperty("data-page", \min([$max, $this->_page+1]))->setProperty("data-max", $max)->addToProperty("class", "_lastPage no-active"); |
|
29 | 29 | $this->asPagination(); |
30 | 30 | } |
31 | - return parent::compile($js,$view); |
|
31 | + return parent::compile($js, $view); |
|
32 | 32 | } |
33 | 33 | |
34 | - public function setActivePage($page){ |
|
34 | + public function setActivePage($page) { |
|
35 | 35 | $index=$page-$this->_pages[0]; |
36 | 36 | $this->setActiveItem($index); |
37 | 37 | $this->_page=$page; |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | * @param mixed $_max |
46 | 46 | */ |
47 | 47 | public function setMax($_max) { |
48 | - $this->_max = $_max; |
|
48 | + $this->_max=$_max; |
|
49 | 49 | } |
50 | 50 | |
51 | 51 |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | use Ajax\JsUtils; |
13 | 13 | |
14 | 14 | class HtmlTD extends HtmlSemDoubleElement { |
15 | - use TextAlignmentTrait,TableElementTrait; |
|
15 | + use TextAlignmentTrait, TableElementTrait; |
|
16 | 16 | private $_container; |
17 | 17 | private $_row; |
18 | 18 | private $_col; |
@@ -28,8 +28,8 @@ discard block |
||
28 | 28 | */ |
29 | 29 | public function __construct($identifier, $content=NULL, $tagName="td") { |
30 | 30 | parent::__construct($identifier, $tagName, "", $content); |
31 | - $this->_variations=[ Variation::COLLAPSING ]; |
|
32 | - $this->_states=[ State::ACTIVE,State::POSITIVE,State::NEGATIVE,State::WARNING,State::ERROR,State::DISABLED ]; |
|
31 | + $this->_variations=[Variation::COLLAPSING]; |
|
32 | + $this->_states=[State::ACTIVE, State::POSITIVE, State::NEGATIVE, State::WARNING, State::ERROR, State::DISABLED]; |
|
33 | 33 | } |
34 | 34 | |
35 | 35 | public function setContainer($container, $row, $col) { |
@@ -49,8 +49,8 @@ discard block |
||
49 | 49 | } |
50 | 50 | |
51 | 51 | public function setRowspan($rowspan) { |
52 | - $to=min($this->_container->count(), $this->_row + $rowspan - 1); |
|
53 | - for($i=$to; $i > $this->_row; $i--) { |
|
52 | + $to=min($this->_container->count(), $this->_row+$rowspan-1); |
|
53 | + for ($i=$to; $i>$this->_row; $i--) { |
|
54 | 54 | $this->_container->toDelete($i, $this->_col); |
55 | 55 | } |
56 | 56 | $this->setProperty("rowspan", $rowspan); |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | } |
59 | 59 | |
60 | 60 | public function mergeRow() { |
61 | - if(!$this->_rowMerged){ |
|
61 | + if (!$this->_rowMerged) { |
|
62 | 62 | $this->_rowMerged=true; |
63 | 63 | return $this->setRowspan($this->_container->count()); |
64 | 64 | } |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | } |
67 | 67 | |
68 | 68 | public function mergeCol() { |
69 | - if(!$this->_colMerged){ |
|
69 | + if (!$this->_colMerged) { |
|
70 | 70 | $this->_colMerged=true; |
71 | 71 | return $this->setColspan($this->_container->getRow($this->_row)->count()); |
72 | 72 | } |
@@ -74,9 +74,9 @@ discard block |
||
74 | 74 | } |
75 | 75 | |
76 | 76 | public function setColspan($colspan) { |
77 | - $to=min($this->_container->getRow($this->_row)->count(), $this->_col + $colspan - 1); |
|
78 | - for($i=$to; $i > $this->_col; $i--) { |
|
79 | - $this->_container->delete($this->_row, $this->_col + 1); |
|
77 | + $to=min($this->_container->getRow($this->_row)->count(), $this->_col+$colspan-1); |
|
78 | + for ($i=$to; $i>$this->_col; $i--) { |
|
79 | + $this->_container->delete($this->_row, $this->_col+1); |
|
80 | 80 | } |
81 | 81 | $this->setProperty("colspan", $colspan); |
82 | 82 | return $this->_container; |
@@ -115,21 +115,21 @@ discard block |
||
115 | 115 | return $this->addToProperty("class", "selectable"); |
116 | 116 | } |
117 | 117 | |
118 | - public function setWidth($width){ |
|
118 | + public function setWidth($width) { |
|
119 | 119 | if (\is_int($width)) { |
120 | - $width=Wide::getConstants()["W" . $width]; |
|
120 | + $width=Wide::getConstants()["W".$width]; |
|
121 | 121 | } |
122 | 122 | $this->addToPropertyCtrl("class", $width, Wide::getConstants()); |
123 | - return $this->addToPropertyCtrl("class", "wide", array ("wide" )); |
|
123 | + return $this->addToPropertyCtrl("class", "wide", array("wide")); |
|
124 | 124 | } |
125 | 125 | |
126 | - public function toDelete(){ |
|
126 | + public function toDelete() { |
|
127 | 127 | $this->_deleted=true; |
128 | 128 | return $this; |
129 | 129 | } |
130 | 130 | |
131 | 131 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
132 | - if(!$this->_deleted) |
|
133 | - return parent::compile($js,$view); |
|
132 | + if (!$this->_deleted) |
|
133 | + return parent::compile($js, $view); |
|
134 | 134 | } |
135 | 135 | } |
@@ -84,15 +84,17 @@ discard block |
||
84 | 84 | |
85 | 85 | public function getColspan() { |
86 | 86 | $colspan=1; |
87 | - if (\array_key_exists("colspan", $this->properties)) |
|
88 | - $colspan=$this->getProperty("colspan"); |
|
87 | + if (\array_key_exists("colspan", $this->properties)) { |
|
88 | + $colspan=$this->getProperty("colspan"); |
|
89 | + } |
|
89 | 90 | return $colspan; |
90 | 91 | } |
91 | 92 | |
92 | 93 | public function getRowspan() { |
93 | 94 | $rowspan=1; |
94 | - if (\array_key_exists("rowspan", $this->properties)) |
|
95 | - $rowspan=$this->getProperty("rowspan"); |
|
95 | + if (\array_key_exists("rowspan", $this->properties)) { |
|
96 | + $rowspan=$this->getProperty("rowspan"); |
|
97 | + } |
|
96 | 98 | return $rowspan; |
97 | 99 | } |
98 | 100 | |
@@ -129,7 +131,8 @@ discard block |
||
129 | 131 | } |
130 | 132 | |
131 | 133 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
132 | - if(!$this->_deleted) |
|
133 | - return parent::compile($js,$view); |
|
134 | + if(!$this->_deleted) { |
|
135 | + return parent::compile($js,$view); |
|
136 | + } |
|
134 | 137 | } |
135 | 138 | } |