@@ -21,8 +21,9 @@ discard block |
||
21 | 21 | $this->widgetIdentifier=$identifier; |
22 | 22 | $this->values=[]; |
23 | 23 | $this->afterCompile=[]; |
24 | - if(isset($instance)) |
|
25 | - $this->setInstance($instance); |
|
24 | + if(isset($instance)) { |
|
25 | + $this->setInstance($instance); |
|
26 | + } |
|
26 | 27 | $this->setCaptions($captions); |
27 | 28 | $this->captionCallback=NULL; |
28 | 29 | $this->defaultValueFunction=function($name,$value){return $value;}; |
@@ -39,11 +40,13 @@ discard block |
||
39 | 40 | } |
40 | 41 | |
41 | 42 | public function getIdentifier($index=NULL){ |
42 | - if(!isset($index)) |
|
43 | - $index=self::$index; |
|
43 | + if(!isset($index)) { |
|
44 | + $index=self::$index; |
|
45 | + } |
|
44 | 46 | $value=$index; |
45 | - if(isset($this->values["identifier"])) |
|
46 | - $value=$this->values["identifier"]($index,$this->instance); |
|
47 | + if(isset($this->values["identifier"])) { |
|
48 | + $value=$this->values["identifier"]($index,$this->instance); |
|
49 | + } |
|
47 | 50 | return $value; |
48 | 51 | } |
49 | 52 | |
@@ -66,7 +69,7 @@ discard block |
||
66 | 69 | $value=$property->getValue($this->instance); |
67 | 70 | if(isset($this->values[$index])){ |
68 | 71 | $value= $this->values[$index]($value,$this->instance,$index); |
69 | - }else{ |
|
72 | + } else{ |
|
70 | 73 | $value=$this->_getDefaultValue($property->getName(),$value, $index); |
71 | 74 | } |
72 | 75 | return $value; |
@@ -76,16 +79,16 @@ discard block |
||
76 | 79 | $value=null; |
77 | 80 | if($property instanceof \ReflectionProperty){ |
78 | 81 | $value=$this->_getPropertyValue($property, $index); |
79 | - }else{ |
|
80 | - if(\is_callable($property)) |
|
81 | - $value=$property($this->instance); |
|
82 | - elseif(\is_array($property)){ |
|
82 | + } else{ |
|
83 | + if(\is_callable($property)) { |
|
84 | + $value=$property($this->instance); |
|
85 | + } elseif(\is_array($property)){ |
|
83 | 86 | $values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property); |
84 | 87 | $value=\implode("", $values); |
85 | - }else{ |
|
88 | + } else{ |
|
86 | 89 | if(isset($this->values[$index])){ |
87 | 90 | $value= $this->values[$index]($property,$this->instance,$index); |
88 | - }elseif(isset($this->instance->{$property})){ |
|
91 | + } elseif(isset($this->instance->{$property})){ |
|
89 | 92 | $value=$this->instance->{$property}; |
90 | 93 | } |
91 | 94 | } |
@@ -108,10 +111,10 @@ discard block |
||
108 | 111 | if(isset($vb[$index])){ |
109 | 112 | if(\is_array($vb[$index])){ |
110 | 113 | $this->visibleProperties[$index][]=$field; |
111 | - }else{ |
|
114 | + } else{ |
|
112 | 115 | $this->visibleProperties[$index]=[$vb[$index],$field]; |
113 | 116 | } |
114 | - }else{ |
|
117 | + } else{ |
|
115 | 118 | return $this->insertField($index, $field); |
116 | 119 | } |
117 | 120 | return $this; |
@@ -138,9 +141,9 @@ discard block |
||
138 | 141 | $property=$this->getProperty($index); |
139 | 142 | if($property instanceof \ReflectionProperty){ |
140 | 143 | $result=$property->getName(); |
141 | - }elseif(\is_callable($property)){ |
|
144 | + } elseif(\is_callable($property)){ |
|
142 | 145 | $result=$this->visibleProperties[$index]; |
143 | - }else{ |
|
146 | + } else{ |
|
144 | 147 | $result=$property; |
145 | 148 | } |
146 | 149 | return $result; |
@@ -160,7 +163,7 @@ discard block |
||
160 | 163 | $this->reflect=new \ReflectionClass($instance); |
161 | 164 | if(\sizeof($this->visibleProperties)===0){ |
162 | 165 | $this->properties=$this->getDefaultProperties(); |
163 | - }else{ |
|
166 | + } else{ |
|
164 | 167 | foreach ($this->visibleProperties as $property){ |
165 | 168 | $this->setInstanceProperty($property); |
166 | 169 | } |
@@ -171,22 +174,23 @@ discard block |
||
171 | 174 | private function setInstanceProperty($property){ |
172 | 175 | if(\is_callable($property)){ |
173 | 176 | $this->properties[]=$property; |
174 | - }elseif(\is_string($property)){ |
|
177 | + } elseif(\is_string($property)){ |
|
175 | 178 | try{ |
176 | 179 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
177 | 180 | $rProperty=$this->reflect->getProperty($property); |
178 | 181 | $this->properties[]=$rProperty; |
179 | - }catch(\Exception $e){ |
|
182 | + } catch(\Exception $e){ |
|
180 | 183 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
181 | 184 | $this->properties[]=$property; |
182 | 185 | } |
183 | - }elseif(\is_int($property)){ |
|
186 | + } elseif(\is_int($property)){ |
|
184 | 187 | $props=$this->getDefaultProperties(); |
185 | - if(isset($props[$property])) |
|
186 | - $this->properties[]=$props[$property]; |
|
187 | - else |
|
188 | - $this->properties[]=$property; |
|
189 | - }else{ |
|
188 | + if(isset($props[$property])) { |
|
189 | + $this->properties[]=$props[$property]; |
|
190 | + } else { |
|
191 | + $this->properties[]=$property; |
|
192 | + } |
|
193 | + } else{ |
|
190 | 194 | $this->properties[]=$property; |
191 | 195 | } |
192 | 196 | } |
@@ -230,12 +234,13 @@ discard block |
||
230 | 234 | if(isset($this->captions[$index])){ |
231 | 235 | return $this->captions[$index]; |
232 | 236 | } |
233 | - if($this->properties[$index] instanceof \ReflectionProperty) |
|
234 | - return $this->properties[$index]->getName(); |
|
235 | - elseif(\is_callable($this->properties[$index])) |
|
236 | - return ""; |
|
237 | - else |
|
238 | - return $this->properties[$index]; |
|
237 | + if($this->properties[$index] instanceof \ReflectionProperty) { |
|
238 | + return $this->properties[$index]->getName(); |
|
239 | + } elseif(\is_callable($this->properties[$index])) { |
|
240 | + return ""; |
|
241 | + } else { |
|
242 | + return $this->properties[$index]; |
|
243 | + } |
|
239 | 244 | } |
240 | 245 | |
241 | 246 | public function getCaptions(){ |
@@ -244,7 +249,7 @@ discard block |
||
244 | 249 | for($i=\sizeof($captions);$i<$this->count();$i++){ |
245 | 250 | $captions[]=""; |
246 | 251 | } |
247 | - }else{ |
|
252 | + } else{ |
|
248 | 253 | $captions=[]; |
249 | 254 | $index=0; |
250 | 255 | $count=$this->count(); |
@@ -260,8 +265,9 @@ discard block |
||
260 | 265 | } |
261 | 266 | |
262 | 267 | public function setCaption($index,$caption){ |
263 | - if(isset($this->captions)===false) |
|
264 | - $this->captions=[]; |
|
268 | + if(isset($this->captions)===false) { |
|
269 | + $this->captions=[]; |
|
270 | + } |
|
265 | 271 | $this->captions[$index]=$caption; |
266 | 272 | return $this; |
267 | 273 | } |
@@ -18,207 +18,207 @@ discard block |
||
18 | 18 | |
19 | 19 | public static $index=0; |
20 | 20 | |
21 | - public function __construct($identifier,$instance=NULL,$captions=NULL){ |
|
21 | + public function __construct($identifier, $instance=NULL, $captions=NULL) { |
|
22 | 22 | $this->widgetIdentifier=$identifier; |
23 | 23 | $this->values=[]; |
24 | 24 | $this->afterCompile=[]; |
25 | - if(isset($instance)) |
|
25 | + if (isset($instance)) |
|
26 | 26 | $this->setInstance($instance); |
27 | 27 | $this->setCaptions($captions); |
28 | 28 | $this->captionCallback=NULL; |
29 | - $this->defaultValueFunction=function($name,$value){return $value;}; |
|
29 | + $this->defaultValueFunction=function($name, $value) {return $value; }; |
|
30 | 30 | } |
31 | 31 | |
32 | - public function moveFieldTo($from,$to){ |
|
33 | - if(JArray::moveElementTo($this->visibleProperties, $from, $to)){ |
|
32 | + public function moveFieldTo($from, $to) { |
|
33 | + if (JArray::moveElementTo($this->visibleProperties, $from, $to)) { |
|
34 | 34 | return JArray::moveElementTo($this->values, $from, $to); |
35 | 35 | } |
36 | 36 | return false; |
37 | 37 | } |
38 | 38 | |
39 | - public function swapFields($index1,$index2){ |
|
40 | - if(JArray::swapElements($this->visibleProperties, $index1, $index2)){ |
|
39 | + public function swapFields($index1, $index2) { |
|
40 | + if (JArray::swapElements($this->visibleProperties, $index1, $index2)) { |
|
41 | 41 | return JArray::swapElements($this->values, $index1, $index2); |
42 | 42 | } |
43 | 43 | return false; |
44 | 44 | } |
45 | 45 | |
46 | - public function removeField($index){ |
|
47 | - \array_splice($this->visibleProperties,$index,1); |
|
48 | - \array_splice($this->values,$index,1); |
|
49 | - \array_splice($this->captions,$index,1); |
|
46 | + public function removeField($index) { |
|
47 | + \array_splice($this->visibleProperties, $index, 1); |
|
48 | + \array_splice($this->values, $index, 1); |
|
49 | + \array_splice($this->captions, $index, 1); |
|
50 | 50 | return $this; |
51 | 51 | } |
52 | 52 | |
53 | - public function getValues(){ |
|
53 | + public function getValues() { |
|
54 | 54 | $values=[]; |
55 | 55 | $index=0; |
56 | 56 | $count=$this->count(); |
57 | - while($index<$count){ |
|
57 | + while ($index<$count) { |
|
58 | 58 | $values[]=$this->getValue($index++); |
59 | 59 | } |
60 | 60 | return $values; |
61 | 61 | } |
62 | 62 | |
63 | - public function getIdentifier($index=NULL){ |
|
64 | - if(!isset($index)) |
|
63 | + public function getIdentifier($index=NULL) { |
|
64 | + if (!isset($index)) |
|
65 | 65 | $index=self::$index; |
66 | 66 | $value=$index; |
67 | - if(isset($this->values["identifier"])) |
|
68 | - $value=$this->values["identifier"]($index,$this->instance); |
|
67 | + if (isset($this->values["identifier"])) |
|
68 | + $value=$this->values["identifier"]($index, $this->instance); |
|
69 | 69 | return $value; |
70 | 70 | } |
71 | 71 | |
72 | - public function getValue($index){ |
|
72 | + public function getValue($index) { |
|
73 | 73 | $property=$this->properties[$index]; |
74 | 74 | return $this->_getValue($property, $index); |
75 | 75 | } |
76 | 76 | |
77 | - protected function _beforeAddProperty($index,&$field){ |
|
77 | + protected function _beforeAddProperty($index, &$field) { |
|
78 | 78 | |
79 | 79 | } |
80 | 80 | |
81 | - protected function _getDefaultValue($name,$value,$index){ |
|
81 | + protected function _getDefaultValue($name, $value, $index) { |
|
82 | 82 | $func=$this->defaultValueFunction; |
83 | - return $func($name,$value,$index,$this->instance); |
|
83 | + return $func($name, $value, $index, $this->instance); |
|
84 | 84 | } |
85 | 85 | |
86 | - protected function _getPropertyValue(\ReflectionProperty $property,$index){ |
|
86 | + protected function _getPropertyValue(\ReflectionProperty $property, $index) { |
|
87 | 87 | $property->setAccessible(true); |
88 | 88 | $value=$property->getValue($this->instance); |
89 | - if(isset($this->values[$index])){ |
|
90 | - $value= $this->values[$index]($value,$this->instance,$index); |
|
91 | - }else{ |
|
92 | - $value=$this->_getDefaultValue($property->getName(),$value, $index); |
|
89 | + if (isset($this->values[$index])) { |
|
90 | + $value=$this->values[$index]($value, $this->instance, $index); |
|
91 | + } else { |
|
92 | + $value=$this->_getDefaultValue($property->getName(), $value, $index); |
|
93 | 93 | } |
94 | 94 | return $value; |
95 | 95 | } |
96 | 96 | |
97 | - protected function _getValue($property,$index){ |
|
97 | + protected function _getValue($property, $index) { |
|
98 | 98 | $value=null; |
99 | - if($property instanceof \ReflectionProperty){ |
|
99 | + if ($property instanceof \ReflectionProperty) { |
|
100 | 100 | $value=$this->_getPropertyValue($property, $index); |
101 | - }else{ |
|
102 | - if(\is_callable($property)) |
|
101 | + } else { |
|
102 | + if (\is_callable($property)) |
|
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 | - }else{ |
|
108 | - if(isset($this->values[$index])){ |
|
109 | - $value= $this->values[$index]($property,$this->instance,$index); |
|
110 | - }elseif(isset($this->instance->{$property})){ |
|
107 | + } else { |
|
108 | + if (isset($this->values[$index])) { |
|
109 | + $value=$this->values[$index]($property, $this->instance, $index); |
|
110 | + }elseif (isset($this->instance->{$property})) { |
|
111 | 111 | $value=$this->instance->{$property}; |
112 | 112 | } |
113 | 113 | } |
114 | 114 | } |
115 | - if(isset($this->afterCompile[$index])){ |
|
116 | - if(\is_callable($this->afterCompile[$index])){ |
|
117 | - $this->afterCompile[$index]($value,$this->instance,$index); |
|
115 | + if (isset($this->afterCompile[$index])) { |
|
116 | + if (\is_callable($this->afterCompile[$index])) { |
|
117 | + $this->afterCompile[$index]($value, $this->instance, $index); |
|
118 | 118 | } |
119 | 119 | } |
120 | 120 | return $value; |
121 | 121 | } |
122 | 122 | |
123 | - public function insertField($index,$field){ |
|
124 | - array_splice( $this->visibleProperties, $index, 0, $field ); |
|
123 | + public function insertField($index, $field) { |
|
124 | + array_splice($this->visibleProperties, $index, 0, $field); |
|
125 | 125 | return $this; |
126 | 126 | } |
127 | 127 | |
128 | - public function insertInField($index,$field){ |
|
128 | + public function insertInField($index, $field) { |
|
129 | 129 | $vb=$this->visibleProperties; |
130 | - if(isset($vb[$index])){ |
|
131 | - if(\is_array($vb[$index])){ |
|
130 | + if (isset($vb[$index])) { |
|
131 | + if (\is_array($vb[$index])) { |
|
132 | 132 | $this->visibleProperties[$index][]=$field; |
133 | - }else{ |
|
134 | - $this->visibleProperties[$index]=[$vb[$index],$field]; |
|
133 | + } else { |
|
134 | + $this->visibleProperties[$index]=[$vb[$index], $field]; |
|
135 | 135 | } |
136 | - }else{ |
|
136 | + } else { |
|
137 | 137 | return $this->insertField($index, $field); |
138 | 138 | } |
139 | 139 | return $this; |
140 | 140 | } |
141 | 141 | |
142 | - public function addField($field){ |
|
142 | + public function addField($field) { |
|
143 | 143 | $this->visibleProperties[]=$field; |
144 | 144 | return $this; |
145 | 145 | } |
146 | 146 | |
147 | - public function count(){ |
|
147 | + public function count() { |
|
148 | 148 | return \sizeof($this->properties); |
149 | 149 | } |
150 | 150 | |
151 | - public function visiblePropertiesCount(){ |
|
151 | + public function visiblePropertiesCount() { |
|
152 | 152 | return \sizeof($this->visibleProperties); |
153 | 153 | } |
154 | 154 | |
155 | - public function getProperty($index){ |
|
155 | + public function getProperty($index) { |
|
156 | 156 | return $this->properties[$index]; |
157 | 157 | } |
158 | 158 | |
159 | - public function getFieldName($index){ |
|
159 | + public function getFieldName($index) { |
|
160 | 160 | $property=$this->getProperty($index); |
161 | - if($property instanceof \ReflectionProperty){ |
|
161 | + if ($property instanceof \ReflectionProperty) { |
|
162 | 162 | $result=$property->getName(); |
163 | - }elseif(\is_callable($property)){ |
|
163 | + }elseif (\is_callable($property)) { |
|
164 | 164 | $result=$this->visibleProperties[$index]; |
165 | - }else{ |
|
165 | + } else { |
|
166 | 166 | $result=$property; |
167 | 167 | } |
168 | 168 | return $result; |
169 | 169 | } |
170 | 170 | |
171 | 171 | |
172 | - protected function showableProperty(\ReflectionProperty $rProperty){ |
|
173 | - return JString::startswith($rProperty->getName(),"_")===false; |
|
172 | + protected function showableProperty(\ReflectionProperty $rProperty) { |
|
173 | + return JString::startswith($rProperty->getName(), "_")===false; |
|
174 | 174 | } |
175 | 175 | |
176 | 176 | public function setInstance($instance) { |
177 | - if(\is_string($instance)){ |
|
177 | + if (\is_string($instance)) { |
|
178 | 178 | $instance=new $instance(); |
179 | 179 | } |
180 | 180 | $this->instance=$instance; |
181 | 181 | $this->properties=[]; |
182 | 182 | $this->reflect=new \ReflectionClass($instance); |
183 | - if(\sizeof($this->visibleProperties)===0){ |
|
183 | + if (\sizeof($this->visibleProperties)===0) { |
|
184 | 184 | $this->properties=$this->getDefaultProperties(); |
185 | - }else{ |
|
186 | - foreach ($this->visibleProperties as $property){ |
|
185 | + } else { |
|
186 | + foreach ($this->visibleProperties as $property) { |
|
187 | 187 | $this->setInstanceProperty($property); |
188 | 188 | } |
189 | 189 | } |
190 | 190 | return $this; |
191 | 191 | } |
192 | 192 | |
193 | - private function setInstanceProperty($property){ |
|
194 | - if(\is_callable($property)){ |
|
193 | + private function setInstanceProperty($property) { |
|
194 | + if (\is_callable($property)) { |
|
195 | 195 | $this->properties[]=$property; |
196 | - }elseif(\is_string($property)){ |
|
197 | - try{ |
|
196 | + }elseif (\is_string($property)) { |
|
197 | + try { |
|
198 | 198 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
199 | 199 | $rProperty=$this->reflect->getProperty($property); |
200 | 200 | $this->properties[]=$rProperty; |
201 | - }catch(\Exception $e){ |
|
201 | + }catch (\Exception $e) { |
|
202 | 202 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
203 | 203 | $this->properties[]=$property; |
204 | 204 | } |
205 | - }elseif(\is_int($property)){ |
|
205 | + }elseif (\is_int($property)) { |
|
206 | 206 | $props=$this->getDefaultProperties(); |
207 | - if(isset($props[$property])) |
|
207 | + if (isset($props[$property])) |
|
208 | 208 | $this->properties[]=$props[$property]; |
209 | 209 | else |
210 | 210 | $this->properties[]=$property; |
211 | - }else{ |
|
211 | + } else { |
|
212 | 212 | $this->properties[]=$property; |
213 | 213 | } |
214 | 214 | } |
215 | 215 | |
216 | - protected function getDefaultProperties(){ |
|
216 | + protected function getDefaultProperties() { |
|
217 | 217 | $result=[]; |
218 | 218 | $properties=$this->reflect->getProperties(); |
219 | - foreach ($properties as $property){ |
|
219 | + foreach ($properties as $property) { |
|
220 | 220 | $showable=$this->showableProperty($property); |
221 | - if($showable!==false){ |
|
221 | + if ($showable!==false) { |
|
222 | 222 | $result[]=$property; |
223 | 223 | } |
224 | 224 | } |
@@ -230,12 +230,12 @@ discard block |
||
230 | 230 | return $this; |
231 | 231 | } |
232 | 232 | |
233 | - public function setValueFunction($index,$callback){ |
|
233 | + public function setValueFunction($index, $callback) { |
|
234 | 234 | $this->values[$index]=$callback; |
235 | 235 | return $this; |
236 | 236 | } |
237 | 237 | |
238 | - public function setIdentifierFunction($callback){ |
|
238 | + public function setIdentifierFunction($callback) { |
|
239 | 239 | $this->values["identifier"]=$callback; |
240 | 240 | return $this; |
241 | 241 | } |
@@ -248,41 +248,41 @@ discard block |
||
248 | 248 | return $this->properties; |
249 | 249 | } |
250 | 250 | |
251 | - public function getCaption($index){ |
|
252 | - if(isset($this->captions[$index])){ |
|
251 | + public function getCaption($index) { |
|
252 | + if (isset($this->captions[$index])) { |
|
253 | 253 | return $this->captions[$index]; |
254 | 254 | } |
255 | - if($this->properties[$index] instanceof \ReflectionProperty) |
|
255 | + if ($this->properties[$index] instanceof \ReflectionProperty) |
|
256 | 256 | return $this->properties[$index]->getName(); |
257 | - elseif(\is_callable($this->properties[$index])) |
|
257 | + elseif (\is_callable($this->properties[$index])) |
|
258 | 258 | return ""; |
259 | 259 | else |
260 | 260 | return $this->properties[$index]; |
261 | 261 | } |
262 | 262 | |
263 | - public function getCaptions(){ |
|
264 | - if(isset($this->captions)){ |
|
265 | - $captions= \array_values($this->captions); |
|
266 | - for($i=\sizeof($captions);$i<$this->count();$i++){ |
|
263 | + public function getCaptions() { |
|
264 | + if (isset($this->captions)) { |
|
265 | + $captions=\array_values($this->captions); |
|
266 | + for ($i=\sizeof($captions); $i<$this->count(); $i++) { |
|
267 | 267 | $captions[]=""; |
268 | 268 | } |
269 | - }else{ |
|
269 | + } else { |
|
270 | 270 | $captions=[]; |
271 | 271 | $index=0; |
272 | 272 | $count=$this->count(); |
273 | - while($index<$count){ |
|
273 | + while ($index<$count) { |
|
274 | 274 | $captions[]=$this->getCaption($index++); |
275 | 275 | } |
276 | 276 | } |
277 | - if(isset($this->captionCallback) && \is_callable($this->captionCallback)){ |
|
277 | + if (isset($this->captionCallback) && \is_callable($this->captionCallback)) { |
|
278 | 278 | $callback=$this->captionCallback; |
279 | - $callback($captions,$this->instance); |
|
279 | + $callback($captions, $this->instance); |
|
280 | 280 | } |
281 | 281 | return $captions; |
282 | 282 | } |
283 | 283 | |
284 | - public function setCaption($index,$caption){ |
|
285 | - if(isset($this->captions)===false) |
|
284 | + public function setCaption($index, $caption) { |
|
285 | + if (isset($this->captions)===false) |
|
286 | 286 | $this->captions=[]; |
287 | 287 | $this->captions[$index]=$caption; |
288 | 288 | return $this; |
@@ -300,7 +300,7 @@ discard block |
||
300 | 300 | * @param callable $callback function called after the field compilation |
301 | 301 | * @return \Ajax\semantic\widgets\datatable\InstanceViewer |
302 | 302 | */ |
303 | - public function afterCompile($index,$callback){ |
|
303 | + public function afterCompile($index, $callback) { |
|
304 | 304 | $this->afterCompile[$index]=$callback; |
305 | 305 | return $this; |
306 | 306 | } |
@@ -53,6 +53,9 @@ discard block |
||
53 | 53 | $element->setStyle($value); |
54 | 54 | } |
55 | 55 | |
56 | + /** |
|
57 | + * @param HtmlDropdown $bt |
|
58 | + */ |
|
56 | 59 | private function dropdownAsButton($bt) { |
57 | 60 | $this->addExistingDropDown($bt); |
58 | 61 | $bt->setTagName("button"); |
@@ -81,6 +84,9 @@ discard block |
||
81 | 84 | return $result; |
82 | 85 | } |
83 | 86 | |
87 | + /** |
|
88 | + * @param integer $iid |
|
89 | + */ |
|
84 | 90 | private function _addArrayElement(array $element,$iid){ |
85 | 91 | if (array_key_exists("glyph", $element)) |
86 | 92 | $bt=new HtmlGlyphButton($this->identifier."-button-".$iid); |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | * @return HtmlButtongroups default : "" |
40 | 40 | */ |
41 | 41 | public function setSize($size) { |
42 | - foreach ( $this->elements as $element ) { |
|
42 | + foreach ($this->elements as $element) { |
|
43 | 43 | $element->setSize($size); |
44 | 44 | } |
45 | 45 | if (is_int($size)) { |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | } |
50 | 50 | |
51 | 51 | public function setStyle($value) { |
52 | - foreach ( $this->elements as $element ) |
|
52 | + foreach ($this->elements as $element) |
|
53 | 53 | $element->setStyle($value); |
54 | 54 | } |
55 | 55 | |
@@ -69,29 +69,29 @@ discard block |
||
69 | 69 | public function addElement($element) { |
70 | 70 | $result=$element; |
71 | 71 | $iid=sizeof($this->elements)+1; |
72 | - if (($element instanceof HtmlDropdown)||($element instanceof HtmlSplitbutton)) { |
|
72 | + if (($element instanceof HtmlDropdown) || ($element instanceof HtmlSplitbutton)) { |
|
73 | 73 | $this->addExistingDropDown($element); |
74 | 74 | } elseif (\is_array($element)) { |
75 | - $result=$this->_addArrayElement($element,$iid); |
|
75 | + $result=$this->_addArrayElement($element, $iid); |
|
76 | 76 | } elseif (is_string($element)) { |
77 | - $result=new HtmlButton($this->identifier."-button-".$iid,$element); |
|
77 | + $result=new HtmlButton($this->identifier."-button-".$iid, $element); |
|
78 | 78 | } |
79 | - if($result instanceof HtmlButton) |
|
79 | + if ($result instanceof HtmlButton) |
|
80 | 80 | $this->elements[]=$result; |
81 | 81 | return $result; |
82 | 82 | } |
83 | 83 | |
84 | - private function _addArrayElement(array $element,$iid){ |
|
84 | + private function _addArrayElement(array $element, $iid) { |
|
85 | 85 | if (array_key_exists("glyph", $element)) |
86 | 86 | $bt=new HtmlGlyphButton($this->identifier."-button-".$iid); |
87 | 87 | elseif (array_key_exists("btnCaption", $element)) { |
88 | 88 | if (array_key_exists("split", $element)) |
89 | 89 | $bt=new HtmlSplitbutton($this->identifier."-dropdown-".$iid); |
90 | - else{ |
|
90 | + else { |
|
91 | 91 | $bt=new HtmlDropdown($this->identifier."-dropdown-".$iid); |
92 | 92 | $this->dropdownAsButton($bt); |
93 | 93 | } |
94 | - } else{ |
|
94 | + } else { |
|
95 | 95 | $bt=new HtmlButton($this->identifier."-button-".$iid); |
96 | 96 | $bt->fromArray($element); |
97 | 97 | } |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | } |
100 | 100 | |
101 | 101 | public function addElements($elements) { |
102 | - foreach ( $elements as $element ) { |
|
102 | + foreach ($elements as $element) { |
|
103 | 103 | $this->addElement($element); |
104 | 104 | } |
105 | 105 | return $this; |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | } else |
120 | 120 | $value="btn-group-".$value; |
121 | 121 | if (strstr($value, "justified")) { |
122 | - foreach ( $this->elements as $element ) { |
|
122 | + foreach ($this->elements as $element) { |
|
123 | 123 | $element->wrap('<div class="btn-group" role="group">', '</div>'); |
124 | 124 | } |
125 | 125 | } |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | * @see \Ajax\bootstrap\html\base\BaseHtml::on() |
151 | 151 | */ |
152 | 152 | public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) { |
153 | - foreach ( $this->elements as $element ) { |
|
153 | + foreach ($this->elements as $element) { |
|
154 | 154 | $element->on($event, $jsCode, $stopPropagation, $preventDefault); |
155 | 155 | } |
156 | 156 | return $this; |
@@ -49,8 +49,9 @@ discard block |
||
49 | 49 | } |
50 | 50 | |
51 | 51 | public function setStyle($value) { |
52 | - foreach ( $this->elements as $element ) |
|
53 | - $element->setStyle($value); |
|
52 | + foreach ( $this->elements as $element ) { |
|
53 | + $element->setStyle($value); |
|
54 | + } |
|
54 | 55 | } |
55 | 56 | |
56 | 57 | private function dropdownAsButton($bt) { |
@@ -76,18 +77,19 @@ discard block |
||
76 | 77 | } elseif (is_string($element)) { |
77 | 78 | $result=new HtmlButton($this->identifier."-button-".$iid,$element); |
78 | 79 | } |
79 | - if($result instanceof HtmlButton) |
|
80 | - $this->elements[]=$result; |
|
80 | + if($result instanceof HtmlButton) { |
|
81 | + $this->elements[]=$result; |
|
82 | + } |
|
81 | 83 | return $result; |
82 | 84 | } |
83 | 85 | |
84 | 86 | private function _addArrayElement(array $element,$iid){ |
85 | - if (array_key_exists("glyph", $element)) |
|
86 | - $bt=new HtmlGlyphButton($this->identifier."-button-".$iid); |
|
87 | - elseif (array_key_exists("btnCaption", $element)) { |
|
88 | - if (array_key_exists("split", $element)) |
|
89 | - $bt=new HtmlSplitbutton($this->identifier."-dropdown-".$iid); |
|
90 | - else{ |
|
87 | + if (array_key_exists("glyph", $element)) { |
|
88 | + $bt=new HtmlGlyphButton($this->identifier."-button-".$iid); |
|
89 | + } elseif (array_key_exists("btnCaption", $element)) { |
|
90 | + if (array_key_exists("split", $element)) { |
|
91 | + $bt=new HtmlSplitbutton($this->identifier."-dropdown-".$iid); |
|
92 | + } else{ |
|
91 | 93 | $bt=new HtmlDropdown($this->identifier."-dropdown-".$iid); |
92 | 94 | $this->dropdownAsButton($bt); |
93 | 95 | } |
@@ -116,8 +118,9 @@ discard block |
||
116 | 118 | public function setAlignment($value) { |
117 | 119 | if (is_int($value)) { |
118 | 120 | $value=CssRef::alignment("btn-group")[$value]; |
119 | - } else |
|
120 | - $value="btn-group-".$value; |
|
121 | + } else { |
|
122 | + $value="btn-group-".$value; |
|
123 | + } |
|
121 | 124 | if (strstr($value, "justified")) { |
122 | 125 | foreach ( $this->elements as $element ) { |
123 | 126 | $element->wrap('<div class="btn-group" role="group">', '</div>'); |
@@ -132,9 +135,9 @@ discard block |
||
132 | 135 | * @return HtmlButton |
133 | 136 | */ |
134 | 137 | public function getElement($index) { |
135 | - if (is_int($index)) |
|
136 | - return $this->elements[$index]; |
|
137 | - else { |
|
138 | + if (is_int($index)) { |
|
139 | + return $this->elements[$index]; |
|
140 | + } else { |
|
138 | 141 | $elm=$this->getElementById($index, $this->elements); |
139 | 142 | return $elm; |
140 | 143 | } |
@@ -1,15 +1,15 @@ |
||
1 | 1 | <?php |
2 | 2 | namespace Ajax\service; |
3 | 3 | class JQueryAjaxEffect { |
4 | - public static function none($responseElement,$jqueryDone="html"){ |
|
4 | + public static function none($responseElement, $jqueryDone="html") { |
|
5 | 5 | return "\t$({$responseElement}).{$jqueryDone}( data );\n"; |
6 | 6 | } |
7 | 7 | |
8 | - public static function fade($responseElement,$jqueryDone="html"){ |
|
8 | + public static function fade($responseElement, $jqueryDone="html") { |
|
9 | 9 | return "\t$({$responseElement}).hide().{$jqueryDone}( data ).fadeIn();\n"; |
10 | 10 | } |
11 | 11 | |
12 | - public static function slide($responseElement,$jqueryDone="html"){ |
|
12 | + public static function slide($responseElement, $jqueryDone="html") { |
|
13 | 13 | return "\t$({$responseElement}).hide().{$jqueryDone}( data ).slideDown();\n"; |
14 | 14 | } |
15 | 15 | } |
16 | 16 | \ No newline at end of file |
@@ -58,8 +58,9 @@ discard block |
||
58 | 58 | */ |
59 | 59 | private function getFieldButton($caption,$visibleHover=true){ |
60 | 60 | $bt= new HtmlButton("",$caption); |
61 | - if($visibleHover) |
|
62 | - $this->_visibleOver($bt); |
|
61 | + if($visibleHover) { |
|
62 | + $this->_visibleOver($bt); |
|
63 | + } |
|
63 | 64 | return $bt; |
64 | 65 | } |
65 | 66 | |
@@ -76,8 +77,9 @@ discard block |
||
76 | 77 | return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle,$index,$attributes){ |
77 | 78 | $button=new HtmlButton($id,$value,$cssStyle); |
78 | 79 | $button->postOnClick($url,"$(event.target).closest('tr').find(':input').serialize()",$responseElement,$attributes["ajax"]); |
79 | - if(!isset($attributes["visibleHover"]) || $attributes["visibleHover"]) |
|
80 | - $this->_visibleOver($button); |
|
80 | + if(!isset($attributes["visibleHover"]) || $attributes["visibleHover"]) { |
|
81 | + $this->_visibleOver($button); |
|
82 | + } |
|
81 | 83 | return $button; |
82 | 84 | }, $index,$attributes); |
83 | 85 | } |
@@ -136,8 +138,9 @@ discard block |
||
136 | 138 | private function getDefaultButton($icon,$class=null,$visibleHover=true){ |
137 | 139 | $bt=$this->getFieldButton("",$visibleHover); |
138 | 140 | $bt->asIcon($icon); |
139 | - if(isset($class)) |
|
140 | - $bt->addClass($class); |
|
141 | + if(isset($class)) { |
|
142 | + $bt->addClass($class); |
|
143 | + } |
|
141 | 144 | return $bt; |
142 | 145 | } |
143 | 146 |
@@ -12,19 +12,19 @@ discard block |
||
12 | 12 | * @property boolean $_visibleHover |
13 | 13 | * @property InstanceViewer $_instanceViewer |
14 | 14 | */ |
15 | -trait DataTableFieldAsTrait{ |
|
15 | +trait DataTableFieldAsTrait { |
|
16 | 16 | abstract public function addField($field); |
17 | - abstract public function insertField($index,$field); |
|
18 | - abstract public function insertInField($index,$field); |
|
19 | - abstract public function fieldAs($index,$type,$attributes=NULL); |
|
17 | + abstract public function insertField($index, $field); |
|
18 | + abstract public function insertInField($index, $field); |
|
19 | + abstract public function fieldAs($index, $type, $attributes=NULL); |
|
20 | 20 | /** |
21 | 21 | * @param string $caption |
22 | 22 | * @param callable $callback |
23 | 23 | * @param boolean $visibleHover |
24 | 24 | * @return callable |
25 | 25 | */ |
26 | - private function getFieldButtonCallable($caption,$visibleHover=true,$callback=null){ |
|
27 | - return $this->getCallable("getFieldButton",[$caption,$visibleHover],$callback); |
|
26 | + private function getFieldButtonCallable($caption, $visibleHover=true, $callback=null) { |
|
27 | + return $this->getCallable("getFieldButton", [$caption, $visibleHover], $callback); |
|
28 | 28 | } |
29 | 29 | |
30 | 30 | /** |
@@ -33,19 +33,19 @@ discard block |
||
33 | 33 | * @param callable $callback |
34 | 34 | * @return callable |
35 | 35 | */ |
36 | - private function getCallable($thisCallback,$parameters,$callback=null){ |
|
37 | - $result=function($instance) use($thisCallback,$parameters,$callback){ |
|
38 | - $object=call_user_func_array(array($this,$thisCallback), $parameters); |
|
39 | - if(isset($callback)){ |
|
40 | - if(\is_callable($callback)){ |
|
41 | - $callback($object,$instance); |
|
36 | + private function getCallable($thisCallback, $parameters, $callback=null) { |
|
37 | + $result=function($instance) use($thisCallback, $parameters, $callback){ |
|
38 | + $object=call_user_func_array(array($this, $thisCallback), $parameters); |
|
39 | + if (isset($callback)) { |
|
40 | + if (\is_callable($callback)) { |
|
41 | + $callback($object, $instance); |
|
42 | 42 | } |
43 | 43 | } |
44 | - if($object instanceof HtmlSemDoubleElement){ |
|
45 | - $object->setProperty("data-ajax",$this->_instanceViewer->getIdentifier()); |
|
46 | - if($object->propertyContains("class","visibleover")){ |
|
44 | + if ($object instanceof HtmlSemDoubleElement) { |
|
45 | + $object->setProperty("data-ajax", $this->_instanceViewer->getIdentifier()); |
|
46 | + if ($object->propertyContains("class", "visibleover")) { |
|
47 | 47 | $this->_visibleHover=true; |
48 | - $object->setProperty("style","visibility:hidden;"); |
|
48 | + $object->setProperty("style", "visibility:hidden;"); |
|
49 | 49 | } |
50 | 50 | } |
51 | 51 | return $object; |
@@ -57,9 +57,9 @@ discard block |
||
57 | 57 | * @param string $caption |
58 | 58 | * @return HtmlButton |
59 | 59 | */ |
60 | - private function getFieldButton($caption,$visibleHover=true){ |
|
61 | - $bt= new HtmlButton("",$caption); |
|
62 | - if($visibleHover) |
|
60 | + private function getFieldButton($caption, $visibleHover=true) { |
|
61 | + $bt=new HtmlButton("", $caption); |
|
62 | + if ($visibleHover) |
|
63 | 63 | $this->_visibleOver($bt); |
64 | 64 | return $bt; |
65 | 65 | } |
@@ -73,19 +73,19 @@ discard block |
||
73 | 73 | * @param array $attributes associative array (<b>ajax</b> key is for ajax post) |
74 | 74 | * @return \Ajax\semantic\widgets\datatable\DataTable |
75 | 75 | */ |
76 | - public function fieldAsSubmit($index,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$attributes=NULL){ |
|
77 | - return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle,$index,$attributes){ |
|
78 | - $button=new HtmlButton($id,$value,$cssStyle); |
|
79 | - $button->postOnClick($url,"$(event.target).closest('tr').find(':input').serialize()",$responseElement,$attributes["ajax"]); |
|
80 | - if(!isset($attributes["visibleHover"]) || $attributes["visibleHover"]) |
|
76 | + public function fieldAsSubmit($index, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $attributes=NULL) { |
|
77 | + return $this->_fieldAs(function($id, $name, $value, $caption) use ($url, $responseElement, $cssStyle, $index, $attributes){ |
|
78 | + $button=new HtmlButton($id, $value, $cssStyle); |
|
79 | + $button->postOnClick($url, "$(event.target).closest('tr').find(':input').serialize()", $responseElement, $attributes["ajax"]); |
|
80 | + if (!isset($attributes["visibleHover"]) || $attributes["visibleHover"]) |
|
81 | 81 | $this->_visibleOver($button); |
82 | 82 | return $button; |
83 | - }, $index,$attributes); |
|
83 | + }, $index, $attributes); |
|
84 | 84 | } |
85 | 85 | |
86 | - protected function _visibleOver($element){ |
|
86 | + protected function _visibleOver($element) { |
|
87 | 87 | $this->_visibleHover=true; |
88 | - return $element->addToProperty("class", "visibleover")->setProperty("style","visibility:hidden;"); |
|
88 | + return $element->addToProperty("class", "visibleover")->setProperty("style", "visibility:hidden;"); |
|
89 | 89 | } |
90 | 90 | |
91 | 91 | /** |
@@ -95,8 +95,8 @@ discard block |
||
95 | 95 | * @param boolean $visibleHover |
96 | 96 | * @return \Ajax\semantic\widgets\datatable\DataTable |
97 | 97 | */ |
98 | - public function addFieldButton($caption,$visibleHover=true,$callback=null){ |
|
99 | - $this->addField($this->getCallable("getFieldButton",[$caption,$visibleHover],$callback)); |
|
98 | + public function addFieldButton($caption, $visibleHover=true, $callback=null) { |
|
99 | + $this->addField($this->getCallable("getFieldButton", [$caption, $visibleHover], $callback)); |
|
100 | 100 | return $this; |
101 | 101 | } |
102 | 102 | |
@@ -107,8 +107,8 @@ discard block |
||
107 | 107 | * @param callable $callback |
108 | 108 | * @return \Ajax\semantic\widgets\datatable\DataTable |
109 | 109 | */ |
110 | - public function insertFieldButton($index,$caption,$visibleHover=true,$callback=null){ |
|
111 | - $this->insertField($index, $this->getFieldButtonCallable($caption,$visibleHover,$callback)); |
|
110 | + public function insertFieldButton($index, $caption, $visibleHover=true, $callback=null) { |
|
111 | + $this->insertField($index, $this->getFieldButtonCallable($caption, $visibleHover, $callback)); |
|
112 | 112 | return $this; |
113 | 113 | } |
114 | 114 | |
@@ -119,25 +119,25 @@ discard block |
||
119 | 119 | * @param callable $callback |
120 | 120 | * @return \Ajax\semantic\widgets\datatable\DataTable |
121 | 121 | */ |
122 | - public function insertInFieldButton($index,$caption,$visibleHover=true,$callback=null){ |
|
123 | - $this->insertInField($index, $this->getFieldButtonCallable($caption,$visibleHover,$callback)); |
|
122 | + public function insertInFieldButton($index, $caption, $visibleHover=true, $callback=null) { |
|
123 | + $this->insertInField($index, $this->getFieldButtonCallable($caption, $visibleHover, $callback)); |
|
124 | 124 | return $this; |
125 | 125 | } |
126 | 126 | |
127 | - private function addDefaultButton($icon,$class=null,$visibleHover=true,$callback=null){ |
|
128 | - $this->addField($this->getCallable("getDefaultButton",[$icon,$class,$visibleHover],$callback)); |
|
127 | + private function addDefaultButton($icon, $class=null, $visibleHover=true, $callback=null) { |
|
128 | + $this->addField($this->getCallable("getDefaultButton", [$icon, $class, $visibleHover], $callback)); |
|
129 | 129 | return $this; |
130 | 130 | } |
131 | 131 | |
132 | - private function insertDefaultButtonIn($index,$icon,$class=null,$visibleHover=true,$callback=null){ |
|
133 | - $this->insertInField($index,$this->getCallable("getDefaultButton",[$icon,$class,$visibleHover],$callback)); |
|
132 | + private function insertDefaultButtonIn($index, $icon, $class=null, $visibleHover=true, $callback=null) { |
|
133 | + $this->insertInField($index, $this->getCallable("getDefaultButton", [$icon, $class, $visibleHover], $callback)); |
|
134 | 134 | return $this; |
135 | 135 | } |
136 | 136 | |
137 | - private function getDefaultButton($icon,$class=null,$visibleHover=true){ |
|
138 | - $bt=$this->getFieldButton("",$visibleHover); |
|
137 | + private function getDefaultButton($icon, $class=null, $visibleHover=true) { |
|
138 | + $bt=$this->getFieldButton("", $visibleHover); |
|
139 | 139 | $bt->asIcon($icon); |
140 | - if(isset($class)) |
|
140 | + if (isset($class)) |
|
141 | 141 | $bt->addClass($class); |
142 | 142 | return $bt; |
143 | 143 | } |
@@ -148,30 +148,30 @@ discard block |
||
148 | 148 | * @param callable $callback |
149 | 149 | * @return DataTable |
150 | 150 | */ |
151 | - public function addDeleteButton($visibleHover=true,$deleteBehavior=[],$callback=null){ |
|
151 | + public function addDeleteButton($visibleHover=true, $deleteBehavior=[], $callback=null) { |
|
152 | 152 | $this->_deleteBehavior=$deleteBehavior; |
153 | - return $this->addDefaultButton("remove","_delete red basic",$visibleHover,$callback); |
|
153 | + return $this->addDefaultButton("remove", "_delete red basic", $visibleHover, $callback); |
|
154 | 154 | } |
155 | 155 | |
156 | - public function addEditButton($visibleHover=true,$editBehavior=[],$callback=null){ |
|
156 | + public function addEditButton($visibleHover=true, $editBehavior=[], $callback=null) { |
|
157 | 157 | $this->_editBehavior=$editBehavior; |
158 | - return $this->addDefaultButton("edit","_edit basic",$visibleHover,$callback); |
|
158 | + return $this->addDefaultButton("edit", "_edit basic", $visibleHover, $callback); |
|
159 | 159 | } |
160 | 160 | |
161 | - public function addEditDeleteButtons($visibleHover=true,$behavior=[],$callbackEdit=null,$callbackDelete=null){ |
|
162 | - $this->addEditButton($visibleHover,$behavior,$callbackEdit); |
|
161 | + public function addEditDeleteButtons($visibleHover=true, $behavior=[], $callbackEdit=null, $callbackDelete=null) { |
|
162 | + $this->addEditButton($visibleHover, $behavior, $callbackEdit); |
|
163 | 163 | $index=$this->_instanceViewer->visiblePropertiesCount()-1; |
164 | - $this->insertDeleteButtonIn($index,$visibleHover,$behavior,$callbackDelete); |
|
164 | + $this->insertDeleteButtonIn($index, $visibleHover, $behavior, $callbackDelete); |
|
165 | 165 | return $this; |
166 | 166 | } |
167 | 167 | |
168 | - public function insertDeleteButtonIn($index,$visibleHover=true,$deleteBehavior=[],$callback=null){ |
|
168 | + public function insertDeleteButtonIn($index, $visibleHover=true, $deleteBehavior=[], $callback=null) { |
|
169 | 169 | $this->_deleteBehavior=$deleteBehavior; |
170 | - return $this->insertDefaultButtonIn($index,"remove","_delete red basic",$visibleHover,$callback); |
|
170 | + return $this->insertDefaultButtonIn($index, "remove", "_delete red basic", $visibleHover, $callback); |
|
171 | 171 | } |
172 | 172 | |
173 | - public function insertEditButtonIn($index,$visibleHover=true,$editBehavior=[],$callback=null){ |
|
173 | + public function insertEditButtonIn($index, $visibleHover=true, $editBehavior=[], $callback=null) { |
|
174 | 174 | $this->_editBehavior=$editBehavior; |
175 | - return $this->insertDefaultButtonIn($index,"edit","_edit basic",$visibleHover,$callback); |
|
175 | + return $this->insertDefaultButtonIn($index, "edit", "_edit basic", $visibleHover, $callback); |
|
176 | 176 | } |
177 | 177 | } |
178 | 178 | \ No newline at end of file |
@@ -15,16 +15,16 @@ discard block |
||
15 | 15 | * @license Apache 2 http://www.apache.org/licenses/ |
16 | 16 | **/ |
17 | 17 | class Jquery { |
18 | - use JqueryEventsTrait,JqueryAjaxTrait,JqueryActionsTrait; |
|
18 | + use JqueryEventsTrait, JqueryAjaxTrait, JqueryActionsTrait; |
|
19 | 19 | protected $_ui; |
20 | 20 | protected $_bootstrap; |
21 | 21 | protected $_semantic; |
22 | - protected $jquery_code_for_compile=array (); |
|
22 | + protected $jquery_code_for_compile=array(); |
|
23 | 23 | protected $jsUtils; |
24 | 24 | protected $params; |
25 | 25 | |
26 | - protected $jquery_events=array ( |
|
27 | - "bind","blur","change","click","dblclick","delegate","die","error","focus","focusin","focusout","hover","keydown","keypress","keyup","live","load","mousedown","mousseenter","mouseleave","mousemove","mouseout","mouseover","mouseup","off","on","one","ready","resize","scroll","select","submit","toggle","trigger","triggerHandler","undind","undelegate","unload" |
|
26 | + protected $jquery_events=array( |
|
27 | + "bind", "blur", "change", "click", "dblclick", "delegate", "die", "error", "focus", "focusin", "focusout", "hover", "keydown", "keypress", "keyup", "live", "load", "mousedown", "mousseenter", "mouseleave", "mousemove", "mouseout", "mouseover", "mouseup", "off", "on", "one", "ready", "resize", "scroll", "select", "submit", "toggle", "trigger", "triggerHandler", "undind", "undelegate", "unload" |
|
28 | 28 | ); |
29 | 29 | |
30 | 30 | public function ui($ui=NULL) { |
@@ -48,13 +48,13 @@ discard block |
||
48 | 48 | return $this->_semantic; |
49 | 49 | } |
50 | 50 | |
51 | - public function __construct($params,$jsUtils) { |
|
51 | + public function __construct($params, $jsUtils) { |
|
52 | 52 | $this->params=array(); |
53 | - foreach ( $params as $key => $val ) { |
|
53 | + foreach ($params as $key => $val) { |
|
54 | 54 | $this->params[$key]=$params[$key]; |
55 | 55 | } |
56 | 56 | $this->jsUtils=$jsUtils; |
57 | - if(isset($params["ajaxTransition"])) |
|
57 | + if (isset($params["ajaxTransition"])) |
|
58 | 58 | $this->ajaxTransition=$this->setAjaxDataCall($params["ajaxTransition"]); |
59 | 59 | } |
60 | 60 | |
@@ -116,12 +116,12 @@ discard block |
||
116 | 116 | */ |
117 | 117 | public function _output($array_js='') { |
118 | 118 | if (!is_array($array_js)) { |
119 | - $array_js=array ( |
|
119 | + $array_js=array( |
|
120 | 120 | $array_js |
121 | 121 | ); |
122 | 122 | } |
123 | 123 | |
124 | - foreach ( $array_js as $js ) { |
|
124 | + foreach ($array_js as $js) { |
|
125 | 125 | $this->jquery_code_for_compile[]="\t$js\n"; |
126 | 126 | } |
127 | 127 | } |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | * @param string $param |
134 | 134 | * @param boolean $immediatly delayed if false |
135 | 135 | */ |
136 | - public function _genericCallValue($jQueryCall,$element='this', $param="", $immediatly=false) { |
|
136 | + public function _genericCallValue($jQueryCall, $element='this', $param="", $immediatly=false) { |
|
137 | 137 | $element=Javascript::prep_element($element); |
138 | 138 | if (isset($param)) { |
139 | 139 | $param=Javascript::prep_value($param); |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | * @param boolean $immediatly delayed if false |
153 | 153 | * @return string |
154 | 154 | */ |
155 | - public function _genericCallElement($jQueryCall,$to='this', $element, $immediatly=false) { |
|
155 | + public function _genericCallElement($jQueryCall, $to='this', $element, $immediatly=false) { |
|
156 | 156 | $to=Javascript::prep_element($to); |
157 | 157 | $element=Javascript::prep_element($element); |
158 | 158 | $str="$({$to}).{$jQueryCall}({$element});"; |
@@ -170,8 +170,8 @@ discard block |
||
170 | 170 | */ |
171 | 171 | public function sortable($element, $options=array()) { |
172 | 172 | if (count($options)>0) { |
173 | - $sort_options=array (); |
|
174 | - foreach ( $options as $k => $v ) { |
|
173 | + $sort_options=array(); |
|
174 | + foreach ($options as $k => $v) { |
|
175 | 175 | $sort_options[]="\n\t\t".$k.': '.$v.""; |
176 | 176 | } |
177 | 177 | $sort_options=implode(",", $sort_options); |
@@ -203,7 +203,7 @@ discard block |
||
203 | 203 | * @param boolean $stopPropagation Prevents the event from bubbling up the DOM tree, preventing any parent handlers from being notified of the event. |
204 | 204 | * @return string |
205 | 205 | */ |
206 | - public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true) { |
|
206 | + public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true) { |
|
207 | 207 | if (\is_array($js)) { |
208 | 208 | $js=implode("\n\t\t", $js); |
209 | 209 | } |
@@ -217,7 +217,7 @@ discard block |
||
217 | 217 | $event="\n\t$(".Javascript::prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n"; |
218 | 218 | else |
219 | 219 | $event="\n\t$(".Javascript::prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n"; |
220 | - if($immediatly) |
|
220 | + if ($immediatly) |
|
221 | 221 | $this->jquery_code_for_compile[]=$event; |
222 | 222 | return $event; |
223 | 223 | } |
@@ -243,29 +243,29 @@ discard block |
||
243 | 243 | $script='$(document).ready(function() {'."\n"; |
244 | 244 | $script.=implode('', $this->jquery_code_for_compile); |
245 | 245 | $script.='})'; |
246 | - if($this->params["defer"]){ |
|
246 | + if ($this->params["defer"]) { |
|
247 | 247 | $script=$this->defer($script); |
248 | 248 | } |
249 | 249 | $script.=";"; |
250 | 250 | $this->jquery_code_for_compile=array(); |
251 | - if($this->params["debug"]===false){ |
|
251 | + if ($this->params["debug"]===false) { |
|
252 | 252 | $script=$this->minify($script); |
253 | 253 | } |
254 | 254 | $output=($script_tags===FALSE) ? $script : $this->inline($script); |
255 | 255 | |
256 | - if ($view!==NULL){ |
|
257 | - $this->jsUtils->createScriptVariable($view,$view_var, $output); |
|
256 | + if ($view!==NULL) { |
|
257 | + $this->jsUtils->createScriptVariable($view, $view_var, $output); |
|
258 | 258 | } |
259 | 259 | return $output; |
260 | 260 | } |
261 | 261 | |
262 | - private function defer($script){ |
|
262 | + private function defer($script) { |
|
263 | 263 | $result="window.defer=function (method) {if (window.jQuery) method(); else setTimeout(function() { defer(method) }, 50);};"; |
264 | 264 | $result.="window.defer(function(){".$script."})"; |
265 | 265 | return $result; |
266 | 266 | } |
267 | 267 | |
268 | - private function _compileLibrary($library){ |
|
268 | + private function _compileLibrary($library) { |
|
269 | 269 | if ($library!=NULL) { |
270 | 270 | if ($library->isAutoCompile()) { |
271 | 271 | $library->compile(true); |
@@ -283,7 +283,7 @@ discard block |
||
283 | 283 | * @return void |
284 | 284 | */ |
285 | 285 | public function _clear_compile() { |
286 | - $this->jquery_code_for_compile=array (); |
|
286 | + $this->jquery_code_for_compile=array(); |
|
287 | 287 | } |
288 | 288 | |
289 | 289 | /** |
@@ -292,18 +292,18 @@ discard block |
||
292 | 292 | */ |
293 | 293 | public function _document_ready($js) { |
294 | 294 | if (!is_array($js)) { |
295 | - $js=array ( |
|
295 | + $js=array( |
|
296 | 296 | $js |
297 | 297 | ); |
298 | 298 | } |
299 | 299 | |
300 | - foreach ( $js as $script ) { |
|
300 | + foreach ($js as $script) { |
|
301 | 301 | $this->jquery_code_for_compile[]=$script; |
302 | 302 | } |
303 | 303 | } |
304 | 304 | |
305 | 305 | private function minify($input) { |
306 | - if(trim($input) === "") return $input; |
|
306 | + if (trim($input)==="") return $input; |
|
307 | 307 | return preg_replace( |
308 | 308 | array( |
309 | 309 | // Remove comment(s) |
@@ -54,8 +54,9 @@ discard block |
||
54 | 54 | $this->params[$key]=$params[$key]; |
55 | 55 | } |
56 | 56 | $this->jsUtils=$jsUtils; |
57 | - if(isset($params["ajaxTransition"])) |
|
58 | - $this->ajaxTransition=$this->setAjaxDataCall($params["ajaxTransition"]); |
|
57 | + if(isset($params["ajaxTransition"])) { |
|
58 | + $this->ajaxTransition=$this->setAjaxDataCall($params["ajaxTransition"]); |
|
59 | + } |
|
59 | 60 | } |
60 | 61 | |
61 | 62 | /** |
@@ -138,10 +139,12 @@ discard block |
||
138 | 139 | if (isset($param)) { |
139 | 140 | $param=Javascript::prep_value($param); |
140 | 141 | $str="$({$element}).{$jQueryCall}({$param});"; |
141 | - } else |
|
142 | - $str="$({$element}).{$jQueryCall}();"; |
|
143 | - if ($immediatly) |
|
144 | - $this->jquery_code_for_compile[]=$str; |
|
142 | + } else { |
|
143 | + $str="$({$element}).{$jQueryCall}();"; |
|
144 | + } |
|
145 | + if ($immediatly) { |
|
146 | + $this->jquery_code_for_compile[]=$str; |
|
147 | + } |
|
145 | 148 | return $str; |
146 | 149 | } |
147 | 150 | /** |
@@ -156,8 +159,9 @@ discard block |
||
156 | 159 | $to=Javascript::prep_element($to); |
157 | 160 | $element=Javascript::prep_element($element); |
158 | 161 | $str="$({$to}).{$jQueryCall}({$element});"; |
159 | - if ($immediatly) |
|
160 | - $this->jquery_code_for_compile[]=$str; |
|
162 | + if ($immediatly) { |
|
163 | + $this->jquery_code_for_compile[]=$str; |
|
164 | + } |
|
161 | 165 | return $str; |
162 | 166 | } |
163 | 167 | |
@@ -213,12 +217,14 @@ discard block |
||
213 | 217 | if ($stopPropagation===true) { |
214 | 218 | $js=Javascript::$stopPropagation.$js; |
215 | 219 | } |
216 | - if (array_search($event, $this->jquery_events)===false) |
|
217 | - $event="\n\t$(".Javascript::prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n"; |
|
218 | - else |
|
219 | - $event="\n\t$(".Javascript::prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n"; |
|
220 | - if($immediatly) |
|
221 | - $this->jquery_code_for_compile[]=$event; |
|
220 | + if (array_search($event, $this->jquery_events)===false) { |
|
221 | + $event="\n\t$(".Javascript::prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n"; |
|
222 | + } else { |
|
223 | + $event="\n\t$(".Javascript::prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n"; |
|
224 | + } |
|
225 | + if($immediatly) { |
|
226 | + $this->jquery_code_for_compile[]=$event; |
|
227 | + } |
|
222 | 228 | return $event; |
223 | 229 | } |
224 | 230 | |
@@ -303,7 +309,9 @@ discard block |
||
303 | 309 | } |
304 | 310 | |
305 | 311 | private function minify($input) { |
306 | - if(trim($input) === "") return $input; |
|
312 | + if(trim($input) === "") { |
|
313 | + return $input; |
|
314 | + } |
|
307 | 315 | return preg_replace( |
308 | 316 | array( |
309 | 317 | // Remove comment(s) |
@@ -25,8 +25,8 @@ discard block |
||
25 | 25 | * @param string $jqueryDone the jquery function call on ajax data. default:html |
26 | 26 | * @param string|callable $ajaxTransition |
27 | 27 | */ |
28 | - public function get($url, $responseElement="", $params="{}", $jsCallback=NULL,$hasLoader=true,$jqueryDone="html",$ajaxTransition=null) { |
|
29 | - return $this->js->_get($url, $params, $responseElement, $jsCallback, NULL, $hasLoader,$jqueryDone,$ajaxTransition,true); |
|
28 | + public function get($url, $responseElement="", $params="{}", $jsCallback=NULL, $hasLoader=true, $jqueryDone="html", $ajaxTransition=null) { |
|
29 | + return $this->js->_get($url, $params, $responseElement, $jsCallback, NULL, $hasLoader, $jqueryDone, $ajaxTransition, true); |
|
30 | 30 | } |
31 | 31 | |
32 | 32 | /** |
@@ -37,8 +37,8 @@ discard block |
||
37 | 37 | * @param string $jsCallback javascript code to execute after the request |
38 | 38 | * @param boolean $immediatly |
39 | 39 | */ |
40 | - public function json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document",$immediatly=false) { |
|
41 | - return $this->js->_json($url, $method, $params, $jsCallback, $attr, $context,$immediatly); |
|
40 | + public function json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document", $immediatly=false) { |
|
41 | + return $this->js->_json($url, $method, $params, $jsCallback, $attr, $context, $immediatly); |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | /** |
@@ -48,8 +48,8 @@ discard block |
||
48 | 48 | * @param string $url the request address |
49 | 49 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true) |
50 | 50 | */ |
51 | - public function jsonOn($event,$element, $url,$parameters=array()) { |
|
52 | - return $this->js->_jsonOn($event, $element, $url,$parameters); |
|
51 | + public function jsonOn($event, $element, $url, $parameters=array()) { |
|
52 | + return $this->js->_jsonOn($event, $element, $url, $parameters); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | /** |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | * @param string $jsCallback javascript code to execute after the request |
72 | 72 | */ |
73 | 73 | public function jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL) { |
74 | - return $this->js->_jsonArray($maskSelector, $url, $method, $params, $jsCallback, NULL,true); |
|
74 | + return $this->js->_jsonArray($maskSelector, $url, $method, $params, $jsCallback, NULL, true); |
|
75 | 75 | } |
76 | 76 | |
77 | 77 | /** |
@@ -93,8 +93,8 @@ discard block |
||
93 | 93 | * @param string $url the request url |
94 | 94 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true) |
95 | 95 | */ |
96 | - public function jsonArrayOn($event,$element,$maskSelector, $url,$parameters=array()) { |
|
97 | - return $this->js->_jsonArrayOn($event,$element,$maskSelector, $url, $parameters); |
|
96 | + public function jsonArrayOn($event, $element, $maskSelector, $url, $parameters=array()) { |
|
97 | + return $this->js->_jsonArrayOn($event, $element, $maskSelector, $url, $parameters); |
|
98 | 98 | } |
99 | 99 | |
100 | 100 | /** |
@@ -108,8 +108,8 @@ discard block |
||
108 | 108 | * @param string $jqueryDone the jquery function call on ajax data. default:html |
109 | 109 | * @param string|callable $ajaxTransition |
110 | 110 | */ |
111 | - public function getDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL,$attr="id",$jqueryDone="html",$ajaxTransition=null) { |
|
112 | - return $this->js->_get($url, $params, $responseElement, $jsCallback, $attr, false,$jqueryDone,$ajaxTransition); |
|
111 | + public function getDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id", $jqueryDone="html", $ajaxTransition=null) { |
|
112 | + return $this->js->_get($url, $params, $responseElement, $jsCallback, $attr, false, $jqueryDone, $ajaxTransition); |
|
113 | 113 | } |
114 | 114 | |
115 | 115 | /** |
@@ -148,8 +148,8 @@ discard block |
||
148 | 148 | * @param string $jqueryDone the jquery function call on ajax data. default:html |
149 | 149 | * @param string|callable $ajaxTransition |
150 | 150 | */ |
151 | - public function post($url, $responseElement="", $params="{}", $jsCallback=NULL,$hasLoader=true,$jqueryDone="html",$ajaxTransition=null) { |
|
152 | - return $this->js->_post($url, $params, $responseElement, $jsCallback, NULL, $hasLoader,$jqueryDone,$ajaxTransition,true); |
|
151 | + public function post($url, $responseElement="", $params="{}", $jsCallback=NULL, $hasLoader=true, $jqueryDone="html", $ajaxTransition=null) { |
|
152 | + return $this->js->_post($url, $params, $responseElement, $jsCallback, NULL, $hasLoader, $jqueryDone, $ajaxTransition, true); |
|
153 | 153 | } |
154 | 154 | |
155 | 155 | /** |
@@ -164,8 +164,8 @@ discard block |
||
164 | 164 | * @param string $jqueryDone the jquery function call on ajax data. default:html |
165 | 165 | * @param string|callable $ajaxTransition |
166 | 166 | */ |
167 | - public function postDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id",$hasLoader=true,$jqueryDone="html",$ajaxTransition=null) { |
|
168 | - return $this->js->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader,$jqueryDone,$ajaxTransition,false); |
|
167 | + public function postDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id", $hasLoader=true, $jqueryDone="html", $ajaxTransition=null) { |
|
168 | + return $this->js->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition, false); |
|
169 | 169 | } |
170 | 170 | |
171 | 171 | /** |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null) |
180 | 180 | */ |
181 | 181 | public function postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) { |
182 | - return $this->js->_postOn($event, $element, $url, $params, $responseElement, $parameters); |
|
182 | + return $this->js->_postOn($event, $element, $url, $params, $responseElement, $parameters); |
|
183 | 183 | } |
184 | 184 | |
185 | 185 | /** |
@@ -205,8 +205,8 @@ discard block |
||
205 | 205 | * @param string $jqueryDone the jquery function call on ajax data. default:html |
206 | 206 | * @param string|callable $ajaxTransition |
207 | 207 | */ |
208 | - public function postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL,$hasLoader=true,$jqueryDone="html",$ajaxTransition=null) { |
|
209 | - return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, NULL, $hasLoader,$jqueryDone,$ajaxTransition,true); |
|
208 | + public function postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $hasLoader=true, $jqueryDone="html", $ajaxTransition=null) { |
|
209 | + return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, NULL, $hasLoader, $jqueryDone, $ajaxTransition, true); |
|
210 | 210 | } |
211 | 211 | |
212 | 212 | /** |
@@ -221,8 +221,8 @@ discard block |
||
221 | 221 | * @param string $jqueryDone the jquery function call on ajax data. default:html |
222 | 222 | * @param string|callable $ajaxTransition |
223 | 223 | */ |
224 | - public function postFormDeferred($url, $form, $responseElement, $validation=false, $jsCallback=NULL,$attr="id",$hasLoader=true,$jqueryDone="html",$ajaxTransition=null) { |
|
225 | - return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader,$jqueryDone,$ajaxTransition,false); |
|
224 | + public function postFormDeferred($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true, $jqueryDone="html", $ajaxTransition=null) { |
|
225 | + return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition, false); |
|
226 | 226 | } |
227 | 227 | |
228 | 228 | /** |
@@ -236,7 +236,7 @@ discard block |
||
236 | 236 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null) |
237 | 237 | */ |
238 | 238 | public function postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) { |
239 | - return $this->js->_postFormOn($event,$element, $url, $form, $responseElement, $parameters); |
|
239 | + return $this->js->_postFormOn($event, $element, $url, $form, $responseElement, $parameters); |
|
240 | 240 | } |
241 | 241 | |
242 | 242 | /** |
@@ -3,26 +3,26 @@ |
||
3 | 3 | use Ajax\semantic\html\base\constants\Transition; |
4 | 4 | |
5 | 5 | class AjaxTransition { |
6 | - public static function none($responseElement,$jqueryDone="html"){ |
|
6 | + public static function none($responseElement, $jqueryDone="html") { |
|
7 | 7 | return "$({$responseElement}).{$jqueryDone}( data )"; |
8 | 8 | } |
9 | 9 | |
10 | - public static function jqFade($responseElement,$jqueryDone="html"){ |
|
10 | + public static function jqFade($responseElement, $jqueryDone="html") { |
|
11 | 11 | return "$({$responseElement}).hide().{$jqueryDone}( data ).fadeIn()"; |
12 | 12 | } |
13 | 13 | |
14 | - public static function jqSlide($responseElement,$jqueryDone="html"){ |
|
14 | + public static function jqSlide($responseElement, $jqueryDone="html") { |
|
15 | 15 | return "$({$responseElement}).hide().{$jqueryDone}( data ).slideDown()"; |
16 | 16 | } |
17 | 17 | |
18 | - public static function random($responseElement,$jqueryDone="html"){ |
|
18 | + public static function random($responseElement, $jqueryDone="html") { |
|
19 | 19 | $transitions=Transition::getConstantValues(); |
20 | - $transition=$transitions[\rand(0,\sizeof($transitions)-1)]; |
|
21 | - return self::__callStatic($transition, [$responseElement,$jqueryDone]); |
|
20 | + $transition=$transitions[\rand(0, \sizeof($transitions)-1)]; |
|
21 | + return self::__callStatic($transition, [$responseElement, $jqueryDone]); |
|
22 | 22 | } |
23 | 23 | |
24 | - public static function __callStatic($name, $arguments){ |
|
25 | - if(\sizeof($arguments)==2){ |
|
24 | + public static function __callStatic($name, $arguments) { |
|
25 | + if (\sizeof($arguments)==2) { |
|
26 | 26 | $responseElement=$arguments[0]; |
27 | 27 | $jqueryDone=$arguments[1]; |
28 | 28 | $name=JString::camelCaseToSeparated($name); |
@@ -3,12 +3,12 @@ |
||
3 | 3 | use Ajax\common\BaseEnum; |
4 | 4 | abstract class Transition extends BaseEnum { |
5 | 5 | const SCALE="scale", |
6 | - FADE="fade",FADE_UP="fadeUp",FADE_DOWN="fadeDown",FADE_LEFT="fadeLeft",FADE_RIGHT="fadeRight", |
|
7 | - HORIZONTAL_FLIP="horizontalFlip",VERTICAL_FLIP="verticalFlip", |
|
6 | + FADE="fade", FADE_UP="fadeUp", FADE_DOWN="fadeDown", FADE_LEFT="fadeLeft", FADE_RIGHT="fadeRight", |
|
7 | + HORIZONTAL_FLIP="horizontalFlip", VERTICAL_FLIP="verticalFlip", |
|
8 | 8 | DROP="drop", |
9 | - FLY_LEFT="flyLeft",FLY_RIGHT="flyRight",FLY_UP="flyUp",FLY_DOWN="flyDown", |
|
10 | - SWING_LEFT="swingLeft",SWING_RIGHT="swingRight",SWING_UP="swingUp",SWING_DOWN="swingDown", |
|
11 | - BROWSE="browse",BROWSE_RIGHT="browseRight", |
|
12 | - SLIDE_LEFT="slideLeft",SLIDE_RIGHT="slideRight",SLIDE_UP="slideUp",SLIDE_DOWN="slideDown", |
|
13 | - JIGGLE="jiggle",FLASH="flash",SHAKE="shake",PULSE="pulse",TADA="tada",BOUNCE="bounce"; |
|
9 | + FLY_LEFT="flyLeft", FLY_RIGHT="flyRight", FLY_UP="flyUp", FLY_DOWN="flyDown", |
|
10 | + SWING_LEFT="swingLeft", SWING_RIGHT="swingRight", SWING_UP="swingUp", SWING_DOWN="swingDown", |
|
11 | + BROWSE="browse", BROWSE_RIGHT="browseRight", |
|
12 | + SLIDE_LEFT="slideLeft", SLIDE_RIGHT="slideRight", SLIDE_UP="slideUp", SLIDE_DOWN="slideDown", |
|
13 | + JIGGLE="jiggle", FLASH="flash", SHAKE="shake", PULSE="pulse", TADA="tada", BOUNCE="bounce"; |
|
14 | 14 | } |
15 | 15 | \ No newline at end of file |
@@ -3,8 +3,8 @@ |
||
3 | 3 | namespace Ajax\service; |
4 | 4 | |
5 | 5 | class JReflection { |
6 | - public static function shortClassName($object){ |
|
7 | - $classNameWithNamespace = get_class($object); |
|
6 | + public static function shortClassName($object) { |
|
7 | + $classNameWithNamespace=get_class($object); |
|
8 | 8 | return substr($classNameWithNamespace, strrpos($classNameWithNamespace, '\\')+1); |
9 | 9 | } |
10 | 10 | } |
11 | 11 | \ No newline at end of file |