@@ -11,11 +11,11 @@ discard block |
||
11 | 11 | trait JsUtilsEventsTrait { |
12 | 12 | |
13 | 13 | |
14 | - protected $jquery_events=array ( |
|
15 | - "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" |
|
14 | + protected $jquery_events=array( |
|
15 | + "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" |
|
16 | 16 | ); |
17 | 17 | |
18 | - abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true); |
|
18 | + abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true); |
|
19 | 19 | |
20 | 20 | /** |
21 | 21 | * Outputs a javascript library blur event |
@@ -37,8 +37,8 @@ discard block |
||
37 | 37 | * @param boolean $stopPropagation |
38 | 38 | * @return string |
39 | 39 | */ |
40 | - public function change($element='this', $js='',$preventDefault=false,$stopPropagation=false) { |
|
41 | - return $this->_add_event($element, $js, 'change',$preventDefault,$stopPropagation); |
|
40 | + public function change($element='this', $js='', $preventDefault=false, $stopPropagation=false) { |
|
41 | + return $this->_add_event($element, $js, 'change', $preventDefault, $stopPropagation); |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | /** |
@@ -51,9 +51,9 @@ discard block |
||
51 | 51 | * @param boolean $stopPropagation |
52 | 52 | * @return string |
53 | 53 | */ |
54 | - public function click($element='this', $js='', $ret_false=TRUE,$preventDefault=false,$stopPropagation=false) { |
|
54 | + public function click($element='this', $js='', $ret_false=TRUE, $preventDefault=false, $stopPropagation=false) { |
|
55 | 55 | if (!is_array($js)) { |
56 | - $js=array ( |
|
56 | + $js=array( |
|
57 | 57 | $js |
58 | 58 | ); |
59 | 59 | } |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | $js[]="return false;"; |
63 | 63 | } |
64 | 64 | |
65 | - return $this->_add_event($element, $js, 'click',$preventDefault,$stopPropagation); |
|
65 | + return $this->_add_event($element, $js, 'click', $preventDefault, $stopPropagation); |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | /** |
@@ -14,8 +14,9 @@ |
||
14 | 14 | } |
15 | 15 | |
16 | 16 | public function compile(JsUtils $js=null) { |
17 | - if ($js===null) |
|
18 | - return; |
|
17 | + if ($js===null) { |
|
18 | + return; |
|
19 | + } |
|
19 | 20 | $params="{}"; |
20 | 21 | $stopPropagation=true; |
21 | 22 | $preventDefault=true; |
@@ -23,21 +23,21 @@ discard block |
||
23 | 23 | $this->parameters["immediatly"]=false; |
24 | 24 | extract($this->parameters); |
25 | 25 | $result=$this->_eventPreparing($preventDefault, $stopPropagation); |
26 | - switch($this->method) { |
|
26 | + switch ($this->method) { |
|
27 | 27 | case "get": |
28 | 28 | $result.=$js->getDeferred($url, $responseElement, $this->parameters); |
29 | 29 | break; |
30 | 30 | case "post": |
31 | - $result.=$js->postDeferred($url, $params,$responseElement, $this->parameters); |
|
31 | + $result.=$js->postDeferred($url, $params, $responseElement, $this->parameters); |
|
32 | 32 | break; |
33 | 33 | case "postForm": |
34 | 34 | $result.=$js->postFormDeferred($url, $form, $responseElement, $this->parameters); |
35 | 35 | break; |
36 | 36 | case "json": |
37 | - $result.=$js->jsonDeferred($url,$method,$this->parameters); |
|
37 | + $result.=$js->jsonDeferred($url, $method, $this->parameters); |
|
38 | 38 | break; |
39 | 39 | case "jsonArray": |
40 | - $result.=$js->jsonArrayDeferred($modelSelector, $url,$method,$this->parameters); |
|
40 | + $result.=$js->jsonArrayDeferred($modelSelector, $url, $method, $this->parameters); |
|
41 | 41 | break; |
42 | 42 | default: |
43 | 43 | break; |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | return $result; |
46 | 46 | } |
47 | 47 | |
48 | - protected function _eventPreparing($preventDefault,$stopPropagation){ |
|
48 | + protected function _eventPreparing($preventDefault, $stopPropagation) { |
|
49 | 49 | $result=""; |
50 | 50 | if ($preventDefault===true) { |
51 | 51 | $result.=Javascript::$preventDefault; |
@@ -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,9 +217,9 @@ discard block |
||
213 | 217 | if(\strstr($result, "%{$key}%")!==false){ |
214 | 218 | if (\is_array($value)) { |
215 | 219 | $v=PropertyWrapper::wrap($value, $js); |
216 | - }elseif($value instanceof \stdClass){ |
|
220 | + } elseif($value instanceof \stdClass){ |
|
217 | 221 | $v=\print_r($value,true); |
218 | - }else{ |
|
222 | + } else{ |
|
219 | 223 | $v=$value; |
220 | 224 | } |
221 | 225 | $result=str_replace("%{$key}%", $v, $result); |
@@ -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 $_postCompile; |
@@ -32,14 +32,14 @@ discard block |
||
32 | 32 | */ |
33 | 33 | abstract public function run(JsUtils $js); |
34 | 34 | |
35 | - private function _callSetter($setter,$key,$value,&$array){ |
|
35 | + private function _callSetter($setter, $key, $value, &$array) { |
|
36 | 36 | $result=false; |
37 | - if (method_exists($this, $setter) && substr($setter, 0, 1) !== "_") { |
|
37 | + if (method_exists($this, $setter) && substr($setter, 0, 1)!=="_") { |
|
38 | 38 | try { |
39 | 39 | $this->$setter($value); |
40 | 40 | unset($array[$key]); |
41 | 41 | $result=true; |
42 | - } catch ( \Exception $e ) { |
|
42 | + }catch (\Exception $e) { |
|
43 | 43 | $result=false; |
44 | 44 | } |
45 | 45 | } |
@@ -47,17 +47,17 @@ discard block |
||
47 | 47 | } |
48 | 48 | |
49 | 49 | protected function getTemplate(JsUtils $js=NULL) { |
50 | - return PropertyWrapper::wrap($this->_wrapBefore, $js) . $this->_template . PropertyWrapper::wrap($this->_wrapAfter, $js); |
|
50 | + return PropertyWrapper::wrap($this->_wrapBefore, $js).$this->_template.PropertyWrapper::wrap($this->_wrapAfter, $js); |
|
51 | 51 | } |
52 | 52 | |
53 | 53 | protected function ctrl($name, $value, $typeCtrl) { |
54 | 54 | if (\is_array($typeCtrl)) { |
55 | - if (array_search($value, $typeCtrl) === false) { |
|
56 | - throw new \Exception("La valeur passée `" . $value . "` à la propriété `" . $name . "` ne fait pas partie des valeurs possibles : {" . implode(",", $typeCtrl) . "}"); |
|
55 | + if (array_search($value, $typeCtrl)===false) { |
|
56 | + throw new \Exception("La valeur passée `".$value."` à la propriété `".$name."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}"); |
|
57 | 57 | } |
58 | 58 | } else { |
59 | 59 | if (!$typeCtrl($value)) { |
60 | - throw new \Exception("La fonction " . $typeCtrl . " a retourné faux pour l'affectation de la propriété " . $name); |
|
60 | + throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$name); |
|
61 | 61 | } |
62 | 62 | } |
63 | 63 | return true; |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | protected function addToMemberUnique(&$name, $value, $typeCtrl, $separator=" ") { |
75 | 75 | if (\is_array($typeCtrl)) { |
76 | 76 | $this->removeOldValues($name, $typeCtrl); |
77 | - $name.=$separator . $value; |
|
77 | + $name.=$separator.$value; |
|
78 | 78 | } |
79 | 79 | return $this; |
80 | 80 | } |
@@ -86,12 +86,12 @@ discard block |
||
86 | 86 | if (\is_array($typeCtrl)) { |
87 | 87 | $this->removeOldValues($name, $typeCtrl); |
88 | 88 | } |
89 | - $name.=$separator . $value; |
|
89 | + $name.=$separator.$value; |
|
90 | 90 | return $this; |
91 | 91 | } |
92 | 92 | |
93 | 93 | protected function addToMember(&$name, $value, $separator=" ") { |
94 | - $name=str_ireplace($value, "", $name) . $separator . $value; |
|
94 | + $name=str_ireplace($value, "", $name).$separator.$value; |
|
95 | 95 | return $this; |
96 | 96 | } |
97 | 97 | |
@@ -102,18 +102,18 @@ discard block |
||
102 | 102 | $oldValue=trim($oldValue); |
103 | 103 | } |
104 | 104 | |
105 | - protected function _getElementBy($callback,$elements){ |
|
105 | + protected function _getElementBy($callback, $elements) { |
|
106 | 106 | if (\is_array($elements)) { |
107 | 107 | $elements=\array_values($elements); |
108 | 108 | $flag=false; |
109 | 109 | $index=0; |
110 | - while ( !$flag && $index < sizeof($elements) ) { |
|
110 | + while (!$flag && $index<sizeof($elements)) { |
|
111 | 111 | if ($elements[$index] instanceof BaseHtml) |
112 | 112 | $flag=($callback($elements[$index])); |
113 | 113 | $index++; |
114 | 114 | } |
115 | - if ($flag === true) |
|
116 | - return $elements[$index - 1]; |
|
115 | + if ($flag===true) |
|
116 | + return $elements[$index-1]; |
|
117 | 117 | } elseif ($elements instanceof BaseHtml) { |
118 | 118 | if ($callback($elements)) |
119 | 119 | return $elements; |
@@ -141,13 +141,13 @@ discard block |
||
141 | 141 | } |
142 | 142 | |
143 | 143 | public function fromArray($array) { |
144 | - foreach ( $this as $key => $value ) { |
|
145 | - if(array_key_exists($key, $array)===true) |
|
146 | - $this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array); |
|
144 | + foreach ($this as $key => $value) { |
|
145 | + if (array_key_exists($key, $array)===true) |
|
146 | + $this->_callSetter("set".ucfirst($key), $key, $array[$key], $array); |
|
147 | 147 | } |
148 | - foreach ( $array as $key => $value ) { |
|
149 | - if($this->_callSetter($key, $key, $value, $array)===false){ |
|
150 | - $this->_callSetter("set" . ucfirst($key), $key, $value, $array); |
|
148 | + foreach ($array as $key => $value) { |
|
149 | + if ($this->_callSetter($key, $key, $value, $array)===false) { |
|
150 | + $this->_callSetter("set".ucfirst($key), $key, $value, $array); |
|
151 | 151 | } |
152 | 152 | } |
153 | 153 | return $array; |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | |
156 | 156 | public function fromDatabaseObjects($objects, $function) { |
157 | 157 | if (isset($objects)) { |
158 | - foreach ( $objects as $object ) { |
|
158 | + foreach ($objects as $object) { |
|
159 | 159 | $this->fromDatabaseObject($object, $function); |
160 | 160 | } |
161 | 161 | } |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | |
177 | 177 | |
178 | 178 | public function getElementById($identifier, $elements) { |
179 | - return $this->_getElementBy(function(BaseWidget $element) use ($identifier){return $element->getIdentifier()===$identifier;}, $elements); |
|
179 | + return $this->_getElementBy(function(BaseWidget $element) use ($identifier){return $element->getIdentifier()===$identifier; }, $elements); |
|
180 | 180 | } |
181 | 181 | |
182 | 182 | public function getBsComponent() { |
@@ -189,14 +189,14 @@ discard block |
||
189 | 189 | } |
190 | 190 | |
191 | 191 | protected function compile_once(JsUtils $js=NULL, &$view=NULL) { |
192 | - if(!$this->_compiled){ |
|
193 | - if(isset($js)){ |
|
192 | + if (!$this->_compiled) { |
|
193 | + if (isset($js)) { |
|
194 | 194 | $beforeCompile=$js->getParam("beforeCompileHtml"); |
195 | - if(\is_callable($beforeCompile)){ |
|
196 | - $beforeCompile($this,$js,$view); |
|
195 | + if (\is_callable($beforeCompile)) { |
|
196 | + $beforeCompile($this, $js, $view); |
|
197 | 197 | } |
198 | 198 | } |
199 | - if(\is_callable($this->_preCompile)){ |
|
199 | + if (\is_callable($this->_preCompile)) { |
|
200 | 200 | $pc=$this->_preCompile; |
201 | 201 | $pc($this); |
202 | 202 | } |
@@ -206,15 +206,15 @@ discard block |
||
206 | 206 | } |
207 | 207 | |
208 | 208 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
209 | - $this->compile_once($js,$view); |
|
209 | + $this->compile_once($js, $view); |
|
210 | 210 | $result=$this->getTemplate($js); |
211 | - foreach ( $this as $key => $value ) { |
|
212 | - if(\strstr($result, "%{$key}%")!==false){ |
|
211 | + foreach ($this as $key => $value) { |
|
212 | + if (\strstr($result, "%{$key}%")!==false) { |
|
213 | 213 | if (\is_array($value)) { |
214 | 214 | $v=PropertyWrapper::wrap($value, $js); |
215 | - }elseif($value instanceof \stdClass){ |
|
216 | - $v=\print_r($value,true); |
|
217 | - }else{ |
|
215 | + }elseif ($value instanceof \stdClass) { |
|
216 | + $v=\print_r($value, true); |
|
217 | + } else { |
|
218 | 218 | $v=$value; |
219 | 219 | } |
220 | 220 | $result=str_replace("%{$key}%", $v, $result); |
@@ -222,12 +222,12 @@ discard block |
||
222 | 222 | } |
223 | 223 | if (isset($js)===true) { |
224 | 224 | $this->run($js); |
225 | - if (isset($view) === true) { |
|
225 | + if (isset($view)===true) { |
|
226 | 226 | $js->addViewElement($this->_identifier, $result, $view); |
227 | 227 | } |
228 | 228 | } |
229 | 229 | |
230 | - if(\is_callable($this->_postCompile)){ |
|
230 | + if (\is_callable($this->_postCompile)) { |
|
231 | 231 | $pc=$this->_postCompile; |
232 | 232 | $pc($this); |
233 | 233 | } |
@@ -241,13 +241,13 @@ discard block |
||
241 | 241 | * @param array $parameters default: ["jsCallback"=>"","jqueryDone"=>"append"] |
242 | 242 | * @return \Ajax\common\html\BaseHtml |
243 | 243 | */ |
244 | - public function setDraggable($attr="id",$dropZone=null,$parameters=[]){ |
|
244 | + public function setDraggable($attr="id", $dropZone=null, $parameters=[]) { |
|
245 | 245 | $this->setProperty("draggable", "true"); |
246 | - $this->addEvent("dragstart",Javascript::draggable($attr)); |
|
247 | - if(isset($dropZone)&& $dropZone instanceof BaseHtml){ |
|
248 | - $jqueryDone="append";$jsCallback=""; |
|
246 | + $this->addEvent("dragstart", Javascript::draggable($attr)); |
|
247 | + if (isset($dropZone) && $dropZone instanceof BaseHtml) { |
|
248 | + $jqueryDone="append"; $jsCallback=""; |
|
249 | 249 | extract($parameters); |
250 | - $dropZone->asDropZone($jsCallback,$jqueryDone,$parameters); |
|
250 | + $dropZone->asDropZone($jsCallback, $jqueryDone, $parameters); |
|
251 | 251 | } |
252 | 252 | return $this; |
253 | 253 | } |
@@ -259,11 +259,11 @@ discard block |
||
259 | 259 | * @param array $parameters |
260 | 260 | * @return \Ajax\common\html\BaseHtml |
261 | 261 | */ |
262 | - public function asDropZone($jsCallback="",$jqueryDone="append",$parameters=[]){ |
|
262 | + public function asDropZone($jsCallback="", $jqueryDone="append", $parameters=[]) { |
|
263 | 263 | $stopPropagation=false; |
264 | - $this->addEvent("dragover", '', $stopPropagation,true); |
|
264 | + $this->addEvent("dragover", '', $stopPropagation, true); |
|
265 | 265 | extract($parameters); |
266 | - $this->addEvent("drop",Javascript::dropZone($jqueryDone,$jsCallback),$stopPropagation,true); |
|
266 | + $this->addEvent("drop", Javascript::dropZone($jqueryDone, $jsCallback), $stopPropagation, true); |
|
267 | 267 | return $this; |
268 | 268 | } |
269 | 269 | |
@@ -271,11 +271,11 @@ discard block |
||
271 | 271 | return $this->compile(); |
272 | 272 | } |
273 | 273 | |
274 | - public function onPostCompile($callback){ |
|
274 | + public function onPostCompile($callback) { |
|
275 | 275 | $this->_postCompile=$callback; |
276 | 276 | } |
277 | 277 | |
278 | - public function onPreCompile($callback){ |
|
278 | + public function onPreCompile($callback) { |
|
279 | 279 | $this->_preCompile=$callback; |
280 | 280 | } |
281 | 281 | } |
@@ -25,8 +25,9 @@ |
||
25 | 25 | |
26 | 26 | private static function containsElement($input) { |
27 | 27 | foreach ( $input as $v ) { |
28 | - if (\is_object($v) || \is_array($v)) |
|
29 | - return true; |
|
28 | + if (\is_object($v) || \is_array($v)) { |
|
29 | + return true; |
|
30 | + } |
|
30 | 31 | } |
31 | 32 | return false; |
32 | 33 | } |
@@ -12,8 +12,8 @@ discard block |
||
12 | 12 | } |
13 | 13 | $output=""; |
14 | 14 | if (\is_array($input)) { |
15 | - if (sizeof($input) > 0) { |
|
16 | - if (self::containsElement($input) === false) { |
|
15 | + if (sizeof($input)>0) { |
|
16 | + if (self::containsElement($input)===false) { |
|
17 | 17 | $output=self::wrapStrings($input, $separator=' ', $valueQuote='"'); |
18 | 18 | } else { |
19 | 19 | $output=self::wrapObjects($input, $js, $separator, $valueQuote); |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | } |
25 | 25 | |
26 | 26 | private static function containsElement($input) { |
27 | - foreach ( $input as $v ) { |
|
27 | + foreach ($input as $v) { |
|
28 | 28 | if (\is_object($v) || \is_array($v)) |
29 | 29 | return true; |
30 | 30 | } |
@@ -32,9 +32,9 @@ discard block |
||
32 | 32 | } |
33 | 33 | |
34 | 34 | public static function wrapStrings($input, $separator=' ', $valueQuote='"') { |
35 | - if (JArray::isAssociative($input) === true) { |
|
36 | - $result=implode($separator, array_map(function ($v, $k) use($valueQuote) { |
|
37 | - return $k . '=' . $valueQuote . $v . $valueQuote; |
|
35 | + if (JArray::isAssociative($input)===true) { |
|
36 | + $result=implode($separator, array_map(function($v, $k) use($valueQuote) { |
|
37 | + return $k.'='.$valueQuote.$v.$valueQuote; |
|
38 | 38 | }, $input, array_keys($input))); |
39 | 39 | } else { |
40 | 40 | $result=implode($separator, $input); |
@@ -43,30 +43,30 @@ discard block |
||
43 | 43 | } |
44 | 44 | |
45 | 45 | public static function wrapObjects($input, $js=NULL, $separator=' ', $valueQuote='"') { |
46 | - return implode($separator, array_map(function ($v) use($js, $separator, $valueQuote) { |
|
47 | - if(\is_string($v)){ |
|
46 | + return implode($separator, array_map(function($v) use($js, $separator, $valueQuote) { |
|
47 | + if (\is_string($v)) { |
|
48 | 48 | return $v; |
49 | 49 | } |
50 | - if ($v instanceof BaseHtml){ |
|
50 | + if ($v instanceof BaseHtml) { |
|
51 | 51 | return $v->compile($js); |
52 | 52 | } |
53 | 53 | if (\is_array($v)) { |
54 | 54 | return self::wrap($v, $js, $separator, $valueQuote); |
55 | 55 | } |
56 | - if(!\is_callable($v)){ |
|
56 | + if (!\is_callable($v)) { |
|
57 | 57 | return $v; |
58 | 58 | } |
59 | 59 | }, $input)); |
60 | 60 | } |
61 | 61 | |
62 | - protected static function wrapValue($value,$js=NULL, $separator=' ', $valueQuote='"'){ |
|
62 | + protected static function wrapValue($value, $js=NULL, $separator=' ', $valueQuote='"') { |
|
63 | 63 | if (\is_array($value)) { |
64 | 64 | return self::wrap($value, $js, $separator, $valueQuote); |
65 | 65 | } |
66 | - if ($value instanceof BaseHtml){ |
|
66 | + if ($value instanceof BaseHtml) { |
|
67 | 67 | return $value->compile($js); |
68 | 68 | } |
69 | - if(!\is_callable($value)){ |
|
69 | + if (!\is_callable($value)) { |
|
70 | 70 | return $value; |
71 | 71 | } |
72 | 72 | return ''; |
@@ -120,25 +120,29 @@ discard block |
||
120 | 120 | } |
121 | 121 | |
122 | 122 | public function getColPosition($colIndex) { |
123 | - if($this->_container->_isMerged()!==true) |
|
124 | - return $colIndex; |
|
123 | + if($this->_container->_isMerged()!==true) { |
|
124 | + return $colIndex; |
|
125 | + } |
|
125 | 126 | $pos=0; |
126 | 127 | $rows=$this->_container->getContent(); |
127 | 128 | for($i=0; $i < $this->_row; $i++) { |
128 | 129 | $max=\min($colIndex, $rows[$i]->count()); |
129 | 130 | for($j=0; $j < $max; $j++) { |
130 | 131 | $rowspan=$rows[$i]->getItem($j)->getRowspan(); |
131 | - if ($rowspan + $i > $this->_row) |
|
132 | - $pos++; |
|
132 | + if ($rowspan + $i > $this->_row) { |
|
133 | + $pos++; |
|
134 | + } |
|
133 | 135 | } |
134 | 136 | } |
135 | - if ($pos > $colIndex) |
|
136 | - return NULL; |
|
137 | + if ($pos > $colIndex) { |
|
138 | + return NULL; |
|
139 | + } |
|
137 | 140 | $count=$this->count(); |
138 | 141 | for($i=0; $i < $count; $i++) { |
139 | 142 | $pos+=$this->content[$i]->getColspan(); |
140 | - if ($pos >= $colIndex + 1) |
|
141 | - return $i; |
|
143 | + if ($pos >= $colIndex + 1) { |
|
144 | + return $i; |
|
145 | + } |
|
142 | 146 | } |
143 | 147 | return null; |
144 | 148 | } |
@@ -161,8 +165,9 @@ discard block |
||
161 | 165 | public function containsStr($needle) { |
162 | 166 | $cells=$this->content; |
163 | 167 | foreach ( $cells as $cell ) { |
164 | - if (\strpos($cell->getContent(), $needle) !== false) |
|
165 | - return true; |
|
168 | + if (\strpos($cell->getContent(), $needle) !== false) { |
|
169 | + return true; |
|
170 | + } |
|
166 | 171 | } |
167 | 172 | return false; |
168 | 173 | } |
@@ -20,19 +20,19 @@ discard block |
||
20 | 20 | |
21 | 21 | public function __construct($identifier) { |
22 | 22 | parent::__construct($identifier, "tr", ""); |
23 | - $this->_states=[ State::ACTIVE,State::POSITIVE,State::NEGATIVE,State::WARNING,State::ERROR,State::DISABLED ]; |
|
23 | + $this->_states=[State::ACTIVE, State::POSITIVE, State::NEGATIVE, State::WARNING, State::ERROR, State::DISABLED]; |
|
24 | 24 | } |
25 | 25 | |
26 | 26 | public function setColCount($colCount) { |
27 | 27 | $count=$this->count(); |
28 | - for($i=$count; $i < $colCount; $i++) { |
|
28 | + for ($i=$count; $i<$colCount; $i++) { |
|
29 | 29 | $item=$this->addItem(NULL); |
30 | 30 | $item->setTagName($this->_tdTagName); |
31 | 31 | } |
32 | 32 | return $this; |
33 | 33 | } |
34 | 34 | |
35 | - public function getColCount(){ |
|
35 | + public function getColCount() { |
|
36 | 36 | return $this->count(); |
37 | 37 | } |
38 | 38 | |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | /** |
53 | 53 | * @return HtmlTD |
54 | 54 | */ |
55 | - public function getItem($index){ |
|
55 | + public function getItem($index) { |
|
56 | 56 | return parent::getItem($index); |
57 | 57 | } |
58 | 58 | |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | * @param mixed $values |
76 | 76 | */ |
77 | 77 | public function setValues($values=array()) { |
78 | - return $this->_addOrSetValues($values, function(HtmlTD &$cell,$value){$cell->setValue($value);}); |
|
78 | + return $this->_addOrSetValues($values, function(HtmlTD &$cell, $value) {$cell->setValue($value); }); |
|
79 | 79 | } |
80 | 80 | |
81 | 81 | /** |
@@ -83,27 +83,27 @@ discard block |
||
83 | 83 | * @param mixed $values |
84 | 84 | */ |
85 | 85 | public function addValues($values=array()) { |
86 | - return $this->_addOrSetValues($values, function(HtmlTD &$cell,$value){$cell->addValue($value);}); |
|
86 | + return $this->_addOrSetValues($values, function(HtmlTD &$cell, $value) {$cell->addValue($value); }); |
|
87 | 87 | } |
88 | 88 | |
89 | 89 | /** |
90 | 90 | * Sets or adds values to the row cols |
91 | 91 | * @param mixed $values |
92 | 92 | */ |
93 | - protected function _addOrSetValues($values,$callback) { |
|
93 | + protected function _addOrSetValues($values, $callback) { |
|
94 | 94 | $count=$this->count(); |
95 | 95 | if (!\is_array($values)) { |
96 | 96 | $values=\array_fill(0, $count, $values); |
97 | 97 | } else { |
98 | - if (JArray::isAssociative($values) === true) { |
|
98 | + if (JArray::isAssociative($values)===true) { |
|
99 | 99 | $values=\array_values($values); |
100 | 100 | } |
101 | 101 | } |
102 | 102 | $count=\min(\sizeof($values), $count); |
103 | 103 | |
104 | - for($i=0; $i < $count; $i++) { |
|
104 | + for ($i=0; $i<$count; $i++) { |
|
105 | 105 | $cell=$this->content[$i]; |
106 | - $callback($cell,$values[$i]); |
|
106 | + $callback($cell, $values[$i]); |
|
107 | 107 | } |
108 | 108 | return $this; |
109 | 109 | } |
@@ -127,24 +127,24 @@ discard block |
||
127 | 127 | } |
128 | 128 | |
129 | 129 | public function getColPosition($colIndex) { |
130 | - if($this->_container->_isMerged()!==true) |
|
130 | + if ($this->_container->_isMerged()!==true) |
|
131 | 131 | return $colIndex; |
132 | 132 | $pos=0; |
133 | 133 | $rows=$this->_container->getContent(); |
134 | - for($i=0; $i < $this->_row; $i++) { |
|
134 | + for ($i=0; $i<$this->_row; $i++) { |
|
135 | 135 | $max=\min($colIndex, $rows[$i]->count()); |
136 | - for($j=0; $j < $max; $j++) { |
|
136 | + for ($j=0; $j<$max; $j++) { |
|
137 | 137 | $rowspan=$rows[$i]->getItem($j)->getRowspan(); |
138 | - if ($rowspan + $i > $this->_row) |
|
138 | + if ($rowspan+$i>$this->_row) |
|
139 | 139 | $pos++; |
140 | 140 | } |
141 | 141 | } |
142 | - if ($pos > $colIndex) |
|
142 | + if ($pos>$colIndex) |
|
143 | 143 | return NULL; |
144 | 144 | $count=$this->count(); |
145 | - for($i=0; $i < $count; $i++) { |
|
145 | + for ($i=0; $i<$count; $i++) { |
|
146 | 146 | $pos+=$this->content[$i]->getColspan(); |
147 | - if ($pos >= $colIndex + 1) |
|
147 | + if ($pos>=$colIndex+1) |
|
148 | 148 | return $i; |
149 | 149 | } |
150 | 150 | return null; |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | |
153 | 153 | public function conditionalCellFormat($callback, $format) { |
154 | 154 | $cells=$this->content; |
155 | - foreach ( $cells as $cell ) { |
|
155 | + foreach ($cells as $cell) { |
|
156 | 156 | $cell->conditionalCellFormat($callback, $format); |
157 | 157 | } |
158 | 158 | return $this; |
@@ -167,8 +167,8 @@ discard block |
||
167 | 167 | |
168 | 168 | public function containsStr($needle) { |
169 | 169 | $cells=$this->content; |
170 | - foreach ( $cells as $cell ) { |
|
171 | - if (\strpos($cell->getContent(), $needle) !== false) |
|
170 | + foreach ($cells as $cell) { |
|
171 | + if (\strpos($cell->getContent(), $needle)!==false) |
|
172 | 172 | return true; |
173 | 173 | } |
174 | 174 | return false; |
@@ -181,13 +181,13 @@ discard block |
||
181 | 181 | |
182 | 182 | public function applyCells($callback) { |
183 | 183 | $cells=$this->content; |
184 | - foreach ( $cells as $cell ) { |
|
184 | + foreach ($cells as $cell) { |
|
185 | 185 | $cell->apply($callback); |
186 | 186 | } |
187 | 187 | return $this; |
188 | 188 | } |
189 | 189 | |
190 | - public function toDelete($colIndex){ |
|
190 | + public function toDelete($colIndex) { |
|
191 | 191 | $this->getItem($colIndex)->toDelete(); |
192 | 192 | return $this; |
193 | 193 | } |
@@ -43,8 +43,7 @@ discard block |
||
43 | 43 | foreach ($actions as $action){ |
44 | 44 | $this->addAction($action); |
45 | 45 | } |
46 | - } |
|
47 | - else{ |
|
46 | + } else{ |
|
48 | 47 | $this->addAction($actions); |
49 | 48 | } |
50 | 49 | return $this; |
@@ -64,8 +63,9 @@ discard block |
||
64 | 63 | $class="cancel"; |
65 | 64 | } |
66 | 65 | $action=new HtmlButton("action-".$this->identifier."-".JArray::count($this->content["actions"]->getContent()),$action); |
67 | - if($class!=="") |
|
68 | - $action->addToProperty("class", $class); |
|
66 | + if($class!=="") { |
|
67 | + $action->addToProperty("class", $class); |
|
68 | + } |
|
69 | 69 | } |
70 | 70 | return $this->addElementInPart($action, "actions"); |
71 | 71 | } |
@@ -174,8 +174,9 @@ discard block |
||
174 | 174 | * @see BaseHtml::run() |
175 | 175 | */ |
176 | 176 | public function run(JsUtils $js) { |
177 | - if(isset($this->_bsComponent)===false) |
|
178 | - $this->_bsComponent=$js->semantic()->modal("#".$this->identifier,$this->_params,$this->_paramParts); |
|
177 | + if(isset($this->_bsComponent)===false) { |
|
178 | + $this->_bsComponent=$js->semantic()->modal("#".$this->identifier,$this->_params,$this->_paramParts); |
|
179 | + } |
|
179 | 180 | $this->addEventsOnRun($js); |
180 | 181 | return $this->_bsComponent; |
181 | 182 | } |
@@ -15,36 +15,36 @@ discard block |
||
15 | 15 | protected $_paramParts=array(); |
16 | 16 | |
17 | 17 | public function __construct($identifier, $header="", $content="", $actions=null) { |
18 | - parent::__construct($identifier, "div","ui modal"); |
|
19 | - if(isset($header)){ |
|
18 | + parent::__construct($identifier, "div", "ui modal"); |
|
19 | + if (isset($header)) { |
|
20 | 20 | $this->setHeader($header); |
21 | 21 | } |
22 | - if(isset($content)){ |
|
22 | + if (isset($content)) { |
|
23 | 23 | $this->setContent($content); |
24 | 24 | } |
25 | - if(isset($actions)){ |
|
25 | + if (isset($actions)) { |
|
26 | 26 | $this->setActions($actions); |
27 | 27 | } |
28 | 28 | } |
29 | 29 | |
30 | 30 | public function setHeader($value) { |
31 | - $this->content["header"]=new HtmlSemDoubleElement("header-" . $this->identifier, "a", "header", $value); |
|
31 | + $this->content["header"]=new HtmlSemDoubleElement("header-".$this->identifier, "a", "header", $value); |
|
32 | 32 | return $this; |
33 | 33 | } |
34 | 34 | |
35 | 35 | public function setContent($value) { |
36 | - $this->content["content"]=new HtmlSemDoubleElement("content-" . $this->identifier, "div", "content", $value); |
|
36 | + $this->content["content"]=new HtmlSemDoubleElement("content-".$this->identifier, "div", "content", $value); |
|
37 | 37 | return $this; |
38 | 38 | } |
39 | 39 | |
40 | 40 | public function setActions($actions) { |
41 | - $this->content["actions"]=new HtmlSemDoubleElement("content-" . $this->identifier, "div", "actions"); |
|
42 | - if(\is_array($actions)){ |
|
43 | - foreach ($actions as $action){ |
|
41 | + $this->content["actions"]=new HtmlSemDoubleElement("content-".$this->identifier, "div", "actions"); |
|
42 | + if (\is_array($actions)) { |
|
43 | + foreach ($actions as $action) { |
|
44 | 44 | $this->addAction($action); |
45 | 45 | } |
46 | 46 | } |
47 | - else{ |
|
47 | + else { |
|
48 | 48 | $this->addAction($actions); |
49 | 49 | } |
50 | 50 | return $this; |
@@ -54,17 +54,17 @@ discard block |
||
54 | 54 | * @param string|BaseHtml $action |
55 | 55 | * @return HtmlButton |
56 | 56 | */ |
57 | - public function addAction($action){ |
|
58 | - if(!$action instanceof BaseHtml){ |
|
57 | + public function addAction($action) { |
|
58 | + if (!$action instanceof BaseHtml) { |
|
59 | 59 | $class=""; |
60 | - if(\array_search($action, ["Okay","Yes","Validate"])!==false){ |
|
60 | + if (\array_search($action, ["Okay", "Yes", "Validate"])!==false) { |
|
61 | 61 | $class="approve"; |
62 | 62 | } |
63 | - if(\array_search($action, ["Close","Cancel","No"])!==false){ |
|
63 | + if (\array_search($action, ["Close", "Cancel", "No"])!==false) { |
|
64 | 64 | $class="cancel"; |
65 | 65 | } |
66 | - $action=new HtmlButton("action-".$this->identifier."-".JArray::count($this->content["actions"]->getContent()),$action); |
|
67 | - if($class!=="") |
|
66 | + $action=new HtmlButton("action-".$this->identifier."-".JArray::count($this->content["actions"]->getContent()), $action); |
|
67 | + if ($class!=="") |
|
68 | 68 | $action->addToProperty("class", $class); |
69 | 69 | } |
70 | 70 | return $this->addElementInPart($action, "actions"); |
@@ -74,66 +74,66 @@ discard block |
||
74 | 74 | * @param int $index |
75 | 75 | * @return HtmlButton |
76 | 76 | */ |
77 | - public function getAction($index){ |
|
77 | + public function getAction($index) { |
|
78 | 78 | return $this->content["actions"]->getContent()[$index]; |
79 | 79 | } |
80 | 80 | |
81 | - public function addContent($content,$before=false){ |
|
82 | - $this->content["content"]->addContent($content,$before); |
|
81 | + public function addContent($content, $before=false) { |
|
82 | + $this->content["content"]->addContent($content, $before); |
|
83 | 83 | return $this; |
84 | 84 | } |
85 | 85 | |
86 | - public function addImageContent($image,$description=NULL){ |
|
86 | + public function addImageContent($image, $description=NULL) { |
|
87 | 87 | $content=$this->content["content"]; |
88 | - if(isset($description)){ |
|
89 | - $description=new HtmlSemDoubleElement("description-".$this->identifier,"div","description",$description); |
|
90 | - $content->addContent($description,true); |
|
88 | + if (isset($description)) { |
|
89 | + $description=new HtmlSemDoubleElement("description-".$this->identifier, "div", "description", $description); |
|
90 | + $content->addContent($description, true); |
|
91 | 91 | } |
92 | - if($image!==""){ |
|
93 | - $img=new HtmlImage("image-".$this->identifier,$image,"","medium"); |
|
94 | - $content->addContent($img,true); |
|
95 | - $content->addToProperty("class","image"); |
|
92 | + if ($image!=="") { |
|
93 | + $img=new HtmlImage("image-".$this->identifier, $image, "", "medium"); |
|
94 | + $content->addContent($img, true); |
|
95 | + $content->addToProperty("class", "image"); |
|
96 | 96 | } |
97 | 97 | return $this; |
98 | 98 | } |
99 | 99 | |
100 | - public function addIconContent($icon,$description=NULL){ |
|
100 | + public function addIconContent($icon, $description=NULL) { |
|
101 | 101 | $content=$this->content["content"]; |
102 | - if(isset($description)){ |
|
103 | - $description=new HtmlSemDoubleElement("description-".$this->identifier,"div","description",$description); |
|
104 | - $content->addContent($description,true); |
|
102 | + if (isset($description)) { |
|
103 | + $description=new HtmlSemDoubleElement("description-".$this->identifier, "div", "description", $description); |
|
104 | + $content->addContent($description, true); |
|
105 | 105 | } |
106 | - if($icon!==""){ |
|
107 | - $img=new HtmlIcon("image-".$this->identifier,$icon); |
|
108 | - $content->addContent($img,true); |
|
109 | - $content->addToProperty("class","image"); |
|
106 | + if ($icon!=="") { |
|
107 | + $img=new HtmlIcon("image-".$this->identifier, $icon); |
|
108 | + $content->addContent($img, true); |
|
109 | + $content->addToProperty("class", "image"); |
|
110 | 110 | } |
111 | 111 | return $this; |
112 | 112 | } |
113 | 113 | |
114 | - private function addElementInPart($element,$part) { |
|
114 | + private function addElementInPart($element, $part) { |
|
115 | 115 | $this->content[$part]->addContent($element); |
116 | 116 | return $element; |
117 | 117 | } |
118 | 118 | |
119 | - public function showDimmer($value){ |
|
120 | - $value=$value?"show":"hide"; |
|
119 | + public function showDimmer($value) { |
|
120 | + $value=$value ? "show" : "hide"; |
|
121 | 121 | $this->_paramParts[]=["'".$value." dimmer'"]; |
122 | 122 | return $this; |
123 | 123 | } |
124 | 124 | |
125 | - public function setInverted($recursive=true){ |
|
125 | + public function setInverted($recursive=true) { |
|
126 | 126 | $this->_params["inverted"]=true; |
127 | 127 | return $this; |
128 | 128 | } |
129 | 129 | |
130 | - public function setBasic(){ |
|
130 | + public function setBasic() { |
|
131 | 131 | return $this->addToProperty("class", "basic"); |
132 | 132 | } |
133 | 133 | |
134 | 134 | |
135 | - public function setTransition($value){ |
|
136 | - $this->_paramParts[]=["'setting'","'transition'","'".$value."'"]; |
|
135 | + public function setTransition($value) { |
|
136 | + $this->_paramParts[]=["'setting'", "'transition'", "'".$value."'"]; |
|
137 | 137 | } |
138 | 138 | |
139 | 139 | /** |
@@ -143,8 +143,8 @@ discard block |
||
143 | 143 | * @param string $viewName |
144 | 144 | * @param array $params The parameters to pass to the view |
145 | 145 | */ |
146 | - public function renderView(JsUtils $js,$initialController,$viewName, $params=array()) { |
|
147 | - return $this->setContent($js->renderContent($initialController, $viewName,$params)); |
|
146 | + public function renderView(JsUtils $js, $initialController, $viewName, $params=array()) { |
|
147 | + return $this->setContent($js->renderContent($initialController, $viewName, $params)); |
|
148 | 148 | } |
149 | 149 | |
150 | 150 | /** |
@@ -155,8 +155,8 @@ discard block |
||
155 | 155 | * @param string $actionName the action name |
156 | 156 | * @param array $params |
157 | 157 | */ |
158 | - public function forward(JsUtils $js,$initialControllerInstance,$controllerName,$actionName,$params=NULL){ |
|
159 | - return $this->setContent($js->forward($initialControllerInstance, $controllerName, $actionName,$params)); |
|
158 | + public function forward(JsUtils $js, $initialControllerInstance, $controllerName, $actionName, $params=NULL) { |
|
159 | + return $this->setContent($js->forward($initialControllerInstance, $controllerName, $actionName, $params)); |
|
160 | 160 | } |
161 | 161 | |
162 | 162 | /** |
@@ -166,7 +166,7 @@ discard block |
||
166 | 166 | * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile() |
167 | 167 | */ |
168 | 168 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
169 | - $this->content=JArray::sortAssociative($this->content, ["header","content","actions" ]); |
|
169 | + $this->content=JArray::sortAssociative($this->content, ["header", "content", "actions"]); |
|
170 | 170 | return parent::compile($js, $view); |
171 | 171 | } |
172 | 172 | /* |
@@ -174,8 +174,8 @@ discard block |
||
174 | 174 | * @see BaseHtml::run() |
175 | 175 | */ |
176 | 176 | public function run(JsUtils $js) { |
177 | - if(isset($this->_bsComponent)===false) |
|
178 | - $this->_bsComponent=$js->semantic()->modal("#".$this->identifier,$this->_params,$this->_paramParts); |
|
177 | + if (isset($this->_bsComponent)===false) |
|
178 | + $this->_bsComponent=$js->semantic()->modal("#".$this->identifier, $this->_params, $this->_paramParts); |
|
179 | 179 | $this->addEventsOnRun($js); |
180 | 180 | return $this->_bsComponent; |
181 | 181 | } |
@@ -188,7 +188,7 @@ discard block |
||
188 | 188 | return $this->jsDo("hide"); |
189 | 189 | } |
190 | 190 | |
191 | - public function onHidden($js){ |
|
191 | + public function onHidden($js) { |
|
192 | 192 | $this->_params["onHidden"]=$js; |
193 | 193 | } |
194 | 194 | } |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | if(isset($value)){ |
37 | 37 | if($value instanceof HtmlSemDoubleElement){ |
38 | 38 | $text=$value; |
39 | - }else{ |
|
39 | + } else{ |
|
40 | 40 | $text=new HtmlSemDoubleElement("text-".$this->identifier,"div"); |
41 | 41 | $text->setClass("text"); |
42 | 42 | $this->setValue($value); |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | } |
110 | 110 | if(!$item instanceof HtmlDropdownItem){ |
111 | 111 | $itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items),$item,$value,$image,$description); |
112 | - }elseif($itemO instanceof HtmlDropdownItem){ |
|
112 | + } elseif($itemO instanceof HtmlDropdownItem){ |
|
113 | 113 | $this->addToProperty("class", "vertical"); |
114 | 114 | } |
115 | 115 | return $itemO; |
@@ -123,8 +123,9 @@ discard block |
||
123 | 123 | } |
124 | 124 | |
125 | 125 | public function addInput($name){ |
126 | - if(!isset($name)) |
|
127 | - $name="input-".$this->identifier; |
|
126 | + if(!isset($name)) { |
|
127 | + $name="input-".$this->identifier; |
|
128 | + } |
|
128 | 129 | $this->setAction("activate"); |
129 | 130 | $this->input=new HtmlInput($name,"hidden"); |
130 | 131 | $this->input->setIdentifier("input-".$this->identifier); |
@@ -183,7 +184,7 @@ discard block |
||
183 | 184 | foreach ($items as $k=>$v){ |
184 | 185 | $this->addItem($v)->setData($k); |
185 | 186 | } |
186 | - }else{ |
|
187 | + } else{ |
|
187 | 188 | foreach ($items as $item){ |
188 | 189 | $this->addItem($item); |
189 | 190 | } |
@@ -205,8 +206,7 @@ discard block |
||
205 | 206 | $c=$this->items[$i++]; |
206 | 207 | if(isset($c)){ |
207 | 208 | $c->setProperty($property,$value); |
208 | - } |
|
209 | - else{ |
|
209 | + } else{ |
|
210 | 210 | return $this; |
211 | 211 | } |
212 | 212 | } |
@@ -237,7 +237,7 @@ discard block |
||
237 | 237 | if($dropdown===false){ |
238 | 238 | $this->_template=include dirname(__FILE__).'/../templates/tplDropdownMenu.php'; |
239 | 239 | $dropdown="menu"; |
240 | - }else{ |
|
240 | + } else{ |
|
241 | 241 | $dropdown="dropdown"; |
242 | 242 | $this->mClass="menu"; |
243 | 243 | } |
@@ -258,22 +258,25 @@ discard block |
||
258 | 258 | |
259 | 259 | public function asButton($floating=false){ |
260 | 260 | $this->removeArrow(); |
261 | - if($floating) |
|
262 | - $this->addToProperty("class", "floating"); |
|
261 | + if($floating) { |
|
262 | + $this->addToProperty("class", "floating"); |
|
263 | + } |
|
263 | 264 | $this->removePropertyValue("class", "selection"); |
264 | 265 | return $this->addToProperty("class", "button"); |
265 | 266 | } |
266 | 267 | |
267 | 268 | public function asSelect($name=NULL,$multiple=false,$selection=true){ |
268 | 269 | $this->_multiple=$multiple; |
269 | - if(isset($name)) |
|
270 | - $this->addInput($name); |
|
270 | + if(isset($name)) { |
|
271 | + $this->addInput($name); |
|
272 | + } |
|
271 | 273 | if($multiple){ |
272 | 274 | $this->addToProperty("class", "multiple"); |
273 | 275 | } |
274 | 276 | if ($selection){ |
275 | - if($this->propertyContains("class", "button")===false) |
|
276 | - $this->addToPropertyCtrl("class", "selection",array("selection")); |
|
277 | + if($this->propertyContains("class", "button")===false) { |
|
278 | + $this->addToPropertyCtrl("class", "selection",array("selection")); |
|
279 | + } |
|
277 | 280 | } |
278 | 281 | return $this; |
279 | 282 | } |
@@ -284,8 +287,9 @@ discard block |
||
284 | 287 | } |
285 | 288 | |
286 | 289 | public function setSelect($name=NULL,$multiple=false){ |
287 | - if(!isset($name)) |
|
288 | - $name="select-".$this->identifier; |
|
290 | + if(!isset($name)) { |
|
291 | + $name="select-".$this->identifier; |
|
292 | + } |
|
289 | 293 | $this->input=null; |
290 | 294 | if($multiple){ |
291 | 295 | $this->setProperty("multiple", true); |
@@ -321,12 +325,13 @@ discard block |
||
321 | 325 | $value=$this->value; |
322 | 326 | if(isset($this->input) && isset($value)){ |
323 | 327 | $this->input->setProperty("value", $value); |
324 | - }else{ |
|
328 | + } else{ |
|
325 | 329 | $this->setProperty("value", $value); |
326 | 330 | } |
327 | 331 | $textElement=$this->getElementById("text-".$this->identifier, $this->content); |
328 | - if(isset($textElement) && ($textElement instanceof HtmlDoubleElement) && !$this->_multiple) |
|
329 | - $textElement->setContent($value); |
|
332 | + if(isset($textElement) && ($textElement instanceof HtmlDoubleElement) && !$this->_multiple) { |
|
333 | + $textElement->setContent($value); |
|
334 | + } |
|
330 | 335 | return $this; |
331 | 336 | } |
332 | 337 |
@@ -15,29 +15,29 @@ discard block |
||
15 | 15 | use Ajax\common\html\HtmlDoubleElement; |
16 | 16 | |
17 | 17 | class HtmlDropdown extends HtmlSemDoubleElement { |
18 | - use FieldTrait,LabeledIconTrait { |
|
18 | + use FieldTrait, LabeledIconTrait { |
|
19 | 19 | addIcon as addIconP; |
20 | 20 | } |
21 | 21 | protected $mClass="menu"; |
22 | 22 | protected $mTagName="div"; |
23 | - protected $items=array (); |
|
24 | - protected $_params=array("action"=>"nothing","on"=>"hover","showOnFocus"=>false); |
|
23 | + protected $items=array(); |
|
24 | + protected $_params=array("action"=>"nothing", "on"=>"hover", "showOnFocus"=>false); |
|
25 | 25 | protected $input; |
26 | 26 | protected $value; |
27 | 27 | protected $_associative; |
28 | 28 | protected $_multiple; |
29 | 29 | |
30 | - public function __construct($identifier, $value="", $items=array(),$associative=true) { |
|
30 | + public function __construct($identifier, $value="", $items=array(), $associative=true) { |
|
31 | 31 | parent::__construct($identifier, "div"); |
32 | 32 | $this->_template=include dirname(__FILE__).'/../templates/tplDropdown.php'; |
33 | 33 | $this->setProperty("class", "ui dropdown"); |
34 | 34 | $this->_multiple=false; |
35 | 35 | $content=[]; |
36 | - if(isset($value)){ |
|
37 | - if($value instanceof HtmlSemDoubleElement){ |
|
36 | + if (isset($value)) { |
|
37 | + if ($value instanceof HtmlSemDoubleElement) { |
|
38 | 38 | $text=$value; |
39 | - }else{ |
|
40 | - $text=new HtmlSemDoubleElement("text-".$this->identifier,"div"); |
|
39 | + } else { |
|
40 | + $text=new HtmlSemDoubleElement("text-".$this->identifier, "div"); |
|
41 | 41 | $text->setClass("text"); |
42 | 42 | $this->setValue($value); |
43 | 43 | } |
@@ -50,29 +50,29 @@ discard block |
||
50 | 50 | $this->addItems($items); |
51 | 51 | } |
52 | 52 | |
53 | - public function getField(){ |
|
53 | + public function getField() { |
|
54 | 54 | return $this->input; |
55 | 55 | } |
56 | 56 | |
57 | - public function getDataField(){ |
|
57 | + public function getDataField() { |
|
58 | 58 | return $this->input; |
59 | 59 | } |
60 | 60 | |
61 | - public function addItem($item,$value=NULL,$image=NULL,$description=NULL){ |
|
62 | - $itemO=$this->beforeAddItem($item,$value,$image,$description); |
|
61 | + public function addItem($item, $value=NULL, $image=NULL, $description=NULL) { |
|
62 | + $itemO=$this->beforeAddItem($item, $value, $image, $description); |
|
63 | 63 | $this->items[]=$itemO; |
64 | 64 | return $itemO; |
65 | 65 | } |
66 | 66 | |
67 | - public function addIcon($icon,$before=true,$labeled=false){ |
|
67 | + public function addIcon($icon, $before=true, $labeled=false) { |
|
68 | 68 | $this->removeArrow(); |
69 | - $this->addIconP($icon,$before,$labeled); |
|
69 | + $this->addIconP($icon, $before, $labeled); |
|
70 | 70 | return $this->getElementById("text-".$this->identifier, $this->content)->setWrapAfter(""); |
71 | 71 | } |
72 | 72 | |
73 | - public function addIcons($icons){ |
|
73 | + public function addIcons($icons) { |
|
74 | 74 | $count=$this->count(); |
75 | - for ($i=0;$i<\sizeof($icons) && $i<$count;$i++){ |
|
75 | + for ($i=0; $i<\sizeof($icons) && $i<$count; $i++) { |
|
76 | 76 | $this->getItem($i)->addIcon($icons[$i]); |
77 | 77 | } |
78 | 78 | } |
@@ -83,33 +83,33 @@ discard block |
||
83 | 83 | * @param int $position |
84 | 84 | * @return HtmlDropdownItem |
85 | 85 | */ |
86 | - public function insertItem($item,$position=0){ |
|
86 | + public function insertItem($item, $position=0) { |
|
87 | 87 | $itemO=$this->beforeAddItem($item); |
88 | - $start = array_slice($this->items, 0, $position); |
|
89 | - $end = array_slice($this->items, $position); |
|
90 | - $start[] = $item; |
|
88 | + $start=array_slice($this->items, 0, $position); |
|
89 | + $end=array_slice($this->items, $position); |
|
90 | + $start[]=$item; |
|
91 | 91 | $this->items=array_merge($start, $end); |
92 | 92 | return $itemO; |
93 | 93 | } |
94 | 94 | |
95 | - protected function removeArrow(){ |
|
96 | - if(\sizeof($this->content)>1){ |
|
95 | + protected function removeArrow() { |
|
96 | + if (\sizeof($this->content)>1) { |
|
97 | 97 | unset($this->content["arrow"]); |
98 | 98 | $this->content=\array_values($this->content); |
99 | 99 | } |
100 | 100 | } |
101 | 101 | |
102 | - protected function beforeAddItem($item,$value=NULL,$image=NULL,$description=NULL){ |
|
102 | + protected function beforeAddItem($item, $value=NULL, $image=NULL, $description=NULL) { |
|
103 | 103 | $itemO=$item; |
104 | - if(\is_array($item)){ |
|
104 | + if (\is_array($item)) { |
|
105 | 105 | $description=JArray::getValue($item, "description", 3); |
106 | 106 | $value=JArray::getValue($item, "value", 1); |
107 | 107 | $image=JArray::getValue($item, "image", 2); |
108 | 108 | $item=JArray::getValue($item, "item", 0); |
109 | 109 | } |
110 | - if(!$item instanceof HtmlDropdownItem){ |
|
111 | - $itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items),$item,$value,$image,$description); |
|
112 | - }elseif($itemO instanceof HtmlDropdownItem){ |
|
110 | + if (!$item instanceof HtmlDropdownItem) { |
|
111 | + $itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items), $item, $value, $image, $description); |
|
112 | + }elseif ($itemO instanceof HtmlDropdownItem) { |
|
113 | 113 | $this->addToProperty("class", "vertical"); |
114 | 114 | } |
115 | 115 | return $itemO; |
@@ -122,11 +122,11 @@ discard block |
||
122 | 122 | $this->addItem($function($object)); |
123 | 123 | } |
124 | 124 | |
125 | - public function addInput($name){ |
|
126 | - if(!isset($name)) |
|
125 | + public function addInput($name) { |
|
126 | + if (!isset($name)) |
|
127 | 127 | $name="input-".$this->identifier; |
128 | 128 | $this->setAction("activate"); |
129 | - $this->input=new HtmlInput($name,"hidden"); |
|
129 | + $this->input=new HtmlInput($name, "hidden"); |
|
130 | 130 | $this->input->setIdentifier("input-".$this->identifier); |
131 | 131 | return $this->input; |
132 | 132 | } |
@@ -137,15 +137,15 @@ discard block |
||
137 | 137 | * @param string $icon |
138 | 138 | * @return HtmlDropdownItem |
139 | 139 | */ |
140 | - public function addSearchInputItem($placeHolder=NULL,$icon=NULL){ |
|
141 | - return $this->addItem(HtmlDropdownItem::searchInput($placeHolder,$icon)); |
|
140 | + public function addSearchInputItem($placeHolder=NULL, $icon=NULL) { |
|
141 | + return $this->addItem(HtmlDropdownItem::searchInput($placeHolder, $icon)); |
|
142 | 142 | } |
143 | 143 | |
144 | 144 | /** |
145 | 145 | * Adds a divider item |
146 | 146 | * @return HtmlDropdownItem |
147 | 147 | */ |
148 | - public function addDividerItem(){ |
|
148 | + public function addDividerItem() { |
|
149 | 149 | return $this->addItem(HtmlDropdownItem::divider()); |
150 | 150 | } |
151 | 151 | |
@@ -155,8 +155,8 @@ discard block |
||
155 | 155 | * @param string $icon |
156 | 156 | * @return HtmlDropdownItem |
157 | 157 | */ |
158 | - public function addHeaderItem($caption=NULL,$icon=NULL){ |
|
159 | - return $this->addItem(HtmlDropdownItem::header($caption,$icon)); |
|
158 | + public function addHeaderItem($caption=NULL, $icon=NULL) { |
|
159 | + return $this->addItem(HtmlDropdownItem::header($caption, $icon)); |
|
160 | 160 | } |
161 | 161 | |
162 | 162 | /** |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | * @param string $color |
166 | 166 | * @return HtmlDropdownItem |
167 | 167 | */ |
168 | - public function addCircularLabelItem($caption,$color){ |
|
168 | + public function addCircularLabelItem($caption, $color) { |
|
169 | 169 | return $this->addItem(HtmlDropdownItem::circular($caption, $color)); |
170 | 170 | } |
171 | 171 | |
@@ -174,17 +174,17 @@ discard block |
||
174 | 174 | * @param string $image |
175 | 175 | * @return \Ajax\semantic\html\content\HtmlDropdownItem |
176 | 176 | */ |
177 | - public function addMiniAvatarImageItem($caption,$image){ |
|
177 | + public function addMiniAvatarImageItem($caption, $image) { |
|
178 | 178 | return $this->addItem(HtmlDropdownItem::avatar($caption, $image)); |
179 | 179 | } |
180 | 180 | |
181 | - public function addItems($items){ |
|
182 | - if(\is_array($items) && $this->_associative){ |
|
183 | - foreach ($items as $k=>$v){ |
|
181 | + public function addItems($items) { |
|
182 | + if (\is_array($items) && $this->_associative) { |
|
183 | + foreach ($items as $k=>$v) { |
|
184 | 184 | $this->addItem($v)->setData($k); |
185 | 185 | } |
186 | - }else{ |
|
187 | - foreach ($items as $item){ |
|
186 | + } else { |
|
187 | + foreach ($items as $item) { |
|
188 | 188 | $this->addItem($item); |
189 | 189 | } |
190 | 190 | } |
@@ -196,98 +196,98 @@ discard block |
||
196 | 196 | * @param array|mixed $values |
197 | 197 | * @return $this |
198 | 198 | */ |
199 | - public function setPropertyValues($property,$values){ |
|
199 | + public function setPropertyValues($property, $values) { |
|
200 | 200 | $i=0; |
201 | - if(\is_array($values)===false){ |
|
202 | - $values=\array_fill(0, $this->count(),$values); |
|
201 | + if (\is_array($values)===false) { |
|
202 | + $values=\array_fill(0, $this->count(), $values); |
|
203 | 203 | } |
204 | - foreach ($values as $value){ |
|
204 | + foreach ($values as $value) { |
|
205 | 205 | $c=$this->items[$i++]; |
206 | - if(isset($c)){ |
|
207 | - $c->setProperty($property,$value); |
|
206 | + if (isset($c)) { |
|
207 | + $c->setProperty($property, $value); |
|
208 | 208 | } |
209 | - else{ |
|
209 | + else { |
|
210 | 210 | return $this; |
211 | 211 | } |
212 | 212 | } |
213 | 213 | return $this; |
214 | 214 | } |
215 | 215 | |
216 | - public function each($callBack){ |
|
217 | - foreach ($this->items as $index=>$value){ |
|
218 | - $callBack($index,$value); |
|
216 | + public function each($callBack) { |
|
217 | + foreach ($this->items as $index=>$value) { |
|
218 | + $callBack($index, $value); |
|
219 | 219 | } |
220 | 220 | return $this; |
221 | 221 | } |
222 | 222 | |
223 | - public function getItem($index){ |
|
223 | + public function getItem($index) { |
|
224 | 224 | return $this->items[$index]; |
225 | 225 | } |
226 | 226 | |
227 | 227 | /** |
228 | 228 | * @return int |
229 | 229 | */ |
230 | - public function count(){ |
|
230 | + public function count() { |
|
231 | 231 | return \sizeof($this->items); |
232 | 232 | } |
233 | 233 | /** |
234 | 234 | * @param boolean $dropdown |
235 | 235 | */ |
236 | - public function asDropdown($dropdown){ |
|
237 | - if($dropdown===false){ |
|
236 | + public function asDropdown($dropdown) { |
|
237 | + if ($dropdown===false) { |
|
238 | 238 | $this->_template=include dirname(__FILE__).'/../templates/tplDropdownMenu.php'; |
239 | 239 | $dropdown="menu"; |
240 | - }else{ |
|
240 | + } else { |
|
241 | 241 | $dropdown="dropdown"; |
242 | 242 | $this->mClass="menu"; |
243 | 243 | } |
244 | - return $this->addToPropertyCtrl("class", $dropdown,array("menu","dropdown")); |
|
244 | + return $this->addToPropertyCtrl("class", $dropdown, array("menu", "dropdown")); |
|
245 | 245 | } |
246 | 246 | |
247 | - public function setVertical(){ |
|
248 | - return $this->addToPropertyCtrl("class", "vertical",array("vertical")); |
|
247 | + public function setVertical() { |
|
248 | + return $this->addToPropertyCtrl("class", "vertical", array("vertical")); |
|
249 | 249 | } |
250 | 250 | |
251 | - public function setInline(){ |
|
252 | - return $this->addToPropertyCtrl("class", "inline",["inline"]); |
|
251 | + public function setInline() { |
|
252 | + return $this->addToPropertyCtrl("class", "inline", ["inline"]); |
|
253 | 253 | } |
254 | 254 | |
255 | - public function setSimple(){ |
|
256 | - return $this->addToPropertyCtrl("class", "simple",array("simple")); |
|
255 | + public function setSimple() { |
|
256 | + return $this->addToPropertyCtrl("class", "simple", array("simple")); |
|
257 | 257 | } |
258 | 258 | |
259 | - public function asButton($floating=false){ |
|
259 | + public function asButton($floating=false) { |
|
260 | 260 | $this->removeArrow(); |
261 | - if($floating) |
|
261 | + if ($floating) |
|
262 | 262 | $this->addToProperty("class", "floating"); |
263 | 263 | $this->removePropertyValue("class", "selection"); |
264 | 264 | return $this->addToProperty("class", "button"); |
265 | 265 | } |
266 | 266 | |
267 | - public function asSelect($name=NULL,$multiple=false,$selection=true){ |
|
267 | + public function asSelect($name=NULL, $multiple=false, $selection=true) { |
|
268 | 268 | $this->_multiple=$multiple; |
269 | - if(isset($name)) |
|
269 | + if (isset($name)) |
|
270 | 270 | $this->addInput($name); |
271 | - if($multiple){ |
|
271 | + if ($multiple) { |
|
272 | 272 | $this->addToProperty("class", "multiple"); |
273 | 273 | } |
274 | - if ($selection){ |
|
275 | - if($this->propertyContains("class", "button")===false) |
|
276 | - $this->addToPropertyCtrl("class", "selection",array("selection")); |
|
274 | + if ($selection) { |
|
275 | + if ($this->propertyContains("class", "button")===false) |
|
276 | + $this->addToPropertyCtrl("class", "selection", array("selection")); |
|
277 | 277 | } |
278 | 278 | return $this; |
279 | 279 | } |
280 | 280 | |
281 | - public function asSearch($name=NULL,$multiple=false,$selection=true){ |
|
282 | - $this->asSelect($name,$multiple,$selection); |
|
281 | + public function asSearch($name=NULL, $multiple=false, $selection=true) { |
|
282 | + $this->asSelect($name, $multiple, $selection); |
|
283 | 283 | return $this->addToProperty("class", "search"); |
284 | 284 | } |
285 | 285 | |
286 | - public function setSelect($name=NULL,$multiple=false){ |
|
287 | - if(!isset($name)) |
|
286 | + public function setSelect($name=NULL, $multiple=false) { |
|
287 | + if (!isset($name)) |
|
288 | 288 | $name="select-".$this->identifier; |
289 | 289 | $this->input=null; |
290 | - if($multiple){ |
|
290 | + if ($multiple) { |
|
291 | 291 | $this->setProperty("multiple", true); |
292 | 292 | $this->addToProperty("class", "multiple"); |
293 | 293 | } |
@@ -295,37 +295,37 @@ discard block |
||
295 | 295 | $this->tagName="select"; |
296 | 296 | $this->setProperty("name", $name); |
297 | 297 | $this->content=null; |
298 | - foreach ($this->items as $item){ |
|
298 | + foreach ($this->items as $item) { |
|
299 | 299 | $item->asOption(); |
300 | 300 | } |
301 | 301 | return $this; |
302 | 302 | } |
303 | 303 | |
304 | - public function asSubmenu($pointing=NULL){ |
|
304 | + public function asSubmenu($pointing=NULL) { |
|
305 | 305 | $this->setClass("ui dropdown link item"); |
306 | - if(isset($pointing)){ |
|
306 | + if (isset($pointing)) { |
|
307 | 307 | $this->setPointing($pointing); |
308 | 308 | } |
309 | 309 | return $this; |
310 | 310 | } |
311 | 311 | |
312 | - public function setPointing($value=Direction::NONE){ |
|
313 | - return $this->addToPropertyCtrl("class", $value." pointing",Direction::getConstantValues("pointing")); |
|
312 | + public function setPointing($value=Direction::NONE) { |
|
313 | + return $this->addToPropertyCtrl("class", $value." pointing", Direction::getConstantValues("pointing")); |
|
314 | 314 | } |
315 | 315 | |
316 | - public function setValue($value){ |
|
316 | + public function setValue($value) { |
|
317 | 317 | $this->value=$value; |
318 | 318 | return $this; |
319 | 319 | } |
320 | - private function applyValue(){ |
|
320 | + private function applyValue() { |
|
321 | 321 | $value=$this->value; |
322 | - if(isset($this->input) && isset($value)){ |
|
322 | + if (isset($this->input) && isset($value)) { |
|
323 | 323 | $this->input->setProperty("value", $value); |
324 | - }else{ |
|
324 | + } else { |
|
325 | 325 | $this->setProperty("value", $value); |
326 | 326 | } |
327 | 327 | $textElement=$this->getElementById("text-".$this->identifier, $this->content); |
328 | - if(isset($textElement) && ($textElement instanceof HtmlDoubleElement) && !$this->_multiple) |
|
328 | + if (isset($textElement) && ($textElement instanceof HtmlDoubleElement) && !$this->_multiple) |
|
329 | 329 | $textElement->setContent($value); |
330 | 330 | return $this; |
331 | 331 | } |
@@ -335,9 +335,9 @@ discard block |
||
335 | 335 | * @see BaseHtml::run() |
336 | 336 | */ |
337 | 337 | public function run(JsUtils $js) { |
338 | - if($this->propertyContains("class", "simple")===false){ |
|
339 | - if(isset($this->_bsComponent)===false){ |
|
340 | - $this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier,$this->_params); |
|
338 | + if ($this->propertyContains("class", "simple")===false) { |
|
339 | + if (isset($this->_bsComponent)===false) { |
|
340 | + $this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier, $this->_params); |
|
341 | 341 | $this->_bsComponent->setItemSelector(".item"); |
342 | 342 | } |
343 | 343 | $this->addEventsOnRun($js); |
@@ -345,41 +345,41 @@ discard block |
||
345 | 345 | } |
346 | 346 | } |
347 | 347 | |
348 | - public function setCompact(){ |
|
348 | + public function setCompact() { |
|
349 | 349 | return $this->addToPropertyCtrl("class", "compact", array("compact")); |
350 | 350 | } |
351 | 351 | |
352 | - public function setAction($action){ |
|
352 | + public function setAction($action) { |
|
353 | 353 | $this->_params["action"]=$action; |
354 | 354 | } |
355 | 355 | |
356 | - public function setOn($on){ |
|
356 | + public function setOn($on) { |
|
357 | 357 | $this->_params["on"]=$on; |
358 | 358 | } |
359 | 359 | |
360 | - public function setShowOnFocus($value){ |
|
360 | + public function setShowOnFocus($value) { |
|
361 | 361 | $this->_params["showOnFocus"]=$value; |
362 | 362 | } |
363 | 363 | |
364 | - public function setFullTextSearch($value){ |
|
364 | + public function setFullTextSearch($value) { |
|
365 | 365 | $this->_params["fullTextSearch"]=$value; |
366 | 366 | } |
367 | 367 | |
368 | 368 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
369 | 369 | $this->applyValue(); |
370 | - return parent::compile($js,$view); |
|
370 | + return parent::compile($js, $view); |
|
371 | 371 | } |
372 | 372 | |
373 | 373 | public function getInput() { |
374 | 374 | return $this->input; |
375 | 375 | } |
376 | 376 | |
377 | - public function setIcon($icon="dropdown"){ |
|
377 | + public function setIcon($icon="dropdown") { |
|
378 | 378 | $this->content["arrow"]=new HtmlIcon($this->identifier."-icon", $icon); |
379 | 379 | return $this; |
380 | 380 | } |
381 | 381 | |
382 | - public function jsAddItem($caption){ |
|
382 | + public function jsAddItem($caption) { |
|
383 | 383 | $js="var first=$('#{$this->identifier} .item').first();if(first!=undefined){var new =first.clone();first.parent().append(new);first.html('{$caption}};')"; |
384 | 384 | return $js; |
385 | 385 | } |
@@ -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) |
|
132 | + if (!$this->_deleted) |
|
133 | 133 | return parent::compile(); |
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(); |
|
134 | + if(!$this->_deleted) { |
|
135 | + return parent::compile(); |
|
136 | + } |
|
134 | 137 | } |
135 | 138 | } |
@@ -27,15 +27,15 @@ discard block |
||
27 | 27 | return $this->content; |
28 | 28 | } |
29 | 29 | |
30 | - public function addContent($content,$before=false) { |
|
30 | + public function addContent($content, $before=false) { |
|
31 | 31 | if (!\is_array($this->content)) { |
32 | - if(isset($this->content)) |
|
33 | - $this->content=array ($this->content); |
|
32 | + if (isset($this->content)) |
|
33 | + $this->content=array($this->content); |
|
34 | 34 | else |
35 | 35 | $this->content=array(); |
36 | 36 | } |
37 | - if($before) |
|
38 | - array_unshift($this->content,$content); |
|
37 | + if ($before) |
|
38 | + array_unshift($this->content, $content); |
|
39 | 39 | else |
40 | 40 | $this->content []=$content; |
41 | 41 | return $this; |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | if ($this->content instanceof HtmlDoubleElement) { |
51 | 51 | $this->content->run($js); |
52 | 52 | } else if (\is_array($this->content)) { |
53 | - foreach ( $this->content as $itemContent ) { |
|
53 | + foreach ($this->content as $itemContent) { |
|
54 | 54 | if ($itemContent instanceof HtmlDoubleElement) { |
55 | 55 | $itemContent->run($js); |
56 | 56 | } |
@@ -67,19 +67,19 @@ discard block |
||
67 | 67 | return $this; |
68 | 68 | } |
69 | 69 | |
70 | - public function getContentInstances($class){ |
|
71 | - return $this->_getContentInstances($class,$this->content); |
|
70 | + public function getContentInstances($class) { |
|
71 | + return $this->_getContentInstances($class, $this->content); |
|
72 | 72 | } |
73 | 73 | |
74 | - protected function _getContentInstances($class,$content){ |
|
74 | + protected function _getContentInstances($class, $content) { |
|
75 | 75 | $instances=[]; |
76 | - if($content instanceof $class){ |
|
76 | + if ($content instanceof $class) { |
|
77 | 77 | $instances[]=$content; |
78 | - }elseif($content instanceof HtmlDoubleElement){ |
|
79 | - $instances=\array_merge($instances,$content->getContentInstances($class)); |
|
80 | - }elseif (\is_array($content)){ |
|
81 | - foreach ($content as $element){ |
|
82 | - $instances=\array_merge($instances,$this->_getContentInstances($class, $element)); |
|
78 | + }elseif ($content instanceof HtmlDoubleElement) { |
|
79 | + $instances=\array_merge($instances, $content->getContentInstances($class)); |
|
80 | + }elseif (\is_array($content)) { |
|
81 | + foreach ($content as $element) { |
|
82 | + $instances=\array_merge($instances, $this->_getContentInstances($class, $element)); |
|
83 | 83 | } |
84 | 84 | } |
85 | 85 | return $instances; |
@@ -89,10 +89,10 @@ discard block |
||
89 | 89 | * Transforms the element into a link |
90 | 90 | * @return HtmlDoubleElement |
91 | 91 | */ |
92 | - public function asLink($href=NULL,$target=NULL) { |
|
92 | + public function asLink($href=NULL, $target=NULL) { |
|
93 | 93 | if (isset($href)) |
94 | 94 | $this->setProperty("href", $href); |
95 | - if(isset($target)) |
|
95 | + if (isset($target)) |
|
96 | 96 | $this->setProperty("target", $target); |
97 | 97 | return $this->setTagName("a"); |
98 | 98 | } |
@@ -29,15 +29,17 @@ discard block |
||
29 | 29 | |
30 | 30 | public function addContent($content,$before=false) { |
31 | 31 | if (!\is_array($this->content)) { |
32 | - if(isset($this->content)) |
|
33 | - $this->content=array ($this->content); |
|
34 | - else |
|
35 | - $this->content=array(); |
|
32 | + if(isset($this->content)) { |
|
33 | + $this->content=array ($this->content); |
|
34 | + } else { |
|
35 | + $this->content=array(); |
|
36 | + } |
|
37 | + } |
|
38 | + if($before) { |
|
39 | + array_unshift($this->content,$content); |
|
40 | + } else { |
|
41 | + $this->content []=$content; |
|
36 | 42 | } |
37 | - if($before) |
|
38 | - array_unshift($this->content,$content); |
|
39 | - else |
|
40 | - $this->content []=$content; |
|
41 | 43 | return $this; |
42 | 44 | } |
43 | 45 | |
@@ -75,9 +77,9 @@ discard block |
||
75 | 77 | $instances=[]; |
76 | 78 | if($content instanceof $class){ |
77 | 79 | $instances[]=$content; |
78 | - }elseif($content instanceof HtmlDoubleElement){ |
|
80 | + } elseif($content instanceof HtmlDoubleElement){ |
|
79 | 81 | $instances=\array_merge($instances,$content->getContentInstances($class)); |
80 | - }elseif (\is_array($content)){ |
|
82 | + } elseif (\is_array($content)){ |
|
81 | 83 | foreach ($content as $element){ |
82 | 84 | $instances=\array_merge($instances,$this->_getContentInstances($class, $element)); |
83 | 85 | } |
@@ -90,10 +92,12 @@ discard block |
||
90 | 92 | * @return HtmlDoubleElement |
91 | 93 | */ |
92 | 94 | public function asLink($href=NULL,$target=NULL) { |
93 | - if (isset($href)) |
|
94 | - $this->setProperty("href", $href); |
|
95 | - if(isset($target)) |
|
96 | - $this->setProperty("target", $target); |
|
95 | + if (isset($href)) { |
|
96 | + $this->setProperty("href", $href); |
|
97 | + } |
|
98 | + if(isset($target)) { |
|
99 | + $this->setProperty("target", $target); |
|
100 | + } |
|
97 | 101 | return $this->setTagName("a"); |
98 | 102 | } |
99 | 103 | } |