@@ -13,7 +13,7 @@ |
||
13 | 13 | * @param int $rowCount |
14 | 14 | * @param int $colCount |
15 | 15 | */ |
16 | - public function htmlTable($identifier, $rowCount, $colCount){ |
|
16 | + public function htmlTable($identifier, $rowCount, $colCount) { |
|
17 | 17 | return $this->addHtmlComponent(new HtmlTable($identifier, $rowCount, $colCount)); |
18 | 18 | } |
19 | 19 | } |
20 | 20 | \ No newline at end of file |
@@ -6,6 +6,9 @@ |
||
6 | 6 | |
7 | 7 | trait CheckboxTrait { |
8 | 8 | |
9 | + /** |
|
10 | + * @param string $name |
|
11 | + */ |
|
9 | 12 | public abstract function addToPropertyCtrl($name, $value, $typeCtrl); |
10 | 13 | |
11 | 14 | public function setType($checkboxType) { |
@@ -15,7 +15,7 @@ |
||
15 | 15 | class HtmlFormCheckbox extends HtmlFormField { |
16 | 16 | use CheckboxTrait; |
17 | 17 | public function __construct($identifier, $label=NULL, $value=NULL, $type=NULL) { |
18 | - parent::__construct("field-".$identifier, new HtmlCheckbox($identifier,$label,$value,$type)); |
|
18 | + parent::__construct("field-".$identifier, new HtmlCheckbox($identifier, $label, $value, $type)); |
|
19 | 19 | } |
20 | 20 | |
21 | 21 | public static function slider($identifier, $label="", $value=NULL) { |
@@ -6,7 +6,7 @@ discard block |
||
6 | 6 | use Ajax\semantic\html\base\constants\CheckboxType; |
7 | 7 | |
8 | 8 | abstract class AbstractCheckbox extends HtmlSemDoubleElement { |
9 | - protected $_params=array (); |
|
9 | + protected $_params=array(); |
|
10 | 10 | |
11 | 11 | public function __construct($identifier, $name=NULL, $label=NULL, $value=NULL, $inputType="checkbox", $type="checkbox") { |
12 | 12 | parent::__construct("ck-".$identifier, "div", "ui ".$type); |
@@ -73,9 +73,9 @@ discard block |
||
73 | 73 | * @return \Ajax\semantic\html\collections\form\AbstractHtmlFormRadioCheckbox |
74 | 74 | */ |
75 | 75 | public function attachEvent($selector, $action=NULL) { |
76 | - if (isset($action)!==false||\is_numeric($action)===true) { |
|
76 | + if (isset($action)!==false || \is_numeric($action)===true) { |
|
77 | 77 | $js='$("#%identifier%").checkbox("attach events", "'.$selector.'", "'.$action.'");'; |
78 | - } else { |
|
78 | + }else { |
|
79 | 79 | $js='$("#%identifier%").checkbox("attach events", "'.$selector.'");'; |
80 | 80 | } |
81 | 81 | $js=\str_replace("%identifier%", $this->identifier, $js); |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | */ |
90 | 90 | public function attachEvents($events=array()) { |
91 | 91 | if (\is_array($events)) { |
92 | - foreach ( $events as $action => $selector ) { |
|
92 | + foreach ($events as $action => $selector) { |
|
93 | 93 | $this->attachEvent($selector, $action); |
94 | 94 | } |
95 | 95 | } |
@@ -13,8 +13,9 @@ discard block |
||
13 | 13 | $field=new \Ajax\common\html\html5\HtmlInput($identifier, $inputType, $value); |
14 | 14 | $field->setProperty("name", $name); |
15 | 15 | $this->setField($field); |
16 | - if (isset($label)) |
|
17 | - $this->setLabel($label); |
|
16 | + if (isset($label)) { |
|
17 | + $this->setLabel($label); |
|
18 | + } |
|
18 | 19 | } |
19 | 20 | |
20 | 21 | public function setType($checkboxType) { |
@@ -40,8 +41,9 @@ discard block |
||
40 | 41 | * @return mixed |
41 | 42 | */ |
42 | 43 | public function getLabel() { |
43 | - if (\array_key_exists("label", $this->content)) |
|
44 | - return $this->content["label"]; |
|
44 | + if (\array_key_exists("label", $this->content)) { |
|
45 | + return $this->content["label"]; |
|
46 | + } |
|
45 | 47 | } |
46 | 48 | |
47 | 49 | /** |
@@ -33,8 +33,9 @@ discard block |
||
33 | 33 | $labelO=$label; |
34 | 34 | if (\is_object($label)===false) { |
35 | 35 | $labelO=new HtmlLabel("label-".$this->identifier, $label); |
36 | - if (isset($icon)) |
|
37 | - $labelO->addIcon($icon); |
|
36 | + if (isset($icon)) { |
|
37 | + $labelO->addIcon($icon); |
|
38 | + } |
|
38 | 39 | } else { |
39 | 40 | $labelO->addToPropertyCtrl("class", "label", array ("label" )); |
40 | 41 | } |
@@ -51,8 +52,9 @@ discard block |
||
51 | 52 | $actionO=$action; |
52 | 53 | if (\is_object($action)===false) { |
53 | 54 | $actionO=new HtmlButton("action-".$this->identifier, $action); |
54 | - if (isset($icon)) |
|
55 | - $actionO->addIcon($icon, true, $labeled); |
|
55 | + if (isset($icon)) { |
|
56 | + $actionO->addIcon($icon, true, $labeled); |
|
57 | + } |
|
56 | 58 | } |
57 | 59 | $this->addToProperty("class", $direction." action"); |
58 | 60 | $this->addContent($actionO, \strstr($direction, Direction::LEFT)!==false); |
@@ -12,10 +12,10 @@ discard block |
||
12 | 12 | use IconTrait; |
13 | 13 | |
14 | 14 | public function __construct($identifier, $type="text", $value="", $placeholder="") { |
15 | - parent::__construct("div-" . $identifier, "div", "ui input"); |
|
16 | - $this->content=[ "field" => new \Ajax\common\html\html5\HtmlInput($identifier, $type, $value, $placeholder) ]; |
|
17 | - $this->_states=[ State::DISABLED,State::FOCUS,State::ERROR ]; |
|
18 | - $this->_variations=[ Variation::TRANSPARENT ]; |
|
15 | + parent::__construct("div-".$identifier, "div", "ui input"); |
|
16 | + $this->content=["field" => new \Ajax\common\html\html5\HtmlInput($identifier, $type, $value, $placeholder)]; |
|
17 | + $this->_states=[State::DISABLED, State::FOCUS, State::ERROR]; |
|
18 | + $this->_variations=[Variation::TRANSPARENT]; |
|
19 | 19 | } |
20 | 20 | |
21 | 21 | public function setFocus() { |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | } |
24 | 24 | |
25 | 25 | public function addLoading() { |
26 | - if ($this->_hasIcon === false) { |
|
26 | + if ($this->_hasIcon===false) { |
|
27 | 27 | throw new \Exception("Input must have an icon for showing a loader, use addIcon before"); |
28 | 28 | } |
29 | 29 | return $this->addToProperty("class", State::LOADING); |
@@ -31,31 +31,31 @@ discard block |
||
31 | 31 | |
32 | 32 | public function labeled($label, $direction=Direction::LEFT, $icon=NULL) { |
33 | 33 | $labelO=$label; |
34 | - if (\is_object($label) === false) { |
|
35 | - $labelO=new HtmlLabel("label-" . $this->identifier, $label); |
|
34 | + if (\is_object($label)===false) { |
|
35 | + $labelO=new HtmlLabel("label-".$this->identifier, $label); |
|
36 | 36 | if (isset($icon)) |
37 | 37 | $labelO->addIcon($icon); |
38 | - } else { |
|
39 | - $labelO->addToPropertyCtrl("class", "label", array ("label" )); |
|
38 | + }else { |
|
39 | + $labelO->addToPropertyCtrl("class", "label", array("label")); |
|
40 | 40 | } |
41 | - $this->addToProperty("class", $direction . " labeled"); |
|
42 | - $this->addContent($labelO, \strstr($direction, Direction::LEFT) !== false); |
|
41 | + $this->addToProperty("class", $direction." labeled"); |
|
42 | + $this->addContent($labelO, \strstr($direction, Direction::LEFT)!==false); |
|
43 | 43 | return $labelO; |
44 | 44 | } |
45 | 45 | |
46 | 46 | public function labeledToCorner($label, $direction=Direction::LEFT, $icon=NULL) { |
47 | - return $this->labeled($label, $direction . " corner", $icon)->toCorner($direction); |
|
47 | + return $this->labeled($label, $direction." corner", $icon)->toCorner($direction); |
|
48 | 48 | } |
49 | 49 | |
50 | 50 | public function addAction($action, $direction=Direction::LEFT, $icon=NULL, $labeled=false) { |
51 | 51 | $actionO=$action; |
52 | - if (\is_object($action) === false) { |
|
53 | - $actionO=new HtmlButton("action-" . $this->identifier, $action); |
|
52 | + if (\is_object($action)===false) { |
|
53 | + $actionO=new HtmlButton("action-".$this->identifier, $action); |
|
54 | 54 | if (isset($icon)) |
55 | 55 | $actionO->addIcon($icon, true, $labeled); |
56 | 56 | } |
57 | - $this->addToProperty("class", $direction . " action"); |
|
58 | - $this->addContent($actionO, \strstr($direction, Direction::LEFT) !== false); |
|
57 | + $this->addToProperty("class", $direction." action"); |
|
58 | + $this->addContent($actionO, \strstr($direction, Direction::LEFT)!==false); |
|
59 | 59 | return $actionO; |
60 | 60 | } |
61 | 61 |
@@ -17,12 +17,12 @@ discard block |
||
17 | 17 | * @version 1.001 |
18 | 18 | */ |
19 | 19 | class HtmlSegment extends HtmlSemDoubleElement { |
20 | - use AttachedTrait,TextAlignmentTrait; |
|
20 | + use AttachedTrait, TextAlignmentTrait; |
|
21 | 21 | |
22 | 22 | public function __construct($identifier, $content="") { |
23 | 23 | parent::__construct($identifier, "div", "ui segment"); |
24 | - $this->_variations=\array_merge($this->_variations, [ Variation::PADDED,Variation::COMPACT ]); |
|
25 | - $this->_states=\array_merge($this->_states, [ State::LOADING ]); |
|
24 | + $this->_variations=\array_merge($this->_variations, [Variation::PADDED, Variation::COMPACT]); |
|
25 | + $this->_states=\array_merge($this->_states, [State::LOADING]); |
|
26 | 26 | $this->content=$content; |
27 | 27 | } |
28 | 28 | |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | } |
37 | 37 | |
38 | 38 | public function setSens($sens="vertical") { |
39 | - return $this->addToPropertyCtrl("class", $sens, array ("vertical","horizontal" )); |
|
39 | + return $this->addToPropertyCtrl("class", $sens, array("vertical", "horizontal")); |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | public function setEmphasis($value=Emphasis::SECONDARY) { |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | } |
55 | 55 | |
56 | 56 | public function setFocusable($value=true) { |
57 | - if ($value === true) |
|
57 | + if ($value===true) |
|
58 | 58 | $this->setProperty("tabindex", "0"); |
59 | 59 | else { |
60 | 60 | $this->removeProperty("tabindex"); |
@@ -64,14 +64,14 @@ discard block |
||
64 | 64 | |
65 | 65 | public function setAnimated($content, $animation="") { |
66 | 66 | $this->setTagName("div"); |
67 | - $this->addToProperty("class", "animated " . $animation); |
|
68 | - $visible=new HtmlSemDoubleElement("visible-" . $this->identifier, "div"); |
|
67 | + $this->addToProperty("class", "animated ".$animation); |
|
68 | + $visible=new HtmlSemDoubleElement("visible-".$this->identifier, "div"); |
|
69 | 69 | $visible->setClass("visible content"); |
70 | 70 | $visible->setContent($this->content); |
71 | - $hidden=new HtmlSemDoubleElement("hidden-" . $this->identifier, "div"); |
|
71 | + $hidden=new HtmlSemDoubleElement("hidden-".$this->identifier, "div"); |
|
72 | 72 | $hidden->setClass("hidden content"); |
73 | 73 | $hidden->setContent($content); |
74 | - $this->content=array ($visible,$hidden ); |
|
74 | + $this->content=array($visible, $hidden); |
|
75 | 75 | return $hidden; |
76 | 76 | } |
77 | 77 | |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | public function asIcon($icon) { |
84 | 84 | $iconO=$icon; |
85 | 85 | if (\is_string($icon)) { |
86 | - $iconO=new HtmlIcon("icon-" . $this->identifier, $icon); |
|
86 | + $iconO=new HtmlIcon("icon-".$this->identifier, $icon); |
|
87 | 87 | } |
88 | 88 | $this->addToProperty("class", "icon"); |
89 | 89 | $this->content=$iconO; |
@@ -104,9 +104,9 @@ discard block |
||
104 | 104 | public function addLabel($caption, $before=false) { |
105 | 105 | $this->tagName="div"; |
106 | 106 | $this->addToProperty("class", "labeled"); |
107 | - $this->content=new HtmlButton("button-" . $this->identifier, $this->content); |
|
107 | + $this->content=new HtmlButton("button-".$this->identifier, $this->content); |
|
108 | 108 | $this->content->setTagName("div"); |
109 | - $label=new HtmlLabel("label-" . $this->identifier, $caption, "a"); |
|
109 | + $label=new HtmlLabel("label-".$this->identifier, $caption, "a"); |
|
110 | 110 | $label->setBasic(); |
111 | 111 | $this->addContent($label, $before); |
112 | 112 | return $label; |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | */ |
119 | 119 | public function fromArray($array) { |
120 | 120 | $array=parent::fromArray($array); |
121 | - foreach ( $array as $key => $value ) { |
|
121 | + foreach ($array as $key => $value) { |
|
122 | 122 | $this->setProperty($key, $value); |
123 | 123 | } |
124 | 124 | return $array; |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | } |
182 | 182 | |
183 | 183 | public static function social($identifier, $social, $value=NULL) { |
184 | - if ($value === NULL) |
|
184 | + if ($value===NULL) |
|
185 | 185 | $value=\ucfirst($social); |
186 | 186 | $return=new HtmlButton($identifier, $value); |
187 | 187 | $return->addIcon($social); |
@@ -54,9 +54,9 @@ discard block |
||
54 | 54 | } |
55 | 55 | |
56 | 56 | public function setFocusable($value=true) { |
57 | - if ($value === true) |
|
58 | - $this->setProperty("tabindex", "0"); |
|
59 | - else { |
|
57 | + if ($value === true) { |
|
58 | + $this->setProperty("tabindex", "0"); |
|
59 | + } else { |
|
60 | 60 | $this->removeProperty("tabindex"); |
61 | 61 | } |
62 | 62 | return $this; |
@@ -181,8 +181,9 @@ discard block |
||
181 | 181 | } |
182 | 182 | |
183 | 183 | public static function social($identifier, $social, $value=NULL) { |
184 | - if ($value === NULL) |
|
185 | - $value=\ucfirst($social); |
|
184 | + if ($value === NULL) { |
|
185 | + $value=\ucfirst($social); |
|
186 | + } |
|
186 | 187 | $return=new HtmlButton($identifier, $value); |
187 | 188 | $return->addIcon($social); |
188 | 189 | return $return->addToPropertyCtrl("class", $social, Social::getConstants()); |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | /** |
38 | 38 | * Set the button value |
39 | 39 | * @param string $value |
40 | - * @return \Ajax\semantic\html\HtmlButton |
|
40 | + * @return HtmlButton |
|
41 | 41 | */ |
42 | 42 | public function setValue($value) { |
43 | 43 | $this->content=$value; |
@@ -46,8 +46,8 @@ discard block |
||
46 | 46 | |
47 | 47 | /** |
48 | 48 | * define the button style |
49 | - * @param string|int $cssStyle |
|
50 | - * @return \Ajax\semantic\html\HtmlButton default : "" |
|
49 | + * @param string $cssStyle |
|
50 | + * @return HtmlButton default : "" |
|
51 | 51 | */ |
52 | 52 | public function setStyle($cssStyle) { |
53 | 53 | return $this->addToProperty("class", $cssStyle); |
@@ -30,10 +30,10 @@ |
||
30 | 30 | */ |
31 | 31 | public function setWidth($width) { |
32 | 32 | if (\is_int($width)) { |
33 | - $width=Wide::getConstants()["W" . $width]; |
|
33 | + $width=Wide::getConstants()["W".$width]; |
|
34 | 34 | } |
35 | 35 | $this->addToPropertyCtrl("class", $width, Wide::getConstants()); |
36 | - return $this->addToPropertyCtrl("class", "wide", array ("wide" )); |
|
36 | + return $this->addToPropertyCtrl("class", "wide", array("wide")); |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | public function setValue($value) { |
@@ -19,8 +19,9 @@ |
||
19 | 19 | public function __construct($identifier, $width=NULL) { |
20 | 20 | parent::__construct($identifier, "div"); |
21 | 21 | $this->setClass("column"); |
22 | - if (isset($width)) |
|
23 | - $this->setWidth($width); |
|
22 | + if (isset($width)) { |
|
23 | + $this->setWidth($width); |
|
24 | + } |
|
24 | 25 | } |
25 | 26 | |
26 | 27 | /** |
@@ -51,17 +51,19 @@ discard block |
||
51 | 51 | } |
52 | 52 | |
53 | 53 | public function getProperty($name) { |
54 | - if (array_key_exists($name, $this->properties)) |
|
55 | - return $this->properties[$name]; |
|
54 | + if (array_key_exists($name, $this->properties)) { |
|
55 | + return $this->properties[$name]; |
|
56 | + } |
|
56 | 57 | } |
57 | 58 | |
58 | 59 | public function addToProperty($name, $value, $separator=" ") { |
59 | 60 | if ($value !== "" && $this->propertyContains($name, $value) === false) { |
60 | 61 | $v=@$this->properties[$name]; |
61 | - if (isset($v) && $v !== "") |
|
62 | - $v=$v . $separator . $value; |
|
63 | - else |
|
64 | - $v=$value; |
|
62 | + if (isset($v) && $v !== "") { |
|
63 | + $v=$v . $separator . $value; |
|
64 | + } else { |
|
65 | + $v=$value; |
|
66 | + } |
|
65 | 67 | |
66 | 68 | return $this->setProperty($name, $v); |
67 | 69 | } |
@@ -121,8 +123,9 @@ discard block |
||
121 | 123 | } |
122 | 124 | |
123 | 125 | protected function setPropertyCtrl($name, $value, $typeCtrl) { |
124 | - if ($this->ctrl($name, $value, $typeCtrl) === true) |
|
125 | - return $this->setProperty($name, $value); |
|
126 | + if ($this->ctrl($name, $value, $typeCtrl) === true) { |
|
127 | + return $this->setProperty($name, $value); |
|
128 | + } |
|
126 | 129 | return $this; |
127 | 130 | } |
128 | 131 | |
@@ -152,8 +155,9 @@ discard block |
||
152 | 155 | } |
153 | 156 | |
154 | 157 | protected function removeProperty($name) { |
155 | - if (\array_key_exists($name, $this->properties)) |
|
156 | - unset($this->properties[$name]); |
|
158 | + if (\array_key_exists($name, $this->properties)) { |
|
159 | + unset($this->properties[$name]); |
|
160 | + } |
|
157 | 161 | return $this; |
158 | 162 | } |
159 | 163 | |
@@ -173,8 +177,9 @@ discard block |
||
173 | 177 | } |
174 | 178 | |
175 | 179 | protected function addToPropertyUnique($name, $value, $typeCtrl) { |
176 | - if (@class_exists($typeCtrl, true)) |
|
177 | - $typeCtrl=$typeCtrl::getConstants(); |
|
180 | + if (@class_exists($typeCtrl, true)) { |
|
181 | + $typeCtrl=$typeCtrl::getConstants(); |
|
182 | + } |
|
178 | 183 | if (is_array($typeCtrl)) { |
179 | 184 | $this->removeOldValues($this->properties[$name], $typeCtrl); |
180 | 185 | } |
@@ -359,15 +364,18 @@ discard block |
||
359 | 364 | $flag=false; |
360 | 365 | $index=0; |
361 | 366 | while ( !$flag && $index < sizeof($elements) ) { |
362 | - if ($elements[$index] instanceof BaseHtml) |
|
363 | - $flag=($elements[$index]->getIdentifier() === $identifier); |
|
367 | + if ($elements[$index] instanceof BaseHtml) { |
|
368 | + $flag=($elements[$index]->getIdentifier() === $identifier); |
|
369 | + } |
|
364 | 370 | $index++; |
365 | 371 | } |
366 | - if ($flag === true) |
|
367 | - return $elements[$index - 1]; |
|
372 | + if ($flag === true) { |
|
373 | + return $elements[$index - 1]; |
|
374 | + } |
|
368 | 375 | } elseif ($elements instanceof BaseHtml) { |
369 | - if ($elements->getIdentifier() === $identifier) |
|
370 | - return $elements; |
|
376 | + if ($elements->getIdentifier() === $identifier) { |
|
377 | + return $elements; |
|
378 | + } |
|
371 | 379 | } |
372 | 380 | return null; |
373 | 381 | } |
@@ -17,10 +17,10 @@ discard block |
||
17 | 17 | abstract class BaseHtml extends BaseWidget { |
18 | 18 | protected $_template; |
19 | 19 | protected $tagName; |
20 | - protected $properties=array (); |
|
21 | - protected $_events=array (); |
|
22 | - protected $_wrapBefore=array (); |
|
23 | - protected $_wrapAfter=array (); |
|
20 | + protected $properties=array(); |
|
21 | + protected $_events=array(); |
|
22 | + protected $_wrapBefore=array(); |
|
23 | + protected $_wrapAfter=array(); |
|
24 | 24 | protected $_bsComponent; |
25 | 25 | |
26 | 26 | public function getBsComponent() { |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | } |
34 | 34 | |
35 | 35 | protected function getTemplate(JsUtils $js=NULL) { |
36 | - return PropertyWrapper::wrap($this->_wrapBefore, $js) . $this->_template . PropertyWrapper::wrap($this->_wrapAfter, $js); |
|
36 | + return PropertyWrapper::wrap($this->_wrapBefore, $js).$this->_template.PropertyWrapper::wrap($this->_wrapAfter, $js); |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | public function getProperties() { |
@@ -57,13 +57,13 @@ discard block |
||
57 | 57 | |
58 | 58 | public function addToProperty($name, $value, $separator=" ") { |
59 | 59 | if (\is_array($value)) { |
60 | - foreach ( $value as $v ) { |
|
60 | + foreach ($value as $v) { |
|
61 | 61 | $this->addToProperty($name, $v, $separator); |
62 | 62 | } |
63 | - } else if ($value !== "" && $this->propertyContains($name, $value) === false) { |
|
63 | + }else if ($value!=="" && $this->propertyContains($name, $value)===false) { |
|
64 | 64 | $v=@$this->properties[$name]; |
65 | - if (isset($v) && $v !== "") |
|
66 | - $v=$v . $separator . $value; |
|
65 | + if (isset($v) && $v!=="") |
|
66 | + $v=$v.$separator.$value; |
|
67 | 67 | else |
68 | 68 | $v=$value; |
69 | 69 | |
@@ -79,23 +79,23 @@ discard block |
||
79 | 79 | |
80 | 80 | public function compile(JsUtils $js=NULL, View $view=NULL) { |
81 | 81 | $result=$this->getTemplate($js); |
82 | - foreach ( $this as $key => $value ) { |
|
83 | - if (PhalconUtils::startsWith($key, "_") === false && $key !== "events") { |
|
82 | + foreach ($this as $key => $value) { |
|
83 | + if (PhalconUtils::startsWith($key, "_")===false && $key!=="events") { |
|
84 | 84 | if (is_array($value)) { |
85 | 85 | $v=PropertyWrapper::wrap($value, $js); |
86 | - } else { |
|
86 | + }else { |
|
87 | 87 | $v=$value; |
88 | 88 | } |
89 | - $result=str_ireplace("%" . $key . "%", $v, $result); |
|
89 | + $result=str_ireplace("%".$key."%", $v, $result); |
|
90 | 90 | } |
91 | 91 | } |
92 | 92 | if (isset($js)) { |
93 | 93 | $this->run($js); |
94 | 94 | } |
95 | - if (isset($view) === true) { |
|
95 | + if (isset($view)===true) { |
|
96 | 96 | $controls=$view->getVar("q"); |
97 | - if (isset($controls) === false) { |
|
98 | - $controls=array (); |
|
97 | + if (isset($controls)===false) { |
|
98 | + $controls=array(); |
|
99 | 99 | } |
100 | 100 | $controls[$this->identifier]=$result; |
101 | 101 | $view->setVar("q", $controls); |
@@ -105,12 +105,12 @@ discard block |
||
105 | 105 | |
106 | 106 | protected function ctrl($name, $value, $typeCtrl) { |
107 | 107 | if (is_array($typeCtrl)) { |
108 | - if (array_search($value, $typeCtrl) === false) { |
|
109 | - throw new \Exception("La valeur passée a propriété `" . $name . "` ne fait pas partie des valeurs possibles : {" . implode(",", $typeCtrl) . "}"); |
|
108 | + if (array_search($value, $typeCtrl)===false) { |
|
109 | + throw new \Exception("La valeur passée a propriété `".$name."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}"); |
|
110 | 110 | } |
111 | - } else { |
|
111 | + }else { |
|
112 | 112 | if (!$typeCtrl($value)) { |
113 | - throw new \Exception("La fonction " . $typeCtrl . " a retourné faux pour l'affectation de la propriété " . $name); |
|
113 | + throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$name); |
|
114 | 114 | } |
115 | 115 | } |
116 | 116 | return true; |
@@ -125,13 +125,13 @@ discard block |
||
125 | 125 | } |
126 | 126 | |
127 | 127 | protected function setPropertyCtrl($name, $value, $typeCtrl) { |
128 | - if ($this->ctrl($name, $value, $typeCtrl) === true) |
|
128 | + if ($this->ctrl($name, $value, $typeCtrl)===true) |
|
129 | 129 | return $this->setProperty($name, $value); |
130 | 130 | return $this; |
131 | 131 | } |
132 | 132 | |
133 | 133 | protected function setMemberCtrl(&$name, $value, $typeCtrl) { |
134 | - if ($this->ctrl($name, $value, $typeCtrl) === true) { |
|
134 | + if ($this->ctrl($name, $value, $typeCtrl)===true) { |
|
135 | 135 | return $name=$value; |
136 | 136 | } |
137 | 137 | return $this; |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | protected function addToMemberUnique(&$name, $value, $typeCtrl, $separator=" ") { |
141 | 141 | if (is_array($typeCtrl)) { |
142 | 142 | $this->removeOldValues($name, $typeCtrl); |
143 | - $name.=$separator . $value; |
|
143 | + $name.=$separator.$value; |
|
144 | 144 | } |
145 | 145 | return $this; |
146 | 146 | } |
@@ -162,17 +162,17 @@ discard block |
||
162 | 162 | } |
163 | 163 | |
164 | 164 | protected function addToMemberCtrl(&$name, $value, $typeCtrl, $separator=" ") { |
165 | - if ($this->ctrl($name, $value, $typeCtrl) === true) { |
|
165 | + if ($this->ctrl($name, $value, $typeCtrl)===true) { |
|
166 | 166 | if (is_array($typeCtrl)) { |
167 | 167 | $this->removeOldValues($name, $typeCtrl); |
168 | 168 | } |
169 | - $name.=$separator . $value; |
|
169 | + $name.=$separator.$value; |
|
170 | 170 | } |
171 | 171 | return $this; |
172 | 172 | } |
173 | 173 | |
174 | 174 | protected function addToMember(&$name, $value, $separator=" ") { |
175 | - $name=str_ireplace($value, "", $name) . $separator . $value; |
|
175 | + $name=str_ireplace($value, "", $name).$separator.$value; |
|
176 | 176 | return $this; |
177 | 177 | } |
178 | 178 | |
@@ -190,7 +190,7 @@ discard block |
||
190 | 190 | } |
191 | 191 | |
192 | 192 | public function addToPropertyCtrlCheck($name, $value, $typeCtrl) { |
193 | - if ($this->ctrl($name, $value, $typeCtrl) === true) { |
|
193 | + if ($this->ctrl($name, $value, $typeCtrl)===true) { |
|
194 | 194 | return $this->addToProperty($name, $value); |
195 | 195 | } |
196 | 196 | return $this; |
@@ -218,28 +218,28 @@ discard block |
||
218 | 218 | } |
219 | 219 | |
220 | 220 | public function fromArray($array) { |
221 | - foreach ( $this as $key => $value ) { |
|
221 | + foreach ($this as $key => $value) { |
|
222 | 222 | if (array_key_exists($key, $array) && !PhalconUtils::startsWith($key, "_")) { |
223 | - $setter="set" . ucfirst($key); |
|
223 | + $setter="set".ucfirst($key); |
|
224 | 224 | $this->$setter($array[$key]); |
225 | 225 | unset($array[$key]); |
226 | 226 | } |
227 | 227 | } |
228 | - foreach ( $array as $key => $value ) { |
|
228 | + foreach ($array as $key => $value) { |
|
229 | 229 | if (method_exists($this, $key)) { |
230 | 230 | try { |
231 | 231 | $this->$key($value); |
232 | 232 | unset($array[$key]); |
233 | - } catch ( \Exception $e ) { |
|
233 | + } catch (\Exception $e) { |
|
234 | 234 | // Nothing to do |
235 | 235 | } |
236 | - } else { |
|
237 | - $setter="set" . ucfirst($key); |
|
236 | + }else { |
|
237 | + $setter="set".ucfirst($key); |
|
238 | 238 | if (method_exists($this, $setter)) { |
239 | 239 | try { |
240 | 240 | $this->$setter($value); |
241 | 241 | unset($array[$key]); |
242 | - } catch ( \Exception $e ) { |
|
242 | + } catch (\Exception $e) { |
|
243 | 243 | // Nothing to do |
244 | 244 | } |
245 | 245 | } |
@@ -250,7 +250,7 @@ discard block |
||
250 | 250 | |
251 | 251 | public function fromDatabaseObjects($objects, $function) { |
252 | 252 | if (isset($objects)) { |
253 | - foreach ( $objects as $object ) { |
|
253 | + foreach ($objects as $object) { |
|
254 | 254 | $this->fromDatabaseObject($object, $function); |
255 | 255 | } |
256 | 256 | } |
@@ -269,11 +269,11 @@ discard block |
||
269 | 269 | } |
270 | 270 | |
271 | 271 | public function addEvent($event, $jsCode, $stopPropagation=false, $preventDefault=false) { |
272 | - if ($stopPropagation === true) { |
|
273 | - $jsCode="event.stopPropagation();" . $jsCode; |
|
272 | + if ($stopPropagation===true) { |
|
273 | + $jsCode="event.stopPropagation();".$jsCode; |
|
274 | 274 | } |
275 | - if ($preventDefault === true) { |
|
276 | - $jsCode="event.preventDefault();" . $jsCode; |
|
275 | + if ($preventDefault===true) { |
|
276 | + $jsCode="event.preventDefault();".$jsCode; |
|
277 | 277 | } |
278 | 278 | return $this->_addEvent($event, $jsCode); |
279 | 279 | } |
@@ -282,10 +282,10 @@ discard block |
||
282 | 282 | if (array_key_exists($event, $this->_events)) { |
283 | 283 | if (is_array($this->_events[$event])) { |
284 | 284 | $this->_events[$event][]=$jsCode; |
285 | - } else { |
|
286 | - $this->_events[$event]=array ($this->_events[$event],$jsCode ); |
|
285 | + }else { |
|
286 | + $this->_events[$event]=array($this->_events[$event], $jsCode); |
|
287 | 287 | } |
288 | - } else { |
|
288 | + }else { |
|
289 | 289 | $this->_events[$event]=$jsCode; |
290 | 290 | } |
291 | 291 | return $this; |
@@ -305,15 +305,15 @@ discard block |
||
305 | 305 | |
306 | 306 | public function addEventsOnRun(JsUtils $js) { |
307 | 307 | if (isset($this->_bsComponent)) { |
308 | - foreach ( $this->_events as $event => $jsCode ) { |
|
308 | + foreach ($this->_events as $event => $jsCode) { |
|
309 | 309 | $code=$jsCode; |
310 | 310 | if (is_array($jsCode)) { |
311 | 311 | $code=""; |
312 | - foreach ( $jsCode as $jsC ) { |
|
312 | + foreach ($jsCode as $jsC) { |
|
313 | 313 | if ($jsC instanceof AjaxCall) { |
314 | - $code.="\n" . $jsC->compile($js); |
|
315 | - } else { |
|
316 | - $code.="\n" . $jsC; |
|
314 | + $code.="\n".$jsC->compile($js); |
|
315 | + }else { |
|
316 | + $code.="\n".$jsC; |
|
317 | 317 | } |
318 | 318 | } |
319 | 319 | } elseif ($jsCode instanceof AjaxCall) { |
@@ -321,12 +321,12 @@ discard block |
||
321 | 321 | } |
322 | 322 | $this->_bsComponent->addEvent($event, $code); |
323 | 323 | } |
324 | - $this->_events=array (); |
|
324 | + $this->_events=array(); |
|
325 | 325 | } |
326 | 326 | } |
327 | 327 | |
328 | 328 | public function _ajaxOn($operation, $event, $url, $responseElement="", $parameters=array()) { |
329 | - $params=array ("url" => $url,"responseElement" => $responseElement ); |
|
329 | + $params=array("url" => $url, "responseElement" => $responseElement); |
|
330 | 330 | $params=array_merge($params, $parameters); |
331 | 331 | $this->_addEvent($event, new AjaxCall($operation, $params)); |
332 | 332 | return $this; |
@@ -362,15 +362,15 @@ discard block |
||
362 | 362 | if (is_array($elements)) { |
363 | 363 | $flag=false; |
364 | 364 | $index=0; |
365 | - while ( !$flag && $index < sizeof($elements) ) { |
|
365 | + while (!$flag && $index<sizeof($elements)) { |
|
366 | 366 | if ($elements[$index] instanceof BaseHtml) |
367 | - $flag=($elements[$index]->getIdentifier() === $identifier); |
|
367 | + $flag=($elements[$index]->getIdentifier()===$identifier); |
|
368 | 368 | $index++; |
369 | 369 | } |
370 | - if ($flag === true) |
|
371 | - return $elements[$index - 1]; |
|
370 | + if ($flag===true) |
|
371 | + return $elements[$index-1]; |
|
372 | 372 | } elseif ($elements instanceof BaseHtml) { |
373 | - if ($elements->getIdentifier() === $identifier) |
|
373 | + if ($elements->getIdentifier()===$identifier) |
|
374 | 374 | return $elements; |
375 | 375 | } |
376 | 376 | return null; |
@@ -392,14 +392,14 @@ discard block |
||
392 | 392 | if (is_array($value)) { |
393 | 393 | $value=implode(",", $value); |
394 | 394 | } |
395 | - if (strrpos($value, 'this') === false && strrpos($value, 'event') === false) { |
|
396 | - $value='"' . $value . '"'; |
|
395 | + if (strrpos($value, 'this')===false && strrpos($value, 'event')===false) { |
|
396 | + $value='"'.$value.'"'; |
|
397 | 397 | } |
398 | 398 | return $value; |
399 | 399 | } |
400 | 400 | |
401 | 401 | public function jsDoJquery($jqueryCall, $param="") { |
402 | - return "$('#" . $this->identifier . "')." . $jqueryCall . "(" . $this->_prep_value($param) . ");"; |
|
402 | + return "$('#".$this->identifier."').".$jqueryCall."(".$this->_prep_value($param).");"; |
|
403 | 403 | } |
404 | 404 | |
405 | 405 | public function executeOnRun($jsCode) { |
@@ -145,22 +145,36 @@ discard block |
||
145 | 145 | return $this; |
146 | 146 | } |
147 | 147 | |
148 | + /** |
|
149 | + * @param string $name |
|
150 | + * @param string $value |
|
151 | + */ |
|
148 | 152 | protected function removePropertyValue($name, $value) { |
149 | 153 | $this->properties[$name]=\str_replace($value, "", $this->properties[$name]); |
150 | 154 | return $this; |
151 | 155 | } |
152 | 156 | |
157 | + /** |
|
158 | + * @param string $name |
|
159 | + */ |
|
153 | 160 | protected function removePropertyValues($name, $values) { |
154 | 161 | $this->removeOldValues($this->properties[$name], $values); |
155 | 162 | return $this; |
156 | 163 | } |
157 | 164 | |
165 | + /** |
|
166 | + * @param string $name |
|
167 | + */ |
|
158 | 168 | protected function removeProperty($name) { |
159 | 169 | if (\array_key_exists($name, $this->properties)) |
160 | 170 | unset($this->properties[$name]); |
161 | 171 | return $this; |
162 | 172 | } |
163 | 173 | |
174 | + /** |
|
175 | + * @param string $name |
|
176 | + * @param string[] $typeCtrl |
|
177 | + */ |
|
164 | 178 | protected function addToMemberCtrl(&$name, $value, $typeCtrl, $separator=" ") { |
165 | 179 | if ($this->ctrl($name, $value, $typeCtrl) === true) { |
166 | 180 | if (is_array($typeCtrl)) { |
@@ -185,6 +199,9 @@ discard block |
||
185 | 199 | return $this->addToProperty($name, $value); |
186 | 200 | } |
187 | 201 | |
202 | + /** |
|
203 | + * @param string $name |
|
204 | + */ |
|
188 | 205 | public function addToPropertyCtrl($name, $value, $typeCtrl) { |
189 | 206 | return $this->addToPropertyUnique($name, $value, $typeCtrl); |
190 | 207 | } |
@@ -332,14 +349,23 @@ discard block |
||
332 | 349 | return $this; |
333 | 350 | } |
334 | 351 | |
352 | + /** |
|
353 | + * @param string $event |
|
354 | + */ |
|
335 | 355 | public function getOn($event, $url, $responseElement="", $parameters=array()) { |
336 | 356 | return $this->_ajaxOn("get", $event, $url, $responseElement, $parameters); |
337 | 357 | } |
338 | 358 | |
359 | + /** |
|
360 | + * @param string $url |
|
361 | + */ |
|
339 | 362 | public function getOnClick($url, $responseElement="", $parameters=array()) { |
340 | 363 | return $this->getOn("click", $url, $responseElement, $parameters); |
341 | 364 | } |
342 | 365 | |
366 | + /** |
|
367 | + * @param string $event |
|
368 | + */ |
|
343 | 369 | public function postOn($event, $url, $params="{}", $responseElement="", $parameters=array()) { |
344 | 370 | $parameters["params"]=$params; |
345 | 371 | return $this->_ajaxOn("post", $event, $url, $responseElement, $parameters); |
@@ -349,6 +375,9 @@ discard block |
||
349 | 375 | return $this->postOn("click", $url, $params, $responseElement, $parameters); |
350 | 376 | } |
351 | 377 | |
378 | + /** |
|
379 | + * @param string $event |
|
380 | + */ |
|
352 | 381 | public function postFormOn($event, $url, $form, $responseElement="", $parameters=array()) { |
353 | 382 | $parameters["form"]=$form; |
354 | 383 | return $this->_ajaxOn("postForm", $event, $url, $responseElement, $parameters); |
@@ -398,6 +427,9 @@ discard block |
||
398 | 427 | return $value; |
399 | 428 | } |
400 | 429 | |
430 | + /** |
|
431 | + * @param string $jqueryCall |
|
432 | + */ |
|
401 | 433 | public function jsDoJquery($jqueryCall, $param="") { |
402 | 434 | return "$('#" . $this->identifier . "')." . $jqueryCall . "(" . $this->_prep_value($param) . ");"; |
403 | 435 | } |