@@ -48,8 +48,9 @@ |
||
48 | 48 | $('#pagination-{$id} ._firstPage').attr('data-page',Math.max(1,page-1)); |
49 | 49 | var lastPage=$('#pagination-{$id} ._lastPage');lastPage.attr('data-page',Math.min(lastPage.attr('data-max'),page+1));"; |
50 | 50 | } |
51 | - if(isset($this->_urls["refresh"])) |
|
52 | - $this->jsonArrayOnClick($menu, $this->_urls["refresh"],"post","{'p':$(this).attr('data-page')}",$callback); |
|
51 | + if(isset($this->_urls["refresh"])) { |
|
52 | + $this->jsonArrayOnClick($menu, $this->_urls["refresh"],"post","{'p':$(this).attr('data-page')}",$callback); |
|
53 | + } |
|
53 | 54 | } |
54 | 55 | |
55 | 56 | /** |
@@ -23,24 +23,24 @@ discard block |
||
23 | 23 | $this->_rowClass="_json"; |
24 | 24 | } |
25 | 25 | |
26 | - protected function _generateContent($table){ |
|
26 | + protected function _generateContent($table) { |
|
27 | 27 | $this->_addRowModel($table); |
28 | 28 | parent::_generateContent($table); |
29 | 29 | } |
30 | 30 | |
31 | - protected function _addRowModel($table){ |
|
31 | + protected function _addRowModel($table) { |
|
32 | 32 | $row=$this->_createRow($table, $this->_modelClass); |
33 | - $row->addToProperty("style","display:none;"); |
|
33 | + $row->addToProperty("style", "display:none;"); |
|
34 | 34 | $table->getBody()->_addRow($row); |
35 | 35 | } |
36 | 36 | |
37 | - protected function _createRow($table,$rowClass){ |
|
37 | + protected function _createRow($table, $rowClass) { |
|
38 | 38 | $object=JReflection::jsonObject($this->_model); |
39 | - if(isset($this->_rowModelCallback)){ |
|
39 | + if (isset($this->_rowModelCallback)) { |
|
40 | 40 | $callback=$this->_rowModelCallback; |
41 | 41 | $callback($object); |
42 | 42 | } |
43 | - $row=$this->_generateRow($object, $table,"_jsonArrayChecked"); |
|
43 | + $row=$this->_generateRow($object, $table, "_jsonArrayChecked"); |
|
44 | 44 | $row->setClass($rowClass); |
45 | 45 | return $row; |
46 | 46 | } |
@@ -49,22 +49,22 @@ discard block |
||
49 | 49 | * {@inheritDoc} |
50 | 50 | * @see DataTable::_associatePaginationBehavior() |
51 | 51 | */ |
52 | - protected function _associatePaginationBehavior(HtmlMenu $menu,JsUtils $js=NULL){ |
|
52 | + protected function _associatePaginationBehavior(HtmlMenu $menu, JsUtils $js=NULL) { |
|
53 | 53 | $callback=null; |
54 | - if(isset($js)){ |
|
54 | + if (isset($js)) { |
|
55 | 55 | $id=$this->identifier; |
56 | 56 | $offset=$js->scriptCount(); |
57 | 57 | $this->run($js); |
58 | 58 | $callback=$js->getScript($offset); |
59 | - $callback.=$js->trigger("#".$id." [name='selection[]']","change",false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js)); |
|
59 | + $callback.=$js->trigger("#".$id." [name='selection[]']", "change", false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js)); |
|
60 | 60 | $callback.=";var page=parseInt($(self).attr('data-page')); |
61 | 61 | $('#pagination-{$id} .item').removeClass('active'); |
62 | 62 | $('#pagination-{$id} [data-page='+page+']:not(.no-active)').addClass('active'); |
63 | 63 | $('#pagination-{$id} ._firstPage').attr('data-page',Math.max(1,page-1)); |
64 | 64 | var lastPage=$('#pagination-{$id} ._lastPage');lastPage.attr('data-page',Math.min(lastPage.attr('data-max'),page+1));"; |
65 | 65 | } |
66 | - if(isset($this->_urls["refresh"])) |
|
67 | - $this->jsonArrayOnClick($menu, $this->_urls["refresh"],"post","{'p':$(this).attr('data-page')}",$callback); |
|
66 | + if (isset($this->_urls["refresh"])) |
|
67 | + $this->jsonArrayOnClick($menu, $this->_urls["refresh"], "post", "{'p':$(this).attr('data-page')}", $callback); |
|
68 | 68 | } |
69 | 69 | |
70 | 70 | /** |
@@ -75,29 +75,29 @@ discard block |
||
75 | 75 | * @param string $jsCallback |
76 | 76 | * @return AjaxCall |
77 | 77 | */ |
78 | - public function jsJsonArray($url, $method="get", $params="{}", $jsCallback=NULL,$parameters=[]){ |
|
79 | - $parameters=\array_merge($parameters,["modelSelector"=>"#".$this->_identifier." tr.".$this->_modelClass,"url"=>$url,"method"=>$method,"params"=>$params,"jsCallback"=>$jsCallback]); |
|
78 | + public function jsJsonArray($url, $method="get", $params="{}", $jsCallback=NULL, $parameters=[]) { |
|
79 | + $parameters=\array_merge($parameters, ["modelSelector"=>"#".$this->_identifier." tr.".$this->_modelClass, "url"=>$url, "method"=>$method, "params"=>$params, "jsCallback"=>$jsCallback]); |
|
80 | 80 | return new AjaxCall("jsonArray", $parameters); |
81 | 81 | } |
82 | 82 | |
83 | - public function jsClear(){ |
|
83 | + public function jsClear() { |
|
84 | 84 | return "$('#{$this->identifier} tbody').find('._json').remove();"; |
85 | 85 | } |
86 | 86 | |
87 | - public function clearOn(BaseHtml $element,$event, $stopPropagation=false, $preventDefault=false){ |
|
88 | - return $element->addEvent($event, $this->jsClear(),$stopPropagation,$preventDefault); |
|
87 | + public function clearOn(BaseHtml $element, $event, $stopPropagation=false, $preventDefault=false) { |
|
88 | + return $element->addEvent($event, $this->jsClear(), $stopPropagation, $preventDefault); |
|
89 | 89 | } |
90 | 90 | |
91 | - public function clearOnClick(BaseHtml $element,$stopPropagation=false, $preventDefault=false){ |
|
92 | - return $this->clearOn($element, "click",$stopPropagation,$preventDefault); |
|
91 | + public function clearOnClick(BaseHtml $element, $stopPropagation=false, $preventDefault=false) { |
|
92 | + return $this->clearOn($element, "click", $stopPropagation, $preventDefault); |
|
93 | 93 | } |
94 | 94 | |
95 | - public function jsonArrayOn(BaseHtml $element,$event,$url, $method="get", $params="{}", $jsCallback=NULL,$parameters=[]){ |
|
96 | - return $element->_addEvent($event, $this->jsJsonArray($url,$method,$params,$jsCallback,$parameters)); |
|
95 | + public function jsonArrayOn(BaseHtml $element, $event, $url, $method="get", $params="{}", $jsCallback=NULL, $parameters=[]) { |
|
96 | + return $element->_addEvent($event, $this->jsJsonArray($url, $method, $params, $jsCallback, $parameters)); |
|
97 | 97 | } |
98 | 98 | |
99 | - public function jsonArrayOnClick(BaseHtml $element,$url, $method="get", $params="{}", $jsCallback=NULL,$parameters=[]){ |
|
100 | - return $this->jsonArrayOn($element, "click", $url,$method,$params,$jsCallback,$parameters); |
|
99 | + public function jsonArrayOnClick(BaseHtml $element, $url, $method="get", $params="{}", $jsCallback=NULL, $parameters=[]) { |
|
100 | + return $this->jsonArrayOn($element, "click", $url, $method, $params, $jsCallback, $parameters); |
|
101 | 101 | } |
102 | 102 | |
103 | 103 | /** |
@@ -108,8 +108,8 @@ discard block |
||
108 | 108 | * @param number $pages_visibles The number of visible pages in the Pagination component |
109 | 109 | * @return DataTable |
110 | 110 | */ |
111 | - public function paginate($page,$total_rowcount,$items_per_page=10,$pages_visibles=null){ |
|
112 | - return parent::paginate($page, $total_rowcount,$items_per_page,null); |
|
111 | + public function paginate($page, $total_rowcount, $items_per_page=10, $pages_visibles=null) { |
|
112 | + return parent::paginate($page, $total_rowcount, $items_per_page, null); |
|
113 | 113 | } |
114 | 114 | |
115 | 115 | public function setRowModelCallback($_rowModelCallback) { |
@@ -21,7 +21,7 @@ |
||
21 | 21 | if($class->getProperty($property)!==null){ |
22 | 22 | \call_user_func_array([$object,$name],[$value]); |
23 | 23 | } |
24 | - }catch(\Exception $e){ |
|
24 | + } catch(\Exception $e){ |
|
25 | 25 | //Nothing to do |
26 | 26 | } |
27 | 27 | } |
@@ -3,25 +3,25 @@ discard block |
||
3 | 3 | namespace Ajax\service; |
4 | 4 | |
5 | 5 | class JReflection { |
6 | - public static function shortClassName($object){ |
|
7 | - $classNameWithNamespace = get_class($object); |
|
6 | + public static function shortClassName($object) { |
|
7 | + $classNameWithNamespace=get_class($object); |
|
8 | 8 | return substr($classNameWithNamespace, strrpos($classNameWithNamespace, '\\')+1); |
9 | 9 | } |
10 | 10 | |
11 | - public static function jsonObject($classname){ |
|
11 | + public static function jsonObject($classname) { |
|
12 | 12 | $object=new $classname(); |
13 | - $class = new \ReflectionClass($classname); |
|
13 | + $class=new \ReflectionClass($classname); |
|
14 | 14 | $methods=$class->getMethods(\ReflectionMethod::IS_PUBLIC); |
15 | - foreach ($methods as $method){ |
|
15 | + foreach ($methods as $method) { |
|
16 | 16 | $name=$method->getName(); |
17 | - if(JString::startswith($name, "set")){ |
|
17 | + if (JString::startswith($name, "set")) { |
|
18 | 18 | $property=\lcfirst(JString::replaceAtFirst($name, "set", "")); |
19 | 19 | $value="__".$property."__"; |
20 | - try{ |
|
21 | - if($class->getProperty($property)!==null){ |
|
22 | - \call_user_func_array([$object,$name],[$value]); |
|
20 | + try { |
|
21 | + if ($class->getProperty($property)!==null) { |
|
22 | + \call_user_func_array([$object, $name], [$value]); |
|
23 | 23 | } |
24 | - }catch(\Exception $e){ |
|
24 | + }catch (\Exception $e) { |
|
25 | 25 | //Nothing to do |
26 | 26 | } |
27 | 27 | } |
@@ -29,18 +29,18 @@ discard block |
||
29 | 29 | return $object; |
30 | 30 | } |
31 | 31 | |
32 | - public static function callMethod($object,$callback,array $values){ |
|
33 | - return \call_user_func_array([$object,$callback],$values); |
|
32 | + public static function callMethod($object, $callback, array $values) { |
|
33 | + return \call_user_func_array([$object, $callback], $values); |
|
34 | 34 | } |
35 | 35 | |
36 | - public static function getterName($propertyName,$prefix="get"){ |
|
36 | + public static function getterName($propertyName, $prefix="get") { |
|
37 | 37 | return $prefix.\ucfirst($propertyName); |
38 | 38 | } |
39 | 39 | |
40 | - public static function callMethodFromAssociativeArray($object,$array,$methodPrefix="add"){ |
|
41 | - foreach ($array as $key=>$value){ |
|
42 | - if(\method_exists($object, $methodPrefix.\ucfirst($key))){ |
|
43 | - \call_user_func([$object,$methodPrefix.\ucfirst($key)],$value); |
|
40 | + public static function callMethodFromAssociativeArray($object, $array, $methodPrefix="add") { |
|
41 | + foreach ($array as $key=>$value) { |
|
42 | + if (\method_exists($object, $methodPrefix.\ucfirst($key))) { |
|
43 | + \call_user_func([$object, $methodPrefix.\ucfirst($key)], $value); |
|
44 | 44 | } |
45 | 45 | } |
46 | 46 | } |
@@ -10,10 +10,10 @@ discard block |
||
10 | 10 | class HtmlLink extends HtmlSemDoubleElement { |
11 | 11 | use HtmlLinkTrait; |
12 | 12 | |
13 | - public function __construct($identifier, $href="#", $content="Link",$target=NULL) { |
|
13 | + public function __construct($identifier, $href="#", $content="Link", $target=NULL) { |
|
14 | 14 | parent::__construct($identifier, "a", ""); |
15 | 15 | $this->setHref($href); |
16 | - if(isset($target)) |
|
16 | + if (isset($target)) |
|
17 | 17 | $this->setTarget($target); |
18 | 18 | $this->content=$content; |
19 | 19 | } |
@@ -23,13 +23,13 @@ discard block |
||
23 | 23 | * @see \Ajax\bootstrap\html\base\HtmlSingleElement::run() |
24 | 24 | */ |
25 | 25 | public function run(JsUtils $js) { |
26 | - $this->_bsComponent=$js->semantic()->generic("#" . $this->identifier); |
|
26 | + $this->_bsComponent=$js->semantic()->generic("#".$this->identifier); |
|
27 | 27 | $this->addEventsOnRun($js); |
28 | 28 | return $this->_bsComponent; |
29 | 29 | } |
30 | 30 | |
31 | 31 | public function addIcon($icon, $before=true) { |
32 | - return $this->addContent(new HtmlIcon("icon-" . $this->identifier, $icon), $before); |
|
32 | + return $this->addContent(new HtmlIcon("icon-".$this->identifier, $icon), $before); |
|
33 | 33 | } |
34 | 34 | |
35 | 35 | public static function icon($identifier, $icon, $href="#", $label=NULL) { |
@@ -13,8 +13,9 @@ |
||
13 | 13 | public function __construct($identifier, $href="#", $content="Link",$target=NULL) { |
14 | 14 | parent::__construct($identifier, "a", ""); |
15 | 15 | $this->setHref($href); |
16 | - if(isset($target)) |
|
17 | - $this->setTarget($target); |
|
16 | + if(isset($target)) { |
|
17 | + $this->setTarget($target); |
|
18 | + } |
|
18 | 19 | $this->content=$content; |
19 | 20 | } |
20 | 21 |
@@ -89,8 +89,9 @@ discard block |
||
89 | 89 | public function asLink($href=NULL,$target=NULL) { |
90 | 90 | if (isset($href)) { |
91 | 91 | $_target=""; |
92 | - if(isset($target)) |
|
93 | - $_target="target='{$target}'"; |
|
92 | + if(isset($target)) { |
|
93 | + $_target="target='{$target}'"; |
|
94 | + } |
|
94 | 95 | $this->wrap("<a href='" . $href . "' {$_target}>", "</a>"); |
95 | 96 | } |
96 | 97 | return $this->addToProperty("class", "link"); |
@@ -107,8 +108,9 @@ discard block |
||
107 | 108 | */ |
108 | 109 | public function setBordered($inverted=false) { |
109 | 110 | $invertedStr=""; |
110 | - if ($inverted !== false) |
|
111 | - $invertedStr=" inverted"; |
|
111 | + if ($inverted !== false) { |
|
112 | + $invertedStr=" inverted"; |
|
113 | + } |
|
112 | 114 | return $this->addToProperty("class", "bordered" . $invertedStr); |
113 | 115 | } |
114 | 116 | |
@@ -121,12 +123,14 @@ discard block |
||
121 | 123 | } |
122 | 124 | |
123 | 125 | public function addLabel($label, $before=false, $icon=NULL) { |
124 | - if($before) |
|
125 | - $this->wrap($label); |
|
126 | - else |
|
127 | - $this->wrap("", $label); |
|
128 | - if(isset($icon)) |
|
129 | - $this->addToIcon($icon); |
|
126 | + if($before) { |
|
127 | + $this->wrap($label); |
|
128 | + } else { |
|
129 | + $this->wrap("", $label); |
|
130 | + } |
|
131 | + if(isset($icon)) { |
|
132 | + $this->addToIcon($icon); |
|
133 | + } |
|
130 | 134 | return $this; |
131 | 135 | } |
132 | 136 |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | * @return HtmlIcon |
70 | 70 | */ |
71 | 71 | public function setFlipped($sens="horizontally") { |
72 | - return $this->addToProperty("class", "flipped " . $sens); |
|
72 | + return $this->addToProperty("class", "flipped ".$sens); |
|
73 | 73 | } |
74 | 74 | |
75 | 75 | /** |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | * @return HtmlIcon |
79 | 79 | */ |
80 | 80 | public function setRotated($sens="clockwise") { |
81 | - return $this->addToProperty("class", "rotated " . $sens); |
|
81 | + return $this->addToProperty("class", "rotated ".$sens); |
|
82 | 82 | } |
83 | 83 | |
84 | 84 | /** |
@@ -87,12 +87,12 @@ discard block |
||
87 | 87 | * @param string target |
88 | 88 | * @return HtmlIcon |
89 | 89 | */ |
90 | - public function asLink($href=NULL,$target=NULL) { |
|
90 | + public function asLink($href=NULL, $target=NULL) { |
|
91 | 91 | if (isset($href)) { |
92 | 92 | $_target=""; |
93 | - if(isset($target)) |
|
93 | + if (isset($target)) |
|
94 | 94 | $_target="target='{$target}'"; |
95 | - $this->wrap("<a href='" . $href . "' {$_target}>", "</a>"); |
|
95 | + $this->wrap("<a href='".$href."' {$_target}>", "</a>"); |
|
96 | 96 | } |
97 | 97 | return $this->addToProperty("class", "link"); |
98 | 98 | } |
@@ -108,9 +108,9 @@ discard block |
||
108 | 108 | */ |
109 | 109 | public function setBordered($inverted=false) { |
110 | 110 | $invertedStr=""; |
111 | - if ($inverted !== false) |
|
111 | + if ($inverted!==false) |
|
112 | 112 | $invertedStr=" inverted"; |
113 | - return $this->addToProperty("class", "bordered" . $invertedStr); |
|
113 | + return $this->addToProperty("class", "bordered".$invertedStr); |
|
114 | 114 | } |
115 | 115 | |
116 | 116 | /** |
@@ -122,11 +122,11 @@ discard block |
||
122 | 122 | } |
123 | 123 | |
124 | 124 | public function addLabel($label, $before=false, $icon=NULL) { |
125 | - if($before) |
|
125 | + if ($before) |
|
126 | 126 | $this->wrap($label); |
127 | 127 | else |
128 | 128 | $this->wrap("", $label); |
129 | - if(isset($icon)) |
|
129 | + if (isset($icon)) |
|
130 | 130 | $this->addToIcon($icon); |
131 | 131 | return $this; |
132 | 132 | } |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | use BaseTrait; |
23 | 23 | protected $_popup=NULL; |
24 | 24 | protected $_dimmer=NULL; |
25 | - protected $_params=array (); |
|
25 | + protected $_params=array(); |
|
26 | 26 | |
27 | 27 | |
28 | 28 | public function __construct($identifier, $tagName="p", $baseClass="ui", $content=NULL) { |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | * @return HtmlDimmer |
79 | 79 | */ |
80 | 80 | public function addDimmer($params=array(), $content=NULL) { |
81 | - $dimmer=new HtmlDimmer("dimmer-" . $this->identifier, $content); |
|
81 | + $dimmer=new HtmlDimmer("dimmer-".$this->identifier, $content); |
|
82 | 82 | $dimmer->setParams($params); |
83 | 83 | $dimmer->setContainer($this); |
84 | 84 | $this->addContent($dimmer); |
@@ -94,12 +94,12 @@ discard block |
||
94 | 94 | */ |
95 | 95 | public function addLabel($label, $before=false, $icon=NULL) { |
96 | 96 | $labelO=$label; |
97 | - if (\is_object($label) === false) { |
|
98 | - $labelO=new HtmlLabel("label-" . $this->identifier, $label); |
|
97 | + if (\is_object($label)===false) { |
|
98 | + $labelO=new HtmlLabel("label-".$this->identifier, $label); |
|
99 | 99 | if (isset($icon)) |
100 | 100 | $labelO->addIcon($icon); |
101 | 101 | } else { |
102 | - $labelO->addToPropertyCtrl("class", "label", array ("label" )); |
|
102 | + $labelO->addToPropertyCtrl("class", "label", array("label")); |
|
103 | 103 | } |
104 | 104 | $this->addContent($labelO, $before); |
105 | 105 | return $labelO; |
@@ -113,9 +113,9 @@ discard block |
||
113 | 113 | * @param string $icon |
114 | 114 | * @return HtmlSemDoubleElement |
115 | 115 | */ |
116 | - public function attachLabel($label,$side=Side::TOP,$direction=Direction::NONE,$icon=NULL){ |
|
117 | - $label=$this->addLabel($label,true,$icon); |
|
118 | - $label->setAttached($side,$direction); |
|
116 | + public function attachLabel($label, $side=Side::TOP, $direction=Direction::NONE, $icon=NULL) { |
|
117 | + $label=$this->addLabel($label, true, $icon); |
|
118 | + $label->setAttached($side, $direction); |
|
119 | 119 | return $this; |
120 | 120 | } |
121 | 121 | |
@@ -123,10 +123,10 @@ discard block |
||
123 | 123 | * Transforms the element into a link |
124 | 124 | * @return HtmlSemDoubleElement |
125 | 125 | */ |
126 | - public function asLink($href=NULL,$target=NULL) { |
|
126 | + public function asLink($href=NULL, $target=NULL) { |
|
127 | 127 | if (isset($href)) |
128 | 128 | $this->setProperty("href", $href); |
129 | - if(isset($target)) |
|
129 | + if (isset($target)) |
|
130 | 130 | $this->setProperty("target", $target); |
131 | 131 | return $this->setTagName("a"); |
132 | 132 | } |
@@ -138,9 +138,9 @@ discard block |
||
138 | 138 | */ |
139 | 139 | public function jsShowDimmer($show=true) { |
140 | 140 | $status="hide"; |
141 | - if ($show === true) |
|
141 | + if ($show===true) |
|
142 | 142 | $status="show"; |
143 | - return '$("#.' . $this->identifier . ').dimmer("' . $status . '");'; |
|
143 | + return '$("#.'.$this->identifier.').dimmer("'.$status.'");'; |
|
144 | 144 | } |
145 | 145 | |
146 | 146 | /** |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | * @see HtmlDoubleElement::run() |
159 | 159 | */ |
160 | 160 | public function run(JsUtils $js) { |
161 | - $this->_bsComponent=$js->semantic()->generic("#" . $this->identifier); |
|
161 | + $this->_bsComponent=$js->semantic()->generic("#".$this->identifier); |
|
162 | 162 | parent::run($js); |
163 | 163 | $this->addEventsOnRun($js); |
164 | 164 | if (isset($this->_popup)) { |
@@ -40,8 +40,9 @@ discard block |
||
40 | 40 | * @param string $popupEvent |
41 | 41 | */ |
42 | 42 | public function setPopupAttributes($variation=NULL, $popupEvent=NULL) { |
43 | - if (isset($this->_popup)) |
|
44 | - $this->_popup->setAttributes($variation, $popupEvent); |
|
43 | + if (isset($this->_popup)) { |
|
44 | + $this->_popup->setAttributes($variation, $popupEvent); |
|
45 | + } |
|
45 | 46 | } |
46 | 47 | |
47 | 48 | /** |
@@ -96,8 +97,9 @@ discard block |
||
96 | 97 | $labelO=$label; |
97 | 98 | if (\is_object($label) === false) { |
98 | 99 | $labelO=new HtmlLabel("label-" . $this->identifier, $label); |
99 | - if (isset($icon)) |
|
100 | - $labelO->addIcon($icon); |
|
100 | + if (isset($icon)) { |
|
101 | + $labelO->addIcon($icon); |
|
102 | + } |
|
101 | 103 | } else { |
102 | 104 | $labelO->addToPropertyCtrl("class", "label", array ("label" )); |
103 | 105 | } |
@@ -124,10 +126,12 @@ discard block |
||
124 | 126 | * @return HtmlSemDoubleElement |
125 | 127 | */ |
126 | 128 | public function asLink($href=NULL,$target=NULL) { |
127 | - if (isset($href)) |
|
128 | - $this->setProperty("href", $href); |
|
129 | - if(isset($target)) |
|
130 | - $this->setProperty("target", $target); |
|
129 | + if (isset($href)) { |
|
130 | + $this->setProperty("href", $href); |
|
131 | + } |
|
132 | + if(isset($target)) { |
|
133 | + $this->setProperty("target", $target); |
|
134 | + } |
|
131 | 135 | return $this->setTagName("a"); |
132 | 136 | } |
133 | 137 | |
@@ -138,8 +142,9 @@ discard block |
||
138 | 142 | */ |
139 | 143 | public function jsShowDimmer($show=true) { |
140 | 144 | $status="hide"; |
141 | - if ($show === true) |
|
142 | - $status="show"; |
|
145 | + if ($show === true) { |
|
146 | + $status="show"; |
|
147 | + } |
|
143 | 148 | return '$("#.' . $this->identifier . ').dimmer("' . $status . '");'; |
144 | 149 | } |
145 | 150 | |
@@ -148,8 +153,9 @@ discard block |
||
148 | 153 | * @see BaseHtml::compile() |
149 | 154 | */ |
150 | 155 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
151 | - if (isset($this->_popup)) |
|
152 | - $this->_popup->compile($js); |
|
156 | + if (isset($this->_popup)) { |
|
157 | + $this->_popup->compile($js); |
|
158 | + } |
|
153 | 159 | return parent::compile($js, $view); |
154 | 160 | } |
155 | 161 |
@@ -20,7 +20,7 @@ |
||
20 | 20 | $this->params["onUnchecked"]="%function(){".$value."}%"; |
21 | 21 | } |
22 | 22 | |
23 | - public function setOnChange($value){ |
|
23 | + public function setOnChange($value) { |
|
24 | 24 | $this->params["onChange"]="%function(){".$value."}%"; |
25 | 25 | } |
26 | 26 | //TODO other events implementation |
@@ -19,28 +19,28 @@ discard block |
||
19 | 19 | |
20 | 20 | public function __construct(JsUtils $js=NULL) { |
21 | 21 | parent::__construct($js); |
22 | - $this->events=array (); |
|
22 | + $this->events=array(); |
|
23 | 23 | } |
24 | 24 | |
25 | 25 | protected function compileEvents() { |
26 | - foreach ( $this->events as $event => $jsCode ) { |
|
26 | + foreach ($this->events as $event => $jsCode) { |
|
27 | 27 | $itemSelector=JString::getValueBetween($event); |
28 | 28 | //echo $itemSelector.":::".$jsCode."<br>"; |
29 | - if($event=="execute"){ |
|
29 | + if ($event=="execute") { |
|
30 | 30 | $this->jquery_code_for_compile []=$jsCode; |
31 | - }else if($event=="beforeExecute"){ |
|
31 | + } else if ($event=="beforeExecute") { |
|
32 | 32 | \array_unshift($this->jquery_code_for_compile, $jsCode); |
33 | - }else{ |
|
33 | + } else { |
|
34 | 34 | $selector=$this->_createSelector($itemSelector, $this->attachTo); |
35 | 35 | $this->jquery_code_for_compile []="$( \"".$selector."\" ).on(\"".$event."\" , function( event, data ) {".$jsCode."});"; |
36 | 36 | } |
37 | 37 | } |
38 | 38 | } |
39 | 39 | |
40 | - protected function _createSelector($itemSelector,$selector){ |
|
41 | - if(!isset($itemSelector)) |
|
40 | + protected function _createSelector($itemSelector, $selector) { |
|
41 | + if (!isset($itemSelector)) |
|
42 | 42 | $itemSelector=$this->itemSelector; |
43 | - if(isset($itemSelector) && $itemSelector!=="") |
|
43 | + if (isset($itemSelector) && $itemSelector!=="") |
|
44 | 44 | $selector.=" ".$itemSelector; |
45 | 45 | return $selector; |
46 | 46 | } |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | $result=implode("\n", $this->jquery_code_for_compile); |
50 | 50 | $result=str_ireplace("\"%", "", $result); |
51 | 51 | $result=str_ireplace("%\"", "", $result); |
52 | - $result=str_replace(array ( |
|
52 | + $result=str_replace(array( |
|
53 | 53 | "\\n", |
54 | 54 | "\\r", |
55 | 55 | "\\t" |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | |
60 | 60 | public function getScript() { |
61 | 61 | $allParams=$this->params; |
62 | - $this->jquery_code_for_compile=array (); |
|
62 | + $this->jquery_code_for_compile=array(); |
|
63 | 63 | $this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).{$this->uiName}(".$this->getParamsAsJSON($allParams).");"; |
64 | 64 | $this->compileEvents(); |
65 | 65 | return $this->compileJQueryCode(); |
@@ -28,9 +28,9 @@ discard block |
||
28 | 28 | //echo $itemSelector.":::".$jsCode."<br>"; |
29 | 29 | if($event=="execute"){ |
30 | 30 | $this->jquery_code_for_compile []=$jsCode; |
31 | - }else if($event=="beforeExecute"){ |
|
31 | + } else if($event=="beforeExecute"){ |
|
32 | 32 | \array_unshift($this->jquery_code_for_compile, $jsCode); |
33 | - }else{ |
|
33 | + } else{ |
|
34 | 34 | $selector=$this->_createSelector($itemSelector, $this->attachTo); |
35 | 35 | $this->jquery_code_for_compile []="$( \"".$selector."\" ).on(\"".$event."\" , function( event, data ) {".$jsCode."});"; |
36 | 36 | } |
@@ -38,10 +38,12 @@ discard block |
||
38 | 38 | } |
39 | 39 | |
40 | 40 | protected function _createSelector($itemSelector,$selector){ |
41 | - if(!isset($itemSelector)) |
|
42 | - $itemSelector=$this->itemSelector; |
|
43 | - if(isset($itemSelector) && $itemSelector!=="") |
|
44 | - $selector.=" ".$itemSelector; |
|
41 | + if(!isset($itemSelector)) { |
|
42 | + $itemSelector=$this->itemSelector; |
|
43 | + } |
|
44 | + if(isset($itemSelector) && $itemSelector!=="") { |
|
45 | + $selector.=" ".$itemSelector; |
|
46 | + } |
|
45 | 47 | return $selector; |
46 | 48 | } |
47 | 49 | |
@@ -84,8 +86,9 @@ discard block |
||
84 | 86 | |
85 | 87 | protected function setParamCtrl($key, $value, $typeCtrl) { |
86 | 88 | if (\is_array($typeCtrl)) { |
87 | - if (array_search($value, $typeCtrl)===false) |
|
88 | - throw new \Exception("La valeur passée a propriété `".$key."` pour le composant `".$this->uiName."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}"); |
|
89 | + if (array_search($value, $typeCtrl)===false) { |
|
90 | + throw new \Exception("La valeur passée a propriété `".$key."` pour le composant `".$this->uiName."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}"); |
|
91 | + } |
|
89 | 92 | } else { |
90 | 93 | if (!$typeCtrl($value)) { |
91 | 94 | throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$key." au composant ".$this->uiName); |
@@ -2,63 +2,63 @@ |
||
2 | 2 | namespace Ajax\service; |
3 | 3 | class JString { |
4 | 4 | |
5 | - public static function contains($hay,$needle){ |
|
6 | - return strpos($hay, $needle) !== false; |
|
5 | + public static function contains($hay, $needle) { |
|
6 | + return strpos($hay, $needle)!==false; |
|
7 | 7 | } |
8 | 8 | public static function startswith($hay, $needle) { |
9 | - return substr($hay, 0, strlen($needle)) === $needle; |
|
9 | + return substr($hay, 0, strlen($needle))===$needle; |
|
10 | 10 | } |
11 | 11 | |
12 | 12 | public static function endswith($hay, $needle) { |
13 | - return substr($hay, -strlen($needle)) === $needle; |
|
13 | + return substr($hay, -strlen($needle))===$needle; |
|
14 | 14 | } |
15 | 15 | |
16 | - public static function isNull($s){ |
|
16 | + public static function isNull($s) { |
|
17 | 17 | return (!isset($s) || NULL===$s || ""===$s); |
18 | 18 | } |
19 | - public static function isNotNull($s){ |
|
19 | + public static function isNotNull($s) { |
|
20 | 20 | return (isset($s) && NULL!==$s && ""!==$s); |
21 | 21 | } |
22 | 22 | |
23 | - public static function isBoolean($value){ |
|
23 | + public static function isBoolean($value) { |
|
24 | 24 | return \is_bool($value) || $value==1 || $value==0; |
25 | 25 | } |
26 | 26 | |
27 | - public static function isBooleanTrue($value){ |
|
27 | + public static function isBooleanTrue($value) { |
|
28 | 28 | return $value==1 || $value; |
29 | 29 | } |
30 | 30 | |
31 | - public static function isBooleanFalse($value){ |
|
31 | + public static function isBooleanFalse($value) { |
|
32 | 32 | return $value==0 || !$value; |
33 | 33 | } |
34 | 34 | |
35 | - public static function camelCaseToSeparated($input,$separator=" "){ |
|
35 | + public static function camelCaseToSeparated($input, $separator=" ") { |
|
36 | 36 | return strtolower(preg_replace('/(?<!^)[A-Z]/', $separator.'$0', $input)); |
37 | 37 | } |
38 | 38 | |
39 | - public static function replaceAtFirst($subject,$from, $to){ |
|
40 | - $from = '/\A'.preg_quote($from, '/').'/'; |
|
39 | + public static function replaceAtFirst($subject, $from, $to) { |
|
40 | + $from='/\A'.preg_quote($from, '/').'/'; |
|
41 | 41 | return \preg_replace($from, $to, $subject, 1); |
42 | 42 | } |
43 | 43 | |
44 | - public static function replaceAtLast($subject,$from, $to){ |
|
45 | - $from = '/'.preg_quote($from, '/').'\z/'; |
|
44 | + public static function replaceAtLast($subject, $from, $to) { |
|
45 | + $from='/'.preg_quote($from, '/').'\z/'; |
|
46 | 46 | return \preg_replace($from, $to, $subject, 1); |
47 | 47 | } |
48 | 48 | |
49 | - public static function replaceAtFirstAndLast($subject,$fromFirst,$toFirst,$fromLast,$toLast){ |
|
49 | + public static function replaceAtFirstAndLast($subject, $fromFirst, $toFirst, $fromLast, $toLast) { |
|
50 | 50 | $s=self::replaceAtFirst($subject, $fromFirst, $toFirst); |
51 | 51 | return self::replaceAtLast($s, $fromLast, $toLast); |
52 | 52 | } |
53 | 53 | |
54 | - public static function getValueBetween(&$str,$before="{{",$after="}}"){ |
|
54 | + public static function getValueBetween(&$str, $before="{{", $after="}}") { |
|
55 | 55 | $matches=[]; |
56 | 56 | $result=null; |
57 | 57 | $_before=\preg_quote($before); |
58 | 58 | $_after=\preg_quote($after); |
59 | - if(\preg_match('/'.$_before.'(.*?)'.$_after.'/s', $str, $matches)===1){ |
|
59 | + if (\preg_match('/'.$_before.'(.*?)'.$_after.'/s', $str, $matches)===1) { |
|
60 | 60 | $result=$matches[1]; |
61 | - $str=\str_replace($before.$result.$after,"", $str); |
|
61 | + $str=\str_replace($before.$result.$after, "", $str); |
|
62 | 62 | } |
63 | 63 | return $result; |
64 | 64 | } |
@@ -62,6 +62,9 @@ discard block |
||
62 | 62 | return $tr; |
63 | 63 | } |
64 | 64 | |
65 | + /** |
|
66 | + * @param integer $value |
|
67 | + */ |
|
65 | 68 | public function newRow($value) { |
66 | 69 | return $this->createItem($value); |
67 | 70 | } |
@@ -160,6 +163,9 @@ discard block |
||
160 | 163 | return $this; |
161 | 164 | } |
162 | 165 | |
166 | + /** |
|
167 | + * @param integer $colIndex |
|
168 | + */ |
|
163 | 169 | public function setColValues($colIndex, $values=array()) { |
164 | 170 | $count=$this->count(); |
165 | 171 | if (!\is_array($values)) { |
@@ -180,6 +186,9 @@ discard block |
||
180 | 186 | return $this; |
181 | 187 | } |
182 | 188 | |
189 | + /** |
|
190 | + * @param integer $rowIndex |
|
191 | + */ |
|
183 | 192 | public function setRowValues($rowIndex, $values=array()) { |
184 | 193 | $count=$this->count(); |
185 | 194 | if (!\is_array($values)) { |
@@ -189,6 +198,9 @@ discard block |
||
189 | 198 | return $this; |
190 | 199 | } |
191 | 200 | |
201 | + /** |
|
202 | + * @param string $function |
|
203 | + */ |
|
192 | 204 | private function colAlign($colIndex, $function) { |
193 | 205 | $count=$this->count(); |
194 | 206 | for($i=0; $i < $count; $i++) { |
@@ -266,7 +278,7 @@ discard block |
||
266 | 278 | } |
267 | 279 | |
268 | 280 | /** |
269 | - * @param mixed $callback |
|
281 | + * @param callable $callback |
|
270 | 282 | * @param string $format |
271 | 283 | * @return HtmlTableContent |
272 | 284 | */ |
@@ -279,7 +291,7 @@ discard block |
||
279 | 291 | } |
280 | 292 | |
281 | 293 | /** |
282 | - * @param mixed $callback |
|
294 | + * @param callable $callback |
|
283 | 295 | * @param string $format |
284 | 296 | * @return HtmlTableContent |
285 | 297 | */ |
@@ -292,7 +304,7 @@ discard block |
||
292 | 304 | } |
293 | 305 | |
294 | 306 | /** |
295 | - * @param mixed $callback |
|
307 | + * @param callable $callback |
|
296 | 308 | * @return HtmlTableContent |
297 | 309 | */ |
298 | 310 | public function applyCells($callback) { |
@@ -304,7 +316,7 @@ discard block |
||
304 | 316 | } |
305 | 317 | |
306 | 318 | /** |
307 | - * @param mixed $callback |
|
319 | + * @param callable $callback |
|
308 | 320 | * @return HtmlTableContent |
309 | 321 | */ |
310 | 322 | public function applyRows($callback) { |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | * |
12 | 12 | */ |
13 | 13 | class HtmlTableContent extends HtmlSemCollection { |
14 | - protected $_tdTagNames=[ "thead" => "th","tbody" => "td","tfoot" => "th" ]; |
|
14 | + protected $_tdTagNames=["thead" => "th", "tbody" => "td", "tfoot" => "th"]; |
|
15 | 15 | |
16 | 16 | /** |
17 | 17 | * |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | */ |
35 | 35 | public function setRowCount($rowCount, $colCount) { |
36 | 36 | $count=$this->count(); |
37 | - for($i=$count; $i < $rowCount; $i++) { |
|
37 | + for ($i=$count; $i<$rowCount; $i++) { |
|
38 | 38 | $this->addItem($colCount); |
39 | 39 | } |
40 | 40 | return $this; |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | $tr=new HtmlTR("", $value); |
57 | 57 | $tr->setContainer($this, $count); |
58 | 58 | $tr->setTdTagName($this->_tdTagNames[$this->tagName]); |
59 | - if (isset($value) === true) { |
|
59 | + if (isset($value)===true) { |
|
60 | 60 | $tr->setColCount($value); |
61 | 61 | } |
62 | 62 | return $tr; |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | */ |
115 | 115 | public function setCellValue($row, $col, $value="") { |
116 | 116 | $cell=$this->getCell($row, $col); |
117 | - if (isset($cell) === true) { |
|
117 | + if (isset($cell)===true) { |
|
118 | 118 | $cell->setValue($value); |
119 | 119 | } |
120 | 120 | return $this; |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | * @param mixed $values |
126 | 126 | */ |
127 | 127 | public function setValues($values=array()) { |
128 | - return $this->_addOrSetValues($values, function($row,$_values){$row->setValues($_values);}); |
|
128 | + return $this->_addOrSetValues($values, function($row, $_values) {$row->setValues($_values); }); |
|
129 | 129 | } |
130 | 130 | |
131 | 131 | /** |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | * @param mixed $values |
134 | 134 | */ |
135 | 135 | public function addValues($values=array()) { |
136 | - return $this->_addOrSetValues($values, function($row,$_values){$row->addValues($_values);}); |
|
136 | + return $this->_addOrSetValues($values, function($row, $_values) {$row->addValues($_values); }); |
|
137 | 137 | } |
138 | 138 | |
139 | 139 | /** |
@@ -141,21 +141,21 @@ discard block |
||
141 | 141 | * @param mixed $values |
142 | 142 | * @param callable $callback |
143 | 143 | */ |
144 | - protected function _addOrSetValues($values,$callback) { |
|
144 | + protected function _addOrSetValues($values, $callback) { |
|
145 | 145 | $count=$this->count(); |
146 | 146 | $isArray=true; |
147 | 147 | if (!\is_array($values)) { |
148 | 148 | $values=\array_fill(0, $count, $values); |
149 | 149 | $isArray=false; |
150 | 150 | } |
151 | - if (JArray::dimension($values) == 1 && $isArray) |
|
152 | - $values=[ $values ]; |
|
151 | + if (JArray::dimension($values)==1 && $isArray) |
|
152 | + $values=[$values]; |
|
153 | 153 | |
154 | 154 | $count=\min(\sizeof($values), $count); |
155 | 155 | |
156 | - for($i=0; $i < $count; $i++) { |
|
156 | + for ($i=0; $i<$count; $i++) { |
|
157 | 157 | $row=$this->content[$i]; |
158 | - $callback($row,$values[$i]); |
|
158 | + $callback($row, $values[$i]); |
|
159 | 159 | } |
160 | 160 | return $this; |
161 | 161 | } |
@@ -166,7 +166,7 @@ discard block |
||
166 | 166 | $values=\array_fill(0, $count, $values); |
167 | 167 | } |
168 | 168 | $count=\min(\sizeof($values), $count); |
169 | - for($i=0; $i < $count; $i++) { |
|
169 | + for ($i=0; $i<$count; $i++) { |
|
170 | 170 | $this->getCell($i, $colIndex)->setValue($values[$i]); |
171 | 171 | } |
172 | 172 | return $this; |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | |
175 | 175 | public function addColVariations($colIndex, $variations=array()) { |
176 | 176 | $count=$this->count(); |
177 | - for($i=0; $i < $count; $i++) { |
|
177 | + for ($i=0; $i<$count; $i++) { |
|
178 | 178 | $this->getCell($i, $colIndex)->addVariations($variations); |
179 | 179 | } |
180 | 180 | return $this; |
@@ -191,9 +191,9 @@ discard block |
||
191 | 191 | |
192 | 192 | private function colAlign($colIndex, $function) { |
193 | 193 | $count=$this->count(); |
194 | - for($i=0; $i < $count; $i++) { |
|
194 | + for ($i=0; $i<$count; $i++) { |
|
195 | 195 | $index=$this->content[$i]->getColPosition($colIndex); |
196 | - if ($index !== NULL) |
|
196 | + if ($index!==NULL) |
|
197 | 197 | $this->getCell($i, $index)->$function(); |
198 | 198 | } |
199 | 199 | return $this; |
@@ -225,7 +225,7 @@ discard block |
||
225 | 225 | */ |
226 | 226 | public function getColCount() { |
227 | 227 | $result=0; |
228 | - if ($this->count() > 0) |
|
228 | + if ($this->count()>0) |
|
229 | 229 | $result=$this->getItem(0)->count(); |
230 | 230 | return $result; |
231 | 231 | } |
@@ -239,7 +239,7 @@ discard block |
||
239 | 239 | public function delete($rowIndex, $colIndex=NULL) { |
240 | 240 | if (isset($colIndex)) { |
241 | 241 | $row=$this->getItem($rowIndex); |
242 | - if (isset($row) === true) { |
|
242 | + if (isset($row)===true) { |
|
243 | 243 | $row->delete($colIndex); |
244 | 244 | } |
245 | 245 | } else { |
@@ -272,17 +272,17 @@ discard block |
||
272 | 272 | */ |
273 | 273 | public function conditionalCellFormat($callback, $format) { |
274 | 274 | $rows=$this->content; |
275 | - foreach ( $rows as $row ) { |
|
275 | + foreach ($rows as $row) { |
|
276 | 276 | $row->conditionalCellFormat($callback, $format); |
277 | 277 | } |
278 | 278 | return $this; |
279 | 279 | } |
280 | 280 | |
281 | - public function conditionalColFormat($colIndex,$callback,$format){ |
|
281 | + public function conditionalColFormat($colIndex, $callback, $format) { |
|
282 | 282 | $rows=$this->content; |
283 | - foreach ( $rows as $row ) { |
|
283 | + foreach ($rows as $row) { |
|
284 | 284 | $cell=$row->getItem($colIndex); |
285 | - $cell->conditionnalCellFormat($callback,$format); |
|
285 | + $cell->conditionnalCellFormat($callback, $format); |
|
286 | 286 | } |
287 | 287 | return $this; |
288 | 288 | } |
@@ -294,17 +294,17 @@ discard block |
||
294 | 294 | */ |
295 | 295 | public function conditionalRowFormat($callback, $format) { |
296 | 296 | $rows=$this->content; |
297 | - foreach ( $rows as $row ) { |
|
297 | + foreach ($rows as $row) { |
|
298 | 298 | $row->conditionalRowFormat($callback, $format); |
299 | 299 | } |
300 | 300 | return $this; |
301 | 301 | } |
302 | 302 | |
303 | - public function hideColumn($colIndex){ |
|
303 | + public function hideColumn($colIndex) { |
|
304 | 304 | $rows=$this->content; |
305 | - foreach ( $rows as $row ) { |
|
305 | + foreach ($rows as $row) { |
|
306 | 306 | $cell=$row->getItem($colIndex); |
307 | - $cell->addToProperty("style","display:none;"); |
|
307 | + $cell->addToProperty("style", "display:none;"); |
|
308 | 308 | } |
309 | 309 | return $this; |
310 | 310 | } |
@@ -315,7 +315,7 @@ discard block |
||
315 | 315 | */ |
316 | 316 | public function applyCells($callback) { |
317 | 317 | $rows=$this->content; |
318 | - foreach ( $rows as $row ) { |
|
318 | + foreach ($rows as $row) { |
|
319 | 319 | $row->applyCells($callback); |
320 | 320 | } |
321 | 321 | return $this; |
@@ -327,7 +327,7 @@ discard block |
||
327 | 327 | */ |
328 | 328 | public function applyRows($callback) { |
329 | 329 | $rows=$this->content; |
330 | - foreach ( $rows as $row ) { |
|
330 | + foreach ($rows as $row) { |
|
331 | 331 | $row->apply($callback); |
332 | 332 | } |
333 | 333 | return $this; |
@@ -22,8 +22,9 @@ discard block |
||
22 | 22 | */ |
23 | 23 | public function __construct($identifier, $tagName="tbody", $rowCount=NULL, $colCount=NULL) { |
24 | 24 | parent::__construct($identifier, $tagName, ""); |
25 | - if (isset($rowCount) && isset($colCount)) |
|
26 | - $this->setRowCount($rowCount, $colCount); |
|
25 | + if (isset($rowCount) && isset($colCount)) { |
|
26 | + $this->setRowCount($rowCount, $colCount); |
|
27 | + } |
|
27 | 28 | } |
28 | 29 | |
29 | 30 | /** |
@@ -148,8 +149,9 @@ discard block |
||
148 | 149 | $values=\array_fill(0, $count, $values); |
149 | 150 | $isArray=false; |
150 | 151 | } |
151 | - if (JArray::dimension($values) == 1 && $isArray) |
|
152 | - $values=[ $values ]; |
|
152 | + if (JArray::dimension($values) == 1 && $isArray) { |
|
153 | + $values=[ $values ]; |
|
154 | + } |
|
153 | 155 | |
154 | 156 | $count=\min(\sizeof($values), $count); |
155 | 157 | |
@@ -193,8 +195,9 @@ discard block |
||
193 | 195 | $count=$this->count(); |
194 | 196 | for($i=0; $i < $count; $i++) { |
195 | 197 | $index=$this->content[$i]->getColPosition($colIndex); |
196 | - if ($index !== NULL) |
|
197 | - $this->getCell($i, $index)->$function(); |
|
198 | + if ($index !== NULL) { |
|
199 | + $this->getCell($i, $index)->$function(); |
|
200 | + } |
|
198 | 201 | } |
199 | 202 | return $this; |
200 | 203 | } |
@@ -225,8 +228,9 @@ discard block |
||
225 | 228 | */ |
226 | 229 | public function getColCount() { |
227 | 230 | $result=0; |
228 | - if ($this->count() > 0) |
|
229 | - $result=$this->getItem(0)->count(); |
|
231 | + if ($this->count() > 0) { |
|
232 | + $result=$this->getItem(0)->count(); |
|
233 | + } |
|
230 | 234 | return $result; |
231 | 235 | } |
232 | 236 |