@@ -49,7 +49,7 @@ discard block |
||
49 | 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 | 55 | $compilation=str_ireplace("\"","%quote%", $compilation); |
@@ -67,8 +67,9 @@ discard block |
||
67 | 67 | |
68 | 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 | 73 | return $form; |
73 | 74 | } |
74 | 75 | |
@@ -90,10 +91,11 @@ discard block |
||
90 | 91 | */ |
91 | 92 | public function submitOn($event,$identifierOrElement,$url,$responseElement,$parameters=NULL){ |
92 | 93 | $form=$this->getForm(); |
93 | - if($identifierOrElement instanceof BaseHtml) |
|
94 | - $elem=$identifierOrElement; |
|
95 | - else |
|
96 | - $elem=$form->getElementById($identifierOrElement, $form->getContent()); |
|
94 | + if($identifierOrElement instanceof BaseHtml) { |
|
95 | + $elem=$identifierOrElement; |
|
96 | + } else { |
|
97 | + $elem=$form->getElementById($identifierOrElement, $form->getContent()); |
|
98 | + } |
|
97 | 99 | if(isset($elem)){ |
98 | 100 | $this->_buttonAsSubmit($elem, $event,$url,$responseElement,$parameters); |
99 | 101 | } |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | * @author jc |
16 | 16 | * |
17 | 17 | */ |
18 | -trait FormTrait{ |
|
18 | +trait FormTrait { |
|
19 | 19 | |
20 | 20 | /** |
21 | 21 | * @return HtmlForm |
@@ -23,23 +23,23 @@ discard block |
||
23 | 23 | abstract protected function getForm(); |
24 | 24 | |
25 | 25 | |
26 | - protected function addCompoValidation(Form $compo,HtmlFormField $field){ |
|
26 | + protected function addCompoValidation(Form $compo, HtmlFormField $field) { |
|
27 | 27 | $validation=$field->getValidation(); |
28 | - if(isset($validation)){ |
|
28 | + if (isset($validation)) { |
|
29 | 29 | $validation->setIdentifier($field->getDataField()->getIdentifier()); |
30 | 30 | $compo->addFieldValidation($validation); |
31 | 31 | } |
32 | 32 | } |
33 | 33 | |
34 | - protected function addExtraCompoValidation(Form $compo,FieldValidation $validation){ |
|
34 | + protected function addExtraCompoValidation(Form $compo, FieldValidation $validation) { |
|
35 | 35 | $compo->addFieldValidation($validation); |
36 | 36 | } |
37 | 37 | |
38 | - protected function _runValidationParams(Form &$compo,JsUtils $js=NULL){ |
|
38 | + protected function _runValidationParams(Form &$compo, JsUtils $js=NULL) { |
|
39 | 39 | $form=$this->getForm(); |
40 | 40 | $params=$form->getValidationParams(); |
41 | - if(isset($params["_ajaxSubmit"])){ |
|
42 | - $compilation=$this->_compileAjaxSubmit($params["_ajaxSubmit"],$js); |
|
41 | + if (isset($params["_ajaxSubmit"])) { |
|
42 | + $compilation=$this->_compileAjaxSubmit($params["_ajaxSubmit"], $js); |
|
43 | 43 | $this->onSuccess($compilation); |
44 | 44 | $form->removeValidationParam("_ajaxSubmit"); |
45 | 45 | } |
@@ -48,16 +48,16 @@ discard block |
||
48 | 48 | $form->addEventsOnRun($js); |
49 | 49 | } |
50 | 50 | |
51 | - protected function _compileAjaxSubmit($ajaxSubmit,JsUtils $js=null){ |
|
51 | + protected function _compileAjaxSubmit($ajaxSubmit, JsUtils $js=null) { |
|
52 | 52 | $compilation=""; |
53 | - if(\is_array($ajaxSubmit)){ |
|
54 | - foreach ($ajaxSubmit as $ajaxSubmitItem){ |
|
53 | + if (\is_array($ajaxSubmit)) { |
|
54 | + foreach ($ajaxSubmit as $ajaxSubmitItem) { |
|
55 | 55 | $compilation.=$ajaxSubmitItem->compile($js); |
56 | 56 | } |
57 | - }elseif($ajaxSubmit instanceof AjaxCall){ |
|
57 | + }elseif ($ajaxSubmit instanceof AjaxCall) { |
|
58 | 58 | $compilation=$ajaxSubmit->compile($js); |
59 | 59 | } |
60 | - $compilation=str_ireplace("\"","%quote%", $compilation); |
|
60 | + $compilation=str_ireplace("\"", "%quote%", $compilation); |
|
61 | 61 | return $compilation; |
62 | 62 | } |
63 | 63 | |
@@ -70,14 +70,14 @@ discard block |
||
70 | 70 | return $this; |
71 | 71 | } |
72 | 72 | |
73 | - public function setAttached($value=true){ |
|
73 | + public function setAttached($value=true) { |
|
74 | 74 | $form=$this->getForm(); |
75 | - if($value) |
|
76 | - $form->addToPropertyCtrl("class", "attached", array ("attached" )); |
|
75 | + if ($value) |
|
76 | + $form->addToPropertyCtrl("class", "attached", array("attached")); |
|
77 | 77 | return $form; |
78 | 78 | } |
79 | 79 | |
80 | - public function addErrorMessage(){ |
|
80 | + public function addErrorMessage() { |
|
81 | 81 | return $this->getForm()->addContent((new HtmlMessage(""))->setError()); |
82 | 82 | } |
83 | 83 | |
@@ -93,48 +93,48 @@ discard block |
||
93 | 93 | * @param array $parameters |
94 | 94 | * @return HtmlForm |
95 | 95 | */ |
96 | - public function submitOn($event,$identifierOrElement,$url,$responseElement,$parameters=NULL){ |
|
96 | + public function submitOn($event, $identifierOrElement, $url, $responseElement, $parameters=NULL) { |
|
97 | 97 | $form=$this->getForm(); |
98 | - if($identifierOrElement instanceof BaseHtml) |
|
98 | + if ($identifierOrElement instanceof BaseHtml) |
|
99 | 99 | $elem=$identifierOrElement; |
100 | 100 | else |
101 | 101 | $elem=$form->getElementById($identifierOrElement, $form->getContent()); |
102 | - if(isset($elem)){ |
|
103 | - $this->_buttonAsSubmit($elem, $event,$url,$responseElement,$parameters); |
|
102 | + if (isset($elem)) { |
|
103 | + $this->_buttonAsSubmit($elem, $event, $url, $responseElement, $parameters); |
|
104 | 104 | } |
105 | 105 | return $form; |
106 | 106 | } |
107 | 107 | |
108 | - public function submitOnClick($identifier,$url,$responseElement,$parameters=NULL){ |
|
109 | - return $this->submitOn("click", $identifier, $url, $responseElement,$parameters); |
|
108 | + public function submitOnClick($identifier, $url, $responseElement, $parameters=NULL) { |
|
109 | + return $this->submitOn("click", $identifier, $url, $responseElement, $parameters); |
|
110 | 110 | } |
111 | 111 | |
112 | - public function addSubmit($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$parameters=NULL){ |
|
113 | - $bt=$this->getForm()->addButton($identifier, $value,$cssStyle); |
|
114 | - return $this->_buttonAsSubmit($bt, "click",$url,$responseElement,$parameters); |
|
112 | + public function addSubmit($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $parameters=NULL) { |
|
113 | + $bt=$this->getForm()->addButton($identifier, $value, $cssStyle); |
|
114 | + return $this->_buttonAsSubmit($bt, "click", $url, $responseElement, $parameters); |
|
115 | 115 | } |
116 | 116 | |
117 | - protected function _buttonAsSubmit(BaseHtml &$button,$event,$url,$responseElement=NULL,$parameters=NULL){ |
|
117 | + protected function _buttonAsSubmit(BaseHtml &$button, $event, $url, $responseElement=NULL, $parameters=NULL) { |
|
118 | 118 | $form=$this->getForm(); |
119 | - if(isset($url) && isset($responseElement)){ |
|
120 | - $button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');",true,true); |
|
121 | - $this->setSubmitParams($url,$responseElement,$parameters); |
|
119 | + if (isset($url) && isset($responseElement)) { |
|
120 | + $button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');", true, true); |
|
121 | + $this->setSubmitParams($url, $responseElement, $parameters); |
|
122 | 122 | } |
123 | 123 | return $button; |
124 | 124 | } |
125 | 125 | |
126 | - public function setSubmitParams($url,$responseElement=NULL,$parameters=NULL){ |
|
126 | + public function setSubmitParams($url, $responseElement=NULL, $parameters=NULL) { |
|
127 | 127 | $form=$this->getForm(); |
128 | - $params=["form"=>$form->getIdentifier(),"responseElement"=>$responseElement,"url"=>$url,"stopPropagation"=>true]; |
|
129 | - if(\is_array($parameters)){ |
|
130 | - $params=\array_merge($params,$parameters); |
|
128 | + $params=["form"=>$form->getIdentifier(), "responseElement"=>$responseElement, "url"=>$url, "stopPropagation"=>true]; |
|
129 | + if (\is_array($parameters)) { |
|
130 | + $params=\array_merge($params, $parameters); |
|
131 | 131 | } |
132 | 132 | $form->addValidationParam("_ajaxSubmit", new AjaxCall("postForm", $params)); |
133 | 133 | return $this; |
134 | 134 | } |
135 | 135 | |
136 | - public function addReset($identifier,$value,$cssStyle=NULL){ |
|
137 | - $bt=$this->getForm()->addButton($identifier, $value,$cssStyle); |
|
136 | + public function addReset($identifier, $value, $cssStyle=NULL) { |
|
137 | + $bt=$this->getForm()->addButton($identifier, $value, $cssStyle); |
|
138 | 138 | $bt->setProperty("type", "reset"); |
139 | 139 | return $bt; |
140 | 140 | } |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | * @param string $jsCode |
145 | 145 | * @return \Ajax\semantic\html\collections\form\HtmlForm |
146 | 146 | */ |
147 | - public function onValid($jsCode){ |
|
147 | + public function onValid($jsCode) { |
|
148 | 148 | $form=$this->getForm(); |
149 | 149 | $form->addValidationParam("onValid", "%function(){".$jsCode."}%"); |
150 | 150 | return $form; |
@@ -155,35 +155,35 @@ discard block |
||
155 | 155 | * @param string $jsCode can use event and fields parameters |
156 | 156 | * @return HtmlForm |
157 | 157 | */ |
158 | - public function onSuccess($jsCode){ |
|
158 | + public function onSuccess($jsCode) { |
|
159 | 159 | $form=$this->getForm(); |
160 | - $form->addValidationParam("onSuccess", $jsCode,"%function(event,fields){","}%"); |
|
160 | + $form->addValidationParam("onSuccess", $jsCode, "%function(event,fields){", "}%"); |
|
161 | 161 | return $form; |
162 | 162 | } |
163 | 163 | |
164 | - public function addExtraFieldRules($fieldname,$rules){ |
|
164 | + public function addExtraFieldRules($fieldname, $rules) { |
|
165 | 165 | $form=$this->getForm(); |
166 | 166 | $fv=$form->getExtraFieldValidation($fieldname); |
167 | - foreach ($rules as $rule){ |
|
167 | + foreach ($rules as $rule) { |
|
168 | 168 | $fv->addRule($rule); |
169 | 169 | } |
170 | 170 | } |
171 | 171 | |
172 | - public function addExtraFieldRule($fieldname,$type,$prompt=NULL,$value=NULL){ |
|
172 | + public function addExtraFieldRule($fieldname, $type, $prompt=NULL, $value=NULL) { |
|
173 | 173 | $form=$this->getForm(); |
174 | 174 | $fv=$form->getExtraFieldValidation($fieldname); |
175 | - $fv->addRule($type,$prompt,$value); |
|
175 | + $fv->addRule($type, $prompt, $value); |
|
176 | 176 | } |
177 | 177 | |
178 | - public function setOptional($fieldname,$optional=true){ |
|
178 | + public function setOptional($fieldname, $optional=true) { |
|
179 | 179 | $form=$this->getForm(); |
180 | 180 | $fv=$form->getExtraFieldValidation($fieldname); |
181 | 181 | $fv->setOptional($optional); |
182 | 182 | } |
183 | 183 | |
184 | - public function setActionTarget(string $action, string $target){ |
|
184 | + public function setActionTarget(string $action, string $target) { |
|
185 | 185 | $form=$this->getForm(); |
186 | - $form->setProperty('data-target',$target); |
|
187 | - $form->setProperty('action',$action); |
|
186 | + $form->setProperty('data-target', $target); |
|
187 | + $form->setProperty('action', $action); |
|
188 | 188 | } |
189 | 189 | } |
@@ -123,8 +123,9 @@ |
||
123 | 123 | } |
124 | 124 | |
125 | 125 | public function run(JsUtils $js){ |
126 | - if(JString::isNotNull($this->_identifier)) |
|
127 | - $js->execOn("click", "#".$this->_identifier." .ui.toggle", 'var active=$(this).hasClass("active");$(this).children("i").toggleClass("up",active).toggleClass("down",!active);var nextTd=$(this).closest("td").next("td");nextTd.children(":not(.toggle-caption)").toggle(active);nextTd.children(".toggle-caption").toggle(!active);$(this).trigger({type:"toggled",active: active,caption: nextTd.children(".toggle-caption")});'); |
|
126 | + if(JString::isNotNull($this->_identifier)) { |
|
127 | + $js->execOn("click", "#".$this->_identifier." .ui.toggle", 'var active=$(this).hasClass("active");$(this).children("i").toggleClass("up",active).toggleClass("down",!active);var nextTd=$(this).closest("td").next("td");nextTd.children(":not(.toggle-caption)").toggle(active);nextTd.children(".toggle-caption").toggle(!active);$(this).trigger({type:"toggled",active: active,caption: nextTd.children(".toggle-caption")});'); |
|
128 | + } |
|
128 | 129 | parent::run($js); |
129 | 130 | } |
130 | 131 | } |
@@ -22,72 +22,72 @@ discard block |
||
22 | 22 | protected $_colWidths; |
23 | 23 | |
24 | 24 | public function __construct($identifier, $modelInstance=NULL) { |
25 | - parent::__construct($identifier, null,$modelInstance); |
|
26 | - $this->_init(new DeInstanceViewer($identifier), "table", new HtmlTable($identifier, 0,2), false); |
|
25 | + parent::__construct($identifier, null, $modelInstance); |
|
26 | + $this->_init(new DeInstanceViewer($identifier), "table", new HtmlTable($identifier, 0, 2), false); |
|
27 | 27 | $this->content["table"]->setDefinition()->addClass("_element"); |
28 | 28 | } |
29 | 29 | |
30 | - public function compile(JsUtils $js=NULL,&$view=NULL){ |
|
31 | - if(!$this->_generated){ |
|
30 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
31 | + if (!$this->_generated) { |
|
32 | 32 | $this->_instanceViewer->setInstance($this->_modelInstance); |
33 | 33 | |
34 | 34 | $table=$this->content["table"]; |
35 | 35 | $this->_generateContent($table); |
36 | 36 | |
37 | - if(isset($this->_toolbar)){ |
|
37 | + if (isset($this->_toolbar)) { |
|
38 | 38 | $this->_setToolbarPosition($table); |
39 | 39 | } |
40 | - if(isset($this->_colWidths)){ |
|
40 | + if (isset($this->_colWidths)) { |
|
41 | 41 | $this->_applyStyleAttributes($table); |
42 | 42 | } |
43 | - $this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"table",PositionInTable::AFTERTABLE]); |
|
43 | + $this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "table", PositionInTable::AFTERTABLE]); |
|
44 | 44 | $this->_compileForm(); |
45 | 45 | $this->_generated=true; |
46 | 46 | } |
47 | - return parent::compile($js,$view); |
|
47 | + return parent::compile($js, $view); |
|
48 | 48 | } |
49 | 49 | |
50 | 50 | /** |
51 | 51 | * @param HtmlTable $table |
52 | 52 | */ |
53 | - protected function _generateContent($table){ |
|
54 | - $values= $this->_instanceViewer->getValues(); |
|
53 | + protected function _generateContent($table) { |
|
54 | + $values=$this->_instanceViewer->getValues(); |
|
55 | 55 | $captions=$this->_instanceViewer->getCaptions(); |
56 | 56 | $fields=$this->_instanceViewer->getVisibleProperties(); |
57 | 57 | $count=$this->_instanceViewer->count(); |
58 | 58 | $this->setProperty("data-ajax", $this->_instanceViewer->getIdentifier()); |
59 | - for($i=0;$i<$count;$i++){ |
|
60 | - $row=$table->addRow([$captions[$i],$values[$i]]); |
|
59 | + for ($i=0; $i<$count; $i++) { |
|
60 | + $row=$table->addRow([$captions[$i], $values[$i]]); |
|
61 | 61 | $row->getItem(1)->setProperty("data-field", $fields[$i]); |
62 | 62 | } |
63 | 63 | } |
64 | 64 | |
65 | - public function getFieldValue($index){ |
|
66 | - if(is_string($index)){ |
|
65 | + public function getFieldValue($index) { |
|
66 | + if (is_string($index)) { |
|
67 | 67 | $fields=$this->_instanceViewer->getVisibleProperties(); |
68 | 68 | $index=array_search($index, $fields); |
69 | 69 | } |
70 | - if(is_numeric($index)){ |
|
71 | - $values= $this->_instanceViewer->getValues(); |
|
72 | - if(isset($values[$index])){ |
|
70 | + if (is_numeric($index)) { |
|
71 | + $values=$this->_instanceViewer->getValues(); |
|
72 | + if (isset($values[$index])) { |
|
73 | 73 | return $values[$index]; |
74 | 74 | } |
75 | 75 | } |
76 | 76 | return null; |
77 | 77 | } |
78 | 78 | |
79 | - protected function _applyStyleAttributes(HtmlTable $table){ |
|
79 | + protected function _applyStyleAttributes(HtmlTable $table) { |
|
80 | 80 | $table->setColWidths($this->_colWidths); |
81 | 81 | } |
82 | - protected function _getFieldName($index){ |
|
82 | + protected function _getFieldName($index) { |
|
83 | 83 | return $this->_instanceViewer->getFieldName($index); |
84 | 84 | } |
85 | 85 | |
86 | - protected function _getFieldCaption($index){ |
|
86 | + protected function _getFieldCaption($index) { |
|
87 | 87 | return null; |
88 | 88 | } |
89 | 89 | |
90 | - protected function _getFieldIdentifier($prefix,$name=""){ |
|
90 | + protected function _getFieldIdentifier($prefix, $name="") { |
|
91 | 91 | return $this->identifier."-{$prefix}-".$name; |
92 | 92 | } |
93 | 93 | |
@@ -119,11 +119,11 @@ discard block |
||
119 | 119 | return $this; |
120 | 120 | } |
121 | 121 | |
122 | - public function asForm(){ |
|
122 | + public function asForm() { |
|
123 | 123 | return $this->getForm(); |
124 | 124 | } |
125 | 125 | |
126 | - public function setColCaptionWidth($width){ |
|
126 | + public function setColCaptionWidth($width) { |
|
127 | 127 | $this->_colWidths[0]=$width; |
128 | 128 | return $this; |
129 | 129 | } |
@@ -133,13 +133,13 @@ discard block |
||
133 | 133 | return $this; |
134 | 134 | } |
135 | 135 | |
136 | - public function setColWidths($widths){ |
|
136 | + public function setColWidths($widths) { |
|
137 | 137 | $this->_colWidths=$widths; |
138 | 138 | return $this; |
139 | 139 | } |
140 | 140 | |
141 | - public function run(JsUtils $js){ |
|
142 | - if(JString::isNotNull($this->_identifier)) |
|
141 | + public function run(JsUtils $js) { |
|
142 | + if (JString::isNotNull($this->_identifier)) |
|
143 | 143 | $js->execOn("click", "#".$this->_identifier." .ui.toggle", 'var active=$(this).hasClass("active");$(this).children("i").toggleClass("up",active).toggleClass("down",!active);var nextTd=$(this).closest("td").next("td");nextTd.children(":not(.toggle-caption)").toggle(active);nextTd.children(".toggle-caption").toggle(!active);$(this).trigger({type:"toggled",active: active,caption: nextTd.children(".toggle-caption")});'); |
144 | 144 | parent::run($js); |
145 | 145 | } |
@@ -2,10 +2,10 @@ discard block |
||
2 | 2 | namespace Ajax\common\traits; |
3 | 3 | use Ajax\common\BaseGui; |
4 | 4 | |
5 | -trait JsUtilsInternalTrait{ |
|
5 | +trait JsUtilsInternalTrait { |
|
6 | 6 | |
7 | - protected $jquery_code_for_compile=array (); |
|
8 | - protected $jquery_code_for_compile_at_last=array (); |
|
7 | + protected $jquery_code_for_compile=array(); |
|
8 | + protected $jquery_code_for_compile_at_last=array(); |
|
9 | 9 | |
10 | 10 | protected function _addToCompile($jsScript) { |
11 | 11 | $this->jquery_code_for_compile[]=$jsScript; |
@@ -15,29 +15,29 @@ discard block |
||
15 | 15 | * @param BaseGui $library |
16 | 16 | * @param mixed $view |
17 | 17 | */ |
18 | - protected function _compileLibrary(BaseGui $library, &$view=NULL){ |
|
19 | - if(isset($view)) |
|
18 | + protected function _compileLibrary(BaseGui $library, &$view=NULL) { |
|
19 | + if (isset($view)) |
|
20 | 20 | $library->compileHtml($this, $view); |
21 | 21 | if ($library->isAutoCompile()) { |
22 | 22 | $library->compile(true); |
23 | 23 | } |
24 | 24 | } |
25 | 25 | |
26 | - protected function defer($script){ |
|
26 | + protected function defer($script) { |
|
27 | 27 | $result="window.defer=function (method) {if (window.jQuery) method(); else setTimeout(function() { defer(method) }, 50);};"; |
28 | 28 | $result.="window.defer(function(){".$script."})"; |
29 | 29 | return $result; |
30 | 30 | } |
31 | 31 | |
32 | - protected function ready($script){ |
|
32 | + protected function ready($script) { |
|
33 | 33 | $result='$(document).ready(function() {'."\n"; |
34 | 34 | $result.=$script.'})'; |
35 | 35 | return $result; |
36 | 36 | } |
37 | 37 | |
38 | 38 | protected function minify($input) { |
39 | - if(trim($input) === "") return $input; |
|
40 | - $input= preg_replace( |
|
39 | + if (trim($input)==="") return $input; |
|
40 | + $input=preg_replace( |
|
41 | 41 | array( |
42 | 42 | // Remove comment(s) |
43 | 43 | '#\s*("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\')\s*|\s*\/\*(?!\!|@cc_on)(?>[\s\S]*?\*\/)\s*|\s*(?<![\:\=])\/\/.*(?=[\n\r]|$)|^\s*|\s*$#', |
@@ -16,8 +16,9 @@ discard block |
||
16 | 16 | * @param mixed $view |
17 | 17 | */ |
18 | 18 | protected function _compileLibrary(BaseGui $library, &$view=NULL){ |
19 | - if(isset($view)) |
|
20 | - $library->compileHtml($this, $view); |
|
19 | + if(isset($view)) { |
|
20 | + $library->compileHtml($this, $view); |
|
21 | + } |
|
21 | 22 | if ($library->isAutoCompile()) { |
22 | 23 | $library->compile(true); |
23 | 24 | } |
@@ -36,7 +37,9 @@ discard block |
||
36 | 37 | } |
37 | 38 | |
38 | 39 | protected function minify($input) { |
39 | - if(trim($input) === "") return $input; |
|
40 | + if(trim($input) === "") { |
|
41 | + return $input; |
|
42 | + } |
|
40 | 43 | $input= preg_replace( |
41 | 44 | array( |
42 | 45 | // Remove comment(s) |
@@ -10,12 +10,12 @@ |
||
10 | 10 | * @author jc |
11 | 11 | * |
12 | 12 | */ |
13 | -class Visibility extends SimpleSemExtComponent{ |
|
13 | +class Visibility extends SimpleSemExtComponent { |
|
14 | 14 | |
15 | 15 | public function __construct(JsUtils $js) { |
16 | 16 | parent::__construct($js); |
17 | 17 | $this->uiName="visibility"; |
18 | - $this->params=["once"=>false,"observeChanges"=>true]; |
|
18 | + $this->params=["once"=>false, "observeChanges"=>true]; |
|
19 | 19 | } |
20 | 20 | |
21 | 21 | public function setOnce($value=false) { |
@@ -109,15 +109,18 @@ discard block |
||
109 | 109 | $flag=false; |
110 | 110 | $index=0; |
111 | 111 | while ( !$flag && $index < sizeof($elements) ) { |
112 | - if ($elements[$index] instanceof BaseHtml) |
|
113 | - $flag=($callback($elements[$index])); |
|
112 | + if ($elements[$index] instanceof BaseHtml) { |
|
113 | + $flag=($callback($elements[$index])); |
|
114 | + } |
|
114 | 115 | $index++; |
115 | 116 | } |
116 | - if ($flag === true) |
|
117 | - return $elements[$index - 1]; |
|
117 | + if ($flag === true) { |
|
118 | + return $elements[$index - 1]; |
|
119 | + } |
|
118 | 120 | } elseif ($elements instanceof BaseHtml) { |
119 | - if ($callback($elements)) |
|
120 | - return $elements; |
|
121 | + if ($callback($elements)) { |
|
122 | + return $elements; |
|
123 | + } |
|
121 | 124 | } |
122 | 125 | return null; |
123 | 126 | } |
@@ -143,8 +146,9 @@ discard block |
||
143 | 146 | |
144 | 147 | public function fromArray($array) { |
145 | 148 | foreach ( $this as $key => $value ) { |
146 | - if(array_key_exists($key, $array)===true) |
|
147 | - $this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array); |
|
149 | + if(array_key_exists($key, $array)===true) { |
|
150 | + $this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array); |
|
151 | + } |
|
148 | 152 | } |
149 | 153 | foreach ( $array as $key => $value ) { |
150 | 154 | if($this->_callSetter($key, $key, $value, $array)===false){ |
@@ -213,11 +217,11 @@ discard block |
||
213 | 217 | if(\strstr($result, "%{$key}%")!==false){ |
214 | 218 | if (\is_array($value)) { |
215 | 219 | $v=PropertyWrapper::wrap($value, $js,$view); |
216 | - }elseif($value instanceof \stdClass){ |
|
220 | + } elseif($value instanceof \stdClass){ |
|
217 | 221 | $v=\print_r($value,true); |
218 | - }elseif ($value instanceof BaseHtml){ |
|
222 | + } elseif ($value instanceof BaseHtml){ |
|
219 | 223 | $v=$value->compile($js,$view); |
220 | - }else{ |
|
224 | + } else{ |
|
221 | 225 | $v=$value; |
222 | 226 | } |
223 | 227 | $result=str_replace("%{$key}%", $v, $result); |
@@ -15,11 +15,11 @@ discard block |
||
15 | 15 | * @version 1.3 |
16 | 16 | */ |
17 | 17 | abstract class BaseHtml extends BaseWidget { |
18 | - use BaseHtmlEventsTrait,BaseHtmlPropertiesTrait; |
|
18 | + use BaseHtmlEventsTrait, BaseHtmlPropertiesTrait; |
|
19 | 19 | protected $_template; |
20 | 20 | protected $tagName; |
21 | - protected $_wrapBefore=array (); |
|
22 | - protected $_wrapAfter=array (); |
|
21 | + protected $_wrapBefore=array(); |
|
22 | + protected $_wrapAfter=array(); |
|
23 | 23 | protected $_bsComponent; |
24 | 24 | protected $_compiled=false; |
25 | 25 | protected $_runned=false; |
@@ -33,32 +33,32 @@ discard block |
||
33 | 33 | */ |
34 | 34 | abstract public function run(JsUtils $js); |
35 | 35 | |
36 | - private function _callSetter($setter,$key,$value,&$array){ |
|
36 | + private function _callSetter($setter, $key, $value, &$array) { |
|
37 | 37 | $result=false; |
38 | - if (method_exists($this, $setter) && substr($setter, 0, 1) !== "_") { |
|
38 | + if (method_exists($this, $setter) && substr($setter, 0, 1)!=="_") { |
|
39 | 39 | try { |
40 | 40 | $this->$setter($value); |
41 | 41 | unset($array[$key]); |
42 | 42 | $result=true; |
43 | - } catch ( \Exception $e ) { |
|
43 | + }catch (\Exception $e) { |
|
44 | 44 | $result=false; |
45 | 45 | } |
46 | 46 | } |
47 | 47 | return $result; |
48 | 48 | } |
49 | 49 | |
50 | - protected function getTemplate(JsUtils $js=NULL,$view=null) { |
|
51 | - return PropertyWrapper::wrap($this->_wrapBefore, $js,$view) . $this->_template . PropertyWrapper::wrap($this->_wrapAfter, $js,$view); |
|
50 | + protected function getTemplate(JsUtils $js=NULL, $view=null) { |
|
51 | + return PropertyWrapper::wrap($this->_wrapBefore, $js, $view).$this->_template.PropertyWrapper::wrap($this->_wrapAfter, $js, $view); |
|
52 | 52 | } |
53 | 53 | |
54 | 54 | protected function ctrl($name, $value, $typeCtrl) { |
55 | 55 | if (\is_array($typeCtrl)) { |
56 | - if (array_search($value, $typeCtrl) === false) { |
|
57 | - throw new \Exception("La valeur passée `" . $value . "` à la propriété `" . $name . "` ne fait pas partie des valeurs possibles : {" . implode(",", $typeCtrl) . "}"); |
|
56 | + if (array_search($value, $typeCtrl)===false) { |
|
57 | + throw new \Exception("La valeur passée `".$value."` à la propriété `".$name."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}"); |
|
58 | 58 | } |
59 | 59 | } else { |
60 | 60 | if (!$typeCtrl($value)) { |
61 | - throw new \Exception("La fonction " . $typeCtrl . " a retourné faux pour l'affectation de la propriété " . $name); |
|
61 | + throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$name); |
|
62 | 62 | } |
63 | 63 | } |
64 | 64 | return true; |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | protected function addToMemberUnique(&$name, $value, $typeCtrl, $separator=" ") { |
76 | 76 | if (\is_array($typeCtrl)) { |
77 | 77 | $this->removeOldValues($name, $typeCtrl); |
78 | - $name.=$separator . $value; |
|
78 | + $name.=$separator.$value; |
|
79 | 79 | } |
80 | 80 | return $this; |
81 | 81 | } |
@@ -87,12 +87,12 @@ discard block |
||
87 | 87 | if (\is_array($typeCtrl)) { |
88 | 88 | $this->removeOldValues($name, $typeCtrl); |
89 | 89 | } |
90 | - $name.=$separator . $value; |
|
90 | + $name.=$separator.$value; |
|
91 | 91 | return $this; |
92 | 92 | } |
93 | 93 | |
94 | 94 | protected function addToMember(&$name, $value, $separator=" ") { |
95 | - $name=str_ireplace($value, "", $name) . $separator . $value; |
|
95 | + $name=str_ireplace($value, "", $name).$separator.$value; |
|
96 | 96 | return $this; |
97 | 97 | } |
98 | 98 | |
@@ -103,18 +103,18 @@ discard block |
||
103 | 103 | $oldValue=trim($oldValue); |
104 | 104 | } |
105 | 105 | |
106 | - protected function _getElementBy($callback,$elements){ |
|
106 | + protected function _getElementBy($callback, $elements) { |
|
107 | 107 | if (\is_array($elements)) { |
108 | 108 | $elements=\array_values($elements); |
109 | 109 | $flag=false; |
110 | 110 | $index=0; |
111 | - while ( !$flag && $index < sizeof($elements) ) { |
|
111 | + while (!$flag && $index<sizeof($elements)) { |
|
112 | 112 | if ($elements[$index] instanceof BaseHtml) |
113 | 113 | $flag=($callback($elements[$index])); |
114 | 114 | $index++; |
115 | 115 | } |
116 | - if ($flag === true) |
|
117 | - return $elements[$index - 1]; |
|
116 | + if ($flag===true) |
|
117 | + return $elements[$index-1]; |
|
118 | 118 | } elseif ($elements instanceof BaseHtml) { |
119 | 119 | if ($callback($elements)) |
120 | 120 | return $elements; |
@@ -142,13 +142,13 @@ discard block |
||
142 | 142 | } |
143 | 143 | |
144 | 144 | public function fromArray($array) { |
145 | - foreach ( $this as $key => $value ) { |
|
146 | - if(array_key_exists($key, $array)===true) |
|
147 | - $this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array); |
|
145 | + foreach ($this as $key => $value) { |
|
146 | + if (array_key_exists($key, $array)===true) |
|
147 | + $this->_callSetter("set".ucfirst($key), $key, $array[$key], $array); |
|
148 | 148 | } |
149 | - foreach ( $array as $key => $value ) { |
|
150 | - if($this->_callSetter($key, $key, $value, $array)===false){ |
|
151 | - $this->_callSetter("set" . ucfirst($key), $key, $value, $array); |
|
149 | + foreach ($array as $key => $value) { |
|
150 | + if ($this->_callSetter($key, $key, $value, $array)===false) { |
|
151 | + $this->_callSetter("set".ucfirst($key), $key, $value, $array); |
|
152 | 152 | } |
153 | 153 | } |
154 | 154 | return $array; |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | |
157 | 157 | public function fromDatabaseObjects($objects, $function) { |
158 | 158 | if (isset($objects)) { |
159 | - foreach ( $objects as $object ) { |
|
159 | + foreach ($objects as $object) { |
|
160 | 160 | $this->fromDatabaseObject($object, $function); |
161 | 161 | } |
162 | 162 | } |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | |
178 | 178 | |
179 | 179 | public function getElementById($identifier, $elements) { |
180 | - return $this->_getElementBy(function(BaseWidget $element) use ($identifier){return $element->getIdentifier()===$identifier;}, $elements); |
|
180 | + return $this->_getElementBy(function(BaseWidget $element) use ($identifier){return $element->getIdentifier()===$identifier; }, $elements); |
|
181 | 181 | } |
182 | 182 | |
183 | 183 | public function getBsComponent() { |
@@ -190,11 +190,11 @@ discard block |
||
190 | 190 | } |
191 | 191 | |
192 | 192 | protected function compile_once(JsUtils $js=NULL, &$view=NULL) { |
193 | - if(!$this->_compiled){ |
|
194 | - if(isset($js)){ |
|
193 | + if (!$this->_compiled) { |
|
194 | + if (isset($js)) { |
|
195 | 195 | $beforeCompile=$js->getParam("beforeCompileHtml"); |
196 | - if(\is_callable($beforeCompile)){ |
|
197 | - $beforeCompile($this,$js,$view); |
|
196 | + if (\is_callable($beforeCompile)) { |
|
197 | + $beforeCompile($this, $js, $view); |
|
198 | 198 | } |
199 | 199 | } |
200 | 200 | $this->callCallback($this->_preCompile); |
@@ -204,17 +204,17 @@ discard block |
||
204 | 204 | } |
205 | 205 | |
206 | 206 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
207 | - $this->compile_once($js,$view); |
|
208 | - $result=$this->getTemplate($js,$view); |
|
209 | - foreach ( $this as $key => $value ) { |
|
210 | - if(\strstr($result, "%{$key}%")!==false){ |
|
207 | + $this->compile_once($js, $view); |
|
208 | + $result=$this->getTemplate($js, $view); |
|
209 | + foreach ($this as $key => $value) { |
|
210 | + if (\strstr($result, "%{$key}%")!==false) { |
|
211 | 211 | if (\is_array($value)) { |
212 | - $v=PropertyWrapper::wrap($value, $js,$view); |
|
213 | - }elseif($value instanceof \stdClass){ |
|
214 | - $v=\print_r($value,true); |
|
215 | - }elseif ($value instanceof BaseHtml){ |
|
216 | - $v=$value->compile($js,$view); |
|
217 | - }else{ |
|
212 | + $v=PropertyWrapper::wrap($value, $js, $view); |
|
213 | + }elseif ($value instanceof \stdClass) { |
|
214 | + $v=\print_r($value, true); |
|
215 | + }elseif ($value instanceof BaseHtml) { |
|
216 | + $v=$value->compile($js, $view); |
|
217 | + } else { |
|
218 | 218 | $v=$value; |
219 | 219 | } |
220 | 220 | $result=str_replace("%{$key}%", $v, $result); |
@@ -222,12 +222,12 @@ discard block |
||
222 | 222 | } |
223 | 223 | if (isset($js)===true) { |
224 | 224 | $this->run($js); |
225 | - if (isset($view) === true) { |
|
225 | + if (isset($view)===true) { |
|
226 | 226 | $js->addViewElement($this->getLibraryId(), $result, $view); |
227 | 227 | } |
228 | 228 | } |
229 | 229 | |
230 | - if(\is_callable($this->_postCompile)){ |
|
230 | + if (\is_callable($this->_postCompile)) { |
|
231 | 231 | $pc=$this->_postCompile; |
232 | 232 | $pc($this); |
233 | 233 | } |
@@ -241,13 +241,13 @@ discard block |
||
241 | 241 | * @param array $parameters default: ["jsCallback"=>"","jqueryDone"=>"append"] |
242 | 242 | * @return \Ajax\common\html\BaseHtml |
243 | 243 | */ |
244 | - public function setDraggable($attr="id",$dropZone=null,$parameters=[]){ |
|
244 | + public function setDraggable($attr="id", $dropZone=null, $parameters=[]) { |
|
245 | 245 | $this->setProperty("draggable", "true"); |
246 | - $this->addEvent("dragstart",Javascript::draggable($attr)); |
|
247 | - if(isset($dropZone)&& $dropZone instanceof BaseHtml){ |
|
248 | - $jqueryDone="append";$jsCallback=""; |
|
246 | + $this->addEvent("dragstart", Javascript::draggable($attr)); |
|
247 | + if (isset($dropZone) && $dropZone instanceof BaseHtml) { |
|
248 | + $jqueryDone="append"; $jsCallback=""; |
|
249 | 249 | extract($parameters); |
250 | - $dropZone->asDropZone($jsCallback,$jqueryDone,$parameters); |
|
250 | + $dropZone->asDropZone($jsCallback, $jqueryDone, $parameters); |
|
251 | 251 | } |
252 | 252 | return $this; |
253 | 253 | } |
@@ -259,11 +259,11 @@ discard block |
||
259 | 259 | * @param array $parameters |
260 | 260 | * @return \Ajax\common\html\BaseHtml |
261 | 261 | */ |
262 | - public function asDropZone($jsCallback="",$jqueryDone="append",$parameters=[]){ |
|
262 | + public function asDropZone($jsCallback="", $jqueryDone="append", $parameters=[]) { |
|
263 | 263 | $stopPropagation=false; |
264 | - $this->addEvent("dragover", '', $stopPropagation,true); |
|
264 | + $this->addEvent("dragover", '', $stopPropagation, true); |
|
265 | 265 | extract($parameters); |
266 | - $this->addEvent("drop",Javascript::dropZone($jqueryDone,$jsCallback),$stopPropagation,true); |
|
266 | + $this->addEvent("drop", Javascript::dropZone($jqueryDone, $jsCallback), $stopPropagation, true); |
|
267 | 267 | return $this; |
268 | 268 | } |
269 | 269 | |
@@ -271,17 +271,17 @@ discard block |
||
271 | 271 | return $this->compile(); |
272 | 272 | } |
273 | 273 | |
274 | - public function onPostCompile($callback){ |
|
274 | + public function onPostCompile($callback) { |
|
275 | 275 | $this->_postCompile=$callback; |
276 | 276 | } |
277 | 277 | |
278 | - public function onPreCompile($callback){ |
|
278 | + public function onPreCompile($callback) { |
|
279 | 279 | $this->_preCompile=$this->addCallback($this->_preCompile, $callback); |
280 | 280 | } |
281 | 281 | |
282 | - private function addCallback($originalValue,$callback){ |
|
283 | - if(isset($originalValue)){ |
|
284 | - if(!is_array($originalValue)){ |
|
282 | + private function addCallback($originalValue, $callback) { |
|
283 | + if (isset($originalValue)) { |
|
284 | + if (!is_array($originalValue)) { |
|
285 | 285 | $result=[$originalValue]; |
286 | 286 | } |
287 | 287 | $result[]=$callback; |
@@ -290,12 +290,12 @@ discard block |
||
290 | 290 | return $callback; |
291 | 291 | } |
292 | 292 | |
293 | - private function callCallback($callable){ |
|
294 | - if(\is_callable($callable)){ |
|
293 | + private function callCallback($callable) { |
|
294 | + if (\is_callable($callable)) { |
|
295 | 295 | return $callable($this); |
296 | 296 | } |
297 | - if(is_array($callable)){ |
|
298 | - foreach ($callable as $call){ |
|
297 | + if (is_array($callable)) { |
|
298 | + foreach ($callable as $call) { |
|
299 | 299 | $this->callCallback($call); |
300 | 300 | } |
301 | 301 | } |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | * @param string $event |
22 | 22 | * @param boolean $multiple |
23 | 23 | */ |
24 | - public function __construct($table,$class="active",$event="click",$multiple=false){ |
|
24 | + public function __construct($table, $class="active", $event="click", $multiple=false) { |
|
25 | 25 | $this->table=$table; |
26 | 26 | $this->class=$class; |
27 | 27 | $this->event=$event; |
@@ -55,12 +55,12 @@ discard block |
||
55 | 55 | return $this; |
56 | 56 | } |
57 | 57 | |
58 | - public function run(){ |
|
58 | + public function run() { |
|
59 | 59 | $multiple=""; |
60 | - if(!$this->multiple){ |
|
60 | + if (!$this->multiple) { |
|
61 | 61 | $multiple="$(this).closest('tbody').children('tr').removeClass('".$this->class."');"; |
62 | 62 | } |
63 | - $this->table->onRow($this->event, $multiple."$(this).toggleClass('".$this->class."');".$this->table->jsTrigger("activeRowChange","[this]"),false,false); |
|
63 | + $this->table->onRow($this->event, $multiple."$(this).toggleClass('".$this->class."');".$this->table->jsTrigger("activeRowChange", "[this]"), false, false); |
|
64 | 64 | } |
65 | 65 | |
66 | 66 | } |
@@ -345,8 +345,9 @@ discard block |
||
345 | 345 | $result= $this->getBody()->_addRow($result); |
346 | 346 | } |
347 | 347 | if(isset($this->_afterCompileEvents["onNewRow"])){ |
348 | - if(\is_callable($this->_afterCompileEvents["onNewRow"])) |
|
349 | - $this->_afterCompileEvents["onNewRow"]($result,$object); |
|
348 | + if(\is_callable($this->_afterCompileEvents["onNewRow"])) { |
|
349 | + $this->_afterCompileEvents["onNewRow"]($result,$object); |
|
350 | + } |
|
350 | 351 | } |
351 | 352 | return $result; |
352 | 353 | } |
@@ -375,8 +376,9 @@ discard block |
||
375 | 376 | } |
376 | 377 | } |
377 | 378 | $result= parent::run($js); |
378 | - if(isset($this->_footer)) |
|
379 | - $this->_footer->run($js); |
|
379 | + if(isset($this->_footer)) { |
|
380 | + $this->_footer->run($js); |
|
381 | + } |
|
380 | 382 | $this->_runned=true; |
381 | 383 | return $result; |
382 | 384 | } |
@@ -417,8 +419,9 @@ discard block |
||
417 | 419 | |
418 | 420 | public function setColWidth($colIndex,$width){ |
419 | 421 | $part=$this->_getFirstPart(); |
420 | - if($part!==null && $part->count()>0) |
|
421 | - $part->getCell(0, $colIndex)->setWidth($width); |
|
422 | + if($part!==null && $part->count()>0) { |
|
423 | + $part->getCell(0, $colIndex)->setWidth($width); |
|
424 | + } |
|
422 | 425 | return $this; |
423 | 426 | } |
424 | 427 |
@@ -40,10 +40,10 @@ discard block |
||
40 | 40 | |
41 | 41 | public function __construct($identifier, $rowCount, $colCount) { |
42 | 42 | parent::__construct($identifier, "table", "ui table"); |
43 | - $this->content=array (); |
|
43 | + $this->content=array(); |
|
44 | 44 | $this->setRowCount($rowCount, $colCount); |
45 | - $this->_variations=[ Variation::CELLED,Variation::PADDED,Variation::COMPACT ]; |
|
46 | - $this->_compileParts=["thead","tbody","tfoot"]; |
|
45 | + $this->_variations=[Variation::CELLED, Variation::PADDED, Variation::COMPACT]; |
|
46 | + $this->_compileParts=["thead", "tbody", "tfoot"]; |
|
47 | 47 | $this->_afterCompileEvents=[]; |
48 | 48 | } |
49 | 49 | |
@@ -53,17 +53,17 @@ discard block |
||
53 | 53 | * @return HtmlTableContent |
54 | 54 | */ |
55 | 55 | public function getPart($key) { |
56 | - if (\array_key_exists($key, $this->content) === false) { |
|
56 | + if (\array_key_exists($key, $this->content)===false) { |
|
57 | 57 | $this->content[$key]=new HtmlTableContent("", $key); |
58 | - if ($key !== "tbody") { |
|
58 | + if ($key!=="tbody") { |
|
59 | 59 | $this->content[$key]->setRowCount(1, $this->_colCount); |
60 | 60 | } |
61 | 61 | } |
62 | 62 | return $this->content[$key]; |
63 | 63 | } |
64 | 64 | |
65 | - protected function _getFirstPart(){ |
|
66 | - if(isset($this->content["thead"])){ |
|
65 | + protected function _getFirstPart() { |
|
66 | + if (isset($this->content["thead"])) { |
|
67 | 67 | return $this->content["thead"]; |
68 | 68 | } |
69 | 69 | return $this->content["tbody"]; |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | * @return boolean |
109 | 109 | */ |
110 | 110 | public function hasPart($key) { |
111 | - return \array_key_exists($key, $this->content) === true; |
|
111 | + return \array_key_exists($key, $this->content)===true; |
|
112 | 112 | } |
113 | 113 | |
114 | 114 | /** |
@@ -268,8 +268,8 @@ discard block |
||
268 | 268 | return $this->colAlign($colIndex, "colLeftFromRight"); |
269 | 269 | } |
270 | 270 | |
271 | - public function setColAlignment($colIndex,$alignment){ |
|
272 | - switch ($alignment){ |
|
271 | + public function setColAlignment($colIndex, $alignment) { |
|
272 | + switch ($alignment) { |
|
273 | 273 | case TextAlignment::LEFT: |
274 | 274 | $function="colLeft"; |
275 | 275 | break; |
@@ -289,8 +289,8 @@ discard block |
||
289 | 289 | return $this; |
290 | 290 | } |
291 | 291 | |
292 | - public function setColAlignmentFromRight($colIndex,$alignment){ |
|
293 | - switch ($alignment){ |
|
292 | + public function setColAlignmentFromRight($colIndex, $alignment) { |
|
293 | + switch ($alignment) { |
|
294 | 294 | case TextAlignment::LEFT: |
295 | 295 | $function="colLeftFromRight"; |
296 | 296 | break; |
@@ -312,7 +312,7 @@ discard block |
||
312 | 312 | |
313 | 313 | private function colAlign($colIndex, $function) { |
314 | 314 | if (\is_array($colIndex)) { |
315 | - foreach ( $colIndex as $cIndex ) { |
|
315 | + foreach ($colIndex as $cIndex) { |
|
316 | 316 | $this->colAlign($cIndex, $function); |
317 | 317 | } |
318 | 318 | } else { |
@@ -373,7 +373,7 @@ discard block |
||
373 | 373 | * @see HtmlSemDoubleElement::compile() |
374 | 374 | */ |
375 | 375 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
376 | - if(\sizeof($this->_compileParts)<3){ |
|
376 | + if (\sizeof($this->_compileParts)<3) { |
|
377 | 377 | $this->_template="%content%"; |
378 | 378 | $this->refresh($js); |
379 | 379 | } |
@@ -382,9 +382,9 @@ discard block |
||
382 | 382 | } |
383 | 383 | |
384 | 384 | protected function compile_once(JsUtils $js=NULL, &$view=NULL) { |
385 | - parent::compile_once($js,$view); |
|
385 | + parent::compile_once($js, $view); |
|
386 | 386 | if ($this->propertyContains("class", "sortable")) { |
387 | - $this->addEvent("execute", "$('#" . $this->identifier . "').tablesort().data('tablesort').sort($('th.default-sort'));"); |
|
387 | + $this->addEvent("execute", "$('#".$this->identifier."').tablesort().data('tablesort').sort($('th.default-sort'));"); |
|
388 | 388 | } |
389 | 389 | } |
390 | 390 | |
@@ -397,13 +397,13 @@ discard block |
||
397 | 397 | public function fromDatabaseObject($object, $function) { |
398 | 398 | $result=$function($object); |
399 | 399 | if (\is_array($result)) { |
400 | - $result= $this->addRow($function($object)); |
|
400 | + $result=$this->addRow($function($object)); |
|
401 | 401 | } else { |
402 | - $result= $this->getBody()->_addRow($result); |
|
402 | + $result=$this->getBody()->_addRow($result); |
|
403 | 403 | } |
404 | - if(isset($this->_afterCompileEvents["onNewRow"])){ |
|
405 | - if(\is_callable($this->_afterCompileEvents["onNewRow"])) |
|
406 | - $this->_afterCompileEvents["onNewRow"]($result,$object); |
|
404 | + if (isset($this->_afterCompileEvents["onNewRow"])) { |
|
405 | + if (\is_callable($this->_afterCompileEvents["onNewRow"])) |
|
406 | + $this->_afterCompileEvents["onNewRow"]($result, $object); |
|
407 | 407 | } |
408 | 408 | return $result; |
409 | 409 | } |
@@ -418,26 +418,26 @@ discard block |
||
418 | 418 | return $this; |
419 | 419 | } |
420 | 420 | |
421 | - public function refreshTR(){ |
|
421 | + public function refreshTR() { |
|
422 | 422 | $this->setCompileParts(); |
423 | 423 | $this->getPart("tbody")->refreshTR(); |
424 | 424 | } |
425 | 425 | |
426 | - public function refresh($js){ |
|
426 | + public function refresh($js) { |
|
427 | 427 | $this->_footer=$this->getFooter(); |
428 | - if(isset($js)){ |
|
429 | - $js->exec('$("#'.$this->identifier.' tfoot").replaceWith("'.\addslashes($this->_footer).'");',true); |
|
428 | + if (isset($js)) { |
|
429 | + $js->exec('$("#'.$this->identifier.' tfoot").replaceWith("'.\addslashes($this->_footer).'");', true); |
|
430 | 430 | } |
431 | 431 | } |
432 | 432 | |
433 | - public function run(JsUtils $js){ |
|
434 | - if(!$this->_runned){ |
|
435 | - if(isset($this->_activeRowSelector)){ |
|
433 | + public function run(JsUtils $js) { |
|
434 | + if (!$this->_runned) { |
|
435 | + if (isset($this->_activeRowSelector)) { |
|
436 | 436 | $this->_activeRowSelector->run(); |
437 | 437 | } |
438 | 438 | } |
439 | - $result= parent::run($js); |
|
440 | - if(isset($this->_footer)) |
|
439 | + $result=parent::run($js); |
|
440 | + if (isset($this->_footer)) |
|
441 | 441 | $this->_footer->run($js); |
442 | 442 | $this->_runned=true; |
443 | 443 | return $result; |
@@ -461,51 +461,51 @@ discard block |
||
461 | 461 | * @param boolean $multiple |
462 | 462 | * @return HtmlTable |
463 | 463 | */ |
464 | - public function setActiveRowSelector($class="active",$event="click",$multiple=false){ |
|
465 | - $this->_activeRowSelector=new ActiveRow($this,$class,$event,$multiple); |
|
464 | + public function setActiveRowSelector($class="active", $event="click", $multiple=false) { |
|
465 | + $this->_activeRowSelector=new ActiveRow($this, $class, $event, $multiple); |
|
466 | 466 | return $this; |
467 | 467 | } |
468 | 468 | |
469 | - public function hasActiveRowSelector(){ |
|
469 | + public function hasActiveRowSelector() { |
|
470 | 470 | return isset($this->_activeRowSelector); |
471 | 471 | } |
472 | 472 | |
473 | - public function hideColumn($colIndex){ |
|
474 | - if(isset($this->content["thead"])){ |
|
473 | + public function hideColumn($colIndex) { |
|
474 | + if (isset($this->content["thead"])) { |
|
475 | 475 | $this->content["thead"]->hideColumn($colIndex); |
476 | 476 | } |
477 | 477 | $this->content["tbody"]->hideColumn($colIndex); |
478 | - if(isset($this->content["tfoot"])){ |
|
478 | + if (isset($this->content["tfoot"])) { |
|
479 | 479 | $this->content["tfoot"]->hideColumn($colIndex); |
480 | 480 | } |
481 | 481 | return $this; |
482 | 482 | } |
483 | 483 | |
484 | - public function setColWidth($colIndex,$width){ |
|
484 | + public function setColWidth($colIndex, $width) { |
|
485 | 485 | $part=$this->_getFirstPart(); |
486 | - if($part!==null && $part->count()>0) |
|
486 | + if ($part!==null && $part->count()>0) |
|
487 | 487 | $part->getCell(0, $colIndex)->setWidth($width); |
488 | 488 | return $this; |
489 | 489 | } |
490 | 490 | |
491 | - public function setColWidths($widths){ |
|
491 | + public function setColWidths($widths) { |
|
492 | 492 | $part=$this->_getFirstPart(); |
493 | - if($part!==null && $part->count()>0){ |
|
493 | + if ($part!==null && $part->count()>0) { |
|
494 | 494 | $count=$part->getColCount(); |
495 | - if(!\is_array($widths)){ |
|
495 | + if (!\is_array($widths)) { |
|
496 | 496 | $widths=\array_fill(0, $count, $widths); |
497 | 497 | } |
498 | - $max=\min(\sizeof($widths),$count); |
|
499 | - for($i=0;$i<$max;$i++){ |
|
498 | + $max=\min(\sizeof($widths), $count); |
|
499 | + for ($i=0; $i<$max; $i++) { |
|
500 | 500 | $part->getCell(0, $i)->setWidth($widths[$i]); |
501 | 501 | } |
502 | 502 | } |
503 | 503 | return $this; |
504 | 504 | } |
505 | 505 | |
506 | - public function mergeIdentiqualValues($colIndex,$function="strip_tags"){ |
|
506 | + public function mergeIdentiqualValues($colIndex, $function="strip_tags") { |
|
507 | 507 | $body=$this->getBody(); |
508 | - $body->mergeIdentiqualValues($colIndex,$function); |
|
508 | + $body->mergeIdentiqualValues($colIndex, $function); |
|
509 | 509 | return $this; |
510 | 510 | } |
511 | 511 | /** |
@@ -519,16 +519,16 @@ discard block |
||
519 | 519 | * @param mixed $_innerScript |
520 | 520 | */ |
521 | 521 | public function setInnerScript($_innerScript) { |
522 | - $this->_innerScript = $_innerScript; |
|
522 | + $this->_innerScript=$_innerScript; |
|
523 | 523 | } |
524 | 524 | |
525 | - public function onActiveRowChange($jsCode){ |
|
526 | - $this->on("activeRowChange",$jsCode); |
|
525 | + public function onActiveRowChange($jsCode) { |
|
526 | + $this->on("activeRowChange", $jsCode); |
|
527 | 527 | return $this; |
528 | 528 | } |
529 | 529 | |
530 | - public function addMergeRow($colCount,$value=null){ |
|
531 | - return $this->getBody()->addMergeRow($colCount,$value); |
|
530 | + public function addMergeRow($colCount, $value=null) { |
|
531 | + return $this->getBody()->addMergeRow($colCount, $value); |
|
532 | 532 | } |
533 | 533 | |
534 | 534 | /** |
@@ -6,32 +6,32 @@ discard block |
||
6 | 6 | |
7 | 7 | use Ajax\semantic\html\elements\HtmlIcon; |
8 | 8 | |
9 | -class HtmlPaginationMenu extends HtmlMenu{ |
|
9 | +class HtmlPaginationMenu extends HtmlMenu { |
|
10 | 10 | private $_page; |
11 | 11 | private $_pages; |
12 | 12 | private $_max; |
13 | - public function __construct( $identifier, $items=array() ){ |
|
14 | - parent::__construct( $identifier,$items); |
|
13 | + public function __construct($identifier, $items=array()) { |
|
14 | + parent::__construct($identifier, $items); |
|
15 | 15 | $this->_pages=$items; |
16 | 16 | } |
17 | 17 | /** |
18 | 18 | * {@inheritDoc} |
19 | 19 | * @see \Ajax\common\html\BaseHtml::compile() |
20 | 20 | */ |
21 | - public function compile(JsUtils $js=NULL,&$view=NULL){ |
|
21 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
22 | 22 | $max=$this->_max; |
23 | - if(!$this->_compiled){ |
|
24 | - foreach ($this->content as $item){ |
|
23 | + if (!$this->_compiled) { |
|
24 | + foreach ($this->content as $item) { |
|
25 | 25 | $item->addClass("pageNum"); |
26 | 26 | } |
27 | - $this->insertItem(new HtmlIcon("", "left chevron"))->setProperty("data-page", \max([1,$this->_page-1]))->addToProperty("class","_firstPage no-active"); |
|
28 | - $this->addItem(new HtmlIcon("", "right chevron"))->setProperty("data-page", \min([$max,$this->_page+1]))->setProperty("data-max", $max)->addToProperty("class","_lastPage no-active"); |
|
27 | + $this->insertItem(new HtmlIcon("", "left chevron"))->setProperty("data-page", \max([1, $this->_page-1]))->addToProperty("class", "_firstPage no-active"); |
|
28 | + $this->addItem(new HtmlIcon("", "right chevron"))->setProperty("data-page", \min([$max, $this->_page+1]))->setProperty("data-max", $max)->addToProperty("class", "_lastPage no-active"); |
|
29 | 29 | $this->asPagination(); |
30 | 30 | } |
31 | - return parent::compile($js,$view); |
|
31 | + return parent::compile($js, $view); |
|
32 | 32 | } |
33 | 33 | |
34 | - public function setActivePage($page){ |
|
34 | + public function setActivePage($page) { |
|
35 | 35 | $index=$page-$this->_pages[0]; |
36 | 36 | $this->setActiveItem($index); |
37 | 37 | $this->_page=$page; |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | * @param mixed $_max |
46 | 46 | */ |
47 | 47 | public function setMax($_max) { |
48 | - $this->_max = $_max; |
|
48 | + $this->_max=$_max; |
|
49 | 49 | } |
50 | 50 | |
51 | 51 |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | foreach ($items as $k=>$v){ |
25 | 25 | $this->addItem([$k,$v]); |
26 | 26 | } |
27 | - }else{ |
|
27 | + } else{ |
|
28 | 28 | foreach ($items as $item){ |
29 | 29 | $this->addItem($item); |
30 | 30 | } |
@@ -80,9 +80,9 @@ discard block |
||
80 | 80 | * @return \Ajax\common\html\HtmlDoubleElement |
81 | 81 | */ |
82 | 82 | public function getItem($index) { |
83 | - if (is_int($index)&& isset($this->content[$index])) |
|
84 | - return $this->content[$index]; |
|
85 | - else { |
|
83 | + if (is_int($index)&& isset($this->content[$index])) { |
|
84 | + return $this->content[$index]; |
|
85 | + } else { |
|
86 | 86 | $elm=$this->getElementById($index, $this->content); |
87 | 87 | return $elm; |
88 | 88 | } |
@@ -144,10 +144,11 @@ discard block |
||
144 | 144 | $i=0; |
145 | 145 | foreach ($properties as $k=>$v){ |
146 | 146 | $c=$this->content[$i++]; |
147 | - if(isset($c)) |
|
148 | - $c->setProperty($k,$v); |
|
149 | - else |
|
150 | - return $this; |
|
147 | + if(isset($c)) { |
|
148 | + $c->setProperty($k,$v); |
|
149 | + } else { |
|
150 | + return $this; |
|
151 | + } |
|
151 | 152 | } |
152 | 153 | return $this; |
153 | 154 | } |
@@ -165,8 +166,7 @@ discard block |
||
165 | 166 | foreach ($values as $i=>$value){ |
166 | 167 | if(isset($this->content[$i])){ |
167 | 168 | $this->content[$i]->setProperty($property,$value); |
168 | - } |
|
169 | - else{ |
|
169 | + } else{ |
|
170 | 170 | return $this; |
171 | 171 | } |
172 | 172 | } |
@@ -186,8 +186,7 @@ discard block |
||
186 | 186 | foreach ($values as $i=>$value){ |
187 | 187 | if(isset($this->content[$i])){ |
188 | 188 | $this->content[$i++]->addToProperty($property,$value); |
189 | - } |
|
190 | - else{ |
|
189 | + } else{ |
|
191 | 190 | return $this; |
192 | 191 | } |
193 | 192 | } |
@@ -216,8 +215,9 @@ discard block |
||
216 | 215 | foreach ( $this->content as $index=>$item ) { |
217 | 216 | if($item instanceof HtmlDoubleElement){ |
218 | 217 | $href=""; |
219 | - if(isset($hrefs[$index])) |
|
220 | - $href=$hrefs[$index]; |
|
218 | + if(isset($hrefs[$index])) { |
|
219 | + $href=$hrefs[$index]; |
|
220 | + } |
|
221 | 221 | $item->asLink($href,$target); |
222 | 222 | } |
223 | 223 | } |
@@ -14,44 +14,44 @@ discard block |
||
14 | 14 | */ |
15 | 15 | abstract class HtmlCollection extends HtmlDoubleElement { |
16 | 16 | |
17 | - public function __construct($identifier,$tagName="div"){ |
|
18 | - parent::__construct($identifier,$tagName); |
|
17 | + public function __construct($identifier, $tagName="div") { |
|
18 | + parent::__construct($identifier, $tagName); |
|
19 | 19 | $this->content=array(); |
20 | 20 | } |
21 | 21 | |
22 | - public function addItems($items){ |
|
23 | - if(JArray::isAssociative($items)){ |
|
24 | - foreach ($items as $k=>$v){ |
|
25 | - $this->addItem([$k,$v]); |
|
22 | + public function addItems($items) { |
|
23 | + if (JArray::isAssociative($items)) { |
|
24 | + foreach ($items as $k=>$v) { |
|
25 | + $this->addItem([$k, $v]); |
|
26 | 26 | } |
27 | - }else{ |
|
28 | - foreach ($items as $item){ |
|
27 | + } else { |
|
28 | + foreach ($items as $item) { |
|
29 | 29 | $this->addItem($item); |
30 | 30 | } |
31 | 31 | } |
32 | 32 | return $this; |
33 | 33 | } |
34 | 34 | |
35 | - public function setItems($items){ |
|
35 | + public function setItems($items) { |
|
36 | 36 | $this->content=$items; |
37 | 37 | return $this; |
38 | 38 | } |
39 | 39 | |
40 | - public function getItems(){ |
|
40 | + public function getItems() { |
|
41 | 41 | return $this->content; |
42 | 42 | } |
43 | 43 | |
44 | - protected function getItemToAdd($item){ |
|
44 | + protected function getItemToAdd($item) { |
|
45 | 45 | $itemO=$item; |
46 | - if($this->createCondition($item)===true){ |
|
46 | + if ($this->createCondition($item)===true) { |
|
47 | 47 | $itemO=$this->createItem($item); |
48 | 48 | } |
49 | 49 | return $itemO; |
50 | 50 | } |
51 | 51 | |
52 | - protected function setItemIdentifier($item,$classname,$index){ |
|
53 | - if($item instanceof BaseWidget){ |
|
54 | - if(JString::isNull($item->getIdentifier())){ |
|
52 | + protected function setItemIdentifier($item, $classname, $index) { |
|
53 | + if ($item instanceof BaseWidget) { |
|
54 | + if (JString::isNull($item->getIdentifier())) { |
|
55 | 55 | $item->setIdentifier($classname."-".$this->identifier."-".$index); |
56 | 56 | } |
57 | 57 | } |
@@ -62,15 +62,15 @@ discard block |
||
62 | 62 | * @param HtmlDoubleElement|string|array $item |
63 | 63 | * @return \Ajax\common\html\HtmlDoubleElement |
64 | 64 | */ |
65 | - public function addItem($item){ |
|
65 | + public function addItem($item) { |
|
66 | 66 | $itemO=$this->getItemToAdd($item); |
67 | 67 | $this->addContent($itemO); |
68 | 68 | return $itemO; |
69 | 69 | } |
70 | 70 | |
71 | - public function insertItem($item,$position=0){ |
|
71 | + public function insertItem($item, $position=0) { |
|
72 | 72 | $itemO=$this->getItemToAdd($item); |
73 | - \array_splice( $this->content, $position, 0, array($itemO)); |
|
73 | + \array_splice($this->content, $position, 0, array($itemO)); |
|
74 | 74 | return $itemO; |
75 | 75 | } |
76 | 76 | |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | * @return \Ajax\common\html\HtmlDoubleElement |
81 | 81 | */ |
82 | 82 | public function getItem($index) { |
83 | - if (is_int($index)&& isset($this->content[$index])) |
|
83 | + if (is_int($index) && isset($this->content[$index])) |
|
84 | 84 | return $this->content[$index]; |
85 | 85 | else { |
86 | 86 | $elm=$this->getElementById($index, $this->content); |
@@ -93,11 +93,11 @@ discard block |
||
93 | 93 | return $this; |
94 | 94 | } |
95 | 95 | |
96 | - public function removeItem($index){ |
|
96 | + public function removeItem($index) { |
|
97 | 97 | return array_splice($this->content, $index, 1); |
98 | 98 | } |
99 | 99 | |
100 | - public function count(){ |
|
100 | + public function count() { |
|
101 | 101 | return \sizeof($this->content); |
102 | 102 | } |
103 | 103 | |
@@ -108,8 +108,8 @@ discard block |
||
108 | 108 | return $this->addItem($function($object)); |
109 | 109 | } |
110 | 110 | |
111 | - public function apply($callBack){ |
|
112 | - foreach ($this->content as $item){ |
|
111 | + public function apply($callBack) { |
|
112 | + foreach ($this->content as $item) { |
|
113 | 113 | $callBack($item); |
114 | 114 | } |
115 | 115 | return $this; |
@@ -129,23 +129,23 @@ discard block |
||
129 | 129 | */ |
130 | 130 | abstract protected function createItem($value); |
131 | 131 | |
132 | - protected function createCondition($value){ |
|
132 | + protected function createCondition($value) { |
|
133 | 133 | return !($value instanceof BaseHtml); |
134 | 134 | } |
135 | 135 | |
136 | - protected function contentAs($tagName){ |
|
137 | - foreach ($this->content as $item){ |
|
136 | + protected function contentAs($tagName) { |
|
137 | + foreach ($this->content as $item) { |
|
138 | 138 | $item->setTagName($tagName); |
139 | 139 | } |
140 | 140 | return $this; |
141 | 141 | } |
142 | 142 | |
143 | - public function setProperties($properties){ |
|
143 | + public function setProperties($properties) { |
|
144 | 144 | $i=0; |
145 | - foreach ($properties as $k=>$v){ |
|
145 | + foreach ($properties as $k=>$v) { |
|
146 | 146 | $c=$this->content[$i++]; |
147 | - if(isset($c)) |
|
148 | - $c->setProperty($k,$v); |
|
147 | + if (isset($c)) |
|
148 | + $c->setProperty($k, $v); |
|
149 | 149 | else |
150 | 150 | return $this; |
151 | 151 | } |
@@ -158,15 +158,15 @@ discard block |
||
158 | 158 | * @param array|mixed $values |
159 | 159 | * @return $this |
160 | 160 | */ |
161 | - public function setPropertyValues($property,$values){ |
|
162 | - if(\is_array($values)===false){ |
|
163 | - $values=\array_fill(0, $this->count(),$values); |
|
161 | + public function setPropertyValues($property, $values) { |
|
162 | + if (\is_array($values)===false) { |
|
163 | + $values=\array_fill(0, $this->count(), $values); |
|
164 | 164 | } |
165 | - foreach ($values as $i=>$value){ |
|
166 | - if(isset($this->content[$i])){ |
|
167 | - $this->content[$i]->setProperty($property,$value); |
|
165 | + foreach ($values as $i=>$value) { |
|
166 | + if (isset($this->content[$i])) { |
|
167 | + $this->content[$i]->setProperty($property, $value); |
|
168 | 168 | } |
169 | - else{ |
|
169 | + else { |
|
170 | 170 | return $this; |
171 | 171 | } |
172 | 172 | } |
@@ -179,15 +179,15 @@ discard block |
||
179 | 179 | * @param array|mixed $values |
180 | 180 | * @return $this |
181 | 181 | */ |
182 | - public function addPropertyValues($property,$values){ |
|
183 | - if(\is_array($values)===false){ |
|
184 | - $values=\array_fill(0, $this->count(),$values); |
|
182 | + public function addPropertyValues($property, $values) { |
|
183 | + if (\is_array($values)===false) { |
|
184 | + $values=\array_fill(0, $this->count(), $values); |
|
185 | 185 | } |
186 | - foreach ($values as $i=>$value){ |
|
187 | - if(isset($this->content[$i])){ |
|
188 | - $this->content[$i++]->addToProperty($property,$value); |
|
186 | + foreach ($values as $i=>$value) { |
|
187 | + if (isset($this->content[$i])) { |
|
188 | + $this->content[$i++]->addToProperty($property, $value); |
|
189 | 189 | } |
190 | - else{ |
|
190 | + else { |
|
191 | 191 | return $this; |
192 | 192 | } |
193 | 193 | } |
@@ -197,13 +197,13 @@ discard block |
||
197 | 197 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
198 | 198 | $index=0; |
199 | 199 | $classname=\strtolower(JReflection::shortClassName($this)); |
200 | - foreach ($this->content as $item){ |
|
201 | - $this->setItemIdentifier($item,$classname,$index++); |
|
200 | + foreach ($this->content as $item) { |
|
201 | + $this->setItemIdentifier($item, $classname, $index++); |
|
202 | 202 | } |
203 | - return parent::compile($js,$view); |
|
203 | + return parent::compile($js, $view); |
|
204 | 204 | } |
205 | 205 | |
206 | - public function getItemById($identifier){ |
|
206 | + public function getItemById($identifier) { |
|
207 | 207 | return $this->getElementById($identifier, $this->content); |
208 | 208 | } |
209 | 209 | |
@@ -212,13 +212,13 @@ discard block |
||
212 | 212 | * @param string $target |
213 | 213 | * @return HtmlCollection |
214 | 214 | */ |
215 | - public function asLinks($hrefs=[],$target=NUll) { |
|
216 | - foreach ( $this->content as $index=>$item ) { |
|
217 | - if($item instanceof HtmlDoubleElement){ |
|
215 | + public function asLinks($hrefs=[], $target=NUll) { |
|
216 | + foreach ($this->content as $index=>$item) { |
|
217 | + if ($item instanceof HtmlDoubleElement) { |
|
218 | 218 | $href=""; |
219 | - if(isset($hrefs[$index])) |
|
219 | + if (isset($hrefs[$index])) |
|
220 | 220 | $href=$hrefs[$index]; |
221 | - $item->asLink($href,$target); |
|
221 | + $item->asLink($href, $target); |
|
222 | 222 | } |
223 | 223 | } |
224 | 224 | return $this; |
@@ -230,8 +230,8 @@ discard block |
||
230 | 230 | * @param int $length If length is omitted, removes everything from offset to the end of the array. If length is specified and is positive, then that many elements will be removed. If length is specified and is negative then the end of the removed portion will be that many elements from the end of the array. If length is specified and is zero, no elements will be removed. Tip: to remove everything from offset to the end of the array when replacement is also specified, use count($input) for length. |
231 | 231 | * @return $this |
232 | 232 | */ |
233 | - public function splice($offset,$length=null){ |
|
234 | - $this->content=array_slice($this->content, $offset,$length); |
|
233 | + public function splice($offset, $length=null) { |
|
234 | + $this->content=array_slice($this->content, $offset, $length); |
|
235 | 235 | return $this; |
236 | 236 | } |
237 | 237 | } |