@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | foreach ($ajaxSubmit as $ajaxSubmitItem){ |
49 | 49 | $compilation.=$ajaxSubmitItem->compile($js); |
50 | 50 | } |
51 | - }elseif($ajaxSubmit instanceof AjaxCall){ |
|
51 | + } elseif($ajaxSubmit instanceof AjaxCall){ |
|
52 | 52 | $compilation=$ajaxSubmit->compile($js); |
53 | 53 | } |
54 | 54 | $compilation=str_ireplace("\"","%quote%", $compilation); |
@@ -66,8 +66,9 @@ discard block |
||
66 | 66 | |
67 | 67 | public function setAttached($value=true){ |
68 | 68 | $form=$this->getForm(); |
69 | - if($value) |
|
70 | - $form->addToPropertyCtrl("class", "attached", array ("attached" )); |
|
69 | + if($value) { |
|
70 | + $form->addToPropertyCtrl("class", "attached", array ("attached" )); |
|
71 | + } |
|
71 | 72 | return $form; |
72 | 73 | } |
73 | 74 | |
@@ -89,10 +90,11 @@ discard block |
||
89 | 90 | */ |
90 | 91 | public function submitOn($event,$identifierOrElement,$url,$responseElement,$parameters=NULL){ |
91 | 92 | $form=$this->getForm(); |
92 | - if($identifierOrElement instanceof BaseHtml) |
|
93 | - $elem=$identifierOrElement; |
|
94 | - else |
|
95 | - $elem=$form->getElementById($identifierOrElement, $form->getContent()); |
|
93 | + if($identifierOrElement instanceof BaseHtml) { |
|
94 | + $elem=$identifierOrElement; |
|
95 | + } else { |
|
96 | + $elem=$form->getElementById($identifierOrElement, $form->getContent()); |
|
97 | + } |
|
96 | 98 | if(isset($elem)){ |
97 | 99 | $this->_buttonAsSubmit($elem, $event,$url,$responseElement,$parameters); |
98 | 100 | } |
@@ -120,8 +122,9 @@ discard block |
||
120 | 122 | public function setSubmitParams($url,$responseElement=NULL,$parameters=NULL){ |
121 | 123 | $form=$this->getForm(); |
122 | 124 | $params=["form"=>$form->getIdentifier(),"responseElement"=>$responseElement,"url"=>$url,"stopPropagation"=>true]; |
123 | - if(\is_array($parameters)) |
|
124 | - $params=\array_merge($params,$parameters); |
|
125 | + if(\is_array($parameters)) { |
|
126 | + $params=\array_merge($params,$parameters); |
|
127 | + } |
|
125 | 128 | $form->addValidationParam("_ajaxSubmit", new AjaxCall("postForm", $params)); |
126 | 129 | return $this; |
127 | 130 | } |
@@ -14,27 +14,27 @@ discard block |
||
14 | 14 | * @author jc |
15 | 15 | * |
16 | 16 | */ |
17 | -trait FormTrait{ |
|
17 | +trait FormTrait { |
|
18 | 18 | |
19 | 19 | /** |
20 | 20 | * @return HtmlForm |
21 | 21 | */ |
22 | 22 | abstract protected function getForm(); |
23 | 23 | |
24 | - protected function addCompoValidation(Form $compo,HtmlFormField $field){ |
|
24 | + protected function addCompoValidation(Form $compo, HtmlFormField $field) { |
|
25 | 25 | $validation=$field->getValidation(); |
26 | - if(isset($validation)){ |
|
26 | + if (isset($validation)) { |
|
27 | 27 | $validation->setIdentifier($field->getDataField()->getIdentifier()); |
28 | 28 | $compo->addFieldValidation($validation); |
29 | 29 | } |
30 | 30 | return $compo; |
31 | 31 | } |
32 | 32 | |
33 | - protected function _runValidationParams(Form &$compo,JsUtils $js=NULL){ |
|
33 | + protected function _runValidationParams(Form&$compo, JsUtils $js=NULL) { |
|
34 | 34 | $form=$this->getForm(); |
35 | 35 | $params=$form->getValidationParams(); |
36 | - if(isset($params["_ajaxSubmit"])){ |
|
37 | - $compilation=$this->_compileAjaxSubmit($params["_ajaxSubmit"],$js); |
|
36 | + if (isset($params["_ajaxSubmit"])) { |
|
37 | + $compilation=$this->_compileAjaxSubmit($params["_ajaxSubmit"], $js); |
|
38 | 38 | $this->onSuccess($compilation); |
39 | 39 | $form->removeValidationParam("_ajaxSubmit"); |
40 | 40 | } |
@@ -43,16 +43,16 @@ discard block |
||
43 | 43 | $form->addEventsOnRun($js); |
44 | 44 | } |
45 | 45 | |
46 | - protected function _compileAjaxSubmit($ajaxSubmit,JsUtils $js=null){ |
|
46 | + protected function _compileAjaxSubmit($ajaxSubmit, JsUtils $js=null) { |
|
47 | 47 | $compilation=""; |
48 | - if(\is_array($ajaxSubmit)){ |
|
49 | - foreach ($ajaxSubmit as $ajaxSubmitItem){ |
|
48 | + if (\is_array($ajaxSubmit)) { |
|
49 | + foreach ($ajaxSubmit as $ajaxSubmitItem) { |
|
50 | 50 | $compilation.=$ajaxSubmitItem->compile($js); |
51 | 51 | } |
52 | - }elseif($ajaxSubmit instanceof AjaxCall){ |
|
52 | + }elseif ($ajaxSubmit instanceof AjaxCall) { |
|
53 | 53 | $compilation=$ajaxSubmit->compile($js); |
54 | 54 | } |
55 | - $compilation=str_ireplace("\"","%quote%", $compilation); |
|
55 | + $compilation=str_ireplace("\"", "%quote%", $compilation); |
|
56 | 56 | return $compilation; |
57 | 57 | } |
58 | 58 | |
@@ -65,14 +65,14 @@ discard block |
||
65 | 65 | return $this; |
66 | 66 | } |
67 | 67 | |
68 | - public function setAttached($value=true){ |
|
68 | + public function setAttached($value=true) { |
|
69 | 69 | $form=$this->getForm(); |
70 | - if($value) |
|
71 | - $form->addToPropertyCtrl("class", "attached", array ("attached" )); |
|
70 | + if ($value) |
|
71 | + $form->addToPropertyCtrl("class", "attached", array("attached")); |
|
72 | 72 | return $form; |
73 | 73 | } |
74 | 74 | |
75 | - public function addErrorMessage(){ |
|
75 | + public function addErrorMessage() { |
|
76 | 76 | return $this->getForm()->addContent((new HtmlMessage(""))->setError()); |
77 | 77 | } |
78 | 78 | |
@@ -88,47 +88,47 @@ discard block |
||
88 | 88 | * @param array $parameters |
89 | 89 | * @return HtmlForm |
90 | 90 | */ |
91 | - public function submitOn($event,$identifierOrElement,$url,$responseElement,$parameters=NULL){ |
|
91 | + public function submitOn($event, $identifierOrElement, $url, $responseElement, $parameters=NULL) { |
|
92 | 92 | $form=$this->getForm(); |
93 | - if($identifierOrElement instanceof BaseHtml) |
|
93 | + if ($identifierOrElement instanceof BaseHtml) |
|
94 | 94 | $elem=$identifierOrElement; |
95 | 95 | else |
96 | 96 | $elem=$form->getElementById($identifierOrElement, $form->getContent()); |
97 | - if(isset($elem)){ |
|
98 | - $this->_buttonAsSubmit($elem, $event,$url,$responseElement,$parameters); |
|
97 | + if (isset($elem)) { |
|
98 | + $this->_buttonAsSubmit($elem, $event, $url, $responseElement, $parameters); |
|
99 | 99 | } |
100 | 100 | return $form; |
101 | 101 | } |
102 | 102 | |
103 | - public function submitOnClick($identifier,$url,$responseElement,$parameters=NULL){ |
|
104 | - return $this->submitOn("click", $identifier, $url, $responseElement,$parameters); |
|
103 | + public function submitOnClick($identifier, $url, $responseElement, $parameters=NULL) { |
|
104 | + return $this->submitOn("click", $identifier, $url, $responseElement, $parameters); |
|
105 | 105 | } |
106 | 106 | |
107 | - public function addSubmit($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$parameters=NULL){ |
|
108 | - $bt=$this->getForm()->addButton($identifier, $value,$cssStyle); |
|
109 | - return $this->_buttonAsSubmit($bt, "click",$url,$responseElement,$parameters); |
|
107 | + public function addSubmit($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $parameters=NULL) { |
|
108 | + $bt=$this->getForm()->addButton($identifier, $value, $cssStyle); |
|
109 | + return $this->_buttonAsSubmit($bt, "click", $url, $responseElement, $parameters); |
|
110 | 110 | } |
111 | 111 | |
112 | - protected function _buttonAsSubmit(BaseHtml &$button,$event,$url,$responseElement=NULL,$parameters=NULL){ |
|
112 | + protected function _buttonAsSubmit(BaseHtml&$button, $event, $url, $responseElement=NULL, $parameters=NULL) { |
|
113 | 113 | $form=$this->getForm(); |
114 | - if(isset($url) && isset($responseElement)){ |
|
115 | - $button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');",true,true); |
|
116 | - $this->setSubmitParams($url,$responseElement,$parameters); |
|
114 | + if (isset($url) && isset($responseElement)) { |
|
115 | + $button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');", true, true); |
|
116 | + $this->setSubmitParams($url, $responseElement, $parameters); |
|
117 | 117 | } |
118 | 118 | return $button; |
119 | 119 | } |
120 | 120 | |
121 | - public function setSubmitParams($url,$responseElement=NULL,$parameters=NULL){ |
|
121 | + public function setSubmitParams($url, $responseElement=NULL, $parameters=NULL) { |
|
122 | 122 | $form=$this->getForm(); |
123 | - $params=["form"=>$form->getIdentifier(),"responseElement"=>$responseElement,"url"=>$url,"stopPropagation"=>true]; |
|
124 | - if(\is_array($parameters)) |
|
125 | - $params=\array_merge($params,$parameters); |
|
123 | + $params=["form"=>$form->getIdentifier(), "responseElement"=>$responseElement, "url"=>$url, "stopPropagation"=>true]; |
|
124 | + if (\is_array($parameters)) |
|
125 | + $params=\array_merge($params, $parameters); |
|
126 | 126 | $form->addValidationParam("_ajaxSubmit", new AjaxCall("postForm", $params)); |
127 | 127 | return $this; |
128 | 128 | } |
129 | 129 | |
130 | - public function addReset($identifier,$value,$cssStyle=NULL){ |
|
131 | - $bt=$this->getForm()->addButton($identifier, $value,$cssStyle); |
|
130 | + public function addReset($identifier, $value, $cssStyle=NULL) { |
|
131 | + $bt=$this->getForm()->addButton($identifier, $value, $cssStyle); |
|
132 | 132 | $bt->setProperty("type", "reset"); |
133 | 133 | return $bt; |
134 | 134 | } |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | * @param string $jsCode |
139 | 139 | * @return \Ajax\semantic\html\collections\form\HtmlForm |
140 | 140 | */ |
141 | - public function onValid($jsCode){ |
|
141 | + public function onValid($jsCode) { |
|
142 | 142 | $form=$this->getForm(); |
143 | 143 | $form->addValidationParam("onValid", "%function(){".$jsCode."}%"); |
144 | 144 | return $form; |
@@ -149,9 +149,9 @@ discard block |
||
149 | 149 | * @param string $jsCode can use event and fields parameters |
150 | 150 | * @return HtmlForm |
151 | 151 | */ |
152 | - public function onSuccess($jsCode){ |
|
152 | + public function onSuccess($jsCode) { |
|
153 | 153 | $form=$this->getForm(); |
154 | - $form->addValidationParam("onSuccess", $jsCode,"%function(event,fields){","}%"); |
|
154 | + $form->addValidationParam("onSuccess", $jsCode, "%function(event,fields){", "}%"); |
|
155 | 155 | return $form; |
156 | 156 | } |
157 | 157 | } |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | * @version 1.001 |
17 | 17 | */ |
18 | 18 | class HtmlMessage extends HtmlSemDoubleElement { |
19 | - use AttachedTrait,HasTimeoutTrait; |
|
19 | + use AttachedTrait, HasTimeoutTrait; |
|
20 | 20 | protected $icon; |
21 | 21 | protected $close; |
22 | 22 | |
@@ -33,42 +33,42 @@ discard block |
||
33 | 33 | * @param string|HtmlSemDoubleElement $header |
34 | 34 | * @return \Ajax\semantic\html\collections\HtmlMessage |
35 | 35 | */ |
36 | - public function addHeader($header){ |
|
36 | + public function addHeader($header) { |
|
37 | 37 | $headerO=$header; |
38 | - if(\is_string($header)){ |
|
39 | - $headerO=new HtmlSemDoubleElement("header-".$this->identifier,"div"); |
|
38 | + if (\is_string($header)) { |
|
39 | + $headerO=new HtmlSemDoubleElement("header-".$this->identifier, "div"); |
|
40 | 40 | $headerO->setClass("header"); |
41 | 41 | $headerO->setContent($header); |
42 | 42 | } |
43 | - return $this->addContent($headerO,true); |
|
43 | + return $this->addContent($headerO, true); |
|
44 | 44 | } |
45 | 45 | |
46 | - public function setHeader($header){ |
|
46 | + public function setHeader($header) { |
|
47 | 47 | return $this->addHeader($header); |
48 | 48 | } |
49 | 49 | |
50 | - public function addList($elements,$ordered=false){ |
|
51 | - $list=new HtmlList("list-".$this->identifier,$elements); |
|
50 | + public function addList($elements, $ordered=false) { |
|
51 | + $list=new HtmlList("list-".$this->identifier, $elements); |
|
52 | 52 | $list->setOrdered($ordered); |
53 | 53 | $list->setClass("ui list"); |
54 | 54 | $this->addContent($list); |
55 | 55 | } |
56 | 56 | |
57 | - public function setIcon($icon){ |
|
57 | + public function setIcon($icon) { |
|
58 | 58 | $this->addToProperty("class", "icon"); |
59 | - $this->wrapContent("<div class='content'>","</div>"); |
|
59 | + $this->wrapContent("<div class='content'>", "</div>"); |
|
60 | 60 | $this->icon=new HtmlIcon("icon-".$this->identifier, $icon); |
61 | 61 | return $this; |
62 | 62 | } |
63 | 63 | |
64 | - public function addLoader($loaderIcon="notched circle"){ |
|
64 | + public function addLoader($loaderIcon="notched circle") { |
|
65 | 65 | $this->setIcon($loaderIcon); |
66 | 66 | $this->icon->addToIcon("loading"); |
67 | 67 | return $this; |
68 | 68 | } |
69 | 69 | |
70 | - public function setDismissable($dismiss=true){ |
|
71 | - if($dismiss===true) |
|
70 | + public function setDismissable($dismiss=true) { |
|
71 | + if ($dismiss===true) |
|
72 | 72 | $this->close=new HtmlIcon("close-".$this->identifier, "close"); |
73 | 73 | else |
74 | 74 | $this->close=NULL; |
@@ -79,43 +79,43 @@ discard block |
||
79 | 79 | * {@inheritDoc} |
80 | 80 | * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::run() |
81 | 81 | */ |
82 | - public function run(JsUtils $js){ |
|
83 | - if(!isset($this->_bsComponent)){ |
|
84 | - if(isset($this->close)){ |
|
82 | + public function run(JsUtils $js) { |
|
83 | + if (!isset($this->_bsComponent)) { |
|
84 | + if (isset($this->close)) { |
|
85 | 85 | $js->execOn("click", "#".$this->identifier." .close", "$(this).closest('.message').transition({$this->_closeTransition})"); |
86 | 86 | } |
87 | - if(isset($this->_timeout)){ |
|
88 | - $js->exec("setTimeout(function() { $('#{$this->identifier}').transition({$this->_closeTransition}); }, {$this->_timeout});",true); |
|
87 | + if (isset($this->_timeout)) { |
|
88 | + $js->exec("setTimeout(function() { $('#{$this->identifier}').transition({$this->_closeTransition}); }, {$this->_timeout});", true); |
|
89 | 89 | } |
90 | 90 | } |
91 | 91 | return parent::run($js); |
92 | 92 | } |
93 | 93 | |
94 | - public function setState($visible=true){ |
|
95 | - $visible=($visible===true)?"visible":"hidden"; |
|
96 | - return $this->addToPropertyCtrl("class", $visible, array("visible","hidden")); |
|
94 | + public function setState($visible=true) { |
|
95 | + $visible=($visible===true) ? "visible" : "hidden"; |
|
96 | + return $this->addToPropertyCtrl("class", $visible, array("visible", "hidden")); |
|
97 | 97 | } |
98 | 98 | |
99 | - public function setVariation($value="floating"){ |
|
100 | - return $this->addToPropertyCtrl("class", $value, array("floating","compact")); |
|
99 | + public function setVariation($value="floating") { |
|
100 | + return $this->addToPropertyCtrl("class", $value, array("floating", "compact")); |
|
101 | 101 | } |
102 | 102 | |
103 | - public function setStyle($style){ |
|
103 | + public function setStyle($style) { |
|
104 | 104 | return $this->addToPropertyCtrl("class", $style, Style::getConstants()); |
105 | 105 | } |
106 | 106 | |
107 | - public function setError(){ |
|
107 | + public function setError() { |
|
108 | 108 | return $this->setStyle("error"); |
109 | 109 | } |
110 | 110 | |
111 | - public function setWarning(){ |
|
111 | + public function setWarning() { |
|
112 | 112 | return $this->setStyle("warning"); |
113 | 113 | } |
114 | 114 | |
115 | - public function setMessage($message){ |
|
116 | - if(\is_array($this->content)){ |
|
115 | + public function setMessage($message) { |
|
116 | + if (\is_array($this->content)) { |
|
117 | 117 | $this->content[\sizeof($this->content)-1]=$message; |
118 | - }else |
|
118 | + } else |
|
119 | 119 | $this->setContent($message); |
120 | 120 | } |
121 | 121 |
@@ -68,10 +68,11 @@ discard block |
||
68 | 68 | } |
69 | 69 | |
70 | 70 | public function setDismissable($dismiss=true){ |
71 | - if($dismiss===true) |
|
72 | - $this->close=new HtmlIcon("close-".$this->identifier, "close"); |
|
73 | - else |
|
74 | - $this->close=NULL; |
|
71 | + if($dismiss===true) { |
|
72 | + $this->close=new HtmlIcon("close-".$this->identifier, "close"); |
|
73 | + } else { |
|
74 | + $this->close=NULL; |
|
75 | + } |
|
75 | 76 | return $this; |
76 | 77 | } |
77 | 78 | |
@@ -115,8 +116,9 @@ discard block |
||
115 | 116 | public function setMessage($message){ |
116 | 117 | if(\is_array($this->content)){ |
117 | 118 | $this->content[\sizeof($this->content)-1]=$message; |
118 | - }else |
|
119 | - $this->setContent($message); |
|
119 | + } else { |
|
120 | + $this->setContent($message); |
|
121 | + } |
|
120 | 122 | } |
121 | 123 | |
122 | 124 | } |
@@ -17,18 +17,18 @@ discard block |
||
17 | 17 | protected $_dropdown; |
18 | 18 | public function __construct($identifier, $elements=array(), $asIcons=false) { |
19 | 19 | parent::__construct($identifier, "div", "ui buttons"); |
20 | - if ($asIcons === true) |
|
20 | + if ($asIcons===true) |
|
21 | 21 | $this->asIcons(); |
22 | 22 | $this->addElements($elements, $asIcons); |
23 | 23 | } |
24 | - protected function createItem($value){ |
|
24 | + protected function createItem($value) { |
|
25 | 25 | return new HtmlButton("", $value); |
26 | 26 | } |
27 | 27 | |
28 | - public function addDropdown($items,$asCombo=false){ |
|
29 | - $dd= new HtmlDropdown("dd-".$this->identifier,null,$items); |
|
28 | + public function addDropdown($items, $asCombo=false) { |
|
29 | + $dd=new HtmlDropdown("dd-".$this->identifier, null, $items); |
|
30 | 30 | $dd->asButton(); |
31 | - if($asCombo){ |
|
31 | + if ($asCombo) { |
|
32 | 32 | $dd->setAction("combo"); |
33 | 33 | $dd->addToProperty("class", "combo"); |
34 | 34 | } |
@@ -39,13 +39,13 @@ discard block |
||
39 | 39 | |
40 | 40 | public function addElement($element, $asIcon=false) { |
41 | 41 | $item=$this->addItem($element); |
42 | - if($asIcon) |
|
42 | + if ($asIcon) |
|
43 | 43 | $item->asIcon($element); |
44 | 44 | return $item; |
45 | 45 | } |
46 | 46 | |
47 | 47 | public function addElements($elements, $asIcons=false) { |
48 | - foreach ( $elements as $element ) { |
|
48 | + foreach ($elements as $element) { |
|
49 | 49 | $this->addElement($element, $asIcons); |
50 | 50 | } |
51 | 51 | return $this; |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | public function insertOr($aferIndex=0, $or="or") { |
55 | 55 | $orElement=new HtmlSemDoubleElement("", "div", "or"); |
56 | 56 | $orElement->setProperty("data-text", $or); |
57 | - array_splice($this->content, $aferIndex + 1, 0, array ($orElement )); |
|
57 | + array_splice($this->content, $aferIndex+1, 0, array($orElement)); |
|
58 | 58 | return $this; |
59 | 59 | } |
60 | 60 | |
@@ -67,8 +67,8 @@ discard block |
||
67 | 67 | } |
68 | 68 | |
69 | 69 | public function asIcons() { |
70 | - foreach ( $this->content as $item ) { |
|
71 | - if($item instanceof HtmlButton) |
|
70 | + foreach ($this->content as $item) { |
|
71 | + if ($item instanceof HtmlButton) |
|
72 | 72 | $item->asIcon($item->getContent()); |
73 | 73 | } |
74 | 74 | return $this->addToProperty("class", "icons"); |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | * @see \Ajax\bootstrap\html\base\BaseHtml::on() |
102 | 102 | */ |
103 | 103 | public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) { |
104 | - foreach ( $this->content as $element ) { |
|
104 | + foreach ($this->content as $element) { |
|
105 | 105 | $element->on($event, $jsCode, $stopPropagation, $preventDefault); |
106 | 106 | } |
107 | 107 | return $this; |
@@ -113,10 +113,10 @@ discard block |
||
113 | 113 | |
114 | 114 | public function addClasses($classes=array()) { |
115 | 115 | $i=0; |
116 | - if(!\is_array($classes)){ |
|
117 | - $classes=array_fill (0,$this->count(),$classes); |
|
116 | + if (!\is_array($classes)) { |
|
117 | + $classes=array_fill(0, $this->count(), $classes); |
|
118 | 118 | } |
119 | - foreach ( $this->content as $button ) { |
|
119 | + foreach ($this->content as $button) { |
|
120 | 120 | $button->addToProperty("class", $classes[$i++]); |
121 | 121 | } |
122 | 122 | return $this; |
@@ -130,8 +130,8 @@ discard block |
||
130 | 130 | $this->addElement($function($object)); |
131 | 131 | } |
132 | 132 | |
133 | - public function run(JsUtils $js){ |
|
134 | - $result= parent::run($js); |
|
133 | + public function run(JsUtils $js) { |
|
134 | + $result=parent::run($js); |
|
135 | 135 | return $result->setItemSelector(".ui.button"); |
136 | 136 | } |
137 | 137 |
@@ -17,8 +17,9 @@ discard block |
||
17 | 17 | protected $_dropdown; |
18 | 18 | public function __construct($identifier, $elements=array(), $asIcons=false) { |
19 | 19 | parent::__construct($identifier, "div", "ui buttons"); |
20 | - if ($asIcons === true) |
|
21 | - $this->asIcons(); |
|
20 | + if ($asIcons === true) { |
|
21 | + $this->asIcons(); |
|
22 | + } |
|
22 | 23 | $this->addElements($elements, $asIcons); |
23 | 24 | } |
24 | 25 | protected function createItem($value){ |
@@ -39,8 +40,9 @@ discard block |
||
39 | 40 | |
40 | 41 | public function addElement($element, $asIcon=false) { |
41 | 42 | $item=$this->addItem($element); |
42 | - if($asIcon) |
|
43 | - $item->asIcon($element); |
|
43 | + if($asIcon) { |
|
44 | + $item->asIcon($element); |
|
45 | + } |
|
44 | 46 | return $item; |
45 | 47 | } |
46 | 48 | |
@@ -68,8 +70,9 @@ discard block |
||
68 | 70 | |
69 | 71 | public function asIcons() { |
70 | 72 | foreach ( $this->content as $item ) { |
71 | - if($item instanceof HtmlButton) |
|
72 | - $item->asIcon($item->getContent()); |
|
73 | + if($item instanceof HtmlButton) { |
|
74 | + $item->asIcon($item->getContent()); |
|
75 | + } |
|
73 | 76 | } |
74 | 77 | return $this->addToProperty("class", "icons"); |
75 | 78 | } |
@@ -17,10 +17,10 @@ |
||
17 | 17 | * {@inheritDoc} |
18 | 18 | * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::run() |
19 | 19 | */ |
20 | - public function run(JsUtils $js){ |
|
21 | - if(!isset($this->_bsComponent)){ |
|
22 | - if(isset($this->_timeout)){ |
|
23 | - $js->exec("setTimeout(function() { $('#{$this->identifier}').transition({$this->_closeTransition}); }, {$this->_timeout});",true); |
|
20 | + public function run(JsUtils $js) { |
|
21 | + if (!isset($this->_bsComponent)) { |
|
22 | + if (isset($this->_timeout)) { |
|
23 | + $js->exec("setTimeout(function() { $('#{$this->identifier}').transition({$this->_closeTransition}); }, {$this->_timeout});", true); |
|
24 | 24 | } |
25 | 25 | } |
26 | 26 | return parent::run($js); |
@@ -29,27 +29,27 @@ |
||
29 | 29 | $rowClass="_json"; |
30 | 30 | extract($this->parameters); |
31 | 31 | $result=$this->_eventPreparing($preventDefault, $stopPropagation); |
32 | - switch($this->method) { |
|
32 | + switch ($this->method) { |
|
33 | 33 | case "get": |
34 | - $result.=$js->getDeferred($url, $responseElement, $params, $jsCallback, $attr,$jqueryDone,$ajaxTransition); |
|
34 | + $result.=$js->getDeferred($url, $responseElement, $params, $jsCallback, $attr, $jqueryDone, $ajaxTransition); |
|
35 | 35 | break; |
36 | 36 | case "post": |
37 | - $result.=$js->postDeferred($url, $responseElement, $params, $jsCallback, $attr,$hasLoader,$jqueryDone,$ajaxTransition); |
|
37 | + $result.=$js->postDeferred($url, $responseElement, $params, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition); |
|
38 | 38 | break; |
39 | 39 | case "postForm": |
40 | - $result.=$js->postFormDeferred($url, $form, $responseElement, $validation, $jsCallback, $attr,$hasLoader,$jqueryDone,$ajaxTransition); |
|
40 | + $result.=$js->postFormDeferred($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition); |
|
41 | 41 | break; |
42 | 42 | case "json": |
43 | - $result.=$js->jsonDeferred($url,$method,$params,$jsCallback); |
|
43 | + $result.=$js->jsonDeferred($url, $method, $params, $jsCallback); |
|
44 | 44 | break; |
45 | 45 | case "jsonArray": |
46 | - $result.=$js->jsonArrayDeferred($modelSelector, $url,$method,$params,$jsCallback,$rowClass); |
|
46 | + $result.=$js->jsonArrayDeferred($modelSelector, $url, $method, $params, $jsCallback, $rowClass); |
|
47 | 47 | break; |
48 | 48 | } |
49 | 49 | return $result; |
50 | 50 | } |
51 | 51 | |
52 | - protected function _eventPreparing($preventDefault,$stopPropagation){ |
|
52 | + protected function _eventPreparing($preventDefault, $stopPropagation) { |
|
53 | 53 | $result=""; |
54 | 54 | if ($preventDefault===true) { |
55 | 55 | $result.=Javascript::$preventDefault; |
@@ -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 | $jsCallback=NULL; |
21 | 22 | $attr="id"; |
@@ -330,8 +330,9 @@ discard block |
||
330 | 330 | $result= $this->getBody()->_addRow($result); |
331 | 331 | } |
332 | 332 | if(isset($this->_afterCompileEvents["onNewRow"])){ |
333 | - if(\is_callable($this->_afterCompileEvents["onNewRow"])) |
|
334 | - $this->_afterCompileEvents["onNewRow"]($result,$object); |
|
333 | + if(\is_callable($this->_afterCompileEvents["onNewRow"])) { |
|
334 | + $this->_afterCompileEvents["onNewRow"]($result,$object); |
|
335 | + } |
|
335 | 336 | } |
336 | 337 | return $result; |
337 | 338 | } |
@@ -353,8 +354,9 @@ discard block |
||
353 | 354 | |
354 | 355 | public function run(JsUtils $js){ |
355 | 356 | $result= parent::run($js); |
356 | - if(isset($this->_footer)) |
|
357 | - $this->_footer->run($js); |
|
357 | + if(isset($this->_footer)) { |
|
358 | + $this->_footer->run($js); |
|
359 | + } |
|
358 | 360 | return $result; |
359 | 361 | } |
360 | 362 | |
@@ -394,8 +396,9 @@ discard block |
||
394 | 396 | |
395 | 397 | public function setColWidth($colIndex,$width){ |
396 | 398 | $part=$this->_getFirstPart(); |
397 | - if($part!==null && $part->count()>0) |
|
398 | - $part->getCell(0, $colIndex)->setWidth($width); |
|
399 | + if($part!==null && $part->count()>0) { |
|
400 | + $part->getCell(0, $colIndex)->setWidth($width); |
|
401 | + } |
|
399 | 402 | return $this; |
400 | 403 | } |
401 | 404 |
@@ -27,10 +27,10 @@ discard block |
||
27 | 27 | |
28 | 28 | public function __construct($identifier, $rowCount, $colCount) { |
29 | 29 | parent::__construct($identifier, "table", "ui table"); |
30 | - $this->content=array (); |
|
30 | + $this->content=array(); |
|
31 | 31 | $this->setRowCount($rowCount, $colCount); |
32 | - $this->_variations=[ Variation::CELLED,Variation::PADDED,Variation::COMPACT ]; |
|
33 | - $this->_compileParts=["thead","tbody","tfoot"]; |
|
32 | + $this->_variations=[Variation::CELLED, Variation::PADDED, Variation::COMPACT]; |
|
33 | + $this->_compileParts=["thead", "tbody", "tfoot"]; |
|
34 | 34 | $this->_afterCompileEvents=[]; |
35 | 35 | } |
36 | 36 | |
@@ -40,17 +40,17 @@ discard block |
||
40 | 40 | * @return HtmlTableContent |
41 | 41 | */ |
42 | 42 | public function getPart($key) { |
43 | - if (\array_key_exists($key, $this->content) === false) { |
|
43 | + if (\array_key_exists($key, $this->content)===false) { |
|
44 | 44 | $this->content[$key]=new HtmlTableContent("", $key); |
45 | - if ($key !== "tbody") { |
|
45 | + if ($key!=="tbody") { |
|
46 | 46 | $this->content[$key]->setRowCount(1, $this->_colCount); |
47 | 47 | } |
48 | 48 | } |
49 | 49 | return $this->content[$key]; |
50 | 50 | } |
51 | 51 | |
52 | - protected function _getFirstPart(){ |
|
53 | - if(isset($this->content["thead"])){ |
|
52 | + protected function _getFirstPart() { |
|
53 | + if (isset($this->content["thead"])) { |
|
54 | 54 | return $this->content["thead"]; |
55 | 55 | } |
56 | 56 | return $this->content["tbody"]; |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | * @return boolean |
96 | 96 | */ |
97 | 97 | public function hasPart($key) { |
98 | - return \array_key_exists($key, $this->content) === true; |
|
98 | + return \array_key_exists($key, $this->content)===true; |
|
99 | 99 | } |
100 | 100 | |
101 | 101 | /** |
@@ -230,7 +230,7 @@ discard block |
||
230 | 230 | |
231 | 231 | private function colAlign($colIndex, $function) { |
232 | 232 | if (\is_array($colIndex)) { |
233 | - foreach ( $colIndex as $cIndex ) { |
|
233 | + foreach ($colIndex as $cIndex) { |
|
234 | 234 | $this->colAlign($cIndex, $function); |
235 | 235 | } |
236 | 236 | } else { |
@@ -291,7 +291,7 @@ discard block |
||
291 | 291 | * @see HtmlSemDoubleElement::compile() |
292 | 292 | */ |
293 | 293 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
294 | - if(\sizeof($this->_compileParts)<3){ |
|
294 | + if (\sizeof($this->_compileParts)<3) { |
|
295 | 295 | $this->_template="%content%"; |
296 | 296 | $this->refresh(); |
297 | 297 | } |
@@ -300,11 +300,11 @@ discard block |
||
300 | 300 | } |
301 | 301 | |
302 | 302 | protected function compile_once(JsUtils $js=NULL, &$view=NULL) { |
303 | - parent::compile_once($js,$view); |
|
303 | + parent::compile_once($js, $view); |
|
304 | 304 | if ($this->propertyContains("class", "sortable")) { |
305 | - $this->addEvent("execute", "$('#" . $this->identifier . "').tablesort().data('tablesort').sort($('th.default-sort'));"); |
|
305 | + $this->addEvent("execute", "$('#".$this->identifier."').tablesort().data('tablesort').sort($('th.default-sort'));"); |
|
306 | 306 | } |
307 | - if(isset($this->_activeRowSelector)){ |
|
307 | + if (isset($this->_activeRowSelector)) { |
|
308 | 308 | $this->_activeRowSelector->compile(); |
309 | 309 | } |
310 | 310 | } |
@@ -318,13 +318,13 @@ discard block |
||
318 | 318 | public function fromDatabaseObject($object, $function) { |
319 | 319 | $result=$function($object); |
320 | 320 | if (\is_array($result)) { |
321 | - $result= $this->addRow($function($object)); |
|
321 | + $result=$this->addRow($function($object)); |
|
322 | 322 | } else { |
323 | - $result= $this->getBody()->_addRow($result); |
|
323 | + $result=$this->getBody()->_addRow($result); |
|
324 | 324 | } |
325 | - if(isset($this->_afterCompileEvents["onNewRow"])){ |
|
326 | - if(\is_callable($this->_afterCompileEvents["onNewRow"])) |
|
327 | - $this->_afterCompileEvents["onNewRow"]($result,$object); |
|
325 | + if (isset($this->_afterCompileEvents["onNewRow"])) { |
|
326 | + if (\is_callable($this->_afterCompileEvents["onNewRow"])) |
|
327 | + $this->_afterCompileEvents["onNewRow"]($result, $object); |
|
328 | 328 | } |
329 | 329 | return $result; |
330 | 330 | } |
@@ -339,14 +339,14 @@ discard block |
||
339 | 339 | return $this; |
340 | 340 | } |
341 | 341 | |
342 | - public function refresh(){ |
|
342 | + public function refresh() { |
|
343 | 343 | $this->_footer=$this->getFooter(); |
344 | 344 | $this->addEvent("execute", '$("#'.$this->identifier.' tfoot").replaceWith("'.\addslashes($this->_footer).'");'); |
345 | 345 | } |
346 | 346 | |
347 | - public function run(JsUtils $js){ |
|
348 | - $result= parent::run($js); |
|
349 | - if(isset($this->_footer)) |
|
347 | + public function run(JsUtils $js) { |
|
348 | + $result=parent::run($js); |
|
349 | + if (isset($this->_footer)) |
|
350 | 350 | $this->_footer->run($js); |
351 | 351 | return $result; |
352 | 352 | } |
@@ -369,38 +369,38 @@ discard block |
||
369 | 369 | * @param boolean $multiple |
370 | 370 | * @return HtmlTable |
371 | 371 | */ |
372 | - public function setActiveRowSelector($class="active",$event="click",$multiple=false){ |
|
373 | - $this->_activeRowSelector=new ActiveRow($this,$class,$event,$multiple); |
|
372 | + public function setActiveRowSelector($class="active", $event="click", $multiple=false) { |
|
373 | + $this->_activeRowSelector=new ActiveRow($this, $class, $event, $multiple); |
|
374 | 374 | return $this; |
375 | 375 | } |
376 | 376 | |
377 | - public function hideColumn($colIndex){ |
|
378 | - if(isset($this->content["thead"])){ |
|
377 | + public function hideColumn($colIndex) { |
|
378 | + if (isset($this->content["thead"])) { |
|
379 | 379 | $this->content["thead"]->hideColumn($colIndex); |
380 | 380 | } |
381 | 381 | $this->content["tbody"]->hideColumn($colIndex); |
382 | - if(isset($this->content["tfoot"])){ |
|
382 | + if (isset($this->content["tfoot"])) { |
|
383 | 383 | $this->content["tfoot"]->hideColumn($colIndex); |
384 | 384 | } |
385 | 385 | return $this; |
386 | 386 | } |
387 | 387 | |
388 | - public function setColWidth($colIndex,$width){ |
|
388 | + public function setColWidth($colIndex, $width) { |
|
389 | 389 | $part=$this->_getFirstPart(); |
390 | - if($part!==null && $part->count()>0) |
|
390 | + if ($part!==null && $part->count()>0) |
|
391 | 391 | $part->getCell(0, $colIndex)->setWidth($width); |
392 | 392 | return $this; |
393 | 393 | } |
394 | 394 | |
395 | - public function setColWidths($widths){ |
|
395 | + public function setColWidths($widths) { |
|
396 | 396 | $part=$this->_getFirstPart(); |
397 | - if($part!==null && $part->count()>0){ |
|
397 | + if ($part!==null && $part->count()>0) { |
|
398 | 398 | $count=$part->getColCount(); |
399 | - if(!\is_array($widths)){ |
|
399 | + if (!\is_array($widths)) { |
|
400 | 400 | $widths=\array_fill(0, $count, $widths); |
401 | 401 | } |
402 | - $max=\min(\sizeof($widths),$count); |
|
403 | - for($i=0;$i<$max;$i++){ |
|
402 | + $max=\min(\sizeof($widths), $count); |
|
403 | + for ($i=0; $i<$max; $i++) { |
|
404 | 404 | $part->getCell(0, $i)->setWidth($widths[$i]); |
405 | 405 | } |
406 | 406 | } |
@@ -19,56 +19,56 @@ discard block |
||
19 | 19 | protected $_colWidths; |
20 | 20 | |
21 | 21 | public function __construct($identifier, $modelInstance=NULL) { |
22 | - parent::__construct($identifier, null,$modelInstance); |
|
23 | - $this->_init(new DeInstanceViewer($identifier), "table", new HtmlTable($identifier, 0,2), false); |
|
22 | + parent::__construct($identifier, null, $modelInstance); |
|
23 | + $this->_init(new DeInstanceViewer($identifier), "table", new HtmlTable($identifier, 0, 2), false); |
|
24 | 24 | $this->content["table"]->setDefinition(); |
25 | 25 | } |
26 | 26 | |
27 | - public function compile(JsUtils $js=NULL,&$view=NULL){ |
|
28 | - if(!$this->_generated){ |
|
27 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
28 | + if (!$this->_generated) { |
|
29 | 29 | $this->_instanceViewer->setInstance($this->_modelInstance); |
30 | 30 | |
31 | 31 | $table=$this->content["table"]; |
32 | 32 | $this->_generateContent($table); |
33 | 33 | |
34 | - if(isset($this->_toolbar)){ |
|
34 | + if (isset($this->_toolbar)) { |
|
35 | 35 | $this->_setToolbarPosition($table); |
36 | 36 | } |
37 | - if(isset($this->_colWidths)){ |
|
37 | + if (isset($this->_colWidths)) { |
|
38 | 38 | $this->_applyStyleAttributes($table); |
39 | 39 | } |
40 | - $this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"table",PositionInTable::AFTERTABLE]); |
|
40 | + $this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "table", PositionInTable::AFTERTABLE]); |
|
41 | 41 | $this->_compileForm(); |
42 | 42 | $this->_generated=true; |
43 | 43 | } |
44 | - return parent::compile($js,$view); |
|
44 | + return parent::compile($js, $view); |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | /** |
48 | 48 | * @param HtmlTable $table |
49 | 49 | */ |
50 | - protected function _generateContent($table){ |
|
51 | - $values= $this->_instanceViewer->getValues(); |
|
50 | + protected function _generateContent($table) { |
|
51 | + $values=$this->_instanceViewer->getValues(); |
|
52 | 52 | $captions=$this->_instanceViewer->getCaptions(); |
53 | 53 | $count=$this->_instanceViewer->count(); |
54 | 54 | |
55 | - for($i=0;$i<$count;$i++){ |
|
56 | - $table->addRow([$captions[$i],$values[$i]]); |
|
55 | + for ($i=0; $i<$count; $i++) { |
|
56 | + $table->addRow([$captions[$i], $values[$i]]); |
|
57 | 57 | } |
58 | 58 | } |
59 | 59 | |
60 | - protected function _applyStyleAttributes(HtmlTable $table){ |
|
60 | + protected function _applyStyleAttributes(HtmlTable $table) { |
|
61 | 61 | $table->setColWidths($this->_colWidths); |
62 | 62 | } |
63 | - protected function _getFieldName($index){ |
|
63 | + protected function _getFieldName($index) { |
|
64 | 64 | return $this->_instanceViewer->getFieldName($index); |
65 | 65 | } |
66 | 66 | |
67 | - protected function _getFieldCaption($index){ |
|
67 | + protected function _getFieldCaption($index) { |
|
68 | 68 | return null; |
69 | 69 | } |
70 | 70 | |
71 | - protected function _getFieldIdentifier($prefix,$name=""){ |
|
71 | + protected function _getFieldIdentifier($prefix, $name="") { |
|
72 | 72 | return $this->identifier."-{$prefix}-".$name; |
73 | 73 | } |
74 | 74 | |
@@ -100,11 +100,11 @@ discard block |
||
100 | 100 | return $this; |
101 | 101 | } |
102 | 102 | |
103 | - public function asForm(){ |
|
103 | + public function asForm() { |
|
104 | 104 | return $this->getForm(); |
105 | 105 | } |
106 | 106 | |
107 | - public function setColCaptionWidth($width){ |
|
107 | + public function setColCaptionWidth($width) { |
|
108 | 108 | $this->_colWidths[0]=$width; |
109 | 109 | return $this; |
110 | 110 | } |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | return $this; |
115 | 115 | } |
116 | 116 | |
117 | - public function setColWidths($widths){ |
|
117 | + public function setColWidths($widths) { |
|
118 | 118 | $this->_colWidths=$widths; |
119 | 119 | return $this; |
120 | 120 | } |
@@ -22,15 +22,17 @@ |
||
22 | 22 | |
23 | 23 | public function setBasic($very=false) { |
24 | 24 | $table=$this->_self; |
25 | - if ($very) |
|
26 | - $table->addToPropertyCtrl("class", "very", array ("very" )); |
|
25 | + if ($very) { |
|
26 | + $table->addToPropertyCtrl("class", "very", array ("very" )); |
|
27 | + } |
|
27 | 28 | return $table->addToPropertyCtrl("class", "basic", array ("basic" )); |
28 | 29 | } |
29 | 30 | |
30 | 31 | public function setCompact($very=false) { |
31 | 32 | $table=$this->_self; |
32 | - if ($very) |
|
33 | - $table->addToPropertyCtrl("class", "very", array ("very" )); |
|
33 | + if ($very) { |
|
34 | + $table->addToPropertyCtrl("class", "very", array ("very" )); |
|
35 | + } |
|
34 | 36 | return $table->addToPropertyCtrl("class", "compact", array ("compact" )); |
35 | 37 | } |
36 | 38 |
@@ -7,12 +7,12 @@ discard block |
||
7 | 7 | * @author jc |
8 | 8 | * @property HtmlTable $_self |
9 | 9 | */ |
10 | -trait TableTrait{ |
|
10 | +trait TableTrait { |
|
11 | 11 | |
12 | 12 | abstract public function addEvent($event, $jsCode, $stopPropagation=false, $preventDefault=false); |
13 | 13 | abstract public function getOn($event, $url, $responseElement="", $parameters=array()); |
14 | 14 | |
15 | - protected function addToPropertyTable($property,$value){ |
|
15 | + protected function addToPropertyTable($property, $value) { |
|
16 | 16 | return $this->_self->addToProperty($property, $value); |
17 | 17 | } |
18 | 18 | |
@@ -23,15 +23,15 @@ discard block |
||
23 | 23 | public function setBasic($very=false) { |
24 | 24 | $table=$this->_self; |
25 | 25 | if ($very) |
26 | - $table->addToPropertyCtrl("class", "very", array ("very" )); |
|
27 | - return $table->addToPropertyCtrl("class", "basic", array ("basic" )); |
|
26 | + $table->addToPropertyCtrl("class", "very", array("very")); |
|
27 | + return $table->addToPropertyCtrl("class", "basic", array("basic")); |
|
28 | 28 | } |
29 | 29 | |
30 | 30 | public function setCompact($very=false) { |
31 | 31 | $table=$this->_self; |
32 | 32 | if ($very) |
33 | - $table->addToPropertyCtrl("class", "very", array ("very" )); |
|
34 | - return $table->addToPropertyCtrl("class", "compact", array ("compact" )); |
|
33 | + $table->addToPropertyCtrl("class", "very", array("very")); |
|
34 | + return $table->addToPropertyCtrl("class", "compact", array("compact")); |
|
35 | 35 | } |
36 | 36 | |
37 | 37 | public function setCollapsing() { |
@@ -70,16 +70,16 @@ discard block |
||
70 | 70 | return $this->addToPropertyTable("class", "striped"); |
71 | 71 | } |
72 | 72 | |
73 | - public function onRowClick($jsCode, $stopPropagation=false, $preventDefault=false){ |
|
74 | - $this->onRowClick($jsCode,$stopPropagation,$preventDefault); |
|
73 | + public function onRowClick($jsCode, $stopPropagation=false, $preventDefault=false) { |
|
74 | + $this->onRowClick($jsCode, $stopPropagation, $preventDefault); |
|
75 | 75 | } |
76 | 76 | |
77 | - public function onRow($event,$jsCode, $stopPropagation=false, $preventDefault=false){ |
|
78 | - $this->_self->addEvent($event."{{tr}}",$jsCode,$stopPropagation,$preventDefault); |
|
77 | + public function onRow($event, $jsCode, $stopPropagation=false, $preventDefault=false) { |
|
78 | + $this->_self->addEvent($event."{{tr}}", $jsCode, $stopPropagation, $preventDefault); |
|
79 | 79 | } |
80 | 80 | |
81 | - public function getOnRow($event, $url, $responseElement="", $parameters=array()){ |
|
82 | - $parameters=\array_merge($parameters,["stopPropagation"=>false,"preventDefault"=>false]); |
|
83 | - return $this->_self->getOn($event."{{tbody tr}}", $url,$responseElement,$parameters); |
|
81 | + public function getOnRow($event, $url, $responseElement="", $parameters=array()) { |
|
82 | + $parameters=\array_merge($parameters, ["stopPropagation"=>false, "preventDefault"=>false]); |
|
83 | + return $this->_self->getOn($event."{{tbody tr}}", $url, $responseElement, $parameters); |
|
84 | 84 | } |
85 | 85 | } |
@@ -34,8 +34,9 @@ discard block |
||
34 | 34 | } |
35 | 35 | |
36 | 36 | public function getProperty($name) { |
37 | - if (array_key_exists($name, $this->_self->properties)) |
|
38 | - return $this->_self->properties[$name]; |
|
37 | + if (array_key_exists($name, $this->_self->properties)) { |
|
38 | + return $this->_self->properties[$name]; |
|
39 | + } |
|
39 | 40 | } |
40 | 41 | |
41 | 42 | public function addToProperty($name, $value, $separator=" ") { |
@@ -45,10 +46,11 @@ discard block |
||
45 | 46 | } |
46 | 47 | } else if ($value !== "" && $this->_self->propertyContains($name, $value) === false) { |
47 | 48 | $v=@$this->_self->properties[$name]; |
48 | - if (isset($v) && $v !== "") |
|
49 | - $v=$v . $separator . $value; |
|
50 | - else |
|
51 | - $v=$value; |
|
49 | + if (isset($v) && $v !== "") { |
|
50 | + $v=$v . $separator . $value; |
|
51 | + } else { |
|
52 | + $v=$value; |
|
53 | + } |
|
52 | 54 | |
53 | 55 | return $this->_self->setProperty($name, $v); |
54 | 56 | } |
@@ -71,8 +73,9 @@ discard block |
||
71 | 73 | } |
72 | 74 | |
73 | 75 | protected function addToPropertyUnique($name, $value, $typeCtrl) { |
74 | - if (@class_exists($typeCtrl, true)) |
|
75 | - $typeCtrl=$typeCtrl::getConstants(); |
|
76 | + if (@class_exists($typeCtrl, true)) { |
|
77 | + $typeCtrl=$typeCtrl::getConstants(); |
|
78 | + } |
|
76 | 79 | if (\is_array($typeCtrl)) { |
77 | 80 | $this->_self->removeOldValues($this->_self->properties[$name], $typeCtrl); |
78 | 81 | } |
@@ -91,8 +94,9 @@ discard block |
||
91 | 94 | } |
92 | 95 | |
93 | 96 | public function removeProperty($name) { |
94 | - if (\array_key_exists($name, $this->_self->properties)) |
|
95 | - unset($this->_self->properties[$name]); |
|
97 | + if (\array_key_exists($name, $this->_self->properties)) { |
|
98 | + unset($this->_self->properties[$name]); |
|
99 | + } |
|
96 | 100 | return $this; |
97 | 101 | } |
98 | 102 | |
@@ -105,8 +109,9 @@ discard block |
||
105 | 109 | } |
106 | 110 | |
107 | 111 | protected function setPropertyCtrl($name, $value, $typeCtrl) { |
108 | - if ($this->_self->ctrl($name, $value, $typeCtrl) === true) |
|
109 | - return $this->_self->setProperty($name, $value); |
|
112 | + if ($this->_self->ctrl($name, $value, $typeCtrl) === true) { |
|
113 | + return $this->_self->setProperty($name, $value); |
|
114 | + } |
|
110 | 115 | return $this; |
111 | 116 | } |
112 | 117 |
@@ -9,12 +9,12 @@ discard block |
||
9 | 9 | * @author jc |
10 | 10 | * @property BaseWidget $_self |
11 | 11 | */ |
12 | -trait BaseHtmlPropertiesTrait{ |
|
12 | +trait BaseHtmlPropertiesTrait { |
|
13 | 13 | |
14 | - protected $properties=array (); |
|
14 | + protected $properties=array(); |
|
15 | 15 | abstract protected function ctrl($name, $value, $typeCtrl); |
16 | 16 | abstract protected function removeOldValues(&$oldValue, $allValues); |
17 | - abstract protected function _getElementBy($callback,$elements); |
|
17 | + abstract protected function _getElementBy($callback, $elements); |
|
18 | 18 | public function getProperties() { |
19 | 19 | return $this->_self->properties; |
20 | 20 | } |
@@ -40,13 +40,13 @@ discard block |
||
40 | 40 | |
41 | 41 | public function addToProperty($name, $value, $separator=" ") { |
42 | 42 | if (\is_array($value)) { |
43 | - foreach ( $value as $v ) { |
|
43 | + foreach ($value as $v) { |
|
44 | 44 | $this->_self->addToProperty($name, $v, $separator); |
45 | 45 | } |
46 | - } else if ($value !== "" && $this->_self->propertyContains($name, $value) === false) { |
|
46 | + } else if ($value!=="" && $this->_self->propertyContains($name, $value)===false) { |
|
47 | 47 | $v=@$this->_self->properties[$name]; |
48 | - if (isset($v) && $v !== "") |
|
49 | - $v=$v . $separator . $value; |
|
48 | + if (isset($v) && $v!=="") |
|
49 | + $v=$v.$separator.$value; |
|
50 | 50 | else |
51 | 51 | $v=$value; |
52 | 52 | |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | } |
85 | 85 | |
86 | 86 | public function addToPropertyCtrlCheck($name, $value, $typeCtrl) { |
87 | - if ($this->_self->ctrl($name, $value, $typeCtrl) === true) { |
|
87 | + if ($this->_self->ctrl($name, $value, $typeCtrl)===true) { |
|
88 | 88 | return $this->_self->addToProperty($name, $value); |
89 | 89 | } |
90 | 90 | return $this; |
@@ -105,12 +105,12 @@ discard block |
||
105 | 105 | } |
106 | 106 | |
107 | 107 | protected function setPropertyCtrl($name, $value, $typeCtrl) { |
108 | - if ($this->_self->ctrl($name, $value, $typeCtrl) === true) |
|
108 | + if ($this->_self->ctrl($name, $value, $typeCtrl)===true) |
|
109 | 109 | return $this->_self->setProperty($name, $value); |
110 | 110 | return $this; |
111 | 111 | } |
112 | 112 | |
113 | - protected function getElementByPropertyValue($propertyName,$value, $elements) { |
|
114 | - return $this->_self->_getElementBy(function(BaseHtml $element) use ($propertyName,$value){return $element->propertyContains($propertyName, $value) === true;}, $elements); |
|
113 | + protected function getElementByPropertyValue($propertyName, $value, $elements) { |
|
114 | + return $this->_self->_getElementBy(function(BaseHtml $element) use ($propertyName, $value){return $element->propertyContains($propertyName, $value)===true; }, $elements); |
|
115 | 115 | } |
116 | 116 | } |