@@ -99,15 +99,18 @@ discard block |
||
99 | 99 | $flag=false; |
100 | 100 | $index=0; |
101 | 101 | while ( !$flag && $index < sizeof($elements) ) { |
102 | - if ($elements[$index] instanceof BaseHtml) |
|
103 | - $flag=($callback($elements[$index])); |
|
102 | + if ($elements[$index] instanceof BaseHtml) { |
|
103 | + $flag=($callback($elements[$index])); |
|
104 | + } |
|
104 | 105 | $index++; |
105 | 106 | } |
106 | - if ($flag === true) |
|
107 | - return $elements[$index - 1]; |
|
107 | + if ($flag === true) { |
|
108 | + return $elements[$index - 1]; |
|
109 | + } |
|
108 | 110 | } elseif ($elements instanceof BaseHtml) { |
109 | - if ($callback($elements)) |
|
110 | - return $elements; |
|
111 | + if ($callback($elements)) { |
|
112 | + return $elements; |
|
113 | + } |
|
111 | 114 | } |
112 | 115 | return null; |
113 | 116 | } |
@@ -140,8 +143,9 @@ discard block |
||
140 | 143 | |
141 | 144 | public function fromArray($array) { |
142 | 145 | foreach ( $this as $key => $value ) { |
143 | - if(array_key_exists($key, $array)===true) |
|
144 | - $this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array); |
|
146 | + if(array_key_exists($key, $array)===true) { |
|
147 | + $this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array); |
|
148 | + } |
|
145 | 149 | } |
146 | 150 | foreach ( $array as $key => $value ) { |
147 | 151 | if($this->_callSetter($key, $key, $value, $array)===false){ |
@@ -63,6 +63,10 @@ discard block |
||
63 | 63 | |
64 | 64 | |
65 | 65 | |
66 | + /** |
|
67 | + * @param string $name |
|
68 | + * @param string[] $typeCtrl |
|
69 | + */ |
|
66 | 70 | protected function setMemberCtrl(&$name, $value, $typeCtrl) { |
67 | 71 | if ($this->ctrl($name, $value, $typeCtrl) === true) { |
68 | 72 | return $name=$value; |
@@ -80,6 +84,10 @@ discard block |
||
80 | 84 | |
81 | 85 | |
82 | 86 | |
87 | + /** |
|
88 | + * @param string $name |
|
89 | + * @param string[] $typeCtrl |
|
90 | + */ |
|
83 | 91 | protected function addToMemberCtrl(&$name, $value, $typeCtrl, $separator=" ") { |
84 | 92 | if ($this->ctrl($name, $value, $typeCtrl) === true) { |
85 | 93 | if (\is_array($typeCtrl)) { |
@@ -90,6 +98,9 @@ discard block |
||
90 | 98 | return $this; |
91 | 99 | } |
92 | 100 | |
101 | + /** |
|
102 | + * @param string $name |
|
103 | + */ |
|
93 | 104 | protected function addToMember(&$name, $value, $separator=" ") { |
94 | 105 | $name=str_ireplace($value, "", $name) . $separator . $value; |
95 | 106 | return $this; |
@@ -102,6 +113,9 @@ discard block |
||
102 | 113 | $oldValue=trim($oldValue); |
103 | 114 | } |
104 | 115 | |
116 | + /** |
|
117 | + * @param \Closure $callback |
|
118 | + */ |
|
105 | 119 | protected function _getElementBy($callback,$elements){ |
106 | 120 | if (\is_array($elements)) { |
107 | 121 | $elements=\array_values($elements); |
@@ -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 | |
@@ -30,14 +30,14 @@ discard block |
||
30 | 30 | */ |
31 | 31 | abstract public function run(JsUtils $js); |
32 | 32 | |
33 | - private function _callSetter($setter,$key,$value,&$array){ |
|
33 | + private function _callSetter($setter, $key, $value, &$array) { |
|
34 | 34 | $result=false; |
35 | 35 | if (method_exists($this, $setter) && !JString::startswith($key, "_")) { |
36 | 36 | try { |
37 | 37 | $this->$setter($value); |
38 | 38 | unset($array[$key]); |
39 | 39 | $result=true; |
40 | - } catch ( \Exception $e ) { |
|
40 | + }catch (\Exception $e) { |
|
41 | 41 | $result=false; |
42 | 42 | } |
43 | 43 | } |
@@ -45,17 +45,17 @@ discard block |
||
45 | 45 | } |
46 | 46 | |
47 | 47 | protected function getTemplate(JsUtils $js=NULL) { |
48 | - return PropertyWrapper::wrap($this->_wrapBefore, $js) . $this->_template . PropertyWrapper::wrap($this->_wrapAfter, $js); |
|
48 | + return PropertyWrapper::wrap($this->_wrapBefore, $js).$this->_template.PropertyWrapper::wrap($this->_wrapAfter, $js); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | protected function ctrl($name, $value, $typeCtrl) { |
52 | 52 | if (\is_array($typeCtrl)) { |
53 | - if (array_search($value, $typeCtrl) === false) { |
|
54 | - throw new \Exception("La valeur passée `" . $value . "` à la propriété `" . $name . "` ne fait pas partie des valeurs possibles : {" . implode(",", $typeCtrl) . "}"); |
|
53 | + if (array_search($value, $typeCtrl)===false) { |
|
54 | + throw new \Exception("La valeur passée `".$value."` à la propriété `".$name."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}"); |
|
55 | 55 | } |
56 | 56 | } else { |
57 | 57 | if (!$typeCtrl($value)) { |
58 | - throw new \Exception("La fonction " . $typeCtrl . " a retourné faux pour l'affectation de la propriété " . $name); |
|
58 | + throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$name); |
|
59 | 59 | } |
60 | 60 | } |
61 | 61 | return true; |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | |
65 | 65 | |
66 | 66 | protected function setMemberCtrl(&$name, $value, $typeCtrl) { |
67 | - if ($this->ctrl($name, $value, $typeCtrl) === true) { |
|
67 | + if ($this->ctrl($name, $value, $typeCtrl)===true) { |
|
68 | 68 | return $name=$value; |
69 | 69 | } |
70 | 70 | return $this; |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | protected function addToMemberUnique(&$name, $value, $typeCtrl, $separator=" ") { |
74 | 74 | if (\is_array($typeCtrl)) { |
75 | 75 | $this->removeOldValues($name, $typeCtrl); |
76 | - $name.=$separator . $value; |
|
76 | + $name.=$separator.$value; |
|
77 | 77 | } |
78 | 78 | return $this; |
79 | 79 | } |
@@ -81,17 +81,17 @@ discard block |
||
81 | 81 | |
82 | 82 | |
83 | 83 | protected function addToMemberCtrl(&$name, $value, $typeCtrl, $separator=" ") { |
84 | - if ($this->ctrl($name, $value, $typeCtrl) === true) { |
|
84 | + if ($this->ctrl($name, $value, $typeCtrl)===true) { |
|
85 | 85 | if (\is_array($typeCtrl)) { |
86 | 86 | $this->removeOldValues($name, $typeCtrl); |
87 | 87 | } |
88 | - $name.=$separator . $value; |
|
88 | + $name.=$separator.$value; |
|
89 | 89 | } |
90 | 90 | return $this; |
91 | 91 | } |
92 | 92 | |
93 | 93 | protected function addToMember(&$name, $value, $separator=" ") { |
94 | - $name=str_ireplace($value, "", $name) . $separator . $value; |
|
94 | + $name=str_ireplace($value, "", $name).$separator.$value; |
|
95 | 95 | return $this; |
96 | 96 | } |
97 | 97 | |
@@ -102,18 +102,18 @@ discard block |
||
102 | 102 | $oldValue=trim($oldValue); |
103 | 103 | } |
104 | 104 | |
105 | - protected function _getElementBy($callback,$elements){ |
|
105 | + protected function _getElementBy($callback, $elements) { |
|
106 | 106 | if (\is_array($elements)) { |
107 | 107 | $elements=\array_values($elements); |
108 | 108 | $flag=false; |
109 | 109 | $index=0; |
110 | - while ( !$flag && $index < sizeof($elements) ) { |
|
110 | + while (!$flag && $index<sizeof($elements)) { |
|
111 | 111 | if ($elements[$index] instanceof BaseHtml) |
112 | 112 | $flag=($callback($elements[$index])); |
113 | 113 | $index++; |
114 | 114 | } |
115 | - if ($flag === true) |
|
116 | - return $elements[$index - 1]; |
|
115 | + if ($flag===true) |
|
116 | + return $elements[$index-1]; |
|
117 | 117 | } elseif ($elements instanceof BaseHtml) { |
118 | 118 | if ($callback($elements)) |
119 | 119 | return $elements; |
@@ -141,13 +141,13 @@ discard block |
||
141 | 141 | } |
142 | 142 | |
143 | 143 | public function fromArray($array) { |
144 | - foreach ( $this as $key => $value ) { |
|
145 | - if(array_key_exists($key, $array)===true) |
|
146 | - $this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array); |
|
144 | + foreach ($this as $key => $value) { |
|
145 | + if (array_key_exists($key, $array)===true) |
|
146 | + $this->_callSetter("set".ucfirst($key), $key, $array[$key], $array); |
|
147 | 147 | } |
148 | - foreach ( $array as $key => $value ) { |
|
149 | - if($this->_callSetter($key, $key, $value, $array)===false){ |
|
150 | - $this->_callSetter("set" . ucfirst($key), $key, $value, $array); |
|
148 | + foreach ($array as $key => $value) { |
|
149 | + if ($this->_callSetter($key, $key, $value, $array)===false) { |
|
150 | + $this->_callSetter("set".ucfirst($key), $key, $value, $array); |
|
151 | 151 | } |
152 | 152 | } |
153 | 153 | return $array; |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | |
156 | 156 | public function fromDatabaseObjects($objects, $function) { |
157 | 157 | if (isset($objects)) { |
158 | - foreach ( $objects as $object ) { |
|
158 | + foreach ($objects as $object) { |
|
159 | 159 | $this->fromDatabaseObject($object, $function); |
160 | 160 | } |
161 | 161 | } |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | |
177 | 177 | |
178 | 178 | public function getElementById($identifier, $elements) { |
179 | - return $this->_getElementBy(function($element) use ($identifier){return $element->getIdentifier()===$identifier;}, $elements); |
|
179 | + return $this->_getElementBy(function($element) use ($identifier){return $element->getIdentifier()===$identifier; }, $elements); |
|
180 | 180 | } |
181 | 181 | |
182 | 182 | public function getBsComponent() { |
@@ -189,11 +189,11 @@ discard block |
||
189 | 189 | } |
190 | 190 | |
191 | 191 | protected function compile_once(JsUtils $js=NULL, &$view=NULL) { |
192 | - if(!$this->_compiled){ |
|
193 | - if(isset($js)){ |
|
192 | + if (!$this->_compiled) { |
|
193 | + if (isset($js)) { |
|
194 | 194 | $beforeCompile=$js->getParam("beforeCompileHtml"); |
195 | - if(\is_callable($beforeCompile)){ |
|
196 | - $beforeCompile($this,$js,$view); |
|
195 | + if (\is_callable($beforeCompile)) { |
|
196 | + $beforeCompile($this, $js, $view); |
|
197 | 197 | } |
198 | 198 | } |
199 | 199 | $this->_compiled=true; |
@@ -201,21 +201,21 @@ discard block |
||
201 | 201 | } |
202 | 202 | |
203 | 203 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
204 | - $this->compile_once($js,$view); |
|
204 | + $this->compile_once($js, $view); |
|
205 | 205 | $result=$this->getTemplate($js); |
206 | - foreach ( $this as $key => $value ) { |
|
207 | - if (JString::startswith($key, "_") === false && $key !== "events") { |
|
206 | + foreach ($this as $key => $value) { |
|
207 | + if (JString::startswith($key, "_")===false && $key!=="events") { |
|
208 | 208 | if (\is_array($value)) { |
209 | 209 | $v=PropertyWrapper::wrap($value, $js); |
210 | 210 | } else { |
211 | 211 | $v=$value; |
212 | 212 | } |
213 | - $result=str_ireplace("%" . $key . "%", $v, $result); |
|
213 | + $result=str_ireplace("%".$key."%", $v, $result); |
|
214 | 214 | } |
215 | 215 | } |
216 | 216 | if (isset($js)===true) { |
217 | 217 | $this->run($js); |
218 | - if (isset($view) === true) { |
|
218 | + if (isset($view)===true) { |
|
219 | 219 | $js->addViewElement($this->_identifier, $result, $view); |
220 | 220 | } |
221 | 221 | } |
@@ -53,6 +53,9 @@ discard block |
||
53 | 53 | $element->setStyle($value); |
54 | 54 | } |
55 | 55 | |
56 | + /** |
|
57 | + * @param HtmlDropdown $bt |
|
58 | + */ |
|
56 | 59 | private function dropdownAsButton($bt) { |
57 | 60 | $this->addExistingDropDown($bt); |
58 | 61 | $bt->setTagName("button"); |
@@ -81,6 +84,9 @@ discard block |
||
81 | 84 | return $result; |
82 | 85 | } |
83 | 86 | |
87 | + /** |
|
88 | + * @param integer $iid |
|
89 | + */ |
|
84 | 90 | private function _addArrayElement(array $element,$iid){ |
85 | 91 | if (array_key_exists("glyph", $element)) |
86 | 92 | $bt=new HtmlGlyphButton($this->identifier."-button-".$iid); |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | * @return HtmlButtongroups default : "" |
40 | 40 | */ |
41 | 41 | public function setSize($size) { |
42 | - foreach ( $this->elements as $element ) { |
|
42 | + foreach ($this->elements as $element) { |
|
43 | 43 | $element->setSize($size); |
44 | 44 | } |
45 | 45 | if (is_int($size)) { |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | } |
50 | 50 | |
51 | 51 | public function setStyle($value) { |
52 | - foreach ( $this->elements as $element ) |
|
52 | + foreach ($this->elements as $element) |
|
53 | 53 | $element->setStyle($value); |
54 | 54 | } |
55 | 55 | |
@@ -69,29 +69,29 @@ discard block |
||
69 | 69 | public function addElement($element) { |
70 | 70 | $result=$element; |
71 | 71 | $iid=sizeof($this->elements)+1; |
72 | - if (($element instanceof HtmlDropdown)||($element instanceof HtmlSplitbutton)) { |
|
72 | + if (($element instanceof HtmlDropdown) || ($element instanceof HtmlSplitbutton)) { |
|
73 | 73 | $this->addExistingDropDown($element); |
74 | 74 | } elseif (\is_array($element)) { |
75 | - $result=$this->_addArrayElement($element,$iid); |
|
75 | + $result=$this->_addArrayElement($element, $iid); |
|
76 | 76 | } elseif (is_string($element)) { |
77 | - $result=new HtmlButton($this->identifier."-button-".$iid,$element); |
|
77 | + $result=new HtmlButton($this->identifier."-button-".$iid, $element); |
|
78 | 78 | } |
79 | - if($result instanceof HtmlButton) |
|
79 | + if ($result instanceof HtmlButton) |
|
80 | 80 | $this->elements[]=$result; |
81 | 81 | return $result; |
82 | 82 | } |
83 | 83 | |
84 | - private function _addArrayElement(array $element,$iid){ |
|
84 | + private function _addArrayElement(array $element, $iid) { |
|
85 | 85 | if (array_key_exists("glyph", $element)) |
86 | 86 | $bt=new HtmlGlyphButton($this->identifier."-button-".$iid); |
87 | 87 | elseif (array_key_exists("btnCaption", $element)) { |
88 | 88 | if (array_key_exists("split", $element)) |
89 | 89 | $bt=new HtmlSplitbutton($this->identifier."-dropdown-".$iid); |
90 | - else{ |
|
90 | + else { |
|
91 | 91 | $bt=new HtmlDropdown($this->identifier."-dropdown-".$iid); |
92 | 92 | $this->dropdownAsButton($bt); |
93 | 93 | } |
94 | - } else{ |
|
94 | + } else { |
|
95 | 95 | $bt=new HtmlButton($this->identifier."-button-".$iid); |
96 | 96 | $bt->fromArray($element); |
97 | 97 | } |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | } |
100 | 100 | |
101 | 101 | public function addElements($elements) { |
102 | - foreach ( $elements as $element ) { |
|
102 | + foreach ($elements as $element) { |
|
103 | 103 | $this->addElement($element); |
104 | 104 | } |
105 | 105 | return $this; |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | } else |
120 | 120 | $value="btn-group-".$value; |
121 | 121 | if (strstr($value, "justified")) { |
122 | - foreach ( $this->elements as $element ) { |
|
122 | + foreach ($this->elements as $element) { |
|
123 | 123 | $element->wrap('<div class="btn-group" role="group">', '</div>'); |
124 | 124 | } |
125 | 125 | } |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | * @see \Ajax\bootstrap\html\base\BaseHtml::on() |
151 | 151 | */ |
152 | 152 | public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) { |
153 | - foreach ( $this->elements as $element ) { |
|
153 | + foreach ($this->elements as $element) { |
|
154 | 154 | $element->on($event, $jsCode, $stopPropagation, $preventDefault); |
155 | 155 | } |
156 | 156 | return $this; |
@@ -49,8 +49,9 @@ discard block |
||
49 | 49 | } |
50 | 50 | |
51 | 51 | public function setStyle($value) { |
52 | - foreach ( $this->elements as $element ) |
|
53 | - $element->setStyle($value); |
|
52 | + foreach ( $this->elements as $element ) { |
|
53 | + $element->setStyle($value); |
|
54 | + } |
|
54 | 55 | } |
55 | 56 | |
56 | 57 | private function dropdownAsButton($bt) { |
@@ -76,18 +77,19 @@ discard block |
||
76 | 77 | } elseif (is_string($element)) { |
77 | 78 | $result=new HtmlButton($this->identifier."-button-".$iid,$element); |
78 | 79 | } |
79 | - if($result instanceof HtmlButton) |
|
80 | - $this->elements[]=$result; |
|
80 | + if($result instanceof HtmlButton) { |
|
81 | + $this->elements[]=$result; |
|
82 | + } |
|
81 | 83 | return $result; |
82 | 84 | } |
83 | 85 | |
84 | 86 | private function _addArrayElement(array $element,$iid){ |
85 | - if (array_key_exists("glyph", $element)) |
|
86 | - $bt=new HtmlGlyphButton($this->identifier."-button-".$iid); |
|
87 | - elseif (array_key_exists("btnCaption", $element)) { |
|
88 | - if (array_key_exists("split", $element)) |
|
89 | - $bt=new HtmlSplitbutton($this->identifier."-dropdown-".$iid); |
|
90 | - else{ |
|
87 | + if (array_key_exists("glyph", $element)) { |
|
88 | + $bt=new HtmlGlyphButton($this->identifier."-button-".$iid); |
|
89 | + } elseif (array_key_exists("btnCaption", $element)) { |
|
90 | + if (array_key_exists("split", $element)) { |
|
91 | + $bt=new HtmlSplitbutton($this->identifier."-dropdown-".$iid); |
|
92 | + } else{ |
|
91 | 93 | $bt=new HtmlDropdown($this->identifier."-dropdown-".$iid); |
92 | 94 | $this->dropdownAsButton($bt); |
93 | 95 | } |
@@ -116,8 +118,9 @@ discard block |
||
116 | 118 | public function setAlignment($value) { |
117 | 119 | if (is_int($value)) { |
118 | 120 | $value=CssRef::alignment("btn-group")[$value]; |
119 | - } else |
|
120 | - $value="btn-group-".$value; |
|
121 | + } else { |
|
122 | + $value="btn-group-".$value; |
|
123 | + } |
|
121 | 124 | if (strstr($value, "justified")) { |
122 | 125 | foreach ( $this->elements as $element ) { |
123 | 126 | $element->wrap('<div class="btn-group" role="group">', '</div>'); |
@@ -132,9 +135,9 @@ discard block |
||
132 | 135 | * @return HtmlButton |
133 | 136 | */ |
134 | 137 | public function getElement($index) { |
135 | - if (is_int($index)) |
|
136 | - return $this->elements[$index]; |
|
137 | - else { |
|
138 | + if (is_int($index)) { |
|
139 | + return $this->elements[$index]; |
|
140 | + } else { |
|
138 | 141 | $elm=$this->getElementById($index, $this->elements); |
139 | 142 | return $elm; |
140 | 143 | } |
@@ -58,8 +58,9 @@ discard block |
||
58 | 58 | */ |
59 | 59 | private function getFieldButton($caption,$visibleHover=true){ |
60 | 60 | $bt= new HtmlButton("",$caption); |
61 | - if($visibleHover) |
|
62 | - $this->_visibleOver($bt); |
|
61 | + if($visibleHover) { |
|
62 | + $this->_visibleOver($bt); |
|
63 | + } |
|
63 | 64 | return $bt; |
64 | 65 | } |
65 | 66 | |
@@ -76,8 +77,9 @@ discard block |
||
76 | 77 | return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle,$index,$attributes){ |
77 | 78 | $button=new HtmlButton($id,$value,$cssStyle); |
78 | 79 | $button->postOnClick($url,"$(event.target).closest('tr').find(':input').serialize()",$responseElement,$attributes["ajax"]); |
79 | - if(!isset($attributes["visibleHover"]) || $attributes["visibleHover"]) |
|
80 | - $this->_visibleOver($button); |
|
80 | + if(!isset($attributes["visibleHover"]) || $attributes["visibleHover"]) { |
|
81 | + $this->_visibleOver($button); |
|
82 | + } |
|
81 | 83 | return $button; |
82 | 84 | }, $index,$attributes); |
83 | 85 | } |
@@ -136,8 +138,9 @@ discard block |
||
136 | 138 | private function getDefaultButton($icon,$class=null,$visibleHover=true){ |
137 | 139 | $bt=$this->getFieldButton("",$visibleHover); |
138 | 140 | $bt->asIcon($icon); |
139 | - if(isset($class)) |
|
140 | - $bt->addClass($class); |
|
141 | + if(isset($class)) { |
|
142 | + $bt->addClass($class); |
|
143 | + } |
|
141 | 144 | return $bt; |
142 | 145 | } |
143 | 146 |
@@ -13,15 +13,28 @@ discard block |
||
13 | 13 | * @property InstanceViewer $_instanceViewer |
14 | 14 | */ |
15 | 15 | trait DataTableFieldAsTrait{ |
16 | + |
|
17 | + /** |
|
18 | + * @param \Closure $field |
|
19 | + */ |
|
16 | 20 | abstract public function addField($field); |
21 | + |
|
22 | + /** |
|
23 | + * @param integer $index |
|
24 | + * @param \Closure $field |
|
25 | + */ |
|
17 | 26 | abstract public function insertField($index,$field); |
27 | + |
|
28 | + /** |
|
29 | + * @param \Closure $field |
|
30 | + */ |
|
18 | 31 | abstract public function insertInField($index,$field); |
19 | 32 | abstract public function fieldAs($index,$type,$attributes=NULL); |
20 | 33 | /** |
21 | 34 | * @param string $caption |
22 | 35 | * @param callable $callback |
23 | 36 | * @param boolean $visibleHover |
24 | - * @return callable |
|
37 | + * @return \Closure |
|
25 | 38 | */ |
26 | 39 | private function getFieldButtonCallable($caption,$visibleHover=true,$callback=null){ |
27 | 40 | return $this->getCallable("getFieldButton",[$caption,$visibleHover],$callback); |
@@ -31,7 +44,7 @@ discard block |
||
31 | 44 | * @param callable $thisCallback |
32 | 45 | * @param array $parameters |
33 | 46 | * @param callable $callback |
34 | - * @return callable |
|
47 | + * @return \Closure |
|
35 | 48 | */ |
36 | 49 | private function getCallable($thisCallback,$parameters,$callback=null){ |
37 | 50 | $result=function($instance) use($thisCallback,$parameters,$callback){ |
@@ -83,6 +96,9 @@ discard block |
||
83 | 96 | }, $index,$attributes); |
84 | 97 | } |
85 | 98 | |
99 | + /** |
|
100 | + * @param HtmlButton $element |
|
101 | + */ |
|
86 | 102 | protected function _visibleOver($element){ |
87 | 103 | $this->_visibleHover=true; |
88 | 104 | return $element->addToProperty("class", "visibleover")->setProperty("style","visibility:hidden;"); |
@@ -93,7 +109,7 @@ discard block |
||
93 | 109 | * @param string $caption |
94 | 110 | * @param callable $callback |
95 | 111 | * @param boolean $visibleHover |
96 | - * @return \Ajax\semantic\widgets\datatable\DataTable |
|
112 | + * @return DataTableFieldAsTrait |
|
97 | 113 | */ |
98 | 114 | public function addFieldButton($caption,$visibleHover=true,$callback=null){ |
99 | 115 | $this->addField($this->getCallable("getFieldButton",[$caption,$visibleHover],$callback)); |
@@ -105,7 +121,7 @@ discard block |
||
105 | 121 | * @param int $index |
106 | 122 | * @param string $caption |
107 | 123 | * @param callable $callback |
108 | - * @return \Ajax\semantic\widgets\datatable\DataTable |
|
124 | + * @return DataTableFieldAsTrait |
|
109 | 125 | */ |
110 | 126 | public function insertFieldButton($index,$caption,$visibleHover=true,$callback=null){ |
111 | 127 | $this->insertField($index, $this->getFieldButtonCallable($caption,$visibleHover,$callback)); |
@@ -117,18 +133,26 @@ discard block |
||
117 | 133 | * @param int $index |
118 | 134 | * @param string $caption |
119 | 135 | * @param callable $callback |
120 | - * @return \Ajax\semantic\widgets\datatable\DataTable |
|
136 | + * @return DataTableFieldAsTrait |
|
121 | 137 | */ |
122 | 138 | public function insertInFieldButton($index,$caption,$visibleHover=true,$callback=null){ |
123 | 139 | $this->insertInField($index, $this->getFieldButtonCallable($caption,$visibleHover,$callback)); |
124 | 140 | return $this; |
125 | 141 | } |
126 | 142 | |
143 | + /** |
|
144 | + * @param string $icon |
|
145 | + * @param string $class |
|
146 | + */ |
|
127 | 147 | private function addDefaultButton($icon,$class=null,$visibleHover=true,$callback=null){ |
128 | 148 | $this->addField($this->getCallable("getDefaultButton",[$icon,$class,$visibleHover],$callback)); |
129 | 149 | return $this; |
130 | 150 | } |
131 | 151 | |
152 | + /** |
|
153 | + * @param string $icon |
|
154 | + * @param string $class |
|
155 | + */ |
|
132 | 156 | private function insertDefaultButtonIn($index,$icon,$class=null,$visibleHover=true,$callback=null){ |
133 | 157 | $this->insertInField($index,$this->getCallable("getDefaultButton",[$icon,$class,$visibleHover],$callback)); |
134 | 158 | return $this; |
@@ -146,7 +170,7 @@ discard block |
||
146 | 170 | * @param boolean $visibleHover |
147 | 171 | * @param array $deleteBehavior |
148 | 172 | * @param callable $callback |
149 | - * @return DataTable |
|
173 | + * @return DataTableFieldAsTrait |
|
150 | 174 | */ |
151 | 175 | public function addDeleteButton($visibleHover=true,$deleteBehavior=[],$callback=null){ |
152 | 176 | $this->_deleteBehavior=$deleteBehavior; |
@@ -12,19 +12,19 @@ discard block |
||
12 | 12 | * @property boolean $_visibleHover |
13 | 13 | * @property InstanceViewer $_instanceViewer |
14 | 14 | */ |
15 | -trait DataTableFieldAsTrait{ |
|
15 | +trait DataTableFieldAsTrait { |
|
16 | 16 | abstract public function addField($field); |
17 | - abstract public function insertField($index,$field); |
|
18 | - abstract public function insertInField($index,$field); |
|
19 | - abstract public function fieldAs($index,$type,$attributes=NULL); |
|
17 | + abstract public function insertField($index, $field); |
|
18 | + abstract public function insertInField($index, $field); |
|
19 | + abstract public function fieldAs($index, $type, $attributes=NULL); |
|
20 | 20 | /** |
21 | 21 | * @param string $caption |
22 | 22 | * @param callable $callback |
23 | 23 | * @param boolean $visibleHover |
24 | 24 | * @return callable |
25 | 25 | */ |
26 | - private function getFieldButtonCallable($caption,$visibleHover=true,$callback=null){ |
|
27 | - return $this->getCallable("getFieldButton",[$caption,$visibleHover],$callback); |
|
26 | + private function getFieldButtonCallable($caption, $visibleHover=true, $callback=null) { |
|
27 | + return $this->getCallable("getFieldButton", [$caption, $visibleHover], $callback); |
|
28 | 28 | } |
29 | 29 | |
30 | 30 | /** |
@@ -33,19 +33,19 @@ discard block |
||
33 | 33 | * @param callable $callback |
34 | 34 | * @return callable |
35 | 35 | */ |
36 | - private function getCallable($thisCallback,$parameters,$callback=null){ |
|
37 | - $result=function($instance) use($thisCallback,$parameters,$callback){ |
|
38 | - $object=call_user_func_array(array($this,$thisCallback), $parameters); |
|
39 | - if(isset($callback)){ |
|
40 | - if(\is_callable($callback)){ |
|
41 | - $callback($object,$instance); |
|
36 | + private function getCallable($thisCallback, $parameters, $callback=null) { |
|
37 | + $result=function($instance) use($thisCallback, $parameters, $callback){ |
|
38 | + $object=call_user_func_array(array($this, $thisCallback), $parameters); |
|
39 | + if (isset($callback)) { |
|
40 | + if (\is_callable($callback)) { |
|
41 | + $callback($object, $instance); |
|
42 | 42 | } |
43 | 43 | } |
44 | - if($object instanceof HtmlSemDoubleElement){ |
|
45 | - $object->setProperty("data-ajax",$this->_instanceViewer->getIdentifier()); |
|
46 | - if($object->propertyContains("class","visibleover")){ |
|
44 | + if ($object instanceof HtmlSemDoubleElement) { |
|
45 | + $object->setProperty("data-ajax", $this->_instanceViewer->getIdentifier()); |
|
46 | + if ($object->propertyContains("class", "visibleover")) { |
|
47 | 47 | $this->_visibleHover=true; |
48 | - $object->setProperty("style","visibility:hidden;"); |
|
48 | + $object->setProperty("style", "visibility:hidden;"); |
|
49 | 49 | } |
50 | 50 | } |
51 | 51 | return $object; |
@@ -57,9 +57,9 @@ discard block |
||
57 | 57 | * @param string $caption |
58 | 58 | * @return HtmlButton |
59 | 59 | */ |
60 | - private function getFieldButton($caption,$visibleHover=true){ |
|
61 | - $bt= new HtmlButton("",$caption); |
|
62 | - if($visibleHover) |
|
60 | + private function getFieldButton($caption, $visibleHover=true) { |
|
61 | + $bt=new HtmlButton("", $caption); |
|
62 | + if ($visibleHover) |
|
63 | 63 | $this->_visibleOver($bt); |
64 | 64 | return $bt; |
65 | 65 | } |
@@ -73,19 +73,19 @@ discard block |
||
73 | 73 | * @param array $attributes associative array (<b>ajax</b> key is for ajax post) |
74 | 74 | * @return \Ajax\semantic\widgets\datatable\DataTable |
75 | 75 | */ |
76 | - public function fieldAsSubmit($index,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$attributes=NULL){ |
|
77 | - return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle,$index,$attributes){ |
|
78 | - $button=new HtmlButton($id,$value,$cssStyle); |
|
79 | - $button->postOnClick($url,"$(event.target).closest('tr').find(':input').serialize()",$responseElement,$attributes["ajax"]); |
|
80 | - if(!isset($attributes["visibleHover"]) || $attributes["visibleHover"]) |
|
76 | + public function fieldAsSubmit($index, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $attributes=NULL) { |
|
77 | + return $this->_fieldAs(function($id, $name, $value, $caption) use ($url, $responseElement, $cssStyle, $index, $attributes){ |
|
78 | + $button=new HtmlButton($id, $value, $cssStyle); |
|
79 | + $button->postOnClick($url, "$(event.target).closest('tr').find(':input').serialize()", $responseElement, $attributes["ajax"]); |
|
80 | + if (!isset($attributes["visibleHover"]) || $attributes["visibleHover"]) |
|
81 | 81 | $this->_visibleOver($button); |
82 | 82 | return $button; |
83 | - }, $index,$attributes); |
|
83 | + }, $index, $attributes); |
|
84 | 84 | } |
85 | 85 | |
86 | - protected function _visibleOver($element){ |
|
86 | + protected function _visibleOver($element) { |
|
87 | 87 | $this->_visibleHover=true; |
88 | - return $element->addToProperty("class", "visibleover")->setProperty("style","visibility:hidden;"); |
|
88 | + return $element->addToProperty("class", "visibleover")->setProperty("style", "visibility:hidden;"); |
|
89 | 89 | } |
90 | 90 | |
91 | 91 | /** |
@@ -95,8 +95,8 @@ discard block |
||
95 | 95 | * @param boolean $visibleHover |
96 | 96 | * @return \Ajax\semantic\widgets\datatable\DataTable |
97 | 97 | */ |
98 | - public function addFieldButton($caption,$visibleHover=true,$callback=null){ |
|
99 | - $this->addField($this->getCallable("getFieldButton",[$caption,$visibleHover],$callback)); |
|
98 | + public function addFieldButton($caption, $visibleHover=true, $callback=null) { |
|
99 | + $this->addField($this->getCallable("getFieldButton", [$caption, $visibleHover], $callback)); |
|
100 | 100 | return $this; |
101 | 101 | } |
102 | 102 | |
@@ -107,8 +107,8 @@ discard block |
||
107 | 107 | * @param callable $callback |
108 | 108 | * @return \Ajax\semantic\widgets\datatable\DataTable |
109 | 109 | */ |
110 | - public function insertFieldButton($index,$caption,$visibleHover=true,$callback=null){ |
|
111 | - $this->insertField($index, $this->getFieldButtonCallable($caption,$visibleHover,$callback)); |
|
110 | + public function insertFieldButton($index, $caption, $visibleHover=true, $callback=null) { |
|
111 | + $this->insertField($index, $this->getFieldButtonCallable($caption, $visibleHover, $callback)); |
|
112 | 112 | return $this; |
113 | 113 | } |
114 | 114 | |
@@ -119,25 +119,25 @@ discard block |
||
119 | 119 | * @param callable $callback |
120 | 120 | * @return \Ajax\semantic\widgets\datatable\DataTable |
121 | 121 | */ |
122 | - public function insertInFieldButton($index,$caption,$visibleHover=true,$callback=null){ |
|
123 | - $this->insertInField($index, $this->getFieldButtonCallable($caption,$visibleHover,$callback)); |
|
122 | + public function insertInFieldButton($index, $caption, $visibleHover=true, $callback=null) { |
|
123 | + $this->insertInField($index, $this->getFieldButtonCallable($caption, $visibleHover, $callback)); |
|
124 | 124 | return $this; |
125 | 125 | } |
126 | 126 | |
127 | - private function addDefaultButton($icon,$class=null,$visibleHover=true,$callback=null){ |
|
128 | - $this->addField($this->getCallable("getDefaultButton",[$icon,$class,$visibleHover],$callback)); |
|
127 | + private function addDefaultButton($icon, $class=null, $visibleHover=true, $callback=null) { |
|
128 | + $this->addField($this->getCallable("getDefaultButton", [$icon, $class, $visibleHover], $callback)); |
|
129 | 129 | return $this; |
130 | 130 | } |
131 | 131 | |
132 | - private function insertDefaultButtonIn($index,$icon,$class=null,$visibleHover=true,$callback=null){ |
|
133 | - $this->insertInField($index,$this->getCallable("getDefaultButton",[$icon,$class,$visibleHover],$callback)); |
|
132 | + private function insertDefaultButtonIn($index, $icon, $class=null, $visibleHover=true, $callback=null) { |
|
133 | + $this->insertInField($index, $this->getCallable("getDefaultButton", [$icon, $class, $visibleHover], $callback)); |
|
134 | 134 | return $this; |
135 | 135 | } |
136 | 136 | |
137 | - private function getDefaultButton($icon,$class=null,$visibleHover=true){ |
|
138 | - $bt=$this->getFieldButton("",$visibleHover); |
|
137 | + private function getDefaultButton($icon, $class=null, $visibleHover=true) { |
|
138 | + $bt=$this->getFieldButton("", $visibleHover); |
|
139 | 139 | $bt->asIcon($icon); |
140 | - if(isset($class)) |
|
140 | + if (isset($class)) |
|
141 | 141 | $bt->addClass($class); |
142 | 142 | return $bt; |
143 | 143 | } |
@@ -148,30 +148,30 @@ discard block |
||
148 | 148 | * @param callable $callback |
149 | 149 | * @return DataTable |
150 | 150 | */ |
151 | - public function addDeleteButton($visibleHover=true,$deleteBehavior=[],$callback=null){ |
|
151 | + public function addDeleteButton($visibleHover=true, $deleteBehavior=[], $callback=null) { |
|
152 | 152 | $this->_deleteBehavior=$deleteBehavior; |
153 | - return $this->addDefaultButton("remove","_delete red basic",$visibleHover,$callback); |
|
153 | + return $this->addDefaultButton("remove", "_delete red basic", $visibleHover, $callback); |
|
154 | 154 | } |
155 | 155 | |
156 | - public function addEditButton($visibleHover=true,$editBehavior=[],$callback=null){ |
|
156 | + public function addEditButton($visibleHover=true, $editBehavior=[], $callback=null) { |
|
157 | 157 | $this->_editBehavior=$editBehavior; |
158 | - return $this->addDefaultButton("edit","_edit basic",$visibleHover,$callback); |
|
158 | + return $this->addDefaultButton("edit", "_edit basic", $visibleHover, $callback); |
|
159 | 159 | } |
160 | 160 | |
161 | - public function addEditDeleteButtons($visibleHover=true,$behavior=[],$callbackEdit=null,$callbackDelete=null){ |
|
162 | - $this->addEditButton($visibleHover,$behavior,$callbackEdit); |
|
161 | + public function addEditDeleteButtons($visibleHover=true, $behavior=[], $callbackEdit=null, $callbackDelete=null) { |
|
162 | + $this->addEditButton($visibleHover, $behavior, $callbackEdit); |
|
163 | 163 | $index=$this->_instanceViewer->visiblePropertiesCount()-1; |
164 | - $this->insertDeleteButtonIn($index,$visibleHover,$behavior,$callbackDelete); |
|
164 | + $this->insertDeleteButtonIn($index, $visibleHover, $behavior, $callbackDelete); |
|
165 | 165 | return $this; |
166 | 166 | } |
167 | 167 | |
168 | - public function insertDeleteButtonIn($index,$visibleHover=true,$deleteBehavior=[],$callback=null){ |
|
168 | + public function insertDeleteButtonIn($index, $visibleHover=true, $deleteBehavior=[], $callback=null) { |
|
169 | 169 | $this->_deleteBehavior=$deleteBehavior; |
170 | - return $this->insertDefaultButtonIn($index,"remove","_delete red basic",$visibleHover,$callback); |
|
170 | + return $this->insertDefaultButtonIn($index, "remove", "_delete red basic", $visibleHover, $callback); |
|
171 | 171 | } |
172 | 172 | |
173 | - public function insertEditButtonIn($index,$visibleHover=true,$editBehavior=[],$callback=null){ |
|
173 | + public function insertEditButtonIn($index, $visibleHover=true, $editBehavior=[], $callback=null) { |
|
174 | 174 | $this->_editBehavior=$editBehavior; |
175 | - return $this->insertDefaultButtonIn($index,"edit","_edit basic",$visibleHover,$callback); |
|
175 | + return $this->insertDefaultButtonIn($index, "edit", "_edit basic", $visibleHover, $callback); |
|
176 | 176 | } |
177 | 177 | } |
@@ -3,26 +3,26 @@ |
||
3 | 3 | use Ajax\semantic\html\base\constants\Transition; |
4 | 4 | |
5 | 5 | class AjaxTransition { |
6 | - public static function none($responseElement,$jqueryDone="html"){ |
|
6 | + public static function none($responseElement, $jqueryDone="html") { |
|
7 | 7 | return "$({$responseElement}).{$jqueryDone}( data )"; |
8 | 8 | } |
9 | 9 | |
10 | - public static function jqFade($responseElement,$jqueryDone="html"){ |
|
10 | + public static function jqFade($responseElement, $jqueryDone="html") { |
|
11 | 11 | return "$({$responseElement}).hide().{$jqueryDone}( data ).fadeIn()"; |
12 | 12 | } |
13 | 13 | |
14 | - public static function jqSlide($responseElement,$jqueryDone="html"){ |
|
14 | + public static function jqSlide($responseElement, $jqueryDone="html") { |
|
15 | 15 | return "$({$responseElement}).hide().{$jqueryDone}( data ).slideDown()"; |
16 | 16 | } |
17 | 17 | |
18 | - public static function random($responseElement,$jqueryDone="html"){ |
|
18 | + public static function random($responseElement, $jqueryDone="html") { |
|
19 | 19 | $transitions=Transition::getConstantValues(); |
20 | - $transition=$transitions[\rand(0,\sizeof($transitions)-1)]; |
|
21 | - return self::__callStatic($transition, [$responseElement,$jqueryDone]); |
|
20 | + $transition=$transitions[\rand(0, \sizeof($transitions)-1)]; |
|
21 | + return self::__callStatic($transition, [$responseElement, $jqueryDone]); |
|
22 | 22 | } |
23 | 23 | |
24 | - public static function __callStatic($name, $arguments){ |
|
25 | - if(\sizeof($arguments)==2){ |
|
24 | + public static function __callStatic($name, $arguments) { |
|
25 | + if (\sizeof($arguments)==2) { |
|
26 | 26 | $responseElement=$arguments[0]; |
27 | 27 | $jqueryDone=$arguments[1]; |
28 | 28 | $name=JString::camelCaseToSeparated($name); |
@@ -1,39 +1,39 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | namespace Ajax\php\ci; |
3 | 3 | |
4 | -class JsUtils extends \Ajax\JsUtils{ |
|
4 | +class JsUtils extends \Ajax\JsUtils { |
|
5 | 5 | protected $ci; |
6 | - protected $_my_controller_paths= array(); |
|
7 | - protected $_my_controllers= array(); |
|
6 | + protected $_my_controller_paths=array(); |
|
7 | + protected $_my_controllers=array(); |
|
8 | 8 | |
9 | - public function __construct($params=array(),$injected=NULL){ |
|
10 | - parent::__construct($params,$injected); |
|
11 | - $this->_my_controller_paths = array(APPPATH); |
|
9 | + public function __construct($params=array(), $injected=NULL) { |
|
10 | + parent::__construct($params, $injected); |
|
11 | + $this->_my_controller_paths=array(APPPATH); |
|
12 | 12 | } |
13 | - public function getUrl($url){ |
|
13 | + public function getUrl($url) { |
|
14 | 14 | return site_url($url); |
15 | 15 | } |
16 | 16 | |
17 | - public function getCi(){ |
|
18 | - if(isset($this->ci)===false){ |
|
19 | - $this->ci =& get_instance(); |
|
17 | + public function getCi() { |
|
18 | + if (isset($this->ci)===false) { |
|
19 | + $this->ci=& get_instance(); |
|
20 | 20 | $this->ci->load->helper('url'); |
21 | 21 | } |
22 | 22 | return $this->ci; |
23 | 23 | } |
24 | 24 | |
25 | - public function addViewElement($identifier,$content,&$view){ |
|
26 | - if(\array_key_exists("q", $view)===false){ |
|
25 | + public function addViewElement($identifier, $content, &$view) { |
|
26 | + if (\array_key_exists("q", $view)===false) { |
|
27 | 27 | $view["q"]=array(); |
28 | 28 | } |
29 | 29 | $view["q"][$identifier]=$content; |
30 | 30 | } |
31 | 31 | |
32 | - public function createScriptVariable(&$view,$view_var, $output){ |
|
32 | + public function createScriptVariable(&$view, $view_var, $output) { |
|
33 | 33 | $view[$view_var]=$output; |
34 | 34 | } |
35 | 35 | |
36 | - public function forward($initialControllerInstance,$controllerName,$actionName,$params=NULL){ |
|
36 | + public function forward($initialControllerInstance, $controllerName, $actionName, $params=NULL) { |
|
37 | 37 | $ci=$this->getCi(); |
38 | 38 | $controllerName=strtolower($controllerName); |
39 | 39 | $this->controller($controllerName); |
@@ -44,64 +44,64 @@ discard block |
||
44 | 44 | return $result; |
45 | 45 | } |
46 | 46 | |
47 | - public function renderContent($initialControllerInstance,$viewName, $params=NULL) { |
|
47 | + public function renderContent($initialControllerInstance, $viewName, $params=NULL) { |
|
48 | 48 | return $initialControllerInstance->load->view($viewName, $params, true); |
49 | 49 | } |
50 | 50 | |
51 | - public function fromDispatcher($dispatcher){ |
|
51 | + public function fromDispatcher($dispatcher) { |
|
52 | 52 | return array_values($dispatcher->uri->segment_array()); |
53 | 53 | } |
54 | 54 | |
55 | - public function controller($controller, $name = '', $db_conn = FALSE){ |
|
56 | - if (\is_array($controller)){ |
|
57 | - foreach ($controller as $babe){ |
|
55 | + public function controller($controller, $name='', $db_conn=FALSE) { |
|
56 | + if (\is_array($controller)) { |
|
57 | + foreach ($controller as $babe) { |
|
58 | 58 | $this->controller($babe); |
59 | 59 | } |
60 | 60 | return; |
61 | 61 | } |
62 | - if ($controller == ''){ |
|
62 | + if ($controller=='') { |
|
63 | 63 | return; |
64 | 64 | } |
65 | - $path = ''; |
|
65 | + $path=''; |
|
66 | 66 | // Is the controller in a sub-folder? If so, parse out the filename and path. |
67 | - if (($last_slash = strrpos($controller, '/')) !== FALSE){ |
|
67 | + if (($last_slash=strrpos($controller, '/'))!==FALSE) { |
|
68 | 68 | // The path is in front of the last slash |
69 | - $path = substr($controller, 0, $last_slash + 1); |
|
69 | + $path=substr($controller, 0, $last_slash+1); |
|
70 | 70 | // And the controller name behind it |
71 | - $controller = substr($controller, $last_slash + 1); |
|
71 | + $controller=substr($controller, $last_slash+1); |
|
72 | 72 | } |
73 | 73 | |
74 | - if ($name == ''){ |
|
75 | - $name = $controller; |
|
74 | + if ($name=='') { |
|
75 | + $name=$controller; |
|
76 | 76 | } |
77 | 77 | |
78 | - if (in_array($name, $this->_my_controllers, TRUE)){ |
|
78 | + if (in_array($name, $this->_my_controllers, TRUE)) { |
|
79 | 79 | return; |
80 | 80 | } |
81 | 81 | |
82 | - $CI =$this->getCi(); |
|
83 | - if (isset($CI->$name)){ |
|
82 | + $CI=$this->getCi(); |
|
83 | + if (isset($CI->$name)) { |
|
84 | 84 | show_error('The controller name you are loading is the name of a resource that is already being used: '.$name); |
85 | 85 | } |
86 | - $controller = strtolower($controller); |
|
87 | - foreach ($this->_my_controller_paths as $mod_path){ |
|
88 | - if ( ! file_exists($mod_path.'controllers/'.$path.$controller.'.php')){ |
|
86 | + $controller=strtolower($controller); |
|
87 | + foreach ($this->_my_controller_paths as $mod_path) { |
|
88 | + if (!file_exists($mod_path.'controllers/'.$path.$controller.'.php')) { |
|
89 | 89 | continue; |
90 | 90 | } |
91 | - if ($db_conn !== FALSE && ! class_exists('CI_DB')){ |
|
92 | - if ($db_conn === TRUE){ |
|
93 | - $db_conn = ''; |
|
91 | + if ($db_conn!==FALSE && !class_exists('CI_DB')) { |
|
92 | + if ($db_conn===TRUE) { |
|
93 | + $db_conn=''; |
|
94 | 94 | } |
95 | 95 | $CI->load->database($db_conn, FALSE, TRUE); |
96 | 96 | } |
97 | - if ( ! class_exists('CI_Controller')){ |
|
97 | + if (!class_exists('CI_Controller')) { |
|
98 | 98 | load_class('Controller', 'core'); |
99 | 99 | } |
100 | 100 | require_once($mod_path.'controllers/'.$path.$controller.'.php'); |
101 | - $controller = ucfirst($controller); |
|
102 | - $CI->$name = new $controller(); |
|
101 | + $controller=ucfirst($controller); |
|
102 | + $CI->$name=new $controller(); |
|
103 | 103 | |
104 | - $this->_my_controllers[] = $name; |
|
104 | + $this->_my_controllers[]=$name; |
|
105 | 105 | return; |
106 | 106 | } |
107 | 107 | show_error('Unable to locate the controller you have specified: '.$controller); |
@@ -12,10 +12,10 @@ |
||
12 | 12 | parent::__construct($identifier, $instance, $captions); |
13 | 13 | } |
14 | 14 | |
15 | - public function getValue($index){ |
|
15 | + public function getValue($index) { |
|
16 | 16 | $result=parent::getValue($index); |
17 | - if($result instanceof HtmlFormField){ |
|
18 | - $lbl=new HtmlSemDoubleElement("lbl-".$this->widgetIdentifier."-".$index,"label","",$this->getCaption($index)); |
|
17 | + if ($result instanceof HtmlFormField) { |
|
18 | + $lbl=new HtmlSemDoubleElement("lbl-".$this->widgetIdentifier."-".$index, "label", "", $this->getCaption($index)); |
|
19 | 19 | $lbl->setProperty("for", $result->getDataField()->getIdentifier()); |
20 | 20 | $this->captions[$index]=$lbl; |
21 | 21 | } |
@@ -15,6 +15,7 @@ |
||
15 | 15 | * {@inheritdoc} |
16 | 16 | * |
17 | 17 | * @see \Ajax\semantic\widgets\dataform\DataForm::__construct() |
18 | + * @param string $identifier |
|
18 | 19 | */ |
19 | 20 | public function __construct($identifier,$modelInstance=null,$fieldsOrder,$fieldsDefinition,$fields=[],$captions=[],$separators=[]) { |
20 | 21 | if(!isset($modelInstance)){ |
@@ -16,17 +16,17 @@ discard block |
||
16 | 16 | * |
17 | 17 | * @see \Ajax\semantic\widgets\dataform\DataForm::__construct() |
18 | 18 | */ |
19 | - public function __construct($identifier,$modelInstance=null,$fieldsOrder,$fieldsDefinition,$fields=[],$captions=[],$separators=[]) { |
|
20 | - if(!isset($modelInstance)){ |
|
19 | + public function __construct($identifier, $modelInstance=null, $fieldsOrder, $fieldsDefinition, $fields=[], $captions=[], $separators=[]) { |
|
20 | + if (!isset($modelInstance)) { |
|
21 | 21 | $modelInstance=$this->getDefaultModelInstance(); |
22 | 22 | } |
23 | - parent::__construct($identifier,$modelInstance); |
|
24 | - $this->_initForm($fieldsOrder, $fieldsDefinition,$fields,$captions,$separators); |
|
23 | + parent::__construct($identifier, $modelInstance); |
|
24 | + $this->_initForm($fieldsOrder, $fieldsDefinition, $fields, $captions, $separators); |
|
25 | 25 | } |
26 | 26 | |
27 | 27 | abstract protected function getDefaultModelInstance(); |
28 | 28 | |
29 | - protected function _initForm($fieldsOrder,$fieldsDefinition,$fields=[],$captions=[],$separators=[]){ |
|
29 | + protected function _initForm($fieldsOrder, $fieldsDefinition, $fields=[], $captions=[], $separators=[]) { |
|
30 | 30 | $this->_fieldsOrder=$fieldsOrder; |
31 | 31 | $this->setFields($fields); |
32 | 32 | $this->setSeparators($separators); |
@@ -34,26 +34,26 @@ discard block |
||
34 | 34 | $this->setCaptions($captions); |
35 | 35 | } |
36 | 36 | |
37 | - protected function _getIndex($fieldName){ |
|
37 | + protected function _getIndex($fieldName) { |
|
38 | 38 | $index=$fieldName; |
39 | - if(\is_string($fieldName)){ |
|
39 | + if (\is_string($fieldName)) { |
|
40 | 40 | $index=\array_search($fieldName, $this->_fieldsOrder); |
41 | 41 | } |
42 | 42 | return $index; |
43 | 43 | } |
44 | - protected function _fieldAs($elementCallback,&$index,$attributes=NULL,$prefix=null){ |
|
44 | + protected function _fieldAs($elementCallback, &$index, $attributes=NULL, $prefix=null) { |
|
45 | 45 | $index=$this->_getIndex($index); |
46 | - return parent::_fieldAs($elementCallback, $index,$attributes,$prefix); |
|
46 | + return parent::_fieldAs($elementCallback, $index, $attributes, $prefix); |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | |
50 | - public function removeField($fieldName){ |
|
50 | + public function removeField($fieldName) { |
|
51 | 51 | parent::removeField($fieldName); |
52 | - \array_splice($this->_fieldsOrder,$this->_getIndex($fieldName),1); |
|
52 | + \array_splice($this->_fieldsOrder, $this->_getIndex($fieldName), 1); |
|
53 | 53 | return $this; |
54 | 54 | } |
55 | 55 | |
56 | - public function compile(JsUtils $js=NULL,&$view=NULL){ |
|
57 | - return parent::compile($js,$view); |
|
56 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
57 | + return parent::compile($js, $view); |
|
58 | 58 | } |
59 | 59 | } |
@@ -47,15 +47,17 @@ |
||
47 | 47 | |
48 | 48 | |
49 | 49 | public function addSeparatorAfter($fieldNum){ |
50 | - if(\array_search($fieldNum, $this->separators)===false) |
|
51 | - $this->separators[]=$fieldNum; |
|
50 | + if(\array_search($fieldNum, $this->separators)===false) { |
|
51 | + $this->separators[]=$fieldNum; |
|
52 | + } |
|
52 | 53 | return $this; |
53 | 54 | } |
54 | 55 | |
55 | 56 | public function addHeaderDividerBefore($fieldNum,$header){ |
56 | 57 | $this->headers[$fieldNum]=$header; |
57 | - if($fieldNum>0) |
|
58 | - $this->addSeparatorAfter($fieldNum-1); |
|
58 | + if($fieldNum>0) { |
|
59 | + $this->addSeparatorAfter($fieldNum-1); |
|
60 | + } |
|
59 | 61 | return $this; |
60 | 62 | } |
61 | 63 |
@@ -11,58 +11,58 @@ discard block |
||
11 | 11 | protected $headers; |
12 | 12 | protected $wrappers; |
13 | 13 | |
14 | - public function __construct($identifier,$instance=NULL, $captions=NULL) { |
|
15 | - parent::__construct($identifier,$instance=NULL, $captions=NULL); |
|
14 | + public function __construct($identifier, $instance=NULL, $captions=NULL) { |
|
15 | + parent::__construct($identifier, $instance=NULL, $captions=NULL); |
|
16 | 16 | $this->separators=[-1]; |
17 | 17 | $this->headers=[]; |
18 | 18 | $this->wrappers=[]; |
19 | - $this->defaultValueFunction=function($name,$value,$index){ |
|
19 | + $this->defaultValueFunction=function($name, $value, $index) { |
|
20 | 20 | $caption=$this->getCaption($index); |
21 | - $input=new HtmlFormInput($this->widgetIdentifier."-".$name,$caption,"text",$value); |
|
21 | + $input=new HtmlFormInput($this->widgetIdentifier."-".$name, $caption, "text", $value); |
|
22 | 22 | $input->setName($name); |
23 | 23 | return $input; |
24 | 24 | }; |
25 | 25 | } |
26 | 26 | |
27 | - protected function _beforeAddProperty($index,&$field){ |
|
28 | - if(JString::endswith($field, "\n")===true){ |
|
27 | + protected function _beforeAddProperty($index, &$field) { |
|
28 | + if (JString::endswith($field, "\n")===true) { |
|
29 | 29 | $this->addSeparatorAfter($index); |
30 | 30 | } |
31 | - if($index>1 && JString::startswith($field, "\n")===true){ |
|
31 | + if ($index>1 && JString::startswith($field, "\n")===true) { |
|
32 | 32 | $this->addSeparatorAfter($index-1); |
33 | 33 | } |
34 | 34 | $field=\str_replace("\n", "", $field); |
35 | - if(($header=$this->hasHeader($field))!==false){ |
|
35 | + if (($header=$this->hasHeader($field))!==false) { |
|
36 | 36 | $this->addHeaderDividerBefore($index, $header); |
37 | 37 | } |
38 | 38 | } |
39 | 39 | |
40 | - protected function hasHeader(&$field){ |
|
41 | - $matches=[];$result=false; |
|
42 | - if(\preg_match('/\{(.*?)\}/s', $field, $matches)===1){ |
|
40 | + protected function hasHeader(&$field) { |
|
41 | + $matches=[]; $result=false; |
|
42 | + if (\preg_match('/\{(.*?)\}/s', $field, $matches)===1) { |
|
43 | 43 | $result=$matches[1]; |
44 | - $field=\str_replace("{".$result."}","", $field); |
|
44 | + $field=\str_replace("{".$result."}", "", $field); |
|
45 | 45 | } |
46 | 46 | return $result; |
47 | 47 | } |
48 | 48 | |
49 | 49 | |
50 | 50 | |
51 | - public function addSeparatorAfter($fieldNum){ |
|
52 | - if(\array_search($fieldNum, $this->separators)===false) |
|
51 | + public function addSeparatorAfter($fieldNum) { |
|
52 | + if (\array_search($fieldNum, $this->separators)===false) |
|
53 | 53 | $this->separators[]=$fieldNum; |
54 | 54 | return $this; |
55 | 55 | } |
56 | 56 | |
57 | - public function addHeaderDividerBefore($fieldNum,$header){ |
|
57 | + public function addHeaderDividerBefore($fieldNum, $header) { |
|
58 | 58 | $this->headers[$fieldNum]=$header; |
59 | - if($fieldNum>0) |
|
59 | + if ($fieldNum>0) |
|
60 | 60 | $this->addSeparatorAfter($fieldNum-1); |
61 | 61 | return $this; |
62 | 62 | } |
63 | 63 | |
64 | - public function addWrapper($fieldNum,$contentBefore,$contentAfter=null){ |
|
65 | - $this->wrappers[$fieldNum]=[$contentBefore,$contentAfter]; |
|
64 | + public function addWrapper($fieldNum, $contentBefore, $contentAfter=null) { |
|
65 | + $this->wrappers[$fieldNum]=[$contentBefore, $contentAfter]; |
|
66 | 66 | return $this; |
67 | 67 | } |
68 | 68 | |
@@ -70,15 +70,15 @@ discard block |
||
70 | 70 | return $this->separators; |
71 | 71 | } |
72 | 72 | |
73 | - public function removeSeparator($index){ |
|
74 | - \array_splice($this->separators,$index,1); |
|
73 | + public function removeSeparator($index) { |
|
74 | + \array_splice($this->separators, $index, 1); |
|
75 | 75 | } |
76 | 76 | |
77 | - public function removeField($index){ |
|
77 | + public function removeField($index) { |
|
78 | 78 | parent::removeField($index); |
79 | 79 | $pos=\array_search($index, $this->separators); |
80 | - if($pos!==false){ |
|
81 | - for($i=$pos+1;$i<\sizeof($this->separators);$i++){ |
|
80 | + if ($pos!==false) { |
|
81 | + for ($i=$pos+1; $i<\sizeof($this->separators); $i++) { |
|
82 | 82 | $this->separators[$i]--; |
83 | 83 | } |
84 | 84 | \array_splice($this->separators, $pos, 1); |
@@ -14,34 +14,34 @@ discard block |
||
14 | 14 | use FieldTrait; |
15 | 15 | protected $_container; |
16 | 16 | protected $_validation; |
17 | - public function __construct($identifier, $field,$label=NULL) { |
|
18 | - parent::__construct($identifier, "div","field"); |
|
17 | + public function __construct($identifier, $field, $label=NULL) { |
|
18 | + parent::__construct($identifier, "div", "field"); |
|
19 | 19 | $this->content=array(); |
20 | - $this->_states=[State::ERROR,State::DISABLED]; |
|
21 | - if(isset($label) && $label!=="") |
|
20 | + $this->_states=[State::ERROR, State::DISABLED]; |
|
21 | + if (isset($label) && $label!=="") |
|
22 | 22 | $this->setLabel($label); |
23 | 23 | $this->setField($field); |
24 | 24 | $this->_validation=NULL; |
25 | 25 | } |
26 | 26 | |
27 | - public function addPointingLabel($label,$pointing=Direction::NONE){ |
|
28 | - $labelO=new HtmlLabel("",$label); |
|
27 | + public function addPointingLabel($label, $pointing=Direction::NONE) { |
|
28 | + $labelO=new HtmlLabel("", $label); |
|
29 | 29 | $labelO->setPointing($pointing); |
30 | - $this->addContent($labelO,$pointing==="below" || $pointing==="right"); |
|
30 | + $this->addContent($labelO, $pointing==="below" || $pointing==="right"); |
|
31 | 31 | return $labelO; |
32 | 32 | } |
33 | 33 | |
34 | - public function setLabel($label){ |
|
34 | + public function setLabel($label) { |
|
35 | 35 | $labelO=$label; |
36 | - if(\is_string($label)){ |
|
37 | - $labelO=new HtmlSemDoubleElement("","label",""); |
|
36 | + if (\is_string($label)) { |
|
37 | + $labelO=new HtmlSemDoubleElement("", "label", ""); |
|
38 | 38 | $labelO->setContent($label); |
39 | - $labelO->setProperty("for", \str_replace("field-", "",$this->identifier)); |
|
39 | + $labelO->setProperty("for", \str_replace("field-", "", $this->identifier)); |
|
40 | 40 | } |
41 | 41 | $this->content["label"]=$labelO; |
42 | 42 | } |
43 | 43 | |
44 | - public function setField($field){ |
|
44 | + public function setField($field) { |
|
45 | 45 | $this->content["field"]=$field; |
46 | 46 | } |
47 | 47 | |
@@ -49,8 +49,8 @@ discard block |
||
49 | 49 | * Returns the label or null |
50 | 50 | * @return mixed |
51 | 51 | */ |
52 | - public function getLabel(){ |
|
53 | - if(\array_key_exists("label", $this->content)) |
|
52 | + public function getLabel() { |
|
53 | + if (\array_key_exists("label", $this->content)) |
|
54 | 54 | return $this->content["label"]; |
55 | 55 | } |
56 | 56 | |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | * Return the field |
59 | 59 | * @return mixed |
60 | 60 | */ |
61 | - public function getField(){ |
|
61 | + public function getField() { |
|
62 | 62 | return $this->content["field"]; |
63 | 63 | } |
64 | 64 | |
@@ -66,14 +66,14 @@ discard block |
||
66 | 66 | * Return the field with data |
67 | 67 | * @return mixed |
68 | 68 | */ |
69 | - public function getDataField(){ |
|
69 | + public function getDataField() { |
|
70 | 70 | return $this->content["field"]; |
71 | 71 | } |
72 | 72 | |
73 | 73 | /** |
74 | 74 | * puts the label before or behind |
75 | 75 | */ |
76 | - public function swapLabel(){ |
|
76 | + public function swapLabel() { |
|
77 | 77 | $label=$this->getLabel(); |
78 | 78 | unset($this->content["label"]); |
79 | 79 | $this->content["label"]=$label; |
@@ -84,31 +84,31 @@ discard block |
||
84 | 84 | * @param int $width |
85 | 85 | * @return \Ajax\semantic\html\collections\form\HtmlFormField |
86 | 86 | */ |
87 | - public function setWidth($width){ |
|
88 | - if(\is_int($width)){ |
|
87 | + public function setWidth($width) { |
|
88 | + if (\is_int($width)) { |
|
89 | 89 | $width=Wide::getConstants()["W".$width]; |
90 | 90 | } |
91 | 91 | $this->addToPropertyCtrl("class", $width, Wide::getConstants()); |
92 | - if(isset($this->_container)){ |
|
92 | + if (isset($this->_container)) { |
|
93 | 93 | $this->_container->setEqualWidth(false); |
94 | 94 | } |
95 | - return $this->addToPropertyCtrl("class", "wide",array("wide")); |
|
95 | + return $this->addToPropertyCtrl("class", "wide", array("wide")); |
|
96 | 96 | } |
97 | 97 | |
98 | 98 | /** |
99 | 99 | * Field displays an error state |
100 | 100 | * @return \Ajax\semantic\html\collections\form\HtmlFormField |
101 | 101 | */ |
102 | - public function setError(){ |
|
102 | + public function setError() { |
|
103 | 103 | return $this->addToProperty("class", "error"); |
104 | 104 | } |
105 | 105 | |
106 | - public function setInline(){ |
|
106 | + public function setInline() { |
|
107 | 107 | return $this->addToProperty("class", "inline"); |
108 | 108 | } |
109 | 109 | |
110 | - public function jsState($state){ |
|
111 | - return $this->jsDoJquery("addClass",$state); |
|
110 | + public function jsState($state) { |
|
111 | + return $this->jsDoJquery("addClass", $state); |
|
112 | 112 | } |
113 | 113 | |
114 | 114 | public function setContainer($_container) { |
@@ -116,39 +116,39 @@ discard block |
||
116 | 116 | return $this; |
117 | 117 | } |
118 | 118 | |
119 | - public function setReadonly(){ |
|
119 | + public function setReadonly() { |
|
120 | 120 | $this->getField()->setProperty("readonly", ""); |
121 | 121 | } |
122 | 122 | |
123 | - public function addRule($type,$prompt=NULL,$value=NULL){ |
|
123 | + public function addRule($type, $prompt=NULL, $value=NULL) { |
|
124 | 124 | $field=$this->getDataField(); |
125 | - if(isset($field)){ |
|
126 | - if(!isset($this->_validation)){ |
|
125 | + if (isset($field)) { |
|
126 | + if (!isset($this->_validation)) { |
|
127 | 127 | $this->_validation=new FieldValidation($field->getIdentifier()); |
128 | 128 | } |
129 | - if($type==="empty"){ |
|
130 | - $this->addToProperty("class","required"); |
|
129 | + if ($type==="empty") { |
|
130 | + $this->addToProperty("class", "required"); |
|
131 | 131 | } |
132 | - $this->_validation->addRule($type,$prompt,$value); |
|
132 | + $this->_validation->addRule($type, $prompt, $value); |
|
133 | 133 | } |
134 | 134 | return $this; |
135 | 135 | } |
136 | 136 | |
137 | - public function addRules(array $rules){ |
|
138 | - foreach ($rules as $rule){ |
|
137 | + public function addRules(array $rules) { |
|
138 | + foreach ($rules as $rule) { |
|
139 | 139 | $this->addRule($rule); |
140 | 140 | } |
141 | 141 | return $this; |
142 | 142 | } |
143 | 143 | |
144 | - public function setRules(array $rules){ |
|
144 | + public function setRules(array $rules) { |
|
145 | 145 | $this->_validation=null; |
146 | 146 | return $this->addRules($rules); |
147 | 147 | } |
148 | 148 | |
149 | - public function addIcon($icon,$direction=Direction::LEFT){ |
|
149 | + public function addIcon($icon, $direction=Direction::LEFT) { |
|
150 | 150 | $field=$this->getField(); |
151 | - return $field->addIcon($icon,$direction); |
|
151 | + return $field->addIcon($icon, $direction); |
|
152 | 152 | } |
153 | 153 | |
154 | 154 | public function getValidation() { |
@@ -18,8 +18,9 @@ discard block |
||
18 | 18 | parent::__construct($identifier, "div","field"); |
19 | 19 | $this->content=array(); |
20 | 20 | $this->_states=[State::ERROR,State::DISABLED]; |
21 | - if(isset($label) && $label!=="") |
|
22 | - $this->setLabel($label); |
|
21 | + if(isset($label) && $label!=="") { |
|
22 | + $this->setLabel($label); |
|
23 | + } |
|
23 | 24 | $this->setField($field); |
24 | 25 | $this->_validation=NULL; |
25 | 26 | } |
@@ -50,8 +51,9 @@ discard block |
||
50 | 51 | * @return mixed |
51 | 52 | */ |
52 | 53 | public function getLabel(){ |
53 | - if(\array_key_exists("label", $this->content)) |
|
54 | - return $this->content["label"]; |
|
54 | + if(\array_key_exists("label", $this->content)) { |
|
55 | + return $this->content["label"]; |
|
56 | + } |
|
55 | 57 | } |
56 | 58 | |
57 | 59 | /** |