@@ -13,27 +13,27 @@ discard block |
||
13 | 13 | * @author jc |
14 | 14 | * |
15 | 15 | */ |
16 | -trait FormTrait{ |
|
16 | +trait FormTrait { |
|
17 | 17 | |
18 | 18 | /** |
19 | 19 | * @return HtmlForm |
20 | 20 | */ |
21 | 21 | abstract protected function getForm(); |
22 | 22 | |
23 | - protected function addCompoValidation($compo,$field){ |
|
23 | + protected function addCompoValidation($compo, $field) { |
|
24 | 24 | $validation=$field->getValidation(); |
25 | - if(isset($validation)){ |
|
25 | + if (isset($validation)) { |
|
26 | 26 | $validation->setIdentifier($field->getDataField()->getIdentifier()); |
27 | 27 | $compo->addFieldValidation($validation); |
28 | 28 | } |
29 | 29 | return $compo; |
30 | 30 | } |
31 | 31 | |
32 | - protected function _runValidationParams(&$compo,JsUtils $js=NULL){ |
|
32 | + protected function _runValidationParams(&$compo, JsUtils $js=NULL) { |
|
33 | 33 | $form=$this->getForm(); |
34 | 34 | $params=$form->getValidationParams(); |
35 | - if(isset($params["_ajaxSubmit"])){ |
|
36 | - $compilation=$this->_compileAjaxSubmit($params["_ajaxSubmit"],$js); |
|
35 | + if (isset($params["_ajaxSubmit"])) { |
|
36 | + $compilation=$this->_compileAjaxSubmit($params["_ajaxSubmit"], $js); |
|
37 | 37 | $this->onSuccess($compilation); |
38 | 38 | $form->removeValidationParam("_ajaxSubmit"); |
39 | 39 | } |
@@ -42,16 +42,16 @@ discard block |
||
42 | 42 | $form->addEventsOnRun($js); |
43 | 43 | } |
44 | 44 | |
45 | - protected function _compileAjaxSubmit($ajaxSubmit,JsUtils $js=null){ |
|
45 | + protected function _compileAjaxSubmit($ajaxSubmit, JsUtils $js=null) { |
|
46 | 46 | $compilation=""; |
47 | - if(\is_array($ajaxSubmit)){ |
|
48 | - foreach ($ajaxSubmit as $ajaxSubmitItem){ |
|
47 | + if (\is_array($ajaxSubmit)) { |
|
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 | - $compilation=str_ireplace("\"","%quote%", $compilation); |
|
54 | + $compilation=str_ireplace("\"", "%quote%", $compilation); |
|
55 | 55 | return $compilation; |
56 | 56 | } |
57 | 57 | |
@@ -64,14 +64,14 @@ discard block |
||
64 | 64 | return $this; |
65 | 65 | } |
66 | 66 | |
67 | - public function setAttached($value=true){ |
|
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 | return $form; |
72 | 72 | } |
73 | 73 | |
74 | - public function addErrorMessage(){ |
|
74 | + public function addErrorMessage() { |
|
75 | 75 | return $this->getForm()->addContent((new HtmlMessage(""))->setError()); |
76 | 76 | } |
77 | 77 | |
@@ -87,47 +87,47 @@ discard block |
||
87 | 87 | * @param array $parameters |
88 | 88 | * @return HtmlForm |
89 | 89 | */ |
90 | - public function submitOn($event,$identifierOrElement,$url,$responseElement,$parameters=NULL){ |
|
90 | + public function submitOn($event, $identifierOrElement, $url, $responseElement, $parameters=NULL) { |
|
91 | 91 | $form=$this->getForm(); |
92 | - if($identifierOrElement instanceof BaseHtml) |
|
92 | + if ($identifierOrElement instanceof BaseHtml) |
|
93 | 93 | $elem=$identifierOrElement; |
94 | 94 | else |
95 | 95 | $elem=$form->getElementById($identifierOrElement, $form->getContent()); |
96 | - if(isset($elem)){ |
|
97 | - $this->_buttonAsSubmit($elem, $event,$url,$responseElement,$parameters); |
|
96 | + if (isset($elem)) { |
|
97 | + $this->_buttonAsSubmit($elem, $event, $url, $responseElement, $parameters); |
|
98 | 98 | } |
99 | 99 | return $form; |
100 | 100 | } |
101 | 101 | |
102 | - public function submitOnClick($identifier,$url,$responseElement,$parameters=NULL){ |
|
103 | - return $this->submitOn("click", $identifier, $url, $responseElement,$parameters); |
|
102 | + public function submitOnClick($identifier, $url, $responseElement, $parameters=NULL) { |
|
103 | + return $this->submitOn("click", $identifier, $url, $responseElement, $parameters); |
|
104 | 104 | } |
105 | 105 | |
106 | - public function addSubmit($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$parameters=NULL){ |
|
107 | - $bt=$this->getForm()->addButton($identifier, $value,$cssStyle); |
|
108 | - return $this->_buttonAsSubmit($bt, "click",$url,$responseElement,$parameters); |
|
106 | + public function addSubmit($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $parameters=NULL) { |
|
107 | + $bt=$this->getForm()->addButton($identifier, $value, $cssStyle); |
|
108 | + return $this->_buttonAsSubmit($bt, "click", $url, $responseElement, $parameters); |
|
109 | 109 | } |
110 | 110 | |
111 | - protected function _buttonAsSubmit(BaseHtml &$button,$event,$url,$responseElement=NULL,$parameters=NULL){ |
|
111 | + protected function _buttonAsSubmit(BaseHtml&$button, $event, $url, $responseElement=NULL, $parameters=NULL) { |
|
112 | 112 | $form=$this->getForm(); |
113 | - if(isset($url) && isset($responseElement)){ |
|
114 | - $button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');",true,true); |
|
115 | - $this->setSubmitParams($url,$responseElement,$parameters); |
|
113 | + if (isset($url) && isset($responseElement)) { |
|
114 | + $button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');", true, true); |
|
115 | + $this->setSubmitParams($url, $responseElement, $parameters); |
|
116 | 116 | } |
117 | 117 | return $button; |
118 | 118 | } |
119 | 119 | |
120 | - public function setSubmitParams($url,$responseElement=NULL,$parameters=NULL){ |
|
120 | + public function setSubmitParams($url, $responseElement=NULL, $parameters=NULL) { |
|
121 | 121 | $form=$this->getForm(); |
122 | - $params=["form"=>$form->getIdentifier(),"responseElement"=>$responseElement,"url"=>$url,"stopPropagation"=>true]; |
|
123 | - if(\is_array($parameters)) |
|
124 | - $params=\array_merge($params,$parameters); |
|
122 | + $params=["form"=>$form->getIdentifier(), "responseElement"=>$responseElement, "url"=>$url, "stopPropagation"=>true]; |
|
123 | + if (\is_array($parameters)) |
|
124 | + $params=\array_merge($params, $parameters); |
|
125 | 125 | $form->addValidationParam("_ajaxSubmit", new AjaxCall("postForm", $params)); |
126 | 126 | return $this; |
127 | 127 | } |
128 | 128 | |
129 | - public function addReset($identifier,$value,$cssStyle=NULL){ |
|
130 | - $bt=$this->getForm()->addButton($identifier, $value,$cssStyle); |
|
129 | + public function addReset($identifier, $value, $cssStyle=NULL) { |
|
130 | + $bt=$this->getForm()->addButton($identifier, $value, $cssStyle); |
|
131 | 131 | $bt->setProperty("type", "reset"); |
132 | 132 | return $bt; |
133 | 133 | } |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | * @param string $jsCode |
138 | 138 | * @return \Ajax\semantic\html\collections\form\HtmlForm |
139 | 139 | */ |
140 | - public function onValid($jsCode){ |
|
140 | + public function onValid($jsCode) { |
|
141 | 141 | $form=$this->getForm(); |
142 | 142 | $form->addValidationParam("onValid", "%function(){".$jsCode."}%"); |
143 | 143 | return $form; |
@@ -148,9 +148,9 @@ discard block |
||
148 | 148 | * @param string $jsCode can use event and fields parameters |
149 | 149 | * @return HtmlForm |
150 | 150 | */ |
151 | - public function onSuccess($jsCode){ |
|
151 | + public function onSuccess($jsCode) { |
|
152 | 152 | $form=$this->getForm(); |
153 | - $form->addValidationParam("onSuccess", $jsCode,"%function(event,fields){","}%"); |
|
153 | + $form->addValidationParam("onSuccess", $jsCode, "%function(event,fields){", "}%"); |
|
154 | 154 | return $form; |
155 | 155 | } |
156 | 156 | } |
157 | 157 | \ No newline at end of file |
@@ -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 | } |
@@ -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); |
@@ -25,8 +25,8 @@ discard block |
||
25 | 25 | * @param string $jqueryDone the jquery function call on ajax data. default:html |
26 | 26 | * @param string|callable $ajaxTransition |
27 | 27 | */ |
28 | - public function get($url, $responseElement="", $params="{}", $jsCallback=NULL,$hasLoader=true,$jqueryDone="html",$ajaxTransition=null) { |
|
29 | - return $this->js->_get($url, $params, $responseElement, $jsCallback, NULL, $hasLoader,$jqueryDone,$ajaxTransition,true); |
|
28 | + public function get($url, $responseElement="", $params="{}", $jsCallback=NULL, $hasLoader=true, $jqueryDone="html", $ajaxTransition=null) { |
|
29 | + return $this->js->_get($url, $params, $responseElement, $jsCallback, NULL, $hasLoader, $jqueryDone, $ajaxTransition, true); |
|
30 | 30 | } |
31 | 31 | |
32 | 32 | /** |
@@ -37,8 +37,8 @@ discard block |
||
37 | 37 | * @param string $jsCallback javascript code to execute after the request |
38 | 38 | * @param boolean $immediatly |
39 | 39 | */ |
40 | - public function json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document",$immediatly=false) { |
|
41 | - return $this->js->_json($url, $method, $params, $jsCallback, $attr, $context,$immediatly); |
|
40 | + public function json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document", $immediatly=false) { |
|
41 | + return $this->js->_json($url, $method, $params, $jsCallback, $attr, $context, $immediatly); |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | /** |
@@ -48,8 +48,8 @@ discard block |
||
48 | 48 | * @param string $url the request address |
49 | 49 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true) |
50 | 50 | */ |
51 | - public function jsonOn($event,$element, $url,$parameters=array()) { |
|
52 | - return $this->js->_jsonOn($event, $element, $url,$parameters); |
|
51 | + public function jsonOn($event, $element, $url, $parameters=array()) { |
|
52 | + return $this->js->_jsonOn($event, $element, $url, $parameters); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | /** |
@@ -71,8 +71,8 @@ discard block |
||
71 | 71 | * @param string $jsCallback javascript code to execute after the request |
72 | 72 | * @param string $rowClass the css class for the new element |
73 | 73 | */ |
74 | - public function jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL,$rowClass="_json") { |
|
75 | - return $this->js->_jsonArray($maskSelector, $url, $method, $params, $jsCallback,"id", NULL,$rowClass,true); |
|
74 | + public function jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $rowClass="_json") { |
|
75 | + return $this->js->_jsonArray($maskSelector, $url, $method, $params, $jsCallback, "id", NULL, $rowClass, true); |
|
76 | 76 | } |
77 | 77 | |
78 | 78 | /** |
@@ -84,8 +84,8 @@ discard block |
||
84 | 84 | * @param string $jsCallback javascript code to execute after the request |
85 | 85 | * @param string $rowClass the css class for the new element |
86 | 86 | */ |
87 | - public function jsonArrayDeferred($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL,$rowClass="_json") { |
|
88 | - return $this->js->_jsonArray($maskSelector, $url, $method, $params, $jsCallback,"id", NULL, $rowClass,false); |
|
87 | + public function jsonArrayDeferred($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $rowClass="_json") { |
|
88 | + return $this->js->_jsonArray($maskSelector, $url, $method, $params, $jsCallback, "id", NULL, $rowClass, false); |
|
89 | 89 | } |
90 | 90 | |
91 | 91 | /** |
@@ -95,8 +95,8 @@ discard block |
||
95 | 95 | * @param string $url the request url |
96 | 96 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","rowClass"=>"_json","immediatly"=>true) |
97 | 97 | */ |
98 | - public function jsonArrayOn($event,$element,$maskSelector, $url,$parameters=array()) { |
|
99 | - return $this->js->_jsonArrayOn($event,$element,$maskSelector, $url, $parameters); |
|
98 | + public function jsonArrayOn($event, $element, $maskSelector, $url, $parameters=array()) { |
|
99 | + return $this->js->_jsonArrayOn($event, $element, $maskSelector, $url, $parameters); |
|
100 | 100 | } |
101 | 101 | |
102 | 102 | /** |
@@ -110,8 +110,8 @@ discard block |
||
110 | 110 | * @param string $jqueryDone the jquery function call on ajax data. default:html |
111 | 111 | * @param string|callable $ajaxTransition |
112 | 112 | */ |
113 | - public function getDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL,$attr="id",$jqueryDone="html",$ajaxTransition=null) { |
|
114 | - return $this->js->_get($url, $params, $responseElement, $jsCallback, $attr, false,$jqueryDone,$ajaxTransition); |
|
113 | + public function getDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id", $jqueryDone="html", $ajaxTransition=null) { |
|
114 | + return $this->js->_get($url, $params, $responseElement, $jsCallback, $attr, false, $jqueryDone, $ajaxTransition); |
|
115 | 115 | } |
116 | 116 | |
117 | 117 | /** |
@@ -150,8 +150,8 @@ discard block |
||
150 | 150 | * @param string $jqueryDone the jquery function call on ajax data. default:html |
151 | 151 | * @param string|callable $ajaxTransition |
152 | 152 | */ |
153 | - public function post($url, $responseElement="", $params="{}", $jsCallback=NULL,$hasLoader=true,$jqueryDone="html",$ajaxTransition=null) { |
|
154 | - return $this->js->_post($url, $params, $responseElement, $jsCallback, NULL, $hasLoader,$jqueryDone,$ajaxTransition,true); |
|
153 | + public function post($url, $responseElement="", $params="{}", $jsCallback=NULL, $hasLoader=true, $jqueryDone="html", $ajaxTransition=null) { |
|
154 | + return $this->js->_post($url, $params, $responseElement, $jsCallback, NULL, $hasLoader, $jqueryDone, $ajaxTransition, true); |
|
155 | 155 | } |
156 | 156 | |
157 | 157 | /** |
@@ -166,8 +166,8 @@ discard block |
||
166 | 166 | * @param string $jqueryDone the jquery function call on ajax data. default:html |
167 | 167 | * @param string|callable $ajaxTransition |
168 | 168 | */ |
169 | - public function postDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id",$hasLoader=true,$jqueryDone="html",$ajaxTransition=null) { |
|
170 | - return $this->js->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader,$jqueryDone,$ajaxTransition,false); |
|
169 | + public function postDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id", $hasLoader=true, $jqueryDone="html", $ajaxTransition=null) { |
|
170 | + return $this->js->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition, false); |
|
171 | 171 | } |
172 | 172 | |
173 | 173 | /** |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null) |
182 | 182 | */ |
183 | 183 | public function postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) { |
184 | - return $this->js->_postOn($event, $element, $url, $params, $responseElement, $parameters); |
|
184 | + return $this->js->_postOn($event, $element, $url, $params, $responseElement, $parameters); |
|
185 | 185 | } |
186 | 186 | |
187 | 187 | /** |
@@ -207,8 +207,8 @@ discard block |
||
207 | 207 | * @param string $jqueryDone the jquery function call on ajax data. default:html |
208 | 208 | * @param string|callable $ajaxTransition |
209 | 209 | */ |
210 | - public function postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL,$hasLoader=true,$jqueryDone="html",$ajaxTransition=null) { |
|
211 | - return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, NULL, $hasLoader,$jqueryDone,$ajaxTransition,true); |
|
210 | + public function postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $hasLoader=true, $jqueryDone="html", $ajaxTransition=null) { |
|
211 | + return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, NULL, $hasLoader, $jqueryDone, $ajaxTransition, true); |
|
212 | 212 | } |
213 | 213 | |
214 | 214 | /** |
@@ -223,8 +223,8 @@ discard block |
||
223 | 223 | * @param string $jqueryDone the jquery function call on ajax data. default:html |
224 | 224 | * @param string|callable $ajaxTransition |
225 | 225 | */ |
226 | - public function postFormDeferred($url, $form, $responseElement, $validation=false, $jsCallback=NULL,$attr="id",$hasLoader=true,$jqueryDone="html",$ajaxTransition=null) { |
|
227 | - return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader,$jqueryDone,$ajaxTransition,false); |
|
226 | + public function postFormDeferred($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true, $jqueryDone="html", $ajaxTransition=null) { |
|
227 | + return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition, false); |
|
228 | 228 | } |
229 | 229 | |
230 | 230 | /** |
@@ -238,7 +238,7 @@ discard block |
||
238 | 238 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null) |
239 | 239 | */ |
240 | 240 | public function postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) { |
241 | - return $this->js->_postFormOn($event,$element, $url, $form, $responseElement, $parameters); |
|
241 | + return $this->js->_postFormOn($event, $element, $url, $form, $responseElement, $parameters); |
|
242 | 242 | } |
243 | 243 | |
244 | 244 | /** |
@@ -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,7 +22,7 @@ discard block |
||
22 | 22 | * @return \Ajax\semantic\html\elements\HtmlDivider |
23 | 23 | */ |
24 | 24 | public function setVertical() { |
25 | - return $this->addToPropertyCtrl("class", "vertical", array ("vertical","horizontal" )); |
|
25 | + return $this->addToPropertyCtrl("class", "vertical", array("vertical", "horizontal")); |
|
26 | 26 | } |
27 | 27 | |
28 | 28 | /** |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | * @return \Ajax\semantic\html\elements\HtmlDivider |
31 | 31 | */ |
32 | 32 | public function setHorizontal() { |
33 | - return $this->addToPropertyCtrl("class", "horizontal", array ("vertical","horizontal" )); |
|
33 | + return $this->addToPropertyCtrl("class", "horizontal", array("vertical", "horizontal")); |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | /** |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | return $this->addToProperty("class", "header"); |
58 | 58 | } |
59 | 59 | |
60 | - public function setIgnored(){ |
|
60 | + public function setIgnored() { |
|
61 | 61 | return $this->addToProperty("class", "ignored"); |
62 | 62 | } |
63 | 63 | } |
64 | 64 | \ No newline at end of file |
@@ -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 | } |
86 | 86 | \ No newline at end of file |
@@ -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 |
@@ -15,8 +15,8 @@ discard block |
||
15 | 15 | * @property HtmlSemDoubleElement $_self |
16 | 16 | */ |
17 | 17 | trait BaseTrait { |
18 | - protected $_variations=[ ]; |
|
19 | - protected $_states=[ ]; |
|
18 | + protected $_variations=[]; |
|
19 | + protected $_states=[]; |
|
20 | 20 | protected $_baseClass; |
21 | 21 | |
22 | 22 | abstract protected function setPropertyCtrl($name, $value, $typeCtrl); |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | |
30 | 30 | abstract public function setProperty($name, $value); |
31 | 31 | |
32 | - abstract public function addContent($content,$before=false); |
|
32 | + abstract public function addContent($content, $before=false); |
|
33 | 33 | |
34 | 34 | abstract public function onCreate($jsCode); |
35 | 35 | |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | $this->_self->setProperty("class", $this->_self->_baseClass); |
51 | 51 | if (\is_string($variations)) |
52 | 52 | $variations=\explode(" ", $variations); |
53 | - foreach ( $variations as $variation ) { |
|
53 | + foreach ($variations as $variation) { |
|
54 | 54 | $this->_self->addVariation($variation); |
55 | 55 | } |
56 | 56 | return $this; |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | public function addVariations($variations=array()) { |
65 | 65 | if (\is_string($variations)) |
66 | 66 | $variations=\explode(" ", $variations); |
67 | - foreach ( $variations as $variation ) { |
|
67 | + foreach ($variations as $variation) { |
|
68 | 68 | $this->_self->addVariation($variation); |
69 | 69 | } |
70 | 70 | return $this; |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | public function addStates($states=array()) { |
74 | 74 | if (\is_string($states)) |
75 | 75 | $states=\explode(" ", $states); |
76 | - foreach ( $states as $state ) { |
|
76 | + foreach ($states as $state) { |
|
77 | 77 | $this->_self->addState($state); |
78 | 78 | } |
79 | 79 | return $this; |
@@ -83,17 +83,17 @@ discard block |
||
83 | 83 | $this->_self->setProperty("class", $this->_self->_baseClass); |
84 | 84 | if (\is_string($states)) |
85 | 85 | $states=\explode(" ", $states); |
86 | - foreach ( $states as $state ) { |
|
86 | + foreach ($states as $state) { |
|
87 | 87 | $this->_self->addState($state); |
88 | 88 | } |
89 | 89 | return $this; |
90 | 90 | } |
91 | 91 | |
92 | 92 | public function addIcon($icon, $before=true) { |
93 | - return $this->_self->addContent(new HtmlIcon("icon-" . $this->_self->identifier, $icon), $before); |
|
93 | + return $this->_self->addContent(new HtmlIcon("icon-".$this->_self->identifier, $icon), $before); |
|
94 | 94 | } |
95 | 95 | |
96 | - public function addSticky($context="body"){ |
|
96 | + public function addSticky($context="body") { |
|
97 | 97 | $this->_self->onCreate("$('#".$this->_self->identifier."').sticky({ context: '".$context."'});"); |
98 | 98 | return $this; |
99 | 99 | } |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | * @return HtmlSemDoubleElement |
115 | 115 | */ |
116 | 116 | public function setDisabled($disable=true) { |
117 | - if($disable) |
|
117 | + if ($disable) |
|
118 | 118 | $this->_self->addToProperty("class", "disabled"); |
119 | 119 | return $this; |
120 | 120 | } |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | * |
141 | 141 | * @return HtmlSemDoubleElement |
142 | 142 | */ |
143 | - public function asHeader(){ |
|
143 | + public function asHeader() { |
|
144 | 144 | return $this->_self->addToProperty("class", "header"); |
145 | 145 | } |
146 | 146 | |
@@ -148,15 +148,15 @@ discard block |
||
148 | 148 | * show it is currently the active user selection |
149 | 149 | * @return HtmlSemDoubleElement |
150 | 150 | */ |
151 | - public function setActive($value=true){ |
|
152 | - if($value) |
|
151 | + public function setActive($value=true) { |
|
152 | + if ($value) |
|
153 | 153 | $this->_self->addToProperty("class", "active"); |
154 | 154 | return $this; |
155 | 155 | } |
156 | 156 | |
157 | - public function setAttached($value=true){ |
|
158 | - if($value) |
|
159 | - $this->_self->addToPropertyCtrl("class", "attached", array ("attached" )); |
|
157 | + public function setAttached($value=true) { |
|
158 | + if ($value) |
|
159 | + $this->_self->addToPropertyCtrl("class", "attached", array("attached")); |
|
160 | 160 | return $this; |
161 | 161 | } |
162 | 162 | |
@@ -164,13 +164,13 @@ discard block |
||
164 | 164 | * can be formatted to appear on dark backgrounds |
165 | 165 | */ |
166 | 166 | public function setInverted($recursive=true) { |
167 | - if($recursive===true){ |
|
167 | + if ($recursive===true) { |
|
168 | 168 | $content=$this->_self->getContent(); |
169 | - if($content instanceof HtmlSemDoubleElement) |
|
169 | + if ($content instanceof HtmlSemDoubleElement) |
|
170 | 170 | $content->setInverted($recursive); |
171 | - elseif(\is_array($content) || $content instanceof \Traversable){ |
|
172 | - foreach ($content as $elm){ |
|
173 | - if($elm instanceof HtmlSemDoubleElement){ |
|
171 | + elseif (\is_array($content) || $content instanceof \Traversable) { |
|
172 | + foreach ($content as $elm) { |
|
173 | + if ($elm instanceof HtmlSemDoubleElement) { |
|
174 | 174 | $elm->setInverted($recursive); |
175 | 175 | } |
176 | 176 | } |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | } |
185 | 185 | |
186 | 186 | public function setFloated($direction="right") { |
187 | - return $this->_self->addToPropertyCtrl("class", $direction . " floated", Direction::getConstantValues("floated")); |
|
187 | + return $this->_self->addToPropertyCtrl("class", $direction." floated", Direction::getConstantValues("floated")); |
|
188 | 188 | } |
189 | 189 | |
190 | 190 | public function floatRight() { |
@@ -199,14 +199,14 @@ discard block |
||
199 | 199 | return $this->_self->_baseClass; |
200 | 200 | } |
201 | 201 | |
202 | - protected function addBehavior(&$array,$key,$value,$before="",$after=""){ |
|
203 | - if(\is_string($value)){ |
|
204 | - if(isset($array[$key])){ |
|
202 | + protected function addBehavior(&$array, $key, $value, $before="", $after="") { |
|
203 | + if (\is_string($value)) { |
|
204 | + if (isset($array[$key])) { |
|
205 | 205 | $p=JString::replaceAtFirstAndLast($array[$key], $before, "", $after, ""); |
206 | 206 | $array[$key]=$before.$p.$value.$after; |
207 | - }else |
|
207 | + } else |
|
208 | 208 | $array[$key]=$before.$value.$after; |
209 | - }else{ |
|
209 | + } else { |
|
210 | 210 | $array[$key]=$value; |
211 | 211 | } |
212 | 212 | return $this; |
@@ -48,8 +48,9 @@ discard block |
||
48 | 48 | |
49 | 49 | public function setVariations($variations) { |
50 | 50 | $this->_self->setProperty("class", $this->_self->_baseClass); |
51 | - if (\is_string($variations)) |
|
52 | - $variations=\explode(" ", $variations); |
|
51 | + if (\is_string($variations)) { |
|
52 | + $variations=\explode(" ", $variations); |
|
53 | + } |
|
53 | 54 | foreach ( $variations as $variation ) { |
54 | 55 | $this->_self->addVariation($variation); |
55 | 56 | } |
@@ -62,8 +63,9 @@ discard block |
||
62 | 63 | } |
63 | 64 | |
64 | 65 | public function addVariations($variations=array()) { |
65 | - if (\is_string($variations)) |
|
66 | - $variations=\explode(" ", $variations); |
|
66 | + if (\is_string($variations)) { |
|
67 | + $variations=\explode(" ", $variations); |
|
68 | + } |
|
67 | 69 | foreach ( $variations as $variation ) { |
68 | 70 | $this->_self->addVariation($variation); |
69 | 71 | } |
@@ -71,8 +73,9 @@ discard block |
||
71 | 73 | } |
72 | 74 | |
73 | 75 | public function addStates($states=array()) { |
74 | - if (\is_string($states)) |
|
75 | - $states=\explode(" ", $states); |
|
76 | + if (\is_string($states)) { |
|
77 | + $states=\explode(" ", $states); |
|
78 | + } |
|
76 | 79 | foreach ( $states as $state ) { |
77 | 80 | $this->_self->addState($state); |
78 | 81 | } |
@@ -81,8 +84,9 @@ discard block |
||
81 | 84 | |
82 | 85 | public function setStates($states) { |
83 | 86 | $this->_self->setProperty("class", $this->_self->_baseClass); |
84 | - if (\is_string($states)) |
|
85 | - $states=\explode(" ", $states); |
|
87 | + if (\is_string($states)) { |
|
88 | + $states=\explode(" ", $states); |
|
89 | + } |
|
86 | 90 | foreach ( $states as $state ) { |
87 | 91 | $this->_self->addState($state); |
88 | 92 | } |
@@ -114,8 +118,9 @@ discard block |
||
114 | 118 | * @return HtmlSemDoubleElement |
115 | 119 | */ |
116 | 120 | public function setDisabled($disable=true) { |
117 | - if($disable) |
|
118 | - $this->_self->addToProperty("class", "disabled"); |
|
121 | + if($disable) { |
|
122 | + $this->_self->addToProperty("class", "disabled"); |
|
123 | + } |
|
119 | 124 | return $this; |
120 | 125 | } |
121 | 126 | |
@@ -149,14 +154,16 @@ discard block |
||
149 | 154 | * @return HtmlSemDoubleElement |
150 | 155 | */ |
151 | 156 | public function setActive($value=true){ |
152 | - if($value) |
|
153 | - $this->_self->addToProperty("class", "active"); |
|
157 | + if($value) { |
|
158 | + $this->_self->addToProperty("class", "active"); |
|
159 | + } |
|
154 | 160 | return $this; |
155 | 161 | } |
156 | 162 | |
157 | 163 | public function setAttached($value=true){ |
158 | - if($value) |
|
159 | - $this->_self->addToPropertyCtrl("class", "attached", array ("attached" )); |
|
164 | + if($value) { |
|
165 | + $this->_self->addToPropertyCtrl("class", "attached", array ("attached" )); |
|
166 | + } |
|
160 | 167 | return $this; |
161 | 168 | } |
162 | 169 | |
@@ -166,9 +173,9 @@ discard block |
||
166 | 173 | public function setInverted($recursive=true) { |
167 | 174 | if($recursive===true){ |
168 | 175 | $content=$this->_self->getContent(); |
169 | - if($content instanceof HtmlSemDoubleElement) |
|
170 | - $content->setInverted($recursive); |
|
171 | - elseif(\is_array($content) || $content instanceof \Traversable){ |
|
176 | + if($content instanceof HtmlSemDoubleElement) { |
|
177 | + $content->setInverted($recursive); |
|
178 | + } elseif(\is_array($content) || $content instanceof \Traversable){ |
|
172 | 179 | foreach ($content as $elm){ |
173 | 180 | if($elm instanceof HtmlSemDoubleElement){ |
174 | 181 | $elm->setInverted($recursive); |
@@ -204,9 +211,10 @@ discard block |
||
204 | 211 | if(isset($array[$key])){ |
205 | 212 | $p=JString::replaceAtFirstAndLast($array[$key], $before, "", $after, ""); |
206 | 213 | $array[$key]=$before.$p.$value.$after; |
207 | - }else |
|
208 | - $array[$key]=$before.$value.$after; |
|
209 | - }else{ |
|
214 | + } else { |
|
215 | + $array[$key]=$before.$value.$after; |
|
216 | + } |
|
217 | + } else{ |
|
210 | 218 | $array[$key]=$value; |
211 | 219 | } |
212 | 220 | return $this; |