@@ -158,8 +158,8 @@ discard block |
||
158 | 158 | * @param string $tagName |
159 | 159 | * @return HtmlLabel |
160 | 160 | */ |
161 | - public function htmlLabel($identifier, $content="", $icon=NULL,$tagName="div") { |
|
162 | - return $this->addHtmlComponent(new HtmlLabel($identifier, $content,$icon, $tagName)); |
|
161 | + public function htmlLabel($identifier, $content="", $icon=NULL, $tagName="div") { |
|
162 | + return $this->addHtmlComponent(new HtmlLabel($identifier, $content, $icon, $tagName)); |
|
163 | 163 | } |
164 | 164 | |
165 | 165 | /** |
@@ -168,8 +168,8 @@ discard block |
||
168 | 168 | * @param array $attributes |
169 | 169 | * @return HtmlLabelGroups |
170 | 170 | */ |
171 | - public function htmlLabelGroups($identifier,$labels=array(),$attributes=array()){ |
|
172 | - return $this->addHtmlComponent(new HtmlLabelGroups($identifier,$labels,$attributes)); |
|
171 | + public function htmlLabelGroups($identifier, $labels=array(), $attributes=array()) { |
|
172 | + return $this->addHtmlComponent(new HtmlLabelGroups($identifier, $labels, $attributes)); |
|
173 | 173 | } |
174 | 174 | |
175 | 175 | /** |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | |
17 | 17 | abstract public function addToProperty($name, $value, $separator=" "); |
18 | 18 | abstract public function addLabel($caption, $style="label-default", $leftSeparator=" "); |
19 | - abstract public function addContent($content,$before=false); |
|
19 | + abstract public function addContent($content, $before=false); |
|
20 | 20 | abstract public function getField(); |
21 | 21 | abstract public function getDataField(); |
22 | 22 | |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | } |
26 | 26 | |
27 | 27 | public function addLoading() { |
28 | - if ($this->_hasIcon === false) { |
|
28 | + if ($this->_hasIcon===false) { |
|
29 | 29 | throw new \Exception("Input must have an icon for showing a loader, use addIcon before"); |
30 | 30 | } |
31 | 31 | return $this->addToProperty("class", State::LOADING); |
@@ -33,56 +33,56 @@ discard block |
||
33 | 33 | |
34 | 34 | public function labeled($label, $direction=Direction::LEFT, $icon=NULL) { |
35 | 35 | $field=$this->getField(); |
36 | - $labelO=$field->addLabel($label,$direction===Direction::LEFT,$icon); |
|
37 | - $field->addToProperty("class", $direction . " labeled"); |
|
36 | + $labelO=$field->addLabel($label, $direction===Direction::LEFT, $icon); |
|
37 | + $field->addToProperty("class", $direction." labeled"); |
|
38 | 38 | return $labelO; |
39 | 39 | } |
40 | 40 | |
41 | 41 | public function labeledToCorner($icon, $direction=Direction::LEFT) { |
42 | - return $this->labeled("", $direction . " corner", $icon)->toCorner($direction); |
|
42 | + return $this->labeled("", $direction." corner", $icon)->toCorner($direction); |
|
43 | 43 | } |
44 | 44 | |
45 | 45 | public function addAction($action, $direction=Direction::RIGHT, $icon=NULL, $labeled=false) { |
46 | 46 | $field=$this->getField(); |
47 | 47 | $actionO=$action; |
48 | - if (\is_object($action) === false) { |
|
49 | - $actionO=new HtmlButton("action-" . $this->identifier, $action); |
|
48 | + if (\is_object($action)===false) { |
|
49 | + $actionO=new HtmlButton("action-".$this->identifier, $action); |
|
50 | 50 | if (isset($icon)) |
51 | 51 | $actionO->addIcon($icon, true, $labeled); |
52 | 52 | } |
53 | - $field->addToProperty("class", $direction . " action"); |
|
54 | - $field->addContent($actionO, \strstr($direction, Direction::LEFT) !== false); |
|
53 | + $field->addToProperty("class", $direction." action"); |
|
54 | + $field->addContent($actionO, \strstr($direction, Direction::LEFT)!==false); |
|
55 | 55 | return $actionO; |
56 | 56 | } |
57 | 57 | |
58 | - public function addDropdown($label="", $items=array(),$direction=Direction::RIGHT){ |
|
59 | - $labelO=new HtmlDropdown("dd-".$this->identifier,$label,$items); |
|
60 | - $labelO->asSelect("select-".$this->identifier,false,true); |
|
61 | - return $this->labeled($labelO,$direction); |
|
58 | + public function addDropdown($label="", $items=array(), $direction=Direction::RIGHT) { |
|
59 | + $labelO=new HtmlDropdown("dd-".$this->identifier, $label, $items); |
|
60 | + $labelO->asSelect("select-".$this->identifier, false, true); |
|
61 | + return $this->labeled($labelO, $direction); |
|
62 | 62 | } |
63 | 63 | |
64 | 64 | public function setTransparent() { |
65 | 65 | return $this->getField()->addToProperty("class", "transparent"); |
66 | 66 | } |
67 | 67 | |
68 | - public function setReadonly(){ |
|
68 | + public function setReadonly() { |
|
69 | 69 | $this->getDataField()->setProperty("readonly", ""); |
70 | 70 | return $this; |
71 | 71 | } |
72 | 72 | |
73 | - public function setName($name){ |
|
74 | - $this->getDataField()->setProperty("name",$name); |
|
73 | + public function setName($name) { |
|
74 | + $this->getDataField()->setProperty("name", $name); |
|
75 | 75 | return $this; |
76 | 76 | } |
77 | 77 | |
78 | - public function setFluid(){ |
|
79 | - $this->getField()->addToProperty("class","fluid"); |
|
78 | + public function setFluid() { |
|
79 | + $this->getField()->addToProperty("class", "fluid"); |
|
80 | 80 | return $this; |
81 | 81 | } |
82 | 82 | |
83 | 83 | public function setDisabled($disable=true) { |
84 | 84 | $field=$this->getField(); |
85 | - if($disable) |
|
85 | + if ($disable) |
|
86 | 86 | $field->addToProperty("class", "disabled"); |
87 | 87 | return $this; |
88 | 88 | } |
@@ -47,8 +47,9 @@ discard block |
||
47 | 47 | $actionO=$action; |
48 | 48 | if (\is_object($action) === false) { |
49 | 49 | $actionO=new HtmlButton("action-" . $this->identifier, $action); |
50 | - if (isset($icon)) |
|
51 | - $actionO->addIcon($icon, true, $labeled); |
|
50 | + if (isset($icon)) { |
|
51 | + $actionO->addIcon($icon, true, $labeled); |
|
52 | + } |
|
52 | 53 | } |
53 | 54 | $field->addToProperty("class", $direction . " action"); |
54 | 55 | $field->addContent($actionO, \strstr($direction, Direction::LEFT) !== false); |
@@ -82,8 +83,9 @@ discard block |
||
82 | 83 | |
83 | 84 | public function setDisabled($disable=true) { |
84 | 85 | $field=$this->getField(); |
85 | - if($disable) |
|
86 | - $field->addToProperty("class", "disabled"); |
|
86 | + if($disable) { |
|
87 | + $field->addToProperty("class", "disabled"); |
|
88 | + } |
|
87 | 89 | return $this; |
88 | 90 | } |
89 | 91 | } |
90 | 92 | \ No newline at end of file |
@@ -38,18 +38,18 @@ discard block |
||
38 | 38 | return $this->getHtmlCk()->attachEvents($events); |
39 | 39 | } |
40 | 40 | |
41 | - public function getField(){ |
|
41 | + public function getField() { |
|
42 | 42 | //TODO check getField() ? |
43 | 43 | return $this->content["field"]; |
44 | 44 | } |
45 | 45 | |
46 | - public function getHtmlCk(){ |
|
46 | + public function getHtmlCk() { |
|
47 | 47 | return $this->content["field"]; |
48 | 48 | } |
49 | 49 | |
50 | - public function getDataField(){ |
|
51 | - $field= $this->getField(); |
|
52 | - if($field instanceof AbstractCheckbox) |
|
50 | + public function getDataField() { |
|
51 | + $field=$this->getField(); |
|
52 | + if ($field instanceof AbstractCheckbox) |
|
53 | 53 | $field=$field->getField(); |
54 | 54 | return $field; |
55 | 55 | } |
@@ -59,10 +59,10 @@ discard block |
||
59 | 59 | * @param boolean $value |
60 | 60 | * @return HtmlFormField |
61 | 61 | */ |
62 | - public function setChecked($value=true){ |
|
63 | - if($value===true){ |
|
62 | + public function setChecked($value=true) { |
|
63 | + if ($value===true) { |
|
64 | 64 | $this->getDataField()->setProperty("checked", "checked"); |
65 | - }else{ |
|
65 | + } else { |
|
66 | 66 | $this->getDataField()->removeProperty("checked"); |
67 | 67 | } |
68 | 68 | return $this; |
@@ -49,8 +49,9 @@ discard block |
||
49 | 49 | |
50 | 50 | public function getDataField(){ |
51 | 51 | $field= $this->getField(); |
52 | - if($field instanceof AbstractCheckbox) |
|
53 | - $field=$field->getField(); |
|
52 | + if($field instanceof AbstractCheckbox) { |
|
53 | + $field=$field->getField(); |
|
54 | + } |
|
54 | 55 | return $field; |
55 | 56 | } |
56 | 57 | |
@@ -62,7 +63,7 @@ discard block |
||
62 | 63 | public function setChecked($value=true){ |
63 | 64 | if($value===true){ |
64 | 65 | $this->getDataField()->setProperty("checked", "checked"); |
65 | - }else{ |
|
66 | + } else{ |
|
66 | 67 | $this->getDataField()->removeProperty("checked"); |
67 | 68 | } |
68 | 69 | return $this; |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | |
12 | 12 | class HtmlPopup extends HtmlSemDoubleElement { |
13 | 13 | private $_container; |
14 | - public function __construct(BaseHtml $container,$identifier, $content="") { |
|
14 | + public function __construct(BaseHtml $container, $identifier, $content="") { |
|
15 | 15 | parent::__construct($identifier, "div"); |
16 | 16 | $this->_container=$container; |
17 | 17 | $this->setClass("ui popup"); |
@@ -19,9 +19,9 @@ discard block |
||
19 | 19 | $this->_params=array("on"=>"hover"); |
20 | 20 | } |
21 | 21 | |
22 | - public function addList($items=array(),$header=NULL){ |
|
23 | - if(!$this->content instanceof HtmlGrid){ |
|
24 | - $this->content=new HtmlGrid("Grid-".$this->identifier,0); |
|
22 | + public function addList($items=array(), $header=NULL) { |
|
23 | + if (!$this->content instanceof HtmlGrid) { |
|
24 | + $this->content=new HtmlGrid("Grid-".$this->identifier, 0); |
|
25 | 25 | } |
26 | 26 | $grid=$this->content; |
27 | 27 | |
@@ -29,12 +29,12 @@ discard block |
||
29 | 29 | $colCount++; |
30 | 30 | $grid->setColsCount($colCount); |
31 | 31 | |
32 | - $list=new HtmlList("",$items); |
|
32 | + $list=new HtmlList("", $items); |
|
33 | 33 | $list->asLink(); |
34 | - if(isset($header)){ |
|
35 | - $list->addHeader(4,$header); |
|
34 | + if (isset($header)) { |
|
35 | + $list->addHeader(4, $header); |
|
36 | 36 | } |
37 | - $grid->getCell(0,$colCount-1)->setContent($list); |
|
37 | + $grid->getCell(0, $colCount-1)->setContent($list); |
|
38 | 38 | $grid->setDivided()->setRelaxed(true); |
39 | 39 | return $list; |
40 | 40 | } |
@@ -42,14 +42,14 @@ discard block |
||
42 | 42 | /** |
43 | 43 | * A popup can have no maximum width and continue to flow to fit its content |
44 | 44 | */ |
45 | - public function setFlowing(){ |
|
45 | + public function setFlowing() { |
|
46 | 46 | return $this->addToProperty("class", "flowing"); |
47 | 47 | } |
48 | 48 | |
49 | 49 | /** |
50 | 50 | * A popup can provide more basic formatting |
51 | 51 | */ |
52 | - public function setBasic(){ |
|
52 | + public function setBasic() { |
|
53 | 53 | return $this->addToProperty("class", "basic"); |
54 | 54 | } |
55 | 55 | |
@@ -57,22 +57,22 @@ discard block |
||
57 | 57 | * {@inheritDoc} |
58 | 58 | * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::run() |
59 | 59 | */ |
60 | - public function run(JsUtils $js){ |
|
60 | + public function run(JsUtils $js) { |
|
61 | 61 | $this->_params["popup"]="#".$this->identifier; |
62 | - $js->semantic()->popup("#".$this->_container->getIdentifier(),$this->_params); |
|
62 | + $js->semantic()->popup("#".$this->_container->getIdentifier(), $this->_params); |
|
63 | 63 | } |
64 | 64 | |
65 | - public function setOn($event="click"){ |
|
65 | + public function setOn($event="click") { |
|
66 | 66 | $this->_params["on"]=$event; |
67 | 67 | return $this; |
68 | 68 | } |
69 | 69 | |
70 | - public function setInline($value=true){ |
|
70 | + public function setInline($value=true) { |
|
71 | 71 | $this->_params["inline"]=$value; |
72 | 72 | return $this; |
73 | 73 | } |
74 | 74 | |
75 | - public function setPosition($position){ |
|
75 | + public function setPosition($position) { |
|
76 | 76 | $this->_params["position"]=$position; |
77 | 77 | return $this; |
78 | 78 | } |
@@ -11,8 +11,8 @@ discard block |
||
11 | 11 | use Ajax\semantic\traits\SemanticWidgetsTrait; |
12 | 12 | |
13 | 13 | class Semantic extends BaseGui { |
14 | - use SemanticComponentsTrait,SemanticHtmlElementsTrait,SemanticHtmlCollectionsTrait, |
|
15 | - SemanticHtmlModulesTrait,SemanticHtmlViewsTrait,SemanticWidgetsTrait; |
|
14 | + use SemanticComponentsTrait, SemanticHtmlElementsTrait, SemanticHtmlCollectionsTrait, |
|
15 | + SemanticHtmlModulesTrait, SemanticHtmlViewsTrait, SemanticWidgetsTrait; |
|
16 | 16 | |
17 | 17 | private $language; |
18 | 18 | |
@@ -21,12 +21,12 @@ discard block |
||
21 | 21 | } |
22 | 22 | |
23 | 23 | |
24 | - public function setLanguage($language){ |
|
25 | - if($language!==$this->language){ |
|
24 | + public function setLanguage($language) { |
|
25 | + if ($language!==$this->language) { |
|
26 | 26 | $file=\realpath(dirname(__FILE__)."/semantic/components/validation/languages/".$language.".js"); |
27 | - if(\file_exists($file)){ |
|
27 | + if (\file_exists($file)) { |
|
28 | 28 | $script=\file_get_contents($file); |
29 | - $this->js->exec($script,true); |
|
29 | + $this->js->exec($script, true); |
|
30 | 30 | $this->language=$language; |
31 | 31 | } |
32 | 32 | } |
@@ -10,7 +10,7 @@ discard block |
||
10 | 10 | */ |
11 | 11 | |
12 | 12 | trait JqueryActionsTrait { |
13 | - abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true); |
|
13 | + abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true); |
|
14 | 14 | |
15 | 15 | /** |
16 | 16 | * Get or set the value of an attribute for the first element in the set of matched elements or set one or more attributes for every matched element. |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | * @param boolean $immediatly defers the execution if set to false |
39 | 39 | * @return string |
40 | 40 | */ |
41 | - public function after($element='this', $value='', $immediatly=false){ |
|
41 | + public function after($element='this', $value='', $immediatly=false) { |
|
42 | 42 | $element=Javascript::prep_element($element); |
43 | 43 | $value=Javascript::prep_value($value); |
44 | 44 | $str="$({$element}).after({$value});"; |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | |
64 | 64 | $animations="\t\t\t"; |
65 | 65 | if (\is_array($params)) { |
66 | - foreach ( $params as $param => $value ) { |
|
66 | + foreach ($params as $param => $value) { |
|
67 | 67 | $animations.=$param.': \''.$value.'\', '; |
68 | 68 | } |
69 | 69 | } |
@@ -356,8 +356,8 @@ discard block |
||
356 | 356 | * @param boolean $immediatly |
357 | 357 | * @return string |
358 | 358 | */ |
359 | - public function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $preventDefault=false, $stopPropagation=false, $jsCallback="",$immediatly=true) { |
|
360 | - return $this->_add_event($element, $this->_doJQuery($elementToModify, $jqueryCall, $param, $jsCallback), $event, $preventDefault, $stopPropagation,$immediatly); |
|
359 | + public function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $preventDefault=false, $stopPropagation=false, $jsCallback="", $immediatly=true) { |
|
360 | + return $this->_add_event($element, $this->_doJQuery($elementToModify, $jqueryCall, $param, $jsCallback), $event, $preventDefault, $stopPropagation, $immediatly); |
|
361 | 361 | } |
362 | 362 | |
363 | 363 | /** |
@@ -383,8 +383,8 @@ discard block |
||
383 | 383 | * @param boolean $immediatly |
384 | 384 | * @return String |
385 | 385 | */ |
386 | - public function _execOn($element, $event, $js, $preventDefault=false, $stopPropagation=false,$immediatly=true) { |
|
387 | - return $this->_add_event($element, $this->_exec($js), $event, $preventDefault, $stopPropagation,$immediatly); |
|
386 | + public function _execOn($element, $event, $js, $preventDefault=false, $stopPropagation=false, $immediatly=true) { |
|
387 | + return $this->_add_event($element, $this->_exec($js), $event, $preventDefault, $stopPropagation, $immediatly); |
|
388 | 388 | } |
389 | 389 | |
390 | 390 | /** |
@@ -393,8 +393,8 @@ discard block |
||
393 | 393 | * @return string |
394 | 394 | */ |
395 | 395 | private function _validate_speed($speed) { |
396 | - if (in_array($speed, array ( |
|
397 | - 'slow','normal','fast' |
|
396 | + if (in_array($speed, array( |
|
397 | + 'slow', 'normal', 'fast' |
|
398 | 398 | ))) { |
399 | 399 | $speed='"'.$speed.'"'; |
400 | 400 | } elseif (preg_match("/[^0-9]/", $speed)) { |
@@ -24,10 +24,12 @@ discard block |
||
24 | 24 | if (isset($value)) { |
25 | 25 | $value=Javascript::prep_value($value); |
26 | 26 | $str="$({$element}).attr(\"$attributeName\",{$value});"; |
27 | - } else |
|
28 | - $str="$({$element}).attr(\"$attributeName\");"; |
|
29 | - if ($immediatly) |
|
30 | - $this->jquery_code_for_compile[]=$str; |
|
27 | + } else { |
|
28 | + $str="$({$element}).attr(\"$attributeName\");"; |
|
29 | + } |
|
30 | + if ($immediatly) { |
|
31 | + $this->jquery_code_for_compile[]=$str; |
|
32 | + } |
|
31 | 33 | return $str; |
32 | 34 | } |
33 | 35 | |
@@ -42,8 +44,9 @@ discard block |
||
42 | 44 | $element=Javascript::prep_element($element); |
43 | 45 | $value=Javascript::prep_value($value); |
44 | 46 | $str="$({$element}).after({$value});"; |
45 | - if ($immediatly) |
|
46 | - $this->jquery_code_for_compile[]=$str; |
|
47 | + if ($immediatly) { |
|
48 | + $this->jquery_code_for_compile[]=$str; |
|
49 | + } |
|
47 | 50 | return $str; |
48 | 51 | } |
49 | 52 | |
@@ -79,8 +82,9 @@ discard block |
||
79 | 82 | |
80 | 83 | $str="$({$element}).animate({\n$animations\n\t\t}".$speed.$extra.");"; |
81 | 84 | |
82 | - if ($immediatly) |
|
83 | - $this->jquery_code_for_compile[]=$str; |
|
85 | + if ($immediatly) { |
|
86 | + $this->jquery_code_for_compile[]=$str; |
|
87 | + } |
|
84 | 88 | return $str; |
85 | 89 | } |
86 | 90 | |
@@ -105,8 +109,9 @@ discard block |
||
105 | 109 | |
106 | 110 | $str="$({$element}).fadeIn({$speed}{$callback});"; |
107 | 111 | |
108 | - if ($immediatly) |
|
109 | - $this->jquery_code_for_compile[]=$str; |
|
112 | + if ($immediatly) { |
|
113 | + $this->jquery_code_for_compile[]=$str; |
|
114 | + } |
|
110 | 115 | return $str; |
111 | 116 | } |
112 | 117 | |
@@ -131,8 +136,9 @@ discard block |
||
131 | 136 | |
132 | 137 | $str="$({$element}).fadeOut({$speed}{$callback});"; |
133 | 138 | |
134 | - if ($immediatly) |
|
135 | - $this->jquery_code_for_compile[]=$str; |
|
139 | + if ($immediatly) { |
|
140 | + $this->jquery_code_for_compile[]=$str; |
|
141 | + } |
|
136 | 142 | return $str; |
137 | 143 | } |
138 | 144 | |
@@ -157,8 +163,9 @@ discard block |
||
157 | 163 | |
158 | 164 | $str="$({$element}).hide({$speed}{$callback});"; |
159 | 165 | |
160 | - if ($immediatly) |
|
161 | - $this->jquery_code_for_compile[]=$str; |
|
166 | + if ($immediatly) { |
|
167 | + $this->jquery_code_for_compile[]=$str; |
|
168 | + } |
|
162 | 169 | return $str; |
163 | 170 | } |
164 | 171 | |
@@ -185,8 +192,9 @@ discard block |
||
185 | 192 | |
186 | 193 | $str="$({$element}).slideUp({$speed}{$callback});"; |
187 | 194 | |
188 | - if ($immediatly) |
|
189 | - $this->jquery_code_for_compile[]=$str; |
|
195 | + if ($immediatly) { |
|
196 | + $this->jquery_code_for_compile[]=$str; |
|
197 | + } |
|
190 | 198 | return $str; |
191 | 199 | } |
192 | 200 | |
@@ -211,8 +219,9 @@ discard block |
||
211 | 219 | |
212 | 220 | $str="$({$element}).slideDown({$speed}{$callback});"; |
213 | 221 | |
214 | - if ($immediatly) |
|
215 | - $this->jquery_code_for_compile[]=$str; |
|
222 | + if ($immediatly) { |
|
223 | + $this->jquery_code_for_compile[]=$str; |
|
224 | + } |
|
216 | 225 | return $str; |
217 | 226 | } |
218 | 227 | |
@@ -237,8 +246,9 @@ discard block |
||
237 | 246 | |
238 | 247 | $str="$({$element}).slideToggle({$speed}{$callback});"; |
239 | 248 | |
240 | - if ($immediatly) |
|
241 | - $this->jquery_code_for_compile[]=$str; |
|
249 | + if ($immediatly) { |
|
250 | + $this->jquery_code_for_compile[]=$str; |
|
251 | + } |
|
242 | 252 | return $str; |
243 | 253 | } |
244 | 254 | |
@@ -255,8 +265,9 @@ discard block |
||
255 | 265 | $element=Javascript::prep_element($element); |
256 | 266 | $str="$({$element}).toggle();"; |
257 | 267 | |
258 | - if ($immediatly) |
|
259 | - $this->jquery_code_for_compile[]=$str; |
|
268 | + if ($immediatly) { |
|
269 | + $this->jquery_code_for_compile[]=$str; |
|
270 | + } |
|
260 | 271 | return $str; |
261 | 272 | } |
262 | 273 | |
@@ -272,8 +283,9 @@ discard block |
||
272 | 283 | $element=Javascript::prep_element($element); |
273 | 284 | $str="$({$element}).trigger(\"$event\");"; |
274 | 285 | |
275 | - if ($immediatly) |
|
276 | - $this->jquery_code_for_compile[]=$str; |
|
286 | + if ($immediatly) { |
|
287 | + $this->jquery_code_for_compile[]=$str; |
|
288 | + } |
|
277 | 289 | return $str; |
278 | 290 | } |
279 | 291 | |
@@ -298,8 +310,9 @@ discard block |
||
298 | 310 | |
299 | 311 | $str="$({$element}).show({$speed}{$callback});"; |
300 | 312 | |
301 | - if ($immediatly) |
|
302 | - $this->jquery_code_for_compile[]=$str; |
|
313 | + if ($immediatly) { |
|
314 | + $this->jquery_code_for_compile[]=$str; |
|
315 | + } |
|
303 | 316 | return $str; |
304 | 317 | } |
305 | 318 | |
@@ -317,8 +330,9 @@ discard block |
||
317 | 330 | $str.="else{".$jsCodeIfFalse."}"; |
318 | 331 | } |
319 | 332 | |
320 | - if ($immediatly) |
|
321 | - $this->jquery_code_for_compile[]=$str; |
|
333 | + if ($immediatly) { |
|
334 | + $this->jquery_code_for_compile[]=$str; |
|
335 | + } |
|
322 | 336 | return $str; |
323 | 337 | } |
324 | 338 | |
@@ -335,11 +349,13 @@ discard block |
||
335 | 349 | public function _doJQuery($element, $jqueryCall, $param="", $jsCallback="", $immediatly=false) { |
336 | 350 | $param=Javascript::prep_value($param); |
337 | 351 | $callback=""; |
338 | - if ($jsCallback!="") |
|
339 | - $callback=", function(event){\n{$jsCallback}\n}"; |
|
352 | + if ($jsCallback!="") { |
|
353 | + $callback=", function(event){\n{$jsCallback}\n}"; |
|
354 | + } |
|
340 | 355 | $script="$(".Javascript::prep_element($element).").".$jqueryCall."(".$param.$callback.");\n"; |
341 | - if ($immediatly) |
|
342 | - $this->jquery_code_for_compile[]=$script; |
|
356 | + if ($immediatly) { |
|
357 | + $this->jquery_code_for_compile[]=$script; |
|
358 | + } |
|
343 | 359 | return $script; |
344 | 360 | } |
345 | 361 | |
@@ -368,8 +384,9 @@ discard block |
||
368 | 384 | */ |
369 | 385 | public function _exec($js, $immediatly=false) { |
370 | 386 | $script=$js."\n"; |
371 | - if ($immediatly) |
|
372 | - $this->jquery_code_for_compile[]=$script; |
|
387 | + if ($immediatly) { |
|
388 | + $this->jquery_code_for_compile[]=$script; |
|
389 | + } |
|
373 | 390 | return $script; |
374 | 391 | } |
375 | 392 |
@@ -17,18 +17,18 @@ discard block |
||
17 | 17 | |
18 | 18 | public function __construct(JsUtils $js=NULL) { |
19 | 19 | parent::__construct($js); |
20 | - $this->events=array (); |
|
20 | + $this->events=array(); |
|
21 | 21 | } |
22 | 22 | |
23 | 23 | protected function compileEvents() { |
24 | - foreach ( $this->events as $event => $jsCode ) { |
|
25 | - if($event=="execute"){ |
|
24 | + foreach ($this->events as $event => $jsCode) { |
|
25 | + if ($event=="execute") { |
|
26 | 26 | $this->jquery_code_for_compile []=$jsCode; |
27 | - }else if($event=="beforeExecute"){ |
|
27 | + } else if ($event=="beforeExecute") { |
|
28 | 28 | \array_unshift($this->jquery_code_for_compile, $jsCode); |
29 | - }else{ |
|
29 | + } else { |
|
30 | 30 | $selector=$this->attachTo; |
31 | - if(isset($this->itemSelector)){ |
|
31 | + if (isset($this->itemSelector)) { |
|
32 | 32 | $selector.=" ".$this->itemSelector; |
33 | 33 | } |
34 | 34 | $this->jquery_code_for_compile []="$( \"".$selector."\" ).on(\"".$event."\" , function( event, data ) {".$jsCode."});"; |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | $result=implode("\n", $this->jquery_code_for_compile); |
41 | 41 | $result=str_ireplace("\"%", "", $result); |
42 | 42 | $result=str_ireplace("%\"", "", $result); |
43 | - $result=str_replace(array ( |
|
43 | + $result=str_replace(array( |
|
44 | 44 | "\\n", |
45 | 45 | "\\r", |
46 | 46 | "\\t" |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | |
51 | 51 | public function getScript() { |
52 | 52 | $allParams=$this->params; |
53 | - $this->jquery_code_for_compile=array (); |
|
53 | + $this->jquery_code_for_compile=array(); |
|
54 | 54 | $this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).{$this->uiName}(".$this->getParamsAsJSON($allParams).");"; |
55 | 55 | $this->compileEvents(); |
56 | 56 | return $this->compileJQueryCode(); |
@@ -24,9 +24,9 @@ discard block |
||
24 | 24 | foreach ( $this->events as $event => $jsCode ) { |
25 | 25 | if($event=="execute"){ |
26 | 26 | $this->jquery_code_for_compile []=$jsCode; |
27 | - }else if($event=="beforeExecute"){ |
|
27 | + } else if($event=="beforeExecute"){ |
|
28 | 28 | \array_unshift($this->jquery_code_for_compile, $jsCode); |
29 | - }else{ |
|
29 | + } else{ |
|
30 | 30 | $selector=$this->attachTo; |
31 | 31 | if(isset($this->itemSelector)){ |
32 | 32 | $selector.=" ".$this->itemSelector; |
@@ -75,8 +75,9 @@ discard block |
||
75 | 75 | |
76 | 76 | protected function setParamCtrl($key, $value, $typeCtrl) { |
77 | 77 | if (\is_array($typeCtrl)) { |
78 | - if (array_search($value, $typeCtrl)===false) |
|
79 | - throw new \Exception("La valeur passée a propriété `".$key."` pour le composant `".$this->uiName."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}"); |
|
78 | + if (array_search($value, $typeCtrl)===false) { |
|
79 | + throw new \Exception("La valeur passée a propriété `".$key."` pour le composant `".$this->uiName."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}"); |
|
80 | + } |
|
80 | 81 | } else { |
81 | 82 | if (!$typeCtrl($value)) { |
82 | 83 | throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$key." au composant ".$this->uiName); |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | foreach ($items as $k=>$v){ |
23 | 23 | $this->addItem([$k,$v]); |
24 | 24 | } |
25 | - }else{ |
|
25 | + } else{ |
|
26 | 26 | foreach ($items as $item){ |
27 | 27 | $this->addItem($item); |
28 | 28 | } |
@@ -70,9 +70,9 @@ discard block |
||
70 | 70 | * @return \Ajax\common\html\HtmlDoubleElement |
71 | 71 | */ |
72 | 72 | public function getItem($index) { |
73 | - if (is_int($index)) |
|
74 | - return $this->content[$index]; |
|
75 | - else { |
|
73 | + if (is_int($index)) { |
|
74 | + return $this->content[$index]; |
|
75 | + } else { |
|
76 | 76 | $elm=$this->getElementById($index, $this->content); |
77 | 77 | return $elm; |
78 | 78 | } |
@@ -134,10 +134,11 @@ discard block |
||
134 | 134 | $i=0; |
135 | 135 | foreach ($properties as $k=>$v){ |
136 | 136 | $c=$this->content[$i++]; |
137 | - if(isset($c)) |
|
138 | - $c->setProperty($k,$v); |
|
139 | - else |
|
140 | - return $this; |
|
137 | + if(isset($c)) { |
|
138 | + $c->setProperty($k,$v); |
|
139 | + } else { |
|
140 | + return $this; |
|
141 | + } |
|
141 | 142 | } |
142 | 143 | return $this; |
143 | 144 | } |
@@ -151,8 +152,7 @@ discard block |
||
151 | 152 | $c=$this->content[$i++]; |
152 | 153 | if(isset($c)){ |
153 | 154 | $c->setProperty($property,$value); |
154 | - } |
|
155 | - else{ |
|
155 | + } else{ |
|
156 | 156 | return $this; |
157 | 157 | } |
158 | 158 | } |
@@ -49,6 +49,10 @@ discard block |
||
49 | 49 | return $itemO; |
50 | 50 | } |
51 | 51 | |
52 | + /** |
|
53 | + * @param string $classname |
|
54 | + * @param integer $index |
|
55 | + */ |
|
52 | 56 | protected function setItemIdentifier($item,$classname,$index){ |
53 | 57 | if($item instanceof BaseWidget){ |
54 | 58 | if($item->getIdentifier()===""){ |
@@ -93,6 +97,9 @@ discard block |
||
93 | 97 | return $this; |
94 | 98 | } |
95 | 99 | |
100 | + /** |
|
101 | + * @param integer $index |
|
102 | + */ |
|
96 | 103 | public function removeItem($index){ |
97 | 104 | return array_splice($this->content, $index, 1); |
98 | 105 | } |
@@ -108,6 +115,9 @@ discard block |
||
108 | 115 | return $this->addItem($function($object)); |
109 | 116 | } |
110 | 117 | |
118 | + /** |
|
119 | + * @param \Closure $callBack |
|
120 | + */ |
|
111 | 121 | public function apply($callBack){ |
112 | 122 | foreach ($this->content as $item){ |
113 | 123 | $callBack($item); |
@@ -14,44 +14,44 @@ discard block |
||
14 | 14 | */ |
15 | 15 | abstract class HtmlCollection extends HtmlDoubleElement { |
16 | 16 | |
17 | - public function __construct($identifier,$tagName="div"){ |
|
18 | - parent::__construct($identifier,$tagName); |
|
17 | + public function __construct($identifier, $tagName="div") { |
|
18 | + parent::__construct($identifier, $tagName); |
|
19 | 19 | $this->content=array(); |
20 | 20 | } |
21 | 21 | |
22 | - public function addItems($items){ |
|
23 | - if(JArray::isAssociative($items)){ |
|
24 | - foreach ($items as $k=>$v){ |
|
25 | - $this->addItem([$k,$v]); |
|
22 | + public function addItems($items) { |
|
23 | + if (JArray::isAssociative($items)) { |
|
24 | + foreach ($items as $k=>$v) { |
|
25 | + $this->addItem([$k, $v]); |
|
26 | 26 | } |
27 | - }else{ |
|
28 | - foreach ($items as $item){ |
|
27 | + } else { |
|
28 | + foreach ($items as $item) { |
|
29 | 29 | $this->addItem($item); |
30 | 30 | } |
31 | 31 | } |
32 | 32 | return $this; |
33 | 33 | } |
34 | 34 | |
35 | - public function setItems($items){ |
|
35 | + public function setItems($items) { |
|
36 | 36 | $this->content=$items; |
37 | 37 | return $this; |
38 | 38 | } |
39 | 39 | |
40 | - public function getItems(){ |
|
40 | + public function getItems() { |
|
41 | 41 | return $this->content; |
42 | 42 | } |
43 | 43 | |
44 | - protected function getItemToAdd($item){ |
|
44 | + protected function getItemToAdd($item) { |
|
45 | 45 | $itemO=$item; |
46 | - if($this->createCondition($item)===true){ |
|
46 | + if ($this->createCondition($item)===true) { |
|
47 | 47 | $itemO=$this->createItem($item); |
48 | 48 | } |
49 | 49 | return $itemO; |
50 | 50 | } |
51 | 51 | |
52 | - protected function setItemIdentifier($item,$classname,$index){ |
|
53 | - if($item instanceof BaseWidget){ |
|
54 | - if($item->getIdentifier()===""){ |
|
52 | + protected function setItemIdentifier($item, $classname, $index) { |
|
53 | + if ($item instanceof BaseWidget) { |
|
54 | + if ($item->getIdentifier()==="") { |
|
55 | 55 | $item->setIdentifier($classname."-".$this->identifier."-".$index); |
56 | 56 | } |
57 | 57 | } |
@@ -62,15 +62,15 @@ discard block |
||
62 | 62 | * @param HtmlDoubleElement|string|array $item |
63 | 63 | * @return \Ajax\common\html\HtmlDoubleElement |
64 | 64 | */ |
65 | - public function addItem($item){ |
|
65 | + public function addItem($item) { |
|
66 | 66 | $itemO=$this->getItemToAdd($item); |
67 | 67 | $this->addContent($itemO); |
68 | 68 | return $itemO; |
69 | 69 | } |
70 | 70 | |
71 | - public function insertItem($item,$position=0){ |
|
71 | + public function insertItem($item, $position=0) { |
|
72 | 72 | $itemO=$this->getItemToAdd($item); |
73 | - \array_splice( $this->content, $position, 0, array($itemO)); |
|
73 | + \array_splice($this->content, $position, 0, array($itemO)); |
|
74 | 74 | return $itemO; |
75 | 75 | } |
76 | 76 | |
@@ -93,11 +93,11 @@ discard block |
||
93 | 93 | return $this; |
94 | 94 | } |
95 | 95 | |
96 | - public function removeItem($index){ |
|
96 | + public function removeItem($index) { |
|
97 | 97 | return array_splice($this->content, $index, 1); |
98 | 98 | } |
99 | 99 | |
100 | - public function count(){ |
|
100 | + public function count() { |
|
101 | 101 | return \sizeof($this->content); |
102 | 102 | } |
103 | 103 | |
@@ -108,8 +108,8 @@ discard block |
||
108 | 108 | return $this->addItem($function($object)); |
109 | 109 | } |
110 | 110 | |
111 | - public function apply($callBack){ |
|
112 | - foreach ($this->content as $item){ |
|
111 | + public function apply($callBack) { |
|
112 | + foreach ($this->content as $item) { |
|
113 | 113 | $callBack($item); |
114 | 114 | } |
115 | 115 | return $this; |
@@ -129,23 +129,23 @@ discard block |
||
129 | 129 | */ |
130 | 130 | abstract protected function createItem($value); |
131 | 131 | |
132 | - protected function createCondition($value){ |
|
132 | + protected function createCondition($value) { |
|
133 | 133 | return \is_object($value)===false; |
134 | 134 | } |
135 | 135 | |
136 | - protected function contentAs($tagName){ |
|
137 | - foreach ($this->content as $item){ |
|
136 | + protected function contentAs($tagName) { |
|
137 | + foreach ($this->content as $item) { |
|
138 | 138 | $item->setTagName($tagName); |
139 | 139 | } |
140 | 140 | return $this; |
141 | 141 | } |
142 | 142 | |
143 | - public function setProperties($properties){ |
|
143 | + public function setProperties($properties) { |
|
144 | 144 | $i=0; |
145 | - foreach ($properties as $k=>$v){ |
|
145 | + foreach ($properties as $k=>$v) { |
|
146 | 146 | $c=$this->content[$i++]; |
147 | - if(isset($c)) |
|
148 | - $c->setProperty($k,$v); |
|
147 | + if (isset($c)) |
|
148 | + $c->setProperty($k, $v); |
|
149 | 149 | else |
150 | 150 | return $this; |
151 | 151 | } |
@@ -158,17 +158,17 @@ discard block |
||
158 | 158 | * @param array $values |
159 | 159 | * @return HtmlCollection |
160 | 160 | */ |
161 | - public function setPropertyValues($property,$values){ |
|
161 | + public function setPropertyValues($property, $values) { |
|
162 | 162 | $i=0; |
163 | - if(\is_array($values)===false){ |
|
164 | - $values=\array_fill(0, $this->count(),$values); |
|
163 | + if (\is_array($values)===false) { |
|
164 | + $values=\array_fill(0, $this->count(), $values); |
|
165 | 165 | } |
166 | - foreach ($values as $value){ |
|
166 | + foreach ($values as $value) { |
|
167 | 167 | $c=$this->content[$i++]; |
168 | - if(isset($c)){ |
|
169 | - $c->setProperty($property,$value); |
|
168 | + if (isset($c)) { |
|
169 | + $c->setProperty($property, $value); |
|
170 | 170 | } |
171 | - else{ |
|
171 | + else { |
|
172 | 172 | return $this; |
173 | 173 | } |
174 | 174 | } |
@@ -178,9 +178,9 @@ discard block |
||
178 | 178 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
179 | 179 | $index=0; |
180 | 180 | $classname=\strtolower(JReflection::shortClassName($this)); |
181 | - foreach ($this->content as $item){ |
|
182 | - $this->setItemIdentifier($item,$classname,$index++); |
|
181 | + foreach ($this->content as $item) { |
|
182 | + $this->setItemIdentifier($item, $classname, $index++); |
|
183 | 183 | } |
184 | - return parent::compile($js,$view); |
|
184 | + return parent::compile($js, $view); |
|
185 | 185 | } |
186 | 186 | } |
187 | 187 | \ No newline at end of file |
@@ -7,27 +7,27 @@ |
||
7 | 7 | |
8 | 8 | class HtmlTextarea extends HtmlDoubleElement { |
9 | 9 | |
10 | - public function __construct($identifier,$value=NULL,$placeholder=NULL,$rows=NULL) { |
|
10 | + public function __construct($identifier, $value=NULL, $placeholder=NULL, $rows=NULL) { |
|
11 | 11 | parent::__construct($identifier, "textarea"); |
12 | 12 | $this->setProperty("name", $identifier); |
13 | 13 | $this->setValue($value); |
14 | 14 | $this->setPlaceholder($placeholder); |
15 | - if(isset($rows)) |
|
15 | + if (isset($rows)) |
|
16 | 16 | $this->setRows($rows); |
17 | 17 | } |
18 | 18 | public function setValue($value) { |
19 | - if(isset($value)) |
|
19 | + if (isset($value)) |
|
20 | 20 | $this->setContent($value); |
21 | 21 | return $this; |
22 | 22 | } |
23 | 23 | |
24 | - public function setPlaceholder($value){ |
|
25 | - if(JString::isNotNull($value)) |
|
24 | + public function setPlaceholder($value) { |
|
25 | + if (JString::isNotNull($value)) |
|
26 | 26 | $this->setProperty("placeholder", $value); |
27 | 27 | return $this; |
28 | 28 | } |
29 | 29 | |
30 | - public function setRows($count){ |
|
30 | + public function setRows($count) { |
|
31 | 31 | $this->setProperty("rows", $count); |
32 | 32 | } |
33 | 33 | } |
34 | 34 | \ No newline at end of file |
@@ -12,18 +12,21 @@ |
||
12 | 12 | $this->setProperty("name", $identifier); |
13 | 13 | $this->setValue($value); |
14 | 14 | $this->setPlaceholder($placeholder); |
15 | - if(isset($rows)) |
|
16 | - $this->setRows($rows); |
|
15 | + if(isset($rows)) { |
|
16 | + $this->setRows($rows); |
|
17 | + } |
|
17 | 18 | } |
18 | 19 | public function setValue($value) { |
19 | - if(isset($value)) |
|
20 | - $this->setContent($value); |
|
20 | + if(isset($value)) { |
|
21 | + $this->setContent($value); |
|
22 | + } |
|
21 | 23 | return $this; |
22 | 24 | } |
23 | 25 | |
24 | 26 | public function setPlaceholder($value){ |
25 | - if(JString::isNotNull($value)) |
|
26 | - $this->setProperty("placeholder", $value); |
|
27 | + if(JString::isNotNull($value)) { |
|
28 | + $this->setProperty("placeholder", $value); |
|
29 | + } |
|
27 | 30 | return $this; |
28 | 31 | } |
29 | 32 |