@@ -21,7 +21,7 @@ |
||
21 | 21 | return $this->setParam("context", $value); |
22 | 22 | } |
23 | 23 | |
24 | - public function setOffset($offset=0){ |
|
24 | + public function setOffset($offset=0) { |
|
25 | 25 | return $this->setParam("offset", $offset); |
26 | 26 | } |
27 | 27 |
@@ -7,50 +7,50 @@ |
||
7 | 7 | |
8 | 8 | class HtmlSticky extends HtmlSemDoubleElement { |
9 | 9 | |
10 | - public function __construct($identifier,$context=NULL,$content=NULL) { |
|
10 | + public function __construct($identifier, $context=NULL, $content=NULL) { |
|
11 | 11 | parent::__construct($identifier, "div", "ui sticky", $content); |
12 | - if(isset($content)) |
|
12 | + if (isset($content)) |
|
13 | 13 | $this->setContext($context); |
14 | 14 | } |
15 | 15 | |
16 | - public function setContext($context){ |
|
16 | + public function setContext($context) { |
|
17 | 17 | $this->_params["context"]=$context; |
18 | 18 | return $this; |
19 | 19 | } |
20 | 20 | |
21 | - public function setFixed($value=NULL){ |
|
21 | + public function setFixed($value=NULL) { |
|
22 | 22 | $fixed="fixed"; |
23 | - if(isset($value)) |
|
23 | + if (isset($value)) |
|
24 | 24 | $fixed.=" ".$value; |
25 | - return $this->addToProperty("class",$fixed); |
|
25 | + return $this->addToProperty("class", $fixed); |
|
26 | 26 | } |
27 | 27 | |
28 | - public function setBound($value=NULL){ |
|
28 | + public function setBound($value=NULL) { |
|
29 | 29 | $bound="bound"; |
30 | - if(isset($value)) |
|
30 | + if (isset($value)) |
|
31 | 31 | $bound.=" ".$value; |
32 | - return $this->addToProperty("class",$bound); |
|
32 | + return $this->addToProperty("class", $bound); |
|
33 | 33 | } |
34 | 34 | |
35 | 35 | /** |
36 | 36 | * {@inheritDoc} |
37 | 37 | * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::run() |
38 | 38 | */ |
39 | - public function run(JsUtils $js){ |
|
39 | + public function run(JsUtils $js) { |
|
40 | 40 | parent::run($js); |
41 | - return $js->semantic()->sticky("#".$this->identifier,$this->_params); |
|
41 | + return $js->semantic()->sticky("#".$this->identifier, $this->_params); |
|
42 | 42 | } |
43 | 43 | |
44 | - public function setOffset($offset=0){ |
|
44 | + public function setOffset($offset=0) { |
|
45 | 45 | $this->_params["offset"]=$offset; |
46 | 46 | return $this; |
47 | 47 | } |
48 | 48 | |
49 | 49 | |
50 | 50 | |
51 | - public function setDebug($verbose=NULL){ |
|
51 | + public function setDebug($verbose=NULL) { |
|
52 | 52 | $this->_params["debug"]=true; |
53 | - if(isset($verbose)) |
|
53 | + if (isset($verbose)) |
|
54 | 54 | $this->_params["verbose"]=true; |
55 | 55 | return $this; |
56 | 56 | } |
@@ -9,8 +9,9 @@ discard block |
||
9 | 9 | |
10 | 10 | public function __construct($identifier,$context=NULL,$content=NULL) { |
11 | 11 | parent::__construct($identifier, "div", "ui sticky", $content); |
12 | - if(isset($content)) |
|
13 | - $this->setContext($context); |
|
12 | + if(isset($content)) { |
|
13 | + $this->setContext($context); |
|
14 | + } |
|
14 | 15 | } |
15 | 16 | |
16 | 17 | public function setContext($context){ |
@@ -20,15 +21,17 @@ discard block |
||
20 | 21 | |
21 | 22 | public function setFixed($value=NULL){ |
22 | 23 | $fixed="fixed"; |
23 | - if(isset($value)) |
|
24 | - $fixed.=" ".$value; |
|
24 | + if(isset($value)) { |
|
25 | + $fixed.=" ".$value; |
|
26 | + } |
|
25 | 27 | return $this->addToProperty("class",$fixed); |
26 | 28 | } |
27 | 29 | |
28 | 30 | public function setBound($value=NULL){ |
29 | 31 | $bound="bound"; |
30 | - if(isset($value)) |
|
31 | - $bound.=" ".$value; |
|
32 | + if(isset($value)) { |
|
33 | + $bound.=" ".$value; |
|
34 | + } |
|
32 | 35 | return $this->addToProperty("class",$bound); |
33 | 36 | } |
34 | 37 | |
@@ -50,8 +53,9 @@ discard block |
||
50 | 53 | |
51 | 54 | public function setDebug($verbose=NULL){ |
52 | 55 | $this->_params["debug"]=true; |
53 | - if(isset($verbose)) |
|
54 | - $this->_params["verbose"]=true; |
|
56 | + if(isset($verbose)) { |
|
57 | + $this->_params["verbose"]=true; |
|
58 | + } |
|
55 | 59 | return $this; |
56 | 60 | } |
57 | 61 | } |
@@ -60,9 +60,9 @@ discard block |
||
60 | 60 | } |
61 | 61 | |
62 | 62 | private function afterInsert($item) { |
63 | - if (!$item instanceof HtmlMenu && $item->propertyContains("class", "header")===false) |
|
64 | - $item->addToPropertyCtrl("class", "item", array ("item" )); |
|
65 | - else { |
|
63 | + if (!$item instanceof HtmlMenu && $item->propertyContains("class", "header")===false) { |
|
64 | + $item->addToPropertyCtrl("class", "item", array ("item" )); |
|
65 | + } else { |
|
66 | 66 | $this->setSecondary(); |
67 | 67 | } |
68 | 68 | return $item; |
@@ -77,8 +77,9 @@ discard block |
||
77 | 77 | public function addItem($item) { |
78 | 78 | $number=$item; |
79 | 79 | $item=parent::addItem($this->getItemToInsert($item)); |
80 | - if(\is_int($number)) |
|
81 | - $item->setProperty("data-page", $number); |
|
80 | + if(\is_int($number)) { |
|
81 | + $item->setProperty("data-page", $number); |
|
82 | + } |
|
82 | 83 | return $this->afterInsert($item); |
83 | 84 | } |
84 | 85 | |
@@ -151,10 +152,11 @@ discard block |
||
151 | 152 | } |
152 | 153 | |
153 | 154 | public function setSecondary($value=true) { |
154 | - if($value) |
|
155 | - $this->addToProperty("class", "secondary"); |
|
156 | - else |
|
157 | - $this->removePropertyValue("class", "secondary"); |
|
155 | + if($value) { |
|
156 | + $this->addToProperty("class", "secondary"); |
|
157 | + } else { |
|
158 | + $this->removePropertyValue("class", "secondary"); |
|
159 | + } |
|
158 | 160 | return $this; |
159 | 161 | } |
160 | 162 | |
@@ -174,8 +176,9 @@ discard block |
||
174 | 176 | $this->apply(function (HtmlDoubleElement &$item) { |
175 | 177 | $item->setTagName("a"); |
176 | 178 | }); |
177 | - if ($vertical === true) |
|
178 | - $this->setVertical(); |
|
179 | + if ($vertical === true) { |
|
180 | + $this->setVertical(); |
|
181 | + } |
|
179 | 182 | return $this->addToProperty("class", "tabular"); |
180 | 183 | } |
181 | 184 | |
@@ -204,10 +207,11 @@ discard block |
||
204 | 207 | */ |
205 | 208 | public function fromDatabaseObject($object, $function) { |
206 | 209 | $return=$function($object); |
207 | - if (\is_array($return)) |
|
208 | - $this->addItems($return); |
|
209 | - else |
|
210 | - $this->addItem($return); |
|
210 | + if (\is_array($return)) { |
|
211 | + $this->addItems($return); |
|
212 | + } else { |
|
213 | + $this->addItem($return); |
|
214 | + } |
|
211 | 215 | } |
212 | 216 | |
213 | 217 | /** |
@@ -240,8 +244,9 @@ discard block |
||
240 | 244 | } |
241 | 245 | |
242 | 246 | public function run(JsUtils $js){ |
243 | - if($this->identifier!=="" && !isset($this->_bsComponent)) |
|
244 | - $this->onClick('if(!$(this).hasClass("dropdown")&&!$(this).hasClass("no-active")){$(this).addClass("active").siblings().removeClass("active");}',false,false); |
|
247 | + if($this->identifier!=="" && !isset($this->_bsComponent)) { |
|
248 | + $this->onClick('if(!$(this).hasClass("dropdown")&&!$(this).hasClass("no-active")){$(this).addClass("active").siblings().removeClass("active");}',false,false); |
|
249 | + } |
|
245 | 250 | $result= parent::run($js); |
246 | 251 | return $result->setItemSelector(".item"); |
247 | 252 | } |
@@ -40,12 +40,12 @@ discard block |
||
40 | 40 | * @return \Ajax\semantic\html\collections\HtmlMenu |
41 | 41 | */ |
42 | 42 | public function setType($type="") { |
43 | - return $this->addToPropertyCtrl("class", $type, array ("","item","text" )); |
|
43 | + return $this->addToPropertyCtrl("class", $type, array("", "item", "text")); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | public function setActiveItem($index) { |
47 | 47 | $item=$this->getItem($index); |
48 | - if ($item !== null) { |
|
48 | + if ($item!==null) { |
|
49 | 49 | $item->addToProperty("class", "active"); |
50 | 50 | } |
51 | 51 | return $this; |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | |
54 | 54 | private function getItemToInsert($item) { |
55 | 55 | if ($item instanceof HtmlInput || $item instanceof HtmlImg || $item instanceof HtmlIcon || $item instanceof HtmlButtonGroups || $item instanceof HtmlButton || $item instanceof HtmlLabel) { |
56 | - $itemO=new HtmlMenuItem("item-" . $this->identifier . "-" . \sizeof($this->content) , $item); |
|
56 | + $itemO=new HtmlMenuItem("item-".$this->identifier."-".\sizeof($this->content), $item); |
|
57 | 57 | $item=$itemO; |
58 | 58 | } |
59 | 59 | return $item; |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | |
62 | 62 | private function afterInsert($item) { |
63 | 63 | if (!$item instanceof HtmlMenu && $item->propertyContains("class", "header")===false) |
64 | - $item->addToPropertyCtrl("class", "item", array ("item" )); |
|
64 | + $item->addToPropertyCtrl("class", "item", array("item")); |
|
65 | 65 | else { |
66 | 66 | $this->setSecondary(); |
67 | 67 | } |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | public function addItem($item) { |
78 | 78 | $number=$item; |
79 | 79 | $item=parent::addItem($this->getItemToInsert($item)); |
80 | - if(\is_int($number)) |
|
80 | + if (\is_int($number)) |
|
81 | 81 | $item->setProperty("data-page", $number); |
82 | 82 | return $this->afterInsert($item); |
83 | 83 | } |
@@ -95,15 +95,15 @@ discard block |
||
95 | 95 | |
96 | 96 | public function generateMenuAsItem($menu, $header=null) { |
97 | 97 | $count=$this->count(); |
98 | - $item=new HtmlSemDoubleElement("item-" . $this->identifier . "-" . $count, "div"); |
|
98 | + $item=new HtmlSemDoubleElement("item-".$this->identifier."-".$count, "div"); |
|
99 | 99 | if (isset($header)) { |
100 | - $headerItem=new HtmlSemDoubleElement("item-header-" . $this->identifier . "-" . $count, "div", "header"); |
|
100 | + $headerItem=new HtmlSemDoubleElement("item-header-".$this->identifier."-".$count, "div", "header"); |
|
101 | 101 | $headerItem->setContent($header); |
102 | 102 | $item->addContent($headerItem); |
103 | 103 | $this->_itemHeader=$headerItem; |
104 | 104 | } |
105 | - if(\is_array($menu)){ |
|
106 | - $menu=new HtmlMenu("menu-" . $this->identifier . "-" . $count,$menu); |
|
105 | + if (\is_array($menu)) { |
|
106 | + $menu=new HtmlMenu("menu-".$this->identifier."-".$count, $menu); |
|
107 | 107 | } |
108 | 108 | $menu->setClass("menu"); |
109 | 109 | $item->addContent($menu); |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | $value=new HtmlSemDoubleElement($identifier, "a", "browse item", $value); |
119 | 119 | $value->addContent(new HtmlIcon("", "dropdown")); |
120 | 120 | $value=$this->addItem($value); |
121 | - $popup=new HtmlPopup($value, "popup-" . $this->identifier . "-" . $this->count(), $content); |
|
121 | + $popup=new HtmlPopup($value, "popup-".$this->identifier."-".$this->count(), $content); |
|
122 | 122 | $popup->setFlowing()->setPosition("bottom left")->setOn("click"); |
123 | 123 | $this->wrap("", $popup); |
124 | 124 | return $popup; |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | public function addDropdownAsItem($value, $items=NULL) { |
128 | 128 | $dd=$value; |
129 | 129 | if (\is_string($value)) { |
130 | - $dd=new HtmlDropdown("dropdown-" . $this->identifier . "-" . $this->count(), $value, $items); |
|
130 | + $dd=new HtmlDropdown("dropdown-".$this->identifier."-".$this->count(), $value, $items); |
|
131 | 131 | } |
132 | 132 | $this->addItem($dd); |
133 | 133 | return $dd; |
@@ -140,14 +140,14 @@ discard block |
||
140 | 140 | * @see \Ajax\common\html\html5\HtmlCollection::createItem() |
141 | 141 | */ |
142 | 142 | protected function createItem($value) { |
143 | - $itemO=new HtmlMenuItem($this->identifier."-item-" . \sizeof($this->content),""); |
|
143 | + $itemO=new HtmlMenuItem($this->identifier."-item-".\sizeof($this->content), ""); |
|
144 | 144 | $itemO->setTagName("a"); |
145 | 145 | $itemO->setContent($value); |
146 | 146 | return $itemO; |
147 | 147 | } |
148 | 148 | |
149 | 149 | public function setSecondary($value=true) { |
150 | - if($value) |
|
150 | + if ($value) |
|
151 | 151 | $this->addToProperty("class", "secondary"); |
152 | 152 | else |
153 | 153 | $this->removePropertyValue("class", "secondary"); |
@@ -155,28 +155,28 @@ discard block |
||
155 | 155 | } |
156 | 156 | |
157 | 157 | public function setVertical() { |
158 | - return $this->addToPropertyCtrl("class", "vertical", array ("vertical" )); |
|
158 | + return $this->addToPropertyCtrl("class", "vertical", array("vertical")); |
|
159 | 159 | } |
160 | 160 | |
161 | 161 | public function setPosition($value="right") { |
162 | - return $this->addToPropertyCtrl("class", $value, array ("right","left" )); |
|
162 | + return $this->addToPropertyCtrl("class", $value, array("right", "left")); |
|
163 | 163 | } |
164 | 164 | |
165 | 165 | public function setPointing($value=Direction::NONE) { |
166 | - return $this->addToPropertyCtrl("class", $value . " pointing", Direction::getConstantValues("pointing")); |
|
166 | + return $this->addToPropertyCtrl("class", $value." pointing", Direction::getConstantValues("pointing")); |
|
167 | 167 | } |
168 | 168 | |
169 | 169 | public function asTab($vertical=false) { |
170 | - $this->apply(function (HtmlDoubleElement &$item) { |
|
170 | + $this->apply(function(HtmlDoubleElement&$item) { |
|
171 | 171 | $item->setTagName("a"); |
172 | 172 | }); |
173 | - if ($vertical === true) |
|
173 | + if ($vertical===true) |
|
174 | 174 | $this->setVertical(); |
175 | 175 | return $this->addToProperty("class", "tabular"); |
176 | 176 | } |
177 | 177 | |
178 | 178 | public function asPagination() { |
179 | - $this->apply(function (HtmlDoubleElement &$item) { |
|
179 | + $this->apply(function(HtmlDoubleElement&$item) { |
|
180 | 180 | $item->setTagName("a"); |
181 | 181 | }); |
182 | 182 | return $this->addToProperty("class", "pagination"); |
@@ -213,10 +213,10 @@ discard block |
||
213 | 213 | */ |
214 | 214 | public function setWidth($width) { |
215 | 215 | if (\is_int($width)) { |
216 | - $width=Wide::getConstants()["W" . $width]; |
|
216 | + $width=Wide::getConstants()["W".$width]; |
|
217 | 217 | } |
218 | 218 | $this->addToPropertyCtrl("class", $width, Wide::getConstants()); |
219 | - return $this->addToPropertyCtrl("class", "item", array ("item" )); |
|
219 | + return $this->addToPropertyCtrl("class", "item", array("item")); |
|
220 | 220 | } |
221 | 221 | |
222 | 222 | public function addImage($identifier, $src="", $alt="") { |
@@ -231,14 +231,14 @@ discard block |
||
231 | 231 | return $this->_itemHeader; |
232 | 232 | } |
233 | 233 | |
234 | - public function setHasContainer(){ |
|
235 | - return $this->wrapContent("<div class='ui container'>","</div>"); |
|
234 | + public function setHasContainer() { |
|
235 | + return $this->wrapContent("<div class='ui container'>", "</div>"); |
|
236 | 236 | } |
237 | 237 | |
238 | - public function run(JsUtils $js){ |
|
239 | - if($this->identifier!=="" && !isset($this->_bsComponent)) |
|
240 | - $this->onClick('if(!$(this).hasClass("dropdown")&&!$(this).hasClass("no-active")){$(this).addClass("active").siblings().removeClass("active");}',false,false); |
|
241 | - $result= parent::run($js); |
|
238 | + public function run(JsUtils $js) { |
|
239 | + if ($this->identifier!=="" && !isset($this->_bsComponent)) |
|
240 | + $this->onClick('if(!$(this).hasClass("dropdown")&&!$(this).hasClass("no-active")){$(this).addClass("active").siblings().removeClass("active");}', false, false); |
|
241 | + $result=parent::run($js); |
|
242 | 242 | return $result->setItemSelector(".item"); |
243 | 243 | } |
244 | 244 | } |
@@ -249,6 +249,9 @@ discard block |
||
249 | 249 | return $this; |
250 | 250 | } |
251 | 251 | |
252 | + /** |
|
253 | + * @param integer $index |
|
254 | + */ |
|
252 | 255 | public static function setIndex($index) { |
253 | 256 | self::$index=$index; |
254 | 257 | } |
@@ -307,7 +310,7 @@ discard block |
||
307 | 310 | * The $callback function can take the following arguments : $field=>the compiled field, $instance : the active instance of the object, $index: the field position |
308 | 311 | * @param int $index postion of the compiled field |
309 | 312 | * @param callable $callback function called after the field compilation |
310 | - * @return \Ajax\semantic\widgets\datatable\InstanceViewer |
|
313 | + * @return InstanceViewer |
|
311 | 314 | */ |
312 | 315 | public function afterCompile($index,$callback){ |
313 | 316 | $this->afterCompile[$index]=$callback; |
@@ -19,215 +19,215 @@ discard block |
||
19 | 19 | |
20 | 20 | public static $index=0; |
21 | 21 | |
22 | - public function __construct($identifier,$instance=NULL,$captions=NULL){ |
|
22 | + public function __construct($identifier, $instance=NULL, $captions=NULL) { |
|
23 | 23 | $this->widgetIdentifier=$identifier; |
24 | 24 | $this->values=[]; |
25 | 25 | $this->afterCompile=[]; |
26 | - if(isset($instance)) |
|
26 | + if (isset($instance)) |
|
27 | 27 | $this->setInstance($instance); |
28 | 28 | $this->setCaptions($captions); |
29 | 29 | $this->captionCallback=NULL; |
30 | - $this->defaultValueFunction=function($name,$value){return $value;}; |
|
30 | + $this->defaultValueFunction=function($name, $value) {return $value; }; |
|
31 | 31 | } |
32 | 32 | |
33 | - public function moveFieldTo($from,$to){ |
|
34 | - if(JArray::moveElementTo($this->visibleProperties, $from, $to)){ |
|
33 | + public function moveFieldTo($from, $to) { |
|
34 | + if (JArray::moveElementTo($this->visibleProperties, $from, $to)) { |
|
35 | 35 | return JArray::moveElementTo($this->values, $from, $to); |
36 | 36 | } |
37 | 37 | return false; |
38 | 38 | } |
39 | 39 | |
40 | - public function swapFields($index1,$index2){ |
|
41 | - if(JArray::swapElements($this->visibleProperties, $index1, $index2)){ |
|
40 | + public function swapFields($index1, $index2) { |
|
41 | + if (JArray::swapElements($this->visibleProperties, $index1, $index2)) { |
|
42 | 42 | return JArray::swapElements($this->values, $index1, $index2); |
43 | 43 | } |
44 | 44 | return false; |
45 | 45 | } |
46 | 46 | |
47 | - public function removeField($index){ |
|
48 | - \array_splice($this->visibleProperties,$index,1); |
|
49 | - \array_splice($this->values,$index,1); |
|
50 | - \array_splice($this->captions,$index,1); |
|
47 | + public function removeField($index) { |
|
48 | + \array_splice($this->visibleProperties, $index, 1); |
|
49 | + \array_splice($this->values, $index, 1); |
|
50 | + \array_splice($this->captions, $index, 1); |
|
51 | 51 | return $this; |
52 | 52 | } |
53 | 53 | |
54 | - public function getValues(){ |
|
54 | + public function getValues() { |
|
55 | 55 | $values=[]; |
56 | 56 | $index=0; |
57 | 57 | $count=$this->count(); |
58 | - while($index<$count){ |
|
58 | + while ($index<$count) { |
|
59 | 59 | $values[]=$this->getValue($index++); |
60 | 60 | } |
61 | 61 | return $values; |
62 | 62 | } |
63 | 63 | |
64 | - public function getIdentifier($index=NULL){ |
|
65 | - if(!isset($index)) |
|
64 | + public function getIdentifier($index=NULL) { |
|
65 | + if (!isset($index)) |
|
66 | 66 | $index=self::$index; |
67 | 67 | $value=$index; |
68 | - if(isset($this->values["identifier"])){ |
|
69 | - if(\is_string($this->values["identifier"])) |
|
68 | + if (isset($this->values["identifier"])) { |
|
69 | + if (\is_string($this->values["identifier"])) |
|
70 | 70 | $value=JReflection::callMethod($this->instance, $this->values["identifier"], []); |
71 | 71 | else |
72 | - $value=$this->values["identifier"]($index,$this->instance); |
|
72 | + $value=$this->values["identifier"]($index, $this->instance); |
|
73 | 73 | } |
74 | 74 | return $value; |
75 | 75 | } |
76 | 76 | |
77 | - public function getValue($index){ |
|
77 | + public function getValue($index) { |
|
78 | 78 | $property=$this->properties[$index]; |
79 | 79 | return $this->_getValue($property, $index); |
80 | 80 | } |
81 | 81 | |
82 | - protected function _beforeAddProperty($index,&$field){ |
|
82 | + protected function _beforeAddProperty($index, &$field) { |
|
83 | 83 | |
84 | 84 | } |
85 | 85 | |
86 | - protected function _getDefaultValue($name,$value,$index){ |
|
86 | + protected function _getDefaultValue($name, $value, $index) { |
|
87 | 87 | $func=$this->defaultValueFunction; |
88 | - return $func($name,$value,$index,$this->instance); |
|
88 | + return $func($name, $value, $index, $this->instance); |
|
89 | 89 | } |
90 | 90 | |
91 | - protected function _getPropertyValue(\ReflectionProperty $property,$index){ |
|
91 | + protected function _getPropertyValue(\ReflectionProperty $property, $index) { |
|
92 | 92 | $property->setAccessible(true); |
93 | 93 | return $property->getValue($this->instance); |
94 | 94 | } |
95 | 95 | |
96 | - protected function _getValue($property,$index){ |
|
96 | + protected function _getValue($property, $index) { |
|
97 | 97 | $value=null; |
98 | 98 | $propertyName=$property; |
99 | - if($property instanceof \ReflectionProperty){ |
|
99 | + if ($property instanceof \ReflectionProperty) { |
|
100 | 100 | $value=$this->_getPropertyValue($property, $index); |
101 | 101 | $propertyName=$property->getName(); |
102 | - }elseif(\is_callable($property)) |
|
102 | + }elseif (\is_callable($property)) |
|
103 | 103 | $value=$property($this->instance); |
104 | - elseif(\is_array($property)){ |
|
105 | - $values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property); |
|
104 | + elseif (\is_array($property)) { |
|
105 | + $values=\array_map(function($v) use ($index){return $this->_getValue($v, $index); }, $property); |
|
106 | 106 | $value=\implode("", $values); |
107 | - }elseif(\is_string($property)){ |
|
107 | + }elseif (\is_string($property)) { |
|
108 | 108 | $value=$property; |
109 | - if(isset($this->instance->{$property})){ |
|
109 | + if (isset($this->instance->{$property})) { |
|
110 | 110 | $value=$this->instance->{$property}; |
111 | - }elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){ |
|
111 | + }elseif (\method_exists($this->instance, $getter=JReflection::getterName($property))) { |
|
112 | 112 | $value=JReflection::callMethod($this->instance, $getter, []); |
113 | 113 | } |
114 | 114 | } |
115 | 115 | return $this->_postGetValue($index, $propertyName, $value); |
116 | 116 | } |
117 | 117 | |
118 | - protected function _postGetValue($index,$propertyName,$value){ |
|
119 | - if(isset($this->values[$index])){ |
|
120 | - $value= $this->values[$index]($value,$this->instance,$index); |
|
121 | - }else{ |
|
122 | - $value=$this->_getDefaultValue($propertyName,$value, $index); |
|
118 | + protected function _postGetValue($index, $propertyName, $value) { |
|
119 | + if (isset($this->values[$index])) { |
|
120 | + $value=$this->values[$index]($value, $this->instance, $index); |
|
121 | + } else { |
|
122 | + $value=$this->_getDefaultValue($propertyName, $value, $index); |
|
123 | 123 | } |
124 | - if(isset($this->afterCompile[$index])){ |
|
125 | - if(\is_callable($this->afterCompile[$index])){ |
|
126 | - $this->afterCompile[$index]($value,$this->instance,$index); |
|
124 | + if (isset($this->afterCompile[$index])) { |
|
125 | + if (\is_callable($this->afterCompile[$index])) { |
|
126 | + $this->afterCompile[$index]($value, $this->instance, $index); |
|
127 | 127 | } |
128 | 128 | } |
129 | 129 | return $value; |
130 | 130 | } |
131 | 131 | |
132 | - public function insertField($index,$field){ |
|
133 | - array_splice( $this->visibleProperties, $index, 0, $field ); |
|
132 | + public function insertField($index, $field) { |
|
133 | + array_splice($this->visibleProperties, $index, 0, $field); |
|
134 | 134 | return $this; |
135 | 135 | } |
136 | 136 | |
137 | - public function insertInField($index,$field){ |
|
137 | + public function insertInField($index, $field) { |
|
138 | 138 | $vb=$this->visibleProperties; |
139 | - if(isset($vb[$index])){ |
|
140 | - if(\is_array($vb[$index])){ |
|
139 | + if (isset($vb[$index])) { |
|
140 | + if (\is_array($vb[$index])) { |
|
141 | 141 | $this->visibleProperties[$index][]=$field; |
142 | - }else{ |
|
143 | - $this->visibleProperties[$index]=[$vb[$index],$field]; |
|
142 | + } else { |
|
143 | + $this->visibleProperties[$index]=[$vb[$index], $field]; |
|
144 | 144 | } |
145 | - }else{ |
|
145 | + } else { |
|
146 | 146 | return $this->insertField($index, $field); |
147 | 147 | } |
148 | 148 | return $this; |
149 | 149 | } |
150 | 150 | |
151 | - public function addField($field){ |
|
151 | + public function addField($field) { |
|
152 | 152 | $this->visibleProperties[]=$field; |
153 | 153 | return $this; |
154 | 154 | } |
155 | 155 | |
156 | - public function count(){ |
|
156 | + public function count() { |
|
157 | 157 | return \sizeof($this->properties); |
158 | 158 | } |
159 | 159 | |
160 | - public function visiblePropertiesCount(){ |
|
160 | + public function visiblePropertiesCount() { |
|
161 | 161 | return \sizeof($this->visibleProperties); |
162 | 162 | } |
163 | 163 | |
164 | - public function getProperty($index){ |
|
164 | + public function getProperty($index) { |
|
165 | 165 | return $this->properties[$index]; |
166 | 166 | } |
167 | 167 | |
168 | - public function getFieldName($index){ |
|
168 | + public function getFieldName($index) { |
|
169 | 169 | $property=$this->getProperty($index); |
170 | - if($property instanceof \ReflectionProperty){ |
|
170 | + if ($property instanceof \ReflectionProperty) { |
|
171 | 171 | $result=$property->getName(); |
172 | - }elseif(\is_callable($property)){ |
|
172 | + }elseif (\is_callable($property)) { |
|
173 | 173 | $result=$this->visibleProperties[$index]; |
174 | - }else{ |
|
174 | + } else { |
|
175 | 175 | $result=$property; |
176 | 176 | } |
177 | 177 | return $result; |
178 | 178 | } |
179 | 179 | |
180 | 180 | |
181 | - protected function showableProperty(\ReflectionProperty $rProperty){ |
|
182 | - return JString::startswith($rProperty->getName(),"_")===false; |
|
181 | + protected function showableProperty(\ReflectionProperty $rProperty) { |
|
182 | + return JString::startswith($rProperty->getName(), "_")===false; |
|
183 | 183 | } |
184 | 184 | |
185 | 185 | public function setInstance($instance) { |
186 | - if(\is_string($instance)){ |
|
186 | + if (\is_string($instance)) { |
|
187 | 187 | $instance=new $instance(); |
188 | 188 | } |
189 | 189 | $this->instance=$instance; |
190 | 190 | $this->properties=[]; |
191 | 191 | $this->reflect=new \ReflectionClass($instance); |
192 | - if(\sizeof($this->visibleProperties)===0){ |
|
192 | + if (\sizeof($this->visibleProperties)===0) { |
|
193 | 193 | $this->properties=$this->getDefaultProperties(); |
194 | - }else{ |
|
195 | - foreach ($this->visibleProperties as $property){ |
|
194 | + } else { |
|
195 | + foreach ($this->visibleProperties as $property) { |
|
196 | 196 | $this->setInstanceProperty($property); |
197 | 197 | } |
198 | 198 | } |
199 | 199 | return $this; |
200 | 200 | } |
201 | 201 | |
202 | - private function setInstanceProperty($property){ |
|
203 | - if(\is_callable($property)){ |
|
202 | + private function setInstanceProperty($property) { |
|
203 | + if (\is_callable($property)) { |
|
204 | 204 | $this->properties[]=$property; |
205 | - }elseif(\is_string($property)){ |
|
206 | - try{ |
|
205 | + }elseif (\is_string($property)) { |
|
206 | + try { |
|
207 | 207 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
208 | 208 | $rProperty=$this->reflect->getProperty($property); |
209 | 209 | $this->properties[]=$rProperty; |
210 | - }catch(\Exception $e){ |
|
210 | + }catch (\Exception $e) { |
|
211 | 211 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
212 | 212 | $this->properties[]=$property; |
213 | 213 | } |
214 | - }elseif(\is_int($property)){ |
|
214 | + }elseif (\is_int($property)) { |
|
215 | 215 | $props=$this->getDefaultProperties(); |
216 | - if(isset($props[$property])) |
|
216 | + if (isset($props[$property])) |
|
217 | 217 | $this->properties[]=$props[$property]; |
218 | 218 | else |
219 | 219 | $this->properties[]=$property; |
220 | - }else{ |
|
220 | + } else { |
|
221 | 221 | $this->properties[]=$property; |
222 | 222 | } |
223 | 223 | } |
224 | 224 | |
225 | - protected function getDefaultProperties(){ |
|
225 | + protected function getDefaultProperties() { |
|
226 | 226 | $result=[]; |
227 | 227 | $properties=$this->reflect->getProperties(); |
228 | - foreach ($properties as $property){ |
|
228 | + foreach ($properties as $property) { |
|
229 | 229 | $showable=$this->showableProperty($property); |
230 | - if($showable!==false){ |
|
230 | + if ($showable!==false) { |
|
231 | 231 | $result[]=$property; |
232 | 232 | } |
233 | 233 | } |
@@ -239,12 +239,12 @@ discard block |
||
239 | 239 | return $this; |
240 | 240 | } |
241 | 241 | |
242 | - public function setValueFunction($index,$callback){ |
|
242 | + public function setValueFunction($index, $callback) { |
|
243 | 243 | $this->values[$index]=$callback; |
244 | 244 | return $this; |
245 | 245 | } |
246 | 246 | |
247 | - public function setIdentifierFunction($callback){ |
|
247 | + public function setIdentifierFunction($callback) { |
|
248 | 248 | $this->values["identifier"]=$callback; |
249 | 249 | return $this; |
250 | 250 | } |
@@ -257,42 +257,42 @@ discard block |
||
257 | 257 | return $this->properties; |
258 | 258 | } |
259 | 259 | |
260 | - public function getCaption($index){ |
|
261 | - if(isset($this->captions[$index])){ |
|
260 | + public function getCaption($index) { |
|
261 | + if (isset($this->captions[$index])) { |
|
262 | 262 | return $this->captions[$index]; |
263 | 263 | } |
264 | - if($this->properties[$index] instanceof \ReflectionProperty) |
|
264 | + if ($this->properties[$index] instanceof \ReflectionProperty) |
|
265 | 265 | return $this->properties[$index]->getName(); |
266 | - elseif(\is_callable($this->properties[$index])) |
|
266 | + elseif (\is_callable($this->properties[$index])) |
|
267 | 267 | return ""; |
268 | 268 | else |
269 | 269 | return $this->properties[$index]; |
270 | 270 | } |
271 | 271 | |
272 | - public function getCaptions(){ |
|
273 | - if(isset($this->captions)){ |
|
274 | - $captions= \array_values($this->captions); |
|
272 | + public function getCaptions() { |
|
273 | + if (isset($this->captions)) { |
|
274 | + $captions=\array_values($this->captions); |
|
275 | 275 | $captionsSize=\sizeof($captions); |
276 | - for($i=$captionsSize;$i<$this->count();$i++){ |
|
276 | + for ($i=$captionsSize; $i<$this->count(); $i++) { |
|
277 | 277 | $captions[]=""; |
278 | 278 | } |
279 | - }else{ |
|
279 | + } else { |
|
280 | 280 | $captions=[]; |
281 | 281 | $index=0; |
282 | 282 | $count=$this->count(); |
283 | - while($index<$count){ |
|
283 | + while ($index<$count) { |
|
284 | 284 | $captions[]=$this->getCaption($index++); |
285 | 285 | } |
286 | 286 | } |
287 | - if(isset($this->captionCallback) && \is_callable($this->captionCallback)){ |
|
287 | + if (isset($this->captionCallback) && \is_callable($this->captionCallback)) { |
|
288 | 288 | $callback=$this->captionCallback; |
289 | - $callback($captions,$this->instance); |
|
289 | + $callback($captions, $this->instance); |
|
290 | 290 | } |
291 | 291 | return $captions; |
292 | 292 | } |
293 | 293 | |
294 | - public function setCaption($index,$caption){ |
|
295 | - if(isset($this->captions)===false) |
|
294 | + public function setCaption($index, $caption) { |
|
295 | + if (isset($this->captions)===false) |
|
296 | 296 | $this->captions=[]; |
297 | 297 | $this->captions[$index]=$caption; |
298 | 298 | return $this; |
@@ -310,7 +310,7 @@ discard block |
||
310 | 310 | * @param callable $callback function called after the field compilation |
311 | 311 | * @return \Ajax\semantic\widgets\datatable\InstanceViewer |
312 | 312 | */ |
313 | - public function afterCompile($index,$callback){ |
|
313 | + public function afterCompile($index, $callback) { |
|
314 | 314 | $this->afterCompile[$index]=$callback; |
315 | 315 | return $this; |
316 | 316 | } |
@@ -23,8 +23,9 @@ discard block |
||
23 | 23 | $this->widgetIdentifier=$identifier; |
24 | 24 | $this->values=[]; |
25 | 25 | $this->afterCompile=[]; |
26 | - if(isset($instance)) |
|
27 | - $this->setInstance($instance); |
|
26 | + if(isset($instance)) { |
|
27 | + $this->setInstance($instance); |
|
28 | + } |
|
28 | 29 | $this->setCaptions($captions); |
29 | 30 | $this->captionCallback=NULL; |
30 | 31 | $this->defaultValueFunction=function($name,$value){return $value;}; |
@@ -62,14 +63,16 @@ discard block |
||
62 | 63 | } |
63 | 64 | |
64 | 65 | public function getIdentifier($index=NULL){ |
65 | - if(!isset($index)) |
|
66 | - $index=self::$index; |
|
66 | + if(!isset($index)) { |
|
67 | + $index=self::$index; |
|
68 | + } |
|
67 | 69 | $value=$index; |
68 | 70 | if(isset($this->values["identifier"])){ |
69 | - if(\is_string($this->values["identifier"])) |
|
70 | - $value=JReflection::callMethod($this->instance, $this->values["identifier"], []); |
|
71 | - else |
|
72 | - $value=$this->values["identifier"]($index,$this->instance); |
|
71 | + if(\is_string($this->values["identifier"])) { |
|
72 | + $value=JReflection::callMethod($this->instance, $this->values["identifier"], []); |
|
73 | + } else { |
|
74 | + $value=$this->values["identifier"]($index,$this->instance); |
|
75 | + } |
|
73 | 76 | } |
74 | 77 | return $value; |
75 | 78 | } |
@@ -99,16 +102,16 @@ discard block |
||
99 | 102 | if($property instanceof \ReflectionProperty){ |
100 | 103 | $value=$this->_getPropertyValue($property, $index); |
101 | 104 | $propertyName=$property->getName(); |
102 | - }elseif(\is_callable($property)) |
|
103 | - $value=$property($this->instance); |
|
104 | - elseif(\is_array($property)){ |
|
105 | + } elseif(\is_callable($property)) { |
|
106 | + $value=$property($this->instance); |
|
107 | + } elseif(\is_array($property)){ |
|
105 | 108 | $values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property); |
106 | 109 | $value=\implode("", $values); |
107 | - }elseif(\is_string($property)){ |
|
110 | + } elseif(\is_string($property)){ |
|
108 | 111 | $value=$property; |
109 | 112 | if(isset($this->instance->{$property})){ |
110 | 113 | $value=$this->instance->{$property}; |
111 | - }elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){ |
|
114 | + } elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){ |
|
112 | 115 | $value=JReflection::callMethod($this->instance, $getter, []); |
113 | 116 | } |
114 | 117 | } |
@@ -118,7 +121,7 @@ discard block |
||
118 | 121 | protected function _postGetValue($index,$propertyName,$value){ |
119 | 122 | if(isset($this->values[$index])){ |
120 | 123 | $value= $this->values[$index]($value,$this->instance,$index); |
121 | - }else{ |
|
124 | + } else{ |
|
122 | 125 | $value=$this->_getDefaultValue($propertyName,$value, $index); |
123 | 126 | } |
124 | 127 | if(isset($this->afterCompile[$index])){ |
@@ -139,10 +142,10 @@ discard block |
||
139 | 142 | if(isset($vb[$index])){ |
140 | 143 | if(\is_array($vb[$index])){ |
141 | 144 | $this->visibleProperties[$index][]=$field; |
142 | - }else{ |
|
145 | + } else{ |
|
143 | 146 | $this->visibleProperties[$index]=[$vb[$index],$field]; |
144 | 147 | } |
145 | - }else{ |
|
148 | + } else{ |
|
146 | 149 | return $this->insertField($index, $field); |
147 | 150 | } |
148 | 151 | return $this; |
@@ -169,9 +172,9 @@ discard block |
||
169 | 172 | $property=$this->getProperty($index); |
170 | 173 | if($property instanceof \ReflectionProperty){ |
171 | 174 | $result=$property->getName(); |
172 | - }elseif(\is_callable($property)){ |
|
175 | + } elseif(\is_callable($property)){ |
|
173 | 176 | $result=$this->visibleProperties[$index]; |
174 | - }else{ |
|
177 | + } else{ |
|
175 | 178 | $result=$property; |
176 | 179 | } |
177 | 180 | return $result; |
@@ -191,7 +194,7 @@ discard block |
||
191 | 194 | $this->reflect=new \ReflectionClass($instance); |
192 | 195 | if(\sizeof($this->visibleProperties)===0){ |
193 | 196 | $this->properties=$this->getDefaultProperties(); |
194 | - }else{ |
|
197 | + } else{ |
|
195 | 198 | foreach ($this->visibleProperties as $property){ |
196 | 199 | $this->setInstanceProperty($property); |
197 | 200 | } |
@@ -202,22 +205,23 @@ discard block |
||
202 | 205 | private function setInstanceProperty($property){ |
203 | 206 | if(\is_callable($property)){ |
204 | 207 | $this->properties[]=$property; |
205 | - }elseif(\is_string($property)){ |
|
208 | + } elseif(\is_string($property)){ |
|
206 | 209 | try{ |
207 | 210 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
208 | 211 | $rProperty=$this->reflect->getProperty($property); |
209 | 212 | $this->properties[]=$rProperty; |
210 | - }catch(\Exception $e){ |
|
213 | + } catch(\Exception $e){ |
|
211 | 214 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
212 | 215 | $this->properties[]=$property; |
213 | 216 | } |
214 | - }elseif(\is_int($property)){ |
|
217 | + } elseif(\is_int($property)){ |
|
215 | 218 | $props=$this->getDefaultProperties(); |
216 | - if(isset($props[$property])) |
|
217 | - $this->properties[]=$props[$property]; |
|
218 | - else |
|
219 | - $this->properties[]=$property; |
|
220 | - }else{ |
|
219 | + if(isset($props[$property])) { |
|
220 | + $this->properties[]=$props[$property]; |
|
221 | + } else { |
|
222 | + $this->properties[]=$property; |
|
223 | + } |
|
224 | + } else{ |
|
221 | 225 | $this->properties[]=$property; |
222 | 226 | } |
223 | 227 | } |
@@ -261,12 +265,13 @@ discard block |
||
261 | 265 | if(isset($this->captions[$index])){ |
262 | 266 | return $this->captions[$index]; |
263 | 267 | } |
264 | - if($this->properties[$index] instanceof \ReflectionProperty) |
|
265 | - return $this->properties[$index]->getName(); |
|
266 | - elseif(\is_callable($this->properties[$index])) |
|
267 | - return ""; |
|
268 | - else |
|
269 | - return $this->properties[$index]; |
|
268 | + if($this->properties[$index] instanceof \ReflectionProperty) { |
|
269 | + return $this->properties[$index]->getName(); |
|
270 | + } elseif(\is_callable($this->properties[$index])) { |
|
271 | + return ""; |
|
272 | + } else { |
|
273 | + return $this->properties[$index]; |
|
274 | + } |
|
270 | 275 | } |
271 | 276 | |
272 | 277 | public function getCaptions(){ |
@@ -276,7 +281,7 @@ discard block |
||
276 | 281 | for($i=$captionsSize;$i<$this->count();$i++){ |
277 | 282 | $captions[]=""; |
278 | 283 | } |
279 | - }else{ |
|
284 | + } else{ |
|
280 | 285 | $captions=[]; |
281 | 286 | $index=0; |
282 | 287 | $count=$this->count(); |
@@ -292,8 +297,9 @@ discard block |
||
292 | 297 | } |
293 | 298 | |
294 | 299 | public function setCaption($index,$caption){ |
295 | - if(isset($this->captions)===false) |
|
296 | - $this->captions=[]; |
|
300 | + if(isset($this->captions)===false) { |
|
301 | + $this->captions=[]; |
|
302 | + } |
|
297 | 303 | $this->captions[$index]=$caption; |
298 | 304 | return $this; |
299 | 305 | } |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | foreach ($ajaxSubmit as $ajaxSubmitItem){ |
49 | 49 | $compilation.=$ajaxSubmitItem->compile($js); |
50 | 50 | } |
51 | - }elseif($ajaxSubmit instanceof AjaxCall){ |
|
51 | + } elseif($ajaxSubmit instanceof AjaxCall){ |
|
52 | 52 | $compilation=$ajaxSubmit->compile($js); |
53 | 53 | } |
54 | 54 | $compilation=str_ireplace("\"","%quote%", $compilation); |
@@ -66,8 +66,9 @@ discard block |
||
66 | 66 | |
67 | 67 | public function setAttached($value=true){ |
68 | 68 | $form=$this->getForm(); |
69 | - if($value) |
|
70 | - $form->addToPropertyCtrl("class", "attached", array ("attached" )); |
|
69 | + if($value) { |
|
70 | + $form->addToPropertyCtrl("class", "attached", array ("attached" )); |
|
71 | + } |
|
71 | 72 | return $form; |
72 | 73 | } |
73 | 74 | |
@@ -89,10 +90,11 @@ discard block |
||
89 | 90 | */ |
90 | 91 | public function submitOn($event,$identifierOrElement,$url,$responseElement,$parameters=NULL){ |
91 | 92 | $form=$this->getForm(); |
92 | - if($identifierOrElement instanceof BaseHtml) |
|
93 | - $elem=$identifierOrElement; |
|
94 | - else |
|
95 | - $elem=$form->getElementById($identifierOrElement, $form->getContent()); |
|
93 | + if($identifierOrElement instanceof BaseHtml) { |
|
94 | + $elem=$identifierOrElement; |
|
95 | + } else { |
|
96 | + $elem=$form->getElementById($identifierOrElement, $form->getContent()); |
|
97 | + } |
|
96 | 98 | if(isset($elem)){ |
97 | 99 | $this->_buttonAsSubmit($elem, $event,$url,$responseElement,$parameters); |
98 | 100 | } |
@@ -120,8 +122,9 @@ discard block |
||
120 | 122 | public function setSubmitParams($url,$responseElement=NULL,$parameters=NULL){ |
121 | 123 | $form=$this->getForm(); |
122 | 124 | $params=["form"=>$form->getIdentifier(),"responseElement"=>$responseElement,"url"=>$url,"stopPropagation"=>true]; |
123 | - if(\is_array($parameters)) |
|
124 | - $params=\array_merge($params,$parameters); |
|
125 | + if(\is_array($parameters)) { |
|
126 | + $params=\array_merge($params,$parameters); |
|
127 | + } |
|
125 | 128 | $form->addValidationParam("_ajaxSubmit", new AjaxCall("postForm", $params)); |
126 | 129 | return $this; |
127 | 130 | } |
@@ -13,27 +13,27 @@ discard block |
||
13 | 13 | * @author jc |
14 | 14 | * |
15 | 15 | */ |
16 | -trait FormTrait{ |
|
16 | +trait FormTrait { |
|
17 | 17 | |
18 | 18 | /** |
19 | 19 | * @return HtmlForm |
20 | 20 | */ |
21 | 21 | abstract protected function getForm(); |
22 | 22 | |
23 | - protected function addCompoValidation($compo,$field){ |
|
23 | + protected function addCompoValidation($compo, $field) { |
|
24 | 24 | $validation=$field->getValidation(); |
25 | - if(isset($validation)){ |
|
25 | + if (isset($validation)) { |
|
26 | 26 | $validation->setIdentifier($field->getDataField()->getIdentifier()); |
27 | 27 | $compo->addFieldValidation($validation); |
28 | 28 | } |
29 | 29 | return $compo; |
30 | 30 | } |
31 | 31 | |
32 | - protected function _runValidationParams(&$compo,JsUtils $js=NULL){ |
|
32 | + protected function _runValidationParams(&$compo, JsUtils $js=NULL) { |
|
33 | 33 | $form=$this->getForm(); |
34 | 34 | $params=$form->getValidationParams(); |
35 | - if(isset($params["_ajaxSubmit"])){ |
|
36 | - $compilation=$this->_compileAjaxSubmit($params["_ajaxSubmit"],$js); |
|
35 | + if (isset($params["_ajaxSubmit"])) { |
|
36 | + $compilation=$this->_compileAjaxSubmit($params["_ajaxSubmit"], $js); |
|
37 | 37 | $this->onSuccess($compilation); |
38 | 38 | $form->removeValidationParam("_ajaxSubmit"); |
39 | 39 | } |
@@ -42,16 +42,16 @@ discard block |
||
42 | 42 | $form->addEventsOnRun($js); |
43 | 43 | } |
44 | 44 | |
45 | - protected function _compileAjaxSubmit($ajaxSubmit,JsUtils $js=null){ |
|
45 | + protected function _compileAjaxSubmit($ajaxSubmit, JsUtils $js=null) { |
|
46 | 46 | $compilation=""; |
47 | - if(\is_array($ajaxSubmit)){ |
|
48 | - foreach ($ajaxSubmit as $ajaxSubmitItem){ |
|
47 | + if (\is_array($ajaxSubmit)) { |
|
48 | + foreach ($ajaxSubmit as $ajaxSubmitItem) { |
|
49 | 49 | $compilation.=$ajaxSubmitItem->compile($js); |
50 | 50 | } |
51 | - }elseif($ajaxSubmit instanceof AjaxCall){ |
|
51 | + }elseif ($ajaxSubmit instanceof AjaxCall) { |
|
52 | 52 | $compilation=$ajaxSubmit->compile($js); |
53 | 53 | } |
54 | - $compilation=str_ireplace("\"","%quote%", $compilation); |
|
54 | + $compilation=str_ireplace("\"", "%quote%", $compilation); |
|
55 | 55 | return $compilation; |
56 | 56 | } |
57 | 57 | |
@@ -64,14 +64,14 @@ discard block |
||
64 | 64 | return $this; |
65 | 65 | } |
66 | 66 | |
67 | - public function setAttached($value=true){ |
|
67 | + public function setAttached($value=true) { |
|
68 | 68 | $form=$this->getForm(); |
69 | - if($value) |
|
70 | - $form->addToPropertyCtrl("class", "attached", array ("attached" )); |
|
69 | + if ($value) |
|
70 | + $form->addToPropertyCtrl("class", "attached", array("attached")); |
|
71 | 71 | return $form; |
72 | 72 | } |
73 | 73 | |
74 | - public function addErrorMessage(){ |
|
74 | + public function addErrorMessage() { |
|
75 | 75 | return $this->getForm()->addContent((new HtmlMessage(""))->setError()); |
76 | 76 | } |
77 | 77 | |
@@ -87,47 +87,47 @@ discard block |
||
87 | 87 | * @param array $parameters |
88 | 88 | * @return HtmlForm |
89 | 89 | */ |
90 | - public function submitOn($event,$identifierOrElement,$url,$responseElement,$parameters=NULL){ |
|
90 | + public function submitOn($event, $identifierOrElement, $url, $responseElement, $parameters=NULL) { |
|
91 | 91 | $form=$this->getForm(); |
92 | - if($identifierOrElement instanceof BaseHtml) |
|
92 | + if ($identifierOrElement instanceof BaseHtml) |
|
93 | 93 | $elem=$identifierOrElement; |
94 | 94 | else |
95 | 95 | $elem=$form->getElementById($identifierOrElement, $form->getContent()); |
96 | - if(isset($elem)){ |
|
97 | - $this->_buttonAsSubmit($elem, $event,$url,$responseElement,$parameters); |
|
96 | + if (isset($elem)) { |
|
97 | + $this->_buttonAsSubmit($elem, $event, $url, $responseElement, $parameters); |
|
98 | 98 | } |
99 | 99 | return $form; |
100 | 100 | } |
101 | 101 | |
102 | - public function submitOnClick($identifier,$url,$responseElement,$parameters=NULL){ |
|
103 | - return $this->submitOn("click", $identifier, $url, $responseElement,$parameters); |
|
102 | + public function submitOnClick($identifier, $url, $responseElement, $parameters=NULL) { |
|
103 | + return $this->submitOn("click", $identifier, $url, $responseElement, $parameters); |
|
104 | 104 | } |
105 | 105 | |
106 | - public function addSubmit($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$parameters=NULL){ |
|
107 | - $bt=$this->getForm()->addButton($identifier, $value,$cssStyle); |
|
108 | - return $this->_buttonAsSubmit($bt, "click",$url,$responseElement,$parameters); |
|
106 | + public function addSubmit($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $parameters=NULL) { |
|
107 | + $bt=$this->getForm()->addButton($identifier, $value, $cssStyle); |
|
108 | + return $this->_buttonAsSubmit($bt, "click", $url, $responseElement, $parameters); |
|
109 | 109 | } |
110 | 110 | |
111 | - protected function _buttonAsSubmit(BaseHtml &$button,$event,$url,$responseElement=NULL,$parameters=NULL){ |
|
111 | + protected function _buttonAsSubmit(BaseHtml&$button, $event, $url, $responseElement=NULL, $parameters=NULL) { |
|
112 | 112 | $form=$this->getForm(); |
113 | - if(isset($url) && isset($responseElement)){ |
|
114 | - $button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');",true,true); |
|
115 | - $this->setSubmitParams($url,$responseElement,$parameters); |
|
113 | + if (isset($url) && isset($responseElement)) { |
|
114 | + $button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');", true, true); |
|
115 | + $this->setSubmitParams($url, $responseElement, $parameters); |
|
116 | 116 | } |
117 | 117 | return $button; |
118 | 118 | } |
119 | 119 | |
120 | - public function setSubmitParams($url,$responseElement=NULL,$parameters=NULL){ |
|
120 | + public function setSubmitParams($url, $responseElement=NULL, $parameters=NULL) { |
|
121 | 121 | $form=$this->getForm(); |
122 | - $params=["form"=>$form->getIdentifier(),"responseElement"=>$responseElement,"url"=>$url,"stopPropagation"=>true]; |
|
123 | - if(\is_array($parameters)) |
|
124 | - $params=\array_merge($params,$parameters); |
|
122 | + $params=["form"=>$form->getIdentifier(), "responseElement"=>$responseElement, "url"=>$url, "stopPropagation"=>true]; |
|
123 | + if (\is_array($parameters)) |
|
124 | + $params=\array_merge($params, $parameters); |
|
125 | 125 | $form->addValidationParam("_ajaxSubmit", new AjaxCall("postForm", $params)); |
126 | 126 | return $this; |
127 | 127 | } |
128 | 128 | |
129 | - public function addReset($identifier,$value,$cssStyle=NULL){ |
|
130 | - $bt=$this->getForm()->addButton($identifier, $value,$cssStyle); |
|
129 | + public function addReset($identifier, $value, $cssStyle=NULL) { |
|
130 | + $bt=$this->getForm()->addButton($identifier, $value, $cssStyle); |
|
131 | 131 | $bt->setProperty("type", "reset"); |
132 | 132 | return $bt; |
133 | 133 | } |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | * @param string $jsCode |
138 | 138 | * @return \Ajax\semantic\html\collections\form\HtmlForm |
139 | 139 | */ |
140 | - public function onValid($jsCode){ |
|
140 | + public function onValid($jsCode) { |
|
141 | 141 | $form=$this->getForm(); |
142 | 142 | $form->addValidationParam("onValid", "%function(){".$jsCode."}%"); |
143 | 143 | return $form; |
@@ -148,9 +148,9 @@ discard block |
||
148 | 148 | * @param string $jsCode can use event and fields parameters |
149 | 149 | * @return HtmlForm |
150 | 150 | */ |
151 | - public function onSuccess($jsCode){ |
|
151 | + public function onSuccess($jsCode) { |
|
152 | 152 | $form=$this->getForm(); |
153 | - $form->addValidationParam("onSuccess", $jsCode,"%function(event,fields){","}%"); |
|
153 | + $form->addValidationParam("onSuccess", $jsCode, "%function(event,fields){", "}%"); |
|
154 | 154 | return $form; |
155 | 155 | } |
156 | 156 | } |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | * @version 1.001 |
17 | 17 | */ |
18 | 18 | class HtmlMessage extends HtmlSemDoubleElement { |
19 | - use AttachedTrait,HasTimeoutTrait; |
|
19 | + use AttachedTrait, HasTimeoutTrait; |
|
20 | 20 | protected $icon; |
21 | 21 | protected $close; |
22 | 22 | |
@@ -33,42 +33,42 @@ discard block |
||
33 | 33 | * @param string|HtmlSemDoubleElement $header |
34 | 34 | * @return \Ajax\semantic\html\collections\HtmlMessage |
35 | 35 | */ |
36 | - public function addHeader($header){ |
|
36 | + public function addHeader($header) { |
|
37 | 37 | $headerO=$header; |
38 | - if(\is_string($header)){ |
|
39 | - $headerO=new HtmlSemDoubleElement("header-".$this->identifier,"div"); |
|
38 | + if (\is_string($header)) { |
|
39 | + $headerO=new HtmlSemDoubleElement("header-".$this->identifier, "div"); |
|
40 | 40 | $headerO->setClass("header"); |
41 | 41 | $headerO->setContent($header); |
42 | 42 | } |
43 | - return $this->addContent($headerO,true); |
|
43 | + return $this->addContent($headerO, true); |
|
44 | 44 | } |
45 | 45 | |
46 | - public function setHeader($header){ |
|
46 | + public function setHeader($header) { |
|
47 | 47 | return $this->addHeader($header); |
48 | 48 | } |
49 | 49 | |
50 | - public function addList($elements,$ordered=false){ |
|
51 | - $list=new HtmlList("list-".$this->identifier,$elements); |
|
50 | + public function addList($elements, $ordered=false) { |
|
51 | + $list=new HtmlList("list-".$this->identifier, $elements); |
|
52 | 52 | $list->setOrdered($ordered); |
53 | 53 | $list->setClass("ui list"); |
54 | 54 | $this->addContent($list); |
55 | 55 | } |
56 | 56 | |
57 | - public function setIcon($icon){ |
|
57 | + public function setIcon($icon) { |
|
58 | 58 | $this->addToProperty("class", "icon"); |
59 | - $this->wrapContent("<div class='content'>","</div>"); |
|
59 | + $this->wrapContent("<div class='content'>", "</div>"); |
|
60 | 60 | $this->icon=new HtmlIcon("icon-".$this->identifier, $icon); |
61 | 61 | return $this; |
62 | 62 | } |
63 | 63 | |
64 | - public function addLoader($loaderIcon="notched circle"){ |
|
64 | + public function addLoader($loaderIcon="notched circle") { |
|
65 | 65 | $this->setIcon($loaderIcon); |
66 | 66 | $this->icon->addToIcon("loading"); |
67 | 67 | return $this; |
68 | 68 | } |
69 | 69 | |
70 | - public function setDismissable($dismiss=true){ |
|
71 | - if($dismiss===true) |
|
70 | + public function setDismissable($dismiss=true) { |
|
71 | + if ($dismiss===true) |
|
72 | 72 | $this->close=new HtmlIcon("close-".$this->identifier, "close"); |
73 | 73 | else |
74 | 74 | $this->close=NULL; |
@@ -79,43 +79,43 @@ discard block |
||
79 | 79 | * {@inheritDoc} |
80 | 80 | * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::run() |
81 | 81 | */ |
82 | - public function run(JsUtils $js){ |
|
83 | - if(!isset($this->_bsComponent)){ |
|
84 | - if(isset($this->close)){ |
|
82 | + public function run(JsUtils $js) { |
|
83 | + if (!isset($this->_bsComponent)) { |
|
84 | + if (isset($this->close)) { |
|
85 | 85 | $js->execOn("click", "#".$this->identifier." .close", "$(this).closest('.message').transition({$this->_closeTransition})"); |
86 | 86 | } |
87 | - if(isset($this->_timeout)){ |
|
88 | - $js->exec("setTimeout(function() { $('#{$this->identifier}').transition({$this->_closeTransition}); }, {$this->_timeout});",true); |
|
87 | + if (isset($this->_timeout)) { |
|
88 | + $js->exec("setTimeout(function() { $('#{$this->identifier}').transition({$this->_closeTransition}); }, {$this->_timeout});", true); |
|
89 | 89 | } |
90 | 90 | } |
91 | 91 | return parent::run($js); |
92 | 92 | } |
93 | 93 | |
94 | - public function setState($visible=true){ |
|
95 | - $visible=($visible===true)?"visible":"hidden"; |
|
96 | - return $this->addToPropertyCtrl("class", $visible, array("visible","hidden")); |
|
94 | + public function setState($visible=true) { |
|
95 | + $visible=($visible===true) ? "visible" : "hidden"; |
|
96 | + return $this->addToPropertyCtrl("class", $visible, array("visible", "hidden")); |
|
97 | 97 | } |
98 | 98 | |
99 | - public function setVariation($value="floating"){ |
|
100 | - return $this->addToPropertyCtrl("class", $value, array("floating","compact")); |
|
99 | + public function setVariation($value="floating") { |
|
100 | + return $this->addToPropertyCtrl("class", $value, array("floating", "compact")); |
|
101 | 101 | } |
102 | 102 | |
103 | - public function setStyle($style){ |
|
103 | + public function setStyle($style) { |
|
104 | 104 | return $this->addToPropertyCtrl("class", $style, Style::getConstants()); |
105 | 105 | } |
106 | 106 | |
107 | - public function setError(){ |
|
107 | + public function setError() { |
|
108 | 108 | return $this->setStyle("error"); |
109 | 109 | } |
110 | 110 | |
111 | - public function setWarning(){ |
|
111 | + public function setWarning() { |
|
112 | 112 | return $this->setStyle("warning"); |
113 | 113 | } |
114 | 114 | |
115 | - public function setMessage($message){ |
|
116 | - if(\is_array($this->content)){ |
|
115 | + public function setMessage($message) { |
|
116 | + if (\is_array($this->content)) { |
|
117 | 117 | $this->content[\sizeof($this->content)-1]=$message; |
118 | - }else |
|
118 | + } else |
|
119 | 119 | $this->setContent($message); |
120 | 120 | } |
121 | 121 |
@@ -68,10 +68,11 @@ discard block |
||
68 | 68 | } |
69 | 69 | |
70 | 70 | public function setDismissable($dismiss=true){ |
71 | - if($dismiss===true) |
|
72 | - $this->close=new HtmlIcon("close-".$this->identifier, "close"); |
|
73 | - else |
|
74 | - $this->close=NULL; |
|
71 | + if($dismiss===true) { |
|
72 | + $this->close=new HtmlIcon("close-".$this->identifier, "close"); |
|
73 | + } else { |
|
74 | + $this->close=NULL; |
|
75 | + } |
|
75 | 76 | return $this; |
76 | 77 | } |
77 | 78 | |
@@ -115,8 +116,9 @@ discard block |
||
115 | 116 | public function setMessage($message){ |
116 | 117 | if(\is_array($this->content)){ |
117 | 118 | $this->content[\sizeof($this->content)-1]=$message; |
118 | - }else |
|
119 | - $this->setContent($message); |
|
119 | + } else { |
|
120 | + $this->setContent($message); |
|
121 | + } |
|
120 | 122 | } |
121 | 123 | |
122 | 124 | } |
@@ -17,18 +17,18 @@ discard block |
||
17 | 17 | protected $_dropdown; |
18 | 18 | public function __construct($identifier, $elements=array(), $asIcons=false) { |
19 | 19 | parent::__construct($identifier, "div", "ui buttons"); |
20 | - if ($asIcons === true) |
|
20 | + if ($asIcons===true) |
|
21 | 21 | $this->asIcons(); |
22 | 22 | $this->addElements($elements, $asIcons); |
23 | 23 | } |
24 | - protected function createItem($value){ |
|
24 | + protected function createItem($value) { |
|
25 | 25 | return new HtmlButton("", $value); |
26 | 26 | } |
27 | 27 | |
28 | - public function addDropdown($items,$asCombo=false){ |
|
29 | - $dd= new HtmlDropdown("dd-".$this->identifier,null,$items); |
|
28 | + public function addDropdown($items, $asCombo=false) { |
|
29 | + $dd=new HtmlDropdown("dd-".$this->identifier, null, $items); |
|
30 | 30 | $dd->asButton(); |
31 | - if($asCombo){ |
|
31 | + if ($asCombo) { |
|
32 | 32 | $dd->setAction("combo"); |
33 | 33 | $dd->addToProperty("class", "combo"); |
34 | 34 | } |
@@ -39,13 +39,13 @@ discard block |
||
39 | 39 | |
40 | 40 | public function addElement($element, $asIcon=false) { |
41 | 41 | $item=$this->addItem($element); |
42 | - if($asIcon) |
|
42 | + if ($asIcon) |
|
43 | 43 | $item->asIcon($element); |
44 | 44 | return $item; |
45 | 45 | } |
46 | 46 | |
47 | 47 | public function addElements($elements, $asIcons=false) { |
48 | - foreach ( $elements as $element ) { |
|
48 | + foreach ($elements as $element) { |
|
49 | 49 | $this->addElement($element, $asIcons); |
50 | 50 | } |
51 | 51 | return $this; |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | public function insertOr($aferIndex=0, $or="or") { |
55 | 55 | $orElement=new HtmlSemDoubleElement("", "div", "or"); |
56 | 56 | $orElement->setProperty("data-text", $or); |
57 | - array_splice($this->content, $aferIndex + 1, 0, array ($orElement )); |
|
57 | + array_splice($this->content, $aferIndex+1, 0, array($orElement)); |
|
58 | 58 | return $this; |
59 | 59 | } |
60 | 60 | |
@@ -67,8 +67,8 @@ discard block |
||
67 | 67 | } |
68 | 68 | |
69 | 69 | public function asIcons() { |
70 | - foreach ( $this->content as $item ) { |
|
71 | - if($item instanceof HtmlButton) |
|
70 | + foreach ($this->content as $item) { |
|
71 | + if ($item instanceof HtmlButton) |
|
72 | 72 | $item->asIcon($item->getContent()); |
73 | 73 | } |
74 | 74 | return $this->addToProperty("class", "icons"); |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | * @see \Ajax\bootstrap\html\base\BaseHtml::on() |
102 | 102 | */ |
103 | 103 | public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) { |
104 | - foreach ( $this->content as $element ) { |
|
104 | + foreach ($this->content as $element) { |
|
105 | 105 | $element->on($event, $jsCode, $stopPropagation, $preventDefault); |
106 | 106 | } |
107 | 107 | return $this; |
@@ -113,10 +113,10 @@ discard block |
||
113 | 113 | |
114 | 114 | public function addClasses($classes=array()) { |
115 | 115 | $i=0; |
116 | - if(!\is_array($classes)){ |
|
117 | - $classes=array_fill (0,$this->count(),$classes); |
|
116 | + if (!\is_array($classes)) { |
|
117 | + $classes=array_fill(0, $this->count(), $classes); |
|
118 | 118 | } |
119 | - foreach ( $this->content as $button ) { |
|
119 | + foreach ($this->content as $button) { |
|
120 | 120 | $button->addToProperty("class", $classes[$i++]); |
121 | 121 | } |
122 | 122 | return $this; |
@@ -130,8 +130,8 @@ discard block |
||
130 | 130 | $this->addElement($function($object)); |
131 | 131 | } |
132 | 132 | |
133 | - public function run(JsUtils $js){ |
|
134 | - $result= parent::run($js); |
|
133 | + public function run(JsUtils $js) { |
|
134 | + $result=parent::run($js); |
|
135 | 135 | return $result->setItemSelector(".ui.button"); |
136 | 136 | } |
137 | 137 |
@@ -17,8 +17,9 @@ discard block |
||
17 | 17 | protected $_dropdown; |
18 | 18 | public function __construct($identifier, $elements=array(), $asIcons=false) { |
19 | 19 | parent::__construct($identifier, "div", "ui buttons"); |
20 | - if ($asIcons === true) |
|
21 | - $this->asIcons(); |
|
20 | + if ($asIcons === true) { |
|
21 | + $this->asIcons(); |
|
22 | + } |
|
22 | 23 | $this->addElements($elements, $asIcons); |
23 | 24 | } |
24 | 25 | protected function createItem($value){ |
@@ -39,8 +40,9 @@ discard block |
||
39 | 40 | |
40 | 41 | public function addElement($element, $asIcon=false) { |
41 | 42 | $item=$this->addItem($element); |
42 | - if($asIcon) |
|
43 | - $item->asIcon($element); |
|
43 | + if($asIcon) { |
|
44 | + $item->asIcon($element); |
|
45 | + } |
|
44 | 46 | return $item; |
45 | 47 | } |
46 | 48 | |
@@ -68,8 +70,9 @@ discard block |
||
68 | 70 | |
69 | 71 | public function asIcons() { |
70 | 72 | foreach ( $this->content as $item ) { |
71 | - if($item instanceof HtmlButton) |
|
72 | - $item->asIcon($item->getContent()); |
|
73 | + if($item instanceof HtmlButton) { |
|
74 | + $item->asIcon($item->getContent()); |
|
75 | + } |
|
73 | 76 | } |
74 | 77 | return $this->addToProperty("class", "icons"); |
75 | 78 | } |
@@ -17,10 +17,10 @@ |
||
17 | 17 | * {@inheritDoc} |
18 | 18 | * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::run() |
19 | 19 | */ |
20 | - public function run(JsUtils $js){ |
|
21 | - if(!isset($this->_bsComponent)){ |
|
22 | - if(isset($this->_timeout)){ |
|
23 | - $js->exec("setTimeout(function() { $('#{$this->identifier}').transition({$this->_closeTransition}); }, {$this->_timeout});",true); |
|
20 | + public function run(JsUtils $js) { |
|
21 | + if (!isset($this->_bsComponent)) { |
|
22 | + if (isset($this->_timeout)) { |
|
23 | + $js->exec("setTimeout(function() { $('#{$this->identifier}').transition({$this->_closeTransition}); }, {$this->_timeout});", true); |
|
24 | 24 | } |
25 | 25 | } |
26 | 26 | return parent::run($js); |
@@ -25,8 +25,8 @@ discard block |
||
25 | 25 | * @param string $jqueryDone the jquery function call on ajax data. default:html |
26 | 26 | * @param string|callable $ajaxTransition |
27 | 27 | */ |
28 | - public function get($url, $responseElement="", $params="{}", $jsCallback=NULL,$hasLoader=true,$jqueryDone="html",$ajaxTransition=null) { |
|
29 | - return $this->js->_get($url, $params, $responseElement, $jsCallback, NULL, $hasLoader,$jqueryDone,$ajaxTransition,true); |
|
28 | + public function get($url, $responseElement="", $params="{}", $jsCallback=NULL, $hasLoader=true, $jqueryDone="html", $ajaxTransition=null) { |
|
29 | + return $this->js->_get($url, $params, $responseElement, $jsCallback, NULL, $hasLoader, $jqueryDone, $ajaxTransition, true); |
|
30 | 30 | } |
31 | 31 | |
32 | 32 | /** |
@@ -37,8 +37,8 @@ discard block |
||
37 | 37 | * @param string $jsCallback javascript code to execute after the request |
38 | 38 | * @param boolean $immediatly |
39 | 39 | */ |
40 | - public function json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document",$immediatly=false) { |
|
41 | - return $this->js->_json($url, $method, $params, $jsCallback, $attr, $context,$immediatly); |
|
40 | + public function json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document", $immediatly=false) { |
|
41 | + return $this->js->_json($url, $method, $params, $jsCallback, $attr, $context, $immediatly); |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | /** |
@@ -48,8 +48,8 @@ discard block |
||
48 | 48 | * @param string $url the request address |
49 | 49 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true) |
50 | 50 | */ |
51 | - public function jsonOn($event,$element, $url,$parameters=array()) { |
|
52 | - return $this->js->_jsonOn($event, $element, $url,$parameters); |
|
51 | + public function jsonOn($event, $element, $url, $parameters=array()) { |
|
52 | + return $this->js->_jsonOn($event, $element, $url, $parameters); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | /** |
@@ -71,8 +71,8 @@ discard block |
||
71 | 71 | * @param string $jsCallback javascript code to execute after the request |
72 | 72 | * @param string $rowClass the css class for the new element |
73 | 73 | */ |
74 | - public function jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL,$rowClass="_json") { |
|
75 | - return $this->js->_jsonArray($maskSelector, $url, $method, $params, $jsCallback,"id", NULL,$rowClass,true); |
|
74 | + public function jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $rowClass="_json") { |
|
75 | + return $this->js->_jsonArray($maskSelector, $url, $method, $params, $jsCallback, "id", NULL, $rowClass, true); |
|
76 | 76 | } |
77 | 77 | |
78 | 78 | /** |
@@ -84,8 +84,8 @@ discard block |
||
84 | 84 | * @param string $jsCallback javascript code to execute after the request |
85 | 85 | * @param string $rowClass the css class for the new element |
86 | 86 | */ |
87 | - public function jsonArrayDeferred($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL,$rowClass="_json") { |
|
88 | - return $this->js->_jsonArray($maskSelector, $url, $method, $params, $jsCallback,"id", NULL, $rowClass,false); |
|
87 | + public function jsonArrayDeferred($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $rowClass="_json") { |
|
88 | + return $this->js->_jsonArray($maskSelector, $url, $method, $params, $jsCallback, "id", NULL, $rowClass, false); |
|
89 | 89 | } |
90 | 90 | |
91 | 91 | /** |
@@ -95,8 +95,8 @@ discard block |
||
95 | 95 | * @param string $url the request url |
96 | 96 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","rowClass"=>"_json","immediatly"=>true) |
97 | 97 | */ |
98 | - public function jsonArrayOn($event,$element,$maskSelector, $url,$parameters=array()) { |
|
99 | - return $this->js->_jsonArrayOn($event,$element,$maskSelector, $url, $parameters); |
|
98 | + public function jsonArrayOn($event, $element, $maskSelector, $url, $parameters=array()) { |
|
99 | + return $this->js->_jsonArrayOn($event, $element, $maskSelector, $url, $parameters); |
|
100 | 100 | } |
101 | 101 | |
102 | 102 | /** |
@@ -110,8 +110,8 @@ discard block |
||
110 | 110 | * @param string $jqueryDone the jquery function call on ajax data. default:html |
111 | 111 | * @param string|callable $ajaxTransition |
112 | 112 | */ |
113 | - public function getDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL,$attr="id",$jqueryDone="html",$ajaxTransition=null) { |
|
114 | - return $this->js->_get($url, $params, $responseElement, $jsCallback, $attr, false,$jqueryDone,$ajaxTransition); |
|
113 | + public function getDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id", $jqueryDone="html", $ajaxTransition=null) { |
|
114 | + return $this->js->_get($url, $params, $responseElement, $jsCallback, $attr, false, $jqueryDone, $ajaxTransition); |
|
115 | 115 | } |
116 | 116 | |
117 | 117 | /** |
@@ -150,8 +150,8 @@ discard block |
||
150 | 150 | * @param string $jqueryDone the jquery function call on ajax data. default:html |
151 | 151 | * @param string|callable $ajaxTransition |
152 | 152 | */ |
153 | - public function post($url, $responseElement="", $params="{}", $jsCallback=NULL,$hasLoader=true,$jqueryDone="html",$ajaxTransition=null) { |
|
154 | - return $this->js->_post($url, $params, $responseElement, $jsCallback, NULL, $hasLoader,$jqueryDone,$ajaxTransition,true); |
|
153 | + public function post($url, $responseElement="", $params="{}", $jsCallback=NULL, $hasLoader=true, $jqueryDone="html", $ajaxTransition=null) { |
|
154 | + return $this->js->_post($url, $params, $responseElement, $jsCallback, NULL, $hasLoader, $jqueryDone, $ajaxTransition, true); |
|
155 | 155 | } |
156 | 156 | |
157 | 157 | /** |
@@ -166,8 +166,8 @@ discard block |
||
166 | 166 | * @param string $jqueryDone the jquery function call on ajax data. default:html |
167 | 167 | * @param string|callable $ajaxTransition |
168 | 168 | */ |
169 | - public function postDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id",$hasLoader=true,$jqueryDone="html",$ajaxTransition=null) { |
|
170 | - return $this->js->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader,$jqueryDone,$ajaxTransition,false); |
|
169 | + public function postDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id", $hasLoader=true, $jqueryDone="html", $ajaxTransition=null) { |
|
170 | + return $this->js->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition, false); |
|
171 | 171 | } |
172 | 172 | |
173 | 173 | /** |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null) |
182 | 182 | */ |
183 | 183 | public function postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) { |
184 | - return $this->js->_postOn($event, $element, $url, $params, $responseElement, $parameters); |
|
184 | + return $this->js->_postOn($event, $element, $url, $params, $responseElement, $parameters); |
|
185 | 185 | } |
186 | 186 | |
187 | 187 | /** |
@@ -207,8 +207,8 @@ discard block |
||
207 | 207 | * @param string $jqueryDone the jquery function call on ajax data. default:html |
208 | 208 | * @param string|callable $ajaxTransition |
209 | 209 | */ |
210 | - public function postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL,$hasLoader=true,$jqueryDone="html",$ajaxTransition=null) { |
|
211 | - return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, NULL, $hasLoader,$jqueryDone,$ajaxTransition,true); |
|
210 | + public function postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $hasLoader=true, $jqueryDone="html", $ajaxTransition=null) { |
|
211 | + return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, NULL, $hasLoader, $jqueryDone, $ajaxTransition, true); |
|
212 | 212 | } |
213 | 213 | |
214 | 214 | /** |
@@ -223,8 +223,8 @@ discard block |
||
223 | 223 | * @param string $jqueryDone the jquery function call on ajax data. default:html |
224 | 224 | * @param string|callable $ajaxTransition |
225 | 225 | */ |
226 | - public function postFormDeferred($url, $form, $responseElement, $validation=false, $jsCallback=NULL,$attr="id",$hasLoader=true,$jqueryDone="html",$ajaxTransition=null) { |
|
227 | - return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader,$jqueryDone,$ajaxTransition,false); |
|
226 | + public function postFormDeferred($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true, $jqueryDone="html", $ajaxTransition=null) { |
|
227 | + return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition, false); |
|
228 | 228 | } |
229 | 229 | |
230 | 230 | /** |
@@ -238,7 +238,7 @@ discard block |
||
238 | 238 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null) |
239 | 239 | */ |
240 | 240 | public function postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) { |
241 | - return $this->js->_postFormOn($event,$element, $url, $form, $responseElement, $parameters); |
|
241 | + return $this->js->_postFormOn($event, $element, $url, $form, $responseElement, $parameters); |
|
242 | 242 | } |
243 | 243 | |
244 | 244 | /** |