@@ -9,7 +9,7 @@ discard block |
||
9 | 9 | * @param string $hookKey |
10 | 10 | * @return boolean |
11 | 11 | */ |
12 | - public function hookExists($hookKey){ |
|
12 | + public function hookExists($hookKey) { |
|
13 | 13 | return isset($this->_hooks[$hookKey]); |
14 | 14 | } |
15 | 15 | |
@@ -17,8 +17,8 @@ discard block |
||
17 | 17 | * @param string $hookKey |
18 | 18 | * @return callable|NULL |
19 | 19 | */ |
20 | - public function getHook($hookKey){ |
|
21 | - if(isset($this->_hooks[$hookKey])){ |
|
20 | + public function getHook($hookKey) { |
|
21 | + if (isset($this->_hooks[$hookKey])) { |
|
22 | 22 | return $this->_hooks[$hookKey]; |
23 | 23 | } |
24 | 24 | return null; |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | * @param String $hookKey |
30 | 30 | * @param callable $callable |
31 | 31 | */ |
32 | - public function addHook($hookKey,$callable){ |
|
32 | + public function addHook($hookKey, $callable) { |
|
33 | 33 | $this->_hooks[$hookKey]=$callable; |
34 | 34 | } |
35 | 35 | |
@@ -39,9 +39,9 @@ discard block |
||
39 | 39 | * @param mixed|null $variable |
40 | 40 | * @return void|mixed |
41 | 41 | */ |
42 | - public function execHook($hookKey,...$variables){ |
|
43 | - if(($hook=$this->getHook($hookKey))!=null){ |
|
44 | - return call_user_func_array($hook,$variables); |
|
42 | + public function execHook($hookKey, ...$variables) { |
|
43 | + if (($hook=$this->getHook($hookKey))!=null) { |
|
44 | + return call_user_func_array($hook, $variables); |
|
45 | 45 | } |
46 | 46 | return; |
47 | 47 | } |
@@ -2,8 +2,8 @@ |
||
2 | 2 | |
3 | 3 | namespace Ajax\common\html; |
4 | 4 | |
5 | -class HtmlContentOnly extends HtmlDoubleElement{ |
|
6 | - public function __construct($content,$identifier=""){ |
|
5 | +class HtmlContentOnly extends HtmlDoubleElement { |
|
6 | + public function __construct($content, $identifier="") { |
|
7 | 7 | parent::__construct($identifier); |
8 | 8 | $this->_template='%wrapContentBefore%%content%%wrapContentAfter%'; |
9 | 9 | $this->setContent($content); |
@@ -21,36 +21,36 @@ discard block |
||
21 | 21 | use BaseTrait; |
22 | 22 | |
23 | 23 | public function __construct($identifier, $modelInstance=NULL) { |
24 | - parent::__construct($identifier, null,$modelInstance); |
|
24 | + parent::__construct($identifier, null, $modelInstance); |
|
25 | 25 | $this->_form=new HtmlForm($identifier); |
26 | 26 | $this->_init(new FormInstanceViewer($identifier), "form", $this->_form, true); |
27 | 27 | } |
28 | 28 | |
29 | - protected function _getFieldIdentifier($prefix,$name=""){ |
|
29 | + protected function _getFieldIdentifier($prefix, $name="") { |
|
30 | 30 | return $this->identifier."-{$name}-".$this->_instanceViewer->getIdentifier(); |
31 | 31 | } |
32 | 32 | |
33 | - public function compile(JsUtils $js=NULL,&$view=NULL){ |
|
34 | - if(!$this->_generated){ |
|
33 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
34 | + if (!$this->_generated) { |
|
35 | 35 | $this->_instanceViewer->setInstance($this->_modelInstance); |
36 | 36 | |
37 | 37 | $form=$this->content["form"]; |
38 | 38 | $this->_generateContent($form); |
39 | 39 | |
40 | - if(isset($this->_toolbar)){ |
|
40 | + if (isset($this->_toolbar)) { |
|
41 | 41 | $this->_setToolbarPosition($form); |
42 | 42 | } |
43 | - $this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"form",PositionInTable::AFTERTABLE]); |
|
43 | + $this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "form", PositionInTable::AFTERTABLE]); |
|
44 | 44 | $this->_generated=true; |
45 | 45 | } |
46 | - return parent::compile($js,$view); |
|
46 | + return parent::compile($js, $view); |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | /** |
50 | 50 | * @param HtmlForm $form |
51 | 51 | */ |
52 | - protected function _generateContent($form){ |
|
53 | - $values= $this->_instanceViewer->getValues(); |
|
52 | + protected function _generateContent($form) { |
|
53 | + $values=$this->_instanceViewer->getValues(); |
|
54 | 54 | $count=$this->_instanceViewer->count(); |
55 | 55 | $separators=$this->_instanceViewer->getSeparators(); |
56 | 56 | $headers=$this->_instanceViewer->getHeaders(); |
@@ -58,41 +58,41 @@ discard block |
||
58 | 58 | \sort($separators); |
59 | 59 | $size=\sizeof($separators); |
60 | 60 | $nb=0; |
61 | - if($size===1){ |
|
61 | + if ($size===1) { |
|
62 | 62 | $i=-1; |
63 | - foreach ($values as $v){ |
|
64 | - $this->_generateFields($form, [$v], $headers, $i, $wrappers,$nb++); |
|
63 | + foreach ($values as $v) { |
|
64 | + $this->_generateFields($form, [$v], $headers, $i, $wrappers, $nb++); |
|
65 | 65 | $i++; |
66 | 66 | } |
67 | - }else{ |
|
67 | + } else { |
|
68 | 68 | $separators[]=$count; |
69 | - for($i=0;$i<$size;$i++){ |
|
70 | - $fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]); |
|
71 | - $this->_generateFields($form, $fields, $headers, $separators[$i], $wrappers,$nb++); |
|
69 | + for ($i=0; $i<$size; $i++) { |
|
70 | + $fields=\array_slice($values, $separators[$i]+1, $separators[$i+1]-$separators[$i]); |
|
71 | + $this->_generateFields($form, $fields, $headers, $separators[$i], $wrappers, $nb++); |
|
72 | 72 | } |
73 | 73 | } |
74 | - if($this->_hasRules && !$this->getForm()->hasValidationParams()){ |
|
74 | + if ($this->_hasRules && !$this->getForm()->hasValidationParams()) { |
|
75 | 75 | $this->setValidationParams(["inline"=>true]); |
76 | 76 | } |
77 | 77 | } |
78 | 78 | |
79 | - protected function _generateFields($form,$values,$headers,$sepFirst,$wrappers,$nb){ |
|
79 | + protected function _generateFields($form, $values, $headers, $sepFirst, $wrappers, $nb) { |
|
80 | 80 | $wrapper=null; |
81 | - if(isset($headers[$sepFirst+1])) |
|
82 | - $form->addHeader($headers[$sepFirst+1],4,true); |
|
83 | - if(isset($wrappers[$sepFirst+1])){ |
|
81 | + if (isset($headers[$sepFirst+1])) |
|
82 | + $form->addHeader($headers[$sepFirst+1], 4, true); |
|
83 | + if (isset($wrappers[$sepFirst+1])) { |
|
84 | 84 | $wrapper=$wrappers[$sepFirst+1]; |
85 | 85 | } |
86 | - if(\sizeof($values)===1){ |
|
86 | + if (\sizeof($values)===1) { |
|
87 | 87 | $added=$form->addField($values[0]); |
88 | - }elseif(\sizeof($values)>1){ |
|
88 | + }elseif (\sizeof($values)>1) { |
|
89 | 89 | $added=$form->addFields($values); |
90 | - }else |
|
90 | + } else |
|
91 | 91 | return; |
92 | - if(isset($wrapper)){ |
|
93 | - $added->wrap($wrapper[0],$wrapper[1]); |
|
92 | + if (isset($wrapper)) { |
|
93 | + $added->wrap($wrapper[0], $wrapper[1]); |
|
94 | 94 | } |
95 | - $this->execHook("onGenerateFields",$added,$nb); |
|
95 | + $this->execHook("onGenerateFields", $added, $nb); |
|
96 | 96 | } |
97 | 97 | |
98 | 98 | /** |
@@ -100,18 +100,18 @@ discard block |
||
100 | 100 | * the generated field is the first parameter |
101 | 101 | * @param callable $callback the fonction to call when a field is generated |
102 | 102 | */ |
103 | - public function onGenerateField($callback){ |
|
104 | - $this->addHook("onGenerateFields",$callback); |
|
103 | + public function onGenerateField($callback) { |
|
104 | + $this->addHook("onGenerateFields", $callback); |
|
105 | 105 | } |
106 | 106 | |
107 | 107 | /** |
108 | 108 | * @return HtmlForm |
109 | 109 | */ |
110 | - public function getForm(){ |
|
110 | + public function getForm() { |
|
111 | 111 | return $this->content["form"]; |
112 | 112 | } |
113 | 113 | |
114 | - public function addSeparatorAfter($fieldNum){ |
|
114 | + public function addSeparatorAfter($fieldNum) { |
|
115 | 115 | $fieldNum=$this->_getIndex($fieldNum); |
116 | 116 | $this->_instanceViewer->addSeparatorAfter($fieldNum); |
117 | 117 | return $this; |
@@ -126,12 +126,12 @@ discard block |
||
126 | 126 | return $this; |
127 | 127 | } |
128 | 128 | |
129 | - public function fieldAsReset($index,$cssStyle=NULL,$attributes=NULL){ |
|
130 | - return $this->_fieldAs(function($id,$name,$value) use ($cssStyle){ |
|
131 | - $button=new HtmlButton($id,$value,$cssStyle); |
|
129 | + public function fieldAsReset($index, $cssStyle=NULL, $attributes=NULL) { |
|
130 | + return $this->_fieldAs(function($id, $name, $value) use ($cssStyle){ |
|
131 | + $button=new HtmlButton($id, $value, $cssStyle); |
|
132 | 132 | $button->setProperty("type", "reset"); |
133 | 133 | return $button; |
134 | - }, $index,$attributes); |
|
134 | + }, $index, $attributes); |
|
135 | 135 | } |
136 | 136 | |
137 | 137 | /** |
@@ -150,19 +150,19 @@ discard block |
||
150 | 150 | $this->content[$this->_toolbarPosition]=$this->_toolbar; |
151 | 151 | } |
152 | 152 | |
153 | - public function addDividerBefore($index,$title){ |
|
153 | + public function addDividerBefore($index, $title) { |
|
154 | 154 | $index=$this->_getIndex($index); |
155 | 155 | $this->_instanceViewer->addHeaderDividerBefore($index, $title); |
156 | 156 | return $this; |
157 | 157 | } |
158 | 158 | |
159 | - public function addWrapper($index,$contentBefore,$contentAfter=null){ |
|
159 | + public function addWrapper($index, $contentBefore, $contentAfter=null) { |
|
160 | 160 | $index=$this->_getIndex($index); |
161 | - $this->_instanceViewer->addWrapper($index, $contentBefore,$contentAfter); |
|
161 | + $this->_instanceViewer->addWrapper($index, $contentBefore, $contentAfter); |
|
162 | 162 | return $this; |
163 | 163 | } |
164 | 164 | |
165 | - public function run(JsUtils $js){ |
|
165 | + public function run(JsUtils $js) { |
|
166 | 166 | parent::run($js); |
167 | 167 | } |
168 | 168 | } |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | $this->_generateFields($form, [$v], $headers, $i, $wrappers,$nb++); |
65 | 65 | $i++; |
66 | 66 | } |
67 | - }else{ |
|
67 | + } else{ |
|
68 | 68 | $separators[]=$count; |
69 | 69 | for($i=0;$i<$size;$i++){ |
70 | 70 | $fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]); |
@@ -78,17 +78,19 @@ discard block |
||
78 | 78 | |
79 | 79 | protected function _generateFields($form,$values,$headers,$sepFirst,$wrappers,$nb){ |
80 | 80 | $wrapper=null; |
81 | - if(isset($headers[$sepFirst+1])) |
|
82 | - $form->addHeader($headers[$sepFirst+1],4,true); |
|
81 | + if(isset($headers[$sepFirst+1])) { |
|
82 | + $form->addHeader($headers[$sepFirst+1],4,true); |
|
83 | + } |
|
83 | 84 | if(isset($wrappers[$sepFirst+1])){ |
84 | 85 | $wrapper=$wrappers[$sepFirst+1]; |
85 | 86 | } |
86 | 87 | if(\sizeof($values)===1){ |
87 | 88 | $added=$form->addField($values[0]); |
88 | - }elseif(\sizeof($values)>1){ |
|
89 | + } elseif(\sizeof($values)>1){ |
|
89 | 90 | $added=$form->addFields($values); |
90 | - }else |
|
91 | - return; |
|
91 | + } else { |
|
92 | + return; |
|
93 | + } |
|
92 | 94 | if(isset($wrapper)){ |
93 | 95 | $added->wrap($wrapper[0],$wrapper[1]); |
94 | 96 | } |
@@ -79,8 +79,9 @@ discard block |
||
79 | 79 | $actionO=$action; |
80 | 80 | if (\is_object($action) === false) { |
81 | 81 | $actionO=new HtmlButton("action-" . $this->identifier, $action); |
82 | - if (isset($icon)) |
|
83 | - $actionO->addIcon($icon, true, $labeled); |
|
82 | + if (isset($icon)) { |
|
83 | + $actionO->addIcon($icon, true, $labeled); |
|
84 | + } |
|
84 | 85 | } |
85 | 86 | $field->addToProperty("class", $direction . " action"); |
86 | 87 | $field->addContent($actionO, \strstr($direction, Direction::LEFT) !== false); |
@@ -120,8 +121,9 @@ discard block |
||
120 | 121 | |
121 | 122 | public function setDisabled($disable=true) { |
122 | 123 | $field=$this->getField(); |
123 | - if($disable) |
|
124 | - $field->addToProperty("class", "disabled"); |
|
124 | + if($disable) { |
|
125 | + $field->addToProperty("class", "disabled"); |
|
126 | + } |
|
125 | 127 | return $this; |
126 | 128 | } |
127 | 129 |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | |
22 | 22 | abstract public function addToProperty($name, $value, $separator=" "); |
23 | 23 | abstract public function addLabel($caption, $style="label-default", $leftSeparator=" "); |
24 | - abstract public function addContent($content,$before=false); |
|
24 | + abstract public function addContent($content, $before=false); |
|
25 | 25 | abstract public function getField(); |
26 | 26 | abstract public function getDataField(); |
27 | 27 | |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | } |
31 | 31 | |
32 | 32 | public function addLoading() { |
33 | - if ($this->_hasIcon === false) { |
|
33 | + if ($this->_hasIcon===false) { |
|
34 | 34 | throw new \Exception("Input must have an icon for showing a loader, use addIcon before"); |
35 | 35 | } |
36 | 36 | return $this->addToProperty("class", State::LOADING); |
@@ -44,8 +44,8 @@ discard block |
||
44 | 44 | */ |
45 | 45 | public function labeled($label, $direction=Direction::LEFT, $icon=NULL) { |
46 | 46 | $field=$this->getField(); |
47 | - $labelO=$field->addLabel($label,$direction===Direction::LEFT,$icon); |
|
48 | - $field->addToProperty("class", $direction . " labeled"); |
|
47 | + $labelO=$field->addLabel($label, $direction===Direction::LEFT, $icon); |
|
48 | + $field->addToProperty("class", $direction." labeled"); |
|
49 | 49 | return $labelO; |
50 | 50 | } |
51 | 51 | |
@@ -56,8 +56,8 @@ discard block |
||
56 | 56 | * @param string $checkboxType |
57 | 57 | * @return HtmlLabel |
58 | 58 | */ |
59 | - public function labeledCheckbox($direction=Direction::LEFT,$caption="",$value=NULL,$checkboxType=NULL){ |
|
60 | - return $this->labeled(new HtmlCheckbox("lbl-ck-".$this->getField()->getIdentifier(),$caption,$value,$checkboxType),$direction); |
|
59 | + public function labeledCheckbox($direction=Direction::LEFT, $caption="", $value=NULL, $checkboxType=NULL) { |
|
60 | + return $this->labeled(new HtmlCheckbox("lbl-ck-".$this->getField()->getIdentifier(), $caption, $value, $checkboxType), $direction); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | /** |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | * @return HtmlLabel |
67 | 67 | */ |
68 | 68 | public function labeledToCorner($icon, $direction=Direction::LEFT) { |
69 | - return $this->labeled("", $direction . " corner", $icon)->toCorner($direction); |
|
69 | + return $this->labeled("", $direction." corner", $icon)->toCorner($direction); |
|
70 | 70 | } |
71 | 71 | |
72 | 72 | /** |
@@ -79,13 +79,13 @@ discard block |
||
79 | 79 | public function addAction($action, $direction=Direction::RIGHT, $icon=NULL, $labeled=false) { |
80 | 80 | $field=$this->getField(); |
81 | 81 | $actionO=$action; |
82 | - if (\is_object($action) === false) { |
|
83 | - $actionO=new HtmlButton("action-" . $this->identifier, $action); |
|
82 | + if (\is_object($action)===false) { |
|
83 | + $actionO=new HtmlButton("action-".$this->identifier, $action); |
|
84 | 84 | if (isset($icon)) |
85 | 85 | $actionO->addIcon($icon, true, $labeled); |
86 | 86 | } |
87 | - $field->addToProperty("class", $direction . " action"); |
|
88 | - $field->addContent($actionO, \strstr($direction, Direction::LEFT) !== false); |
|
87 | + $field->addToProperty("class", $direction." action"); |
|
88 | + $field->addContent($actionO, \strstr($direction, Direction::LEFT)!==false); |
|
89 | 89 | return $actionO; |
90 | 90 | } |
91 | 91 | |
@@ -95,59 +95,59 @@ discard block |
||
95 | 95 | * @param string $direction |
96 | 96 | * @return HtmlLabel |
97 | 97 | */ |
98 | - public function addDropdown($label="", $items=array(),$direction=Direction::RIGHT){ |
|
99 | - $labelO=new HtmlDropdown("dd-".$this->identifier,$label,$items); |
|
100 | - $labelO->asSelect("select-".$this->identifier,false,true); |
|
101 | - return $this->labeled($labelO,$direction); |
|
98 | + public function addDropdown($label="", $items=array(), $direction=Direction::RIGHT) { |
|
99 | + $labelO=new HtmlDropdown("dd-".$this->identifier, $label, $items); |
|
100 | + $labelO->asSelect("select-".$this->identifier, false, true); |
|
101 | + return $this->labeled($labelO, $direction); |
|
102 | 102 | } |
103 | 103 | |
104 | 104 | public function setTransparent() { |
105 | 105 | return $this->getField()->addToProperty("class", "transparent"); |
106 | 106 | } |
107 | 107 | |
108 | - public function setReadonly(){ |
|
108 | + public function setReadonly() { |
|
109 | 109 | $this->getDataField()->setProperty("readonly", ""); |
110 | 110 | return $this; |
111 | 111 | } |
112 | 112 | |
113 | - public function setName($name){ |
|
114 | - $this->getDataField()->setProperty("name",$name); |
|
113 | + public function setName($name) { |
|
114 | + $this->getDataField()->setProperty("name", $name); |
|
115 | 115 | return $this; |
116 | 116 | } |
117 | 117 | |
118 | - public function setFluid(){ |
|
119 | - $this->getField()->addToProperty("class","fluid"); |
|
118 | + public function setFluid() { |
|
119 | + $this->getField()->addToProperty("class", "fluid"); |
|
120 | 120 | return $this; |
121 | 121 | } |
122 | 122 | |
123 | 123 | public function setDisabled($disable=true) { |
124 | 124 | $field=$this->getField(); |
125 | - if($disable) |
|
125 | + if ($disable) |
|
126 | 126 | $field->addToProperty("class", "disabled"); |
127 | 127 | return $this; |
128 | 128 | } |
129 | 129 | |
130 | - public function setJsContent($content){ |
|
130 | + public function setJsContent($content) { |
|
131 | 131 | $id=""; |
132 | 132 | $field=$this->getDataField(); |
133 | - if(isset($field)){ |
|
133 | + if (isset($field)) { |
|
134 | 134 | $id=$field->getIdentifier(); |
135 | 135 | } |
136 | - if($id!==''){ |
|
136 | + if ($id!=='') { |
|
137 | 137 | return '$("#'.$id.'").val('.$content.')'; |
138 | 138 | } |
139 | 139 | } |
140 | 140 | |
141 | - public function getJsContent(){ |
|
141 | + public function getJsContent() { |
|
142 | 142 | return $this->setJsContent(""); |
143 | 143 | } |
144 | 144 | |
145 | - public function asFile($caption='', $direction=Direction::RIGHT, $icon='cloud upload alternate', $labeled=false){ |
|
145 | + public function asFile($caption='', $direction=Direction::RIGHT, $icon='cloud upload alternate', $labeled=false) { |
|
146 | 146 | $field=$this->getField(); |
147 | 147 | $field->getDataField()->setProperty('readonly', 'readonly'); |
148 | - $file=new HtmlInput5($this->identifier.'-file','file'); |
|
149 | - $file->setProperty('style','display: none!important;'); |
|
148 | + $file=new HtmlInput5($this->identifier.'-file', 'file'); |
|
149 | + $file->setProperty('style', 'display: none!important;'); |
|
150 | 150 | $field->getField()->content['file']=$file; |
151 | - $this->addAction($caption,$direction,$icon,$labeled); |
|
151 | + $this->addAction($caption, $direction, $icon, $labeled); |
|
152 | 152 | } |
153 | 153 | } |
@@ -20,35 +20,35 @@ discard block |
||
20 | 20 | * @property string $identifier |
21 | 21 | */ |
22 | 22 | trait FieldsTrait { |
23 | - abstract public function addFields($fields=NULL,$label=NULL); |
|
23 | + abstract public function addFields($fields=NULL, $label=NULL); |
|
24 | 24 | abstract public function addItem($item); |
25 | 25 | abstract public function getItem($index); |
26 | 26 | abstract public function count(); |
27 | 27 | |
28 | - protected function createItem($value){ |
|
29 | - if(\is_array($value)){ |
|
30 | - $itemO=new HtmlFormInput(JArray::getDefaultValue($value, "id",""),JArray::getDefaultValue($value, "label",null),JArray::getDefaultValue($value, "type", "text"),JArray::getDefaultValue($value, "value",""),JArray::getDefaultValue($value, "placeholder",JArray::getDefaultValue($value, "label",null))); |
|
28 | + protected function createItem($value) { |
|
29 | + if (\is_array($value)) { |
|
30 | + $itemO=new HtmlFormInput(JArray::getDefaultValue($value, "id", ""), JArray::getDefaultValue($value, "label", null), JArray::getDefaultValue($value, "type", "text"), JArray::getDefaultValue($value, "value", ""), JArray::getDefaultValue($value, "placeholder", JArray::getDefaultValue($value, "label", null))); |
|
31 | 31 | return $itemO; |
32 | - }elseif(\is_object($value)){ |
|
32 | + }elseif (\is_object($value)) { |
|
33 | 33 | $itemO=new HtmlFormField("field-".$this->identifier, $value); |
34 | 34 | return $itemO; |
35 | - }else |
|
35 | + } else |
|
36 | 36 | return new HtmlFormInput($value); |
37 | 37 | } |
38 | 38 | |
39 | - protected function createCondition($value){ |
|
39 | + protected function createCondition($value) { |
|
40 | 40 | return \is_object($value)===false || $value instanceof \Ajax\semantic\html\elements\HtmlInput; |
41 | 41 | } |
42 | 42 | |
43 | - public function addInputs($inputs,$fieldslabel=null){ |
|
43 | + public function addInputs($inputs, $fieldslabel=null) { |
|
44 | 44 | $fields=array(); |
45 | - foreach ($inputs as $input){ |
|
45 | + foreach ($inputs as $input) { |
|
46 | 46 | \extract($input); |
47 | - $f=new HtmlFormInput("",""); |
|
47 | + $f=new HtmlFormInput("", ""); |
|
48 | 48 | $f->fromArray($input); |
49 | 49 | $fields[]=$f; |
50 | 50 | } |
51 | - return $this->addFields($fields,$fieldslabel); |
|
51 | + return $this->addFields($fields, $fieldslabel); |
|
52 | 52 | } |
53 | 53 | |
54 | 54 | /** |
@@ -57,35 +57,35 @@ discard block |
||
57 | 57 | * @param array|mixed $values |
58 | 58 | * @return HtmlFormFields |
59 | 59 | */ |
60 | - public function setFieldsPropertyValues($property,$values){ |
|
60 | + public function setFieldsPropertyValues($property, $values) { |
|
61 | 61 | $i=0; |
62 | - if(\is_array($values)===false){ |
|
63 | - $values=\array_fill(0, $this->count(),$values); |
|
62 | + if (\is_array($values)===false) { |
|
63 | + $values=\array_fill(0, $this->count(), $values); |
|
64 | 64 | } |
65 | - foreach ($values as $value){ |
|
65 | + foreach ($values as $value) { |
|
66 | 66 | $c=$this->content[$i++]; |
67 | - if(isset($c)){ |
|
67 | + if (isset($c)) { |
|
68 | 68 | $df=$c->getDataField(); |
69 | - $df->setProperty($property,$value); |
|
69 | + $df->setProperty($property, $value); |
|
70 | 70 | } |
71 | - else{ |
|
71 | + else { |
|
72 | 72 | return $this; |
73 | 73 | } |
74 | 74 | } |
75 | 75 | return $this; |
76 | 76 | } |
77 | 77 | |
78 | - public function addFieldRule($index,$type,$prompt=NULL,$value=NULL){ |
|
78 | + public function addFieldRule($index, $type, $prompt=NULL, $value=NULL) { |
|
79 | 79 | $field=$this->getItem($index); |
80 | - if(isset($field)){ |
|
81 | - $field->addRule($type,$prompt,$value); |
|
80 | + if (isset($field)) { |
|
81 | + $field->addRule($type, $prompt, $value); |
|
82 | 82 | } |
83 | 83 | return $this; |
84 | 84 | } |
85 | 85 | |
86 | - public function addFieldRules($index,$rules){ |
|
86 | + public function addFieldRules($index, $rules) { |
|
87 | 87 | $field=$this->getItem($index); |
88 | - if(isset($field)){ |
|
88 | + if (isset($field)) { |
|
89 | 89 | $field->addRules($rules); |
90 | 90 | } |
91 | 91 | return $this; |
@@ -100,8 +100,8 @@ discard block |
||
100 | 100 | * @param boolean $multiple |
101 | 101 | * @return HtmlFormDropdown |
102 | 102 | */ |
103 | - public function addDropdown($identifier,$items=array(), $label=NULL,$value=NULL,$multiple=false){ |
|
104 | - return $this->addItem(new HtmlFormDropdown($identifier,$items,$label,$value,$multiple)); |
|
103 | + public function addDropdown($identifier, $items=array(), $label=NULL, $value=NULL, $multiple=false) { |
|
104 | + return $this->addItem(new HtmlFormDropdown($identifier, $items, $label, $value, $multiple)); |
|
105 | 105 | } |
106 | 106 | |
107 | 107 | /** |
@@ -111,8 +111,8 @@ discard block |
||
111 | 111 | * @param boolean $asIcons |
112 | 112 | * @return HtmlButtonGroups |
113 | 113 | */ |
114 | - public function addButtonGroups($identifier,$elements=[],$asIcons=false){ |
|
115 | - return $this->addItem(new HtmlButtonGroups($identifier,$elements,$asIcons)); |
|
114 | + public function addButtonGroups($identifier, $elements=[], $asIcons=false) { |
|
115 | + return $this->addItem(new HtmlButtonGroups($identifier, $elements, $asIcons)); |
|
116 | 116 | } |
117 | 117 | |
118 | 118 | /** |
@@ -124,8 +124,8 @@ discard block |
||
124 | 124 | * @param string $icon |
125 | 125 | * @return HtmlButtonGroups |
126 | 126 | */ |
127 | - public function addDropdownButton($identifier,$value,$items=[],$asCombo=false,$icon=null){ |
|
128 | - return $this->addItem(HtmlButton::dropdown($identifier, $value,$items,$asCombo,$icon)); |
|
127 | + public function addDropdownButton($identifier, $value, $items=[], $asCombo=false, $icon=null) { |
|
128 | + return $this->addItem(HtmlButton::dropdown($identifier, $value, $items, $asCombo, $icon)); |
|
129 | 129 | } |
130 | 130 | |
131 | 131 | /** |
@@ -136,8 +136,8 @@ discard block |
||
136 | 136 | * @param string $placeholder |
137 | 137 | * @return HtmlFormInput |
138 | 138 | */ |
139 | - public function addInput($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL){ |
|
140 | - return $this->addItem(new HtmlFormInput($identifier,$label,$type,$value,$placeholder)); |
|
139 | + public function addInput($identifier, $label=NULL, $type="text", $value=NULL, $placeholder=NULL) { |
|
140 | + return $this->addItem(new HtmlFormInput($identifier, $label, $type, $value, $placeholder)); |
|
141 | 141 | } |
142 | 142 | |
143 | 143 | /** |
@@ -148,22 +148,22 @@ discard block |
||
148 | 148 | * @param int $rows |
149 | 149 | * @return HtmlTextarea |
150 | 150 | */ |
151 | - public function addTextarea($identifier, $label,$value=NULL,$placeholder=NULL,$rows=5){ |
|
152 | - return $this->addItem(new HtmlFormTextarea($identifier,$label,$value,$placeholder,$rows)); |
|
151 | + public function addTextarea($identifier, $label, $value=NULL, $placeholder=NULL, $rows=5) { |
|
152 | + return $this->addItem(new HtmlFormTextarea($identifier, $label, $value, $placeholder, $rows)); |
|
153 | 153 | } |
154 | 154 | |
155 | - public function addPassword($identifier, $label=NULL){ |
|
156 | - return $this->addItem(new HtmlFormInput($identifier,$label,"password","","")); |
|
155 | + public function addPassword($identifier, $label=NULL) { |
|
156 | + return $this->addItem(new HtmlFormInput($identifier, $label, "password", "", "")); |
|
157 | 157 | } |
158 | 158 | |
159 | - public function addButton($identifier,$value,$cssStyle=NULL,$onClick=NULL){ |
|
160 | - return $this->addItem(new HtmlButton($identifier,$value,$cssStyle,$onClick)); |
|
159 | + public function addButton($identifier, $value, $cssStyle=NULL, $onClick=NULL) { |
|
160 | + return $this->addItem(new HtmlButton($identifier, $value, $cssStyle, $onClick)); |
|
161 | 161 | } |
162 | 162 | |
163 | - public function addButtonIcon($identifier,$icon,$cssStyle=NULL,$onClick=NULL){ |
|
163 | + public function addButtonIcon($identifier, $icon, $cssStyle=NULL, $onClick=NULL) { |
|
164 | 164 | $bt=new HtmlButton($identifier); |
165 | 165 | $bt->asIcon($icon); |
166 | - if(isset($onClick)) |
|
166 | + if (isset($onClick)) |
|
167 | 167 | $bt->onClick($onClick); |
168 | 168 | if (isset($cssStyle)) |
169 | 169 | $bt->addClass($cssStyle); |
@@ -177,16 +177,16 @@ discard block |
||
177 | 177 | * @param string $type |
178 | 178 | * @return HtmlFormCheckbox |
179 | 179 | */ |
180 | - public function addCheckbox($identifier, $label=NULL,$value=NULL,$type=NULL){ |
|
181 | - return $this->addItem(new HtmlFormCheckbox($identifier,$label,$value,$type)); |
|
180 | + public function addCheckbox($identifier, $label=NULL, $value=NULL, $type=NULL) { |
|
181 | + return $this->addItem(new HtmlFormCheckbox($identifier, $label, $value, $type)); |
|
182 | 182 | } |
183 | 183 | |
184 | - public function addRadio($identifier, $name,$label=NULL,$value=NULL){ |
|
185 | - return $this->addItem(new HtmlFormRadio($identifier,$name,$label,$value)); |
|
184 | + public function addRadio($identifier, $name, $label=NULL, $value=NULL) { |
|
185 | + return $this->addItem(new HtmlFormRadio($identifier, $name, $label, $value)); |
|
186 | 186 | } |
187 | 187 | |
188 | - public function addElement($identifier,$content,$label,$tagName="div",$baseClass=""){ |
|
189 | - $div=new HtmlSemDoubleElement($identifier,$tagName,$baseClass,$content); |
|
190 | - return $this->addItem(new HtmlFormField("field-".$identifier, $div,$label)); |
|
188 | + public function addElement($identifier, $content, $label, $tagName="div", $baseClass="") { |
|
189 | + $div=new HtmlSemDoubleElement($identifier, $tagName, $baseClass, $content); |
|
190 | + return $this->addItem(new HtmlFormField("field-".$identifier, $div, $label)); |
|
191 | 191 | } |
192 | 192 | } |
@@ -29,11 +29,12 @@ discard block |
||
29 | 29 | if(\is_array($value)){ |
30 | 30 | $itemO=new HtmlFormInput(JArray::getDefaultValue($value, "id",""),JArray::getDefaultValue($value, "label",null),JArray::getDefaultValue($value, "type", "text"),JArray::getDefaultValue($value, "value",""),JArray::getDefaultValue($value, "placeholder",JArray::getDefaultValue($value, "label",null))); |
31 | 31 | return $itemO; |
32 | - }elseif(\is_object($value)){ |
|
32 | + } elseif(\is_object($value)){ |
|
33 | 33 | $itemO=new HtmlFormField("field-".$this->identifier, $value); |
34 | 34 | return $itemO; |
35 | - }else |
|
36 | - return new HtmlFormInput($value); |
|
35 | + } else { |
|
36 | + return new HtmlFormInput($value); |
|
37 | + } |
|
37 | 38 | } |
38 | 39 | |
39 | 40 | protected function createCondition($value){ |
@@ -67,8 +68,7 @@ discard block |
||
67 | 68 | if(isset($c)){ |
68 | 69 | $df=$c->getDataField(); |
69 | 70 | $df->setProperty($property,$value); |
70 | - } |
|
71 | - else{ |
|
71 | + } else{ |
|
72 | 72 | return $this; |
73 | 73 | } |
74 | 74 | } |
@@ -163,10 +163,12 @@ discard block |
||
163 | 163 | public function addButtonIcon($identifier,$icon,$cssStyle=NULL,$onClick=NULL){ |
164 | 164 | $bt=new HtmlButton($identifier); |
165 | 165 | $bt->asIcon($icon); |
166 | - if(isset($onClick)) |
|
167 | - $bt->onClick($onClick); |
|
168 | - if (isset($cssStyle)) |
|
169 | - $bt->addClass($cssStyle); |
|
166 | + if(isset($onClick)) { |
|
167 | + $bt->onClick($onClick); |
|
168 | + } |
|
169 | + if (isset($cssStyle)) { |
|
170 | + $bt->addClass($cssStyle); |
|
171 | + } |
|
170 | 172 | return $this->addItem($bt); |
171 | 173 | } |
172 | 174 |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | * @param int $colCount |
23 | 23 | * @return HtmlTable |
24 | 24 | */ |
25 | - public function htmlTable($identifier, $rowCount, $colCount){ |
|
25 | + public function htmlTable($identifier, $rowCount, $colCount) { |
|
26 | 26 | return $this->addHtmlComponent(new HtmlTable($identifier, $rowCount, $colCount)); |
27 | 27 | } |
28 | 28 | |
@@ -33,9 +33,9 @@ discard block |
||
33 | 33 | * @param $styles string|array|NULL |
34 | 34 | * @return HtmlMessage |
35 | 35 | */ |
36 | - public function htmlMessage($identifier, $content="",$styles=NULL) { |
|
37 | - $msg= $this->addHtmlComponent(new HtmlMessage($identifier, $content)); |
|
38 | - if(isset($msg) && $styles!==null) |
|
36 | + public function htmlMessage($identifier, $content="", $styles=NULL) { |
|
37 | + $msg=$this->addHtmlComponent(new HtmlMessage($identifier, $content)); |
|
38 | + if (isset($msg) && $styles!==null) |
|
39 | 39 | $msg->setStyle($styles); |
40 | 40 | return $msg; |
41 | 41 | } |
@@ -35,8 +35,9 @@ |
||
35 | 35 | */ |
36 | 36 | public function htmlMessage($identifier, $content="",$styles=NULL) { |
37 | 37 | $msg= $this->addHtmlComponent(new HtmlMessage($identifier, $content)); |
38 | - if(isset($msg) && $styles!==null) |
|
39 | - $msg->setStyle($styles); |
|
38 | + if(isset($msg) && $styles!==null) { |
|
39 | + $msg->setStyle($styles); |
|
40 | + } |
|
40 | 41 | return $msg; |
41 | 42 | } |
42 | 43 |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | */ |
24 | 24 | class HtmlForm extends HtmlSemCollection { |
25 | 25 | |
26 | - use FieldsTrait,FormTrait; |
|
26 | + use FieldsTrait, FormTrait; |
|
27 | 27 | /** |
28 | 28 | * @var array |
29 | 29 | */ |
@@ -38,15 +38,15 @@ discard block |
||
38 | 38 | |
39 | 39 | public function __construct($identifier, $elements=array()) { |
40 | 40 | parent::__construct($identifier, "form", "ui form"); |
41 | - $this->_states=[ State::ERROR,State::SUCCESS,State::WARNING,State::DISABLED ]; |
|
41 | + $this->_states=[State::ERROR, State::SUCCESS, State::WARNING, State::DISABLED]; |
|
42 | 42 | $this->setProperty("name", $this->identifier); |
43 | - $this->_fields=array (); |
|
43 | + $this->_fields=array(); |
|
44 | 44 | $this->addItems($elements); |
45 | 45 | $this->_validationParams=[]; |
46 | 46 | $this->_extraFieldRules=[]; |
47 | 47 | } |
48 | 48 | |
49 | - protected function getForm(){ |
|
49 | + protected function getForm() { |
|
50 | 50 | return $this; |
51 | 51 | } |
52 | 52 | |
@@ -68,8 +68,8 @@ discard block |
||
68 | 68 | * @param string $caption |
69 | 69 | * @return HtmlForm |
70 | 70 | */ |
71 | - public function addDivider($caption=NULL){ |
|
72 | - return $this->addContent(new HtmlDivider("",$caption)); |
|
71 | + public function addDivider($caption=NULL) { |
|
72 | + return $this->addContent(new HtmlDivider("", $caption)); |
|
73 | 73 | } |
74 | 74 | |
75 | 75 | /** |
@@ -91,13 +91,13 @@ discard block |
||
91 | 91 | $label=NULL; |
92 | 92 | } |
93 | 93 | $this->_fields=\array_merge($this->_fields, $fields); |
94 | - $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count(), $fields); |
|
94 | + $fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count(), $fields); |
|
95 | 95 | } |
96 | - if (isset($label)){ |
|
97 | - $fields->wrap("<div class='field'><label>{$label}</label>","</div>"); |
|
96 | + if (isset($label)) { |
|
97 | + $fields->wrap("<div class='field'><label>{$label}</label>", "</div>"); |
|
98 | 98 | } |
99 | 99 | } else { |
100 | - $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count()); |
|
100 | + $fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count()); |
|
101 | 101 | } |
102 | 102 | $this->addItem($fields); |
103 | 103 | return $fields; |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | |
106 | 106 | public function addItem($item) { |
107 | 107 | $item=parent::addItem($item); |
108 | - if (\is_subclass_of($item, HtmlFormField::class) === true) { |
|
108 | + if (\is_subclass_of($item, HtmlFormField::class)===true) { |
|
109 | 109 | $this->_fields[]=$item; |
110 | 110 | } |
111 | 111 | return $item; |
@@ -163,49 +163,49 @@ discard block |
||
163 | 163 | |
164 | 164 | |
165 | 165 | |
166 | - public function compile(JsUtils $js=NULL,&$view=NULL){ |
|
167 | - if(\sizeof($this->_validationParams)>0) |
|
166 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
167 | + if (\sizeof($this->_validationParams)>0) |
|
168 | 168 | $this->setProperty("novalidate", ""); |
169 | - return parent::compile($js,$view); |
|
169 | + return parent::compile($js, $view); |
|
170 | 170 | } |
171 | 171 | |
172 | 172 | public function run(JsUtils $js) { |
173 | - if(isset($js)){ |
|
173 | + if (isset($js)) { |
|
174 | 174 | $compo=$js->semantic()->form("#".$this->identifier); |
175 | - }else{ |
|
175 | + } else { |
|
176 | 176 | $compo=new Form(); |
177 | 177 | $compo->attach("#".$this->identifier); |
178 | 178 | } |
179 | - foreach ($this->_fields as $field){ |
|
180 | - if($field instanceof HtmlFormField){ |
|
179 | + foreach ($this->_fields as $field) { |
|
180 | + if ($field instanceof HtmlFormField) { |
|
181 | 181 | $this->addCompoValidation($compo, $field); |
182 | 182 | } |
183 | 183 | } |
184 | - foreach ($this->content as $field){ |
|
185 | - if($field instanceof HtmlFormFields){ |
|
184 | + foreach ($this->content as $field) { |
|
185 | + if ($field instanceof HtmlFormFields) { |
|
186 | 186 | $items=$field->getItems(); |
187 | - foreach ($items as $_field){ |
|
188 | - if($_field instanceof HtmlFormField) |
|
187 | + foreach ($items as $_field) { |
|
188 | + if ($_field instanceof HtmlFormField) |
|
189 | 189 | $this->addCompoValidation($compo, $_field); |
190 | 190 | } |
191 | 191 | } |
192 | 192 | } |
193 | - foreach ($this->_extraFieldRules as $field=>$fieldValidation){ |
|
193 | + foreach ($this->_extraFieldRules as $field=>$fieldValidation) { |
|
194 | 194 | $this->addExtraCompoValidation($compo, $fieldValidation); |
195 | 195 | } |
196 | - $this->_runValidationParams($compo,$js); |
|
196 | + $this->_runValidationParams($compo, $js); |
|
197 | 197 | return $this->_bsComponent; |
198 | 198 | } |
199 | 199 | |
200 | - public function getExtraFieldValidation($fieldname){ |
|
201 | - if(!isset($this->_extraFieldRules[$fieldname])){ |
|
200 | + public function getExtraFieldValidation($fieldname) { |
|
201 | + if (!isset($this->_extraFieldRules[$fieldname])) { |
|
202 | 202 | $this->_extraFieldRules[$fieldname]=new FieldValidation($fieldname); |
203 | 203 | } |
204 | 204 | return $this->_extraFieldRules[$fieldname]; |
205 | 205 | } |
206 | 206 | |
207 | - public function addValidationParam($paramName,$paramValue,$before="",$after=""){ |
|
208 | - $this->addBehavior($this->_validationParams, $paramName, $paramValue,$before,$after); |
|
207 | + public function addValidationParam($paramName, $paramValue, $before="", $after="") { |
|
208 | + $this->addBehavior($this->_validationParams, $paramName, $paramValue, $before, $after); |
|
209 | 209 | return $this; |
210 | 210 | } |
211 | 211 | |
@@ -214,7 +214,7 @@ discard block |
||
214 | 214 | return $this; |
215 | 215 | } |
216 | 216 | |
217 | - public function hasValidationParams(){ |
|
217 | + public function hasValidationParams() { |
|
218 | 218 | return sizeof($this->_validationParams)>0; |
219 | 219 | } |
220 | 220 | |
@@ -222,7 +222,7 @@ discard block |
||
222 | 222 | return $this->_validationParams; |
223 | 223 | } |
224 | 224 | |
225 | - public function removeValidationParam($param){ |
|
225 | + public function removeValidationParam($param) { |
|
226 | 226 | unset($this->_validationParams[$param]); |
227 | 227 | return $this; |
228 | 228 | } |
@@ -58,8 +58,9 @@ discard block |
||
58 | 58 | */ |
59 | 59 | public function addHeader($title, $niveau=1, $dividing=true) { |
60 | 60 | $header=new HtmlHeader("", $niveau, $title); |
61 | - if ($dividing) |
|
62 | - $header->setDividing(); |
|
61 | + if ($dividing) { |
|
62 | + $header->setDividing(); |
|
63 | + } |
|
63 | 64 | return $this->addItem($header); |
64 | 65 | } |
65 | 66 | |
@@ -87,8 +88,9 @@ discard block |
||
87 | 88 | if (\is_string($end)) { |
88 | 89 | $label=$end; |
89 | 90 | \array_pop($fields); |
90 | - } else |
|
91 | - $label=NULL; |
|
91 | + } else { |
|
92 | + $label=NULL; |
|
93 | + } |
|
92 | 94 | } |
93 | 95 | $this->_fields=\array_merge($this->_fields, $fields); |
94 | 96 | $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count(), $fields); |
@@ -152,27 +154,31 @@ discard block |
||
152 | 154 | */ |
153 | 155 | public function addMessage($identifier, $content, $header=NULL, $icon=NULL, $type=NULL) { |
154 | 156 | $message=new HtmlMessage($identifier, $content); |
155 | - if (isset($header)) |
|
156 | - $message->addHeader($header); |
|
157 | - if (isset($icon)) |
|
158 | - $message->setIcon($icon); |
|
159 | - if (isset($type)) |
|
160 | - $message->setStyle($type); |
|
157 | + if (isset($header)) { |
|
158 | + $message->addHeader($header); |
|
159 | + } |
|
160 | + if (isset($icon)) { |
|
161 | + $message->setIcon($icon); |
|
162 | + } |
|
163 | + if (isset($type)) { |
|
164 | + $message->setStyle($type); |
|
165 | + } |
|
161 | 166 | return $this->addItem($message); |
162 | 167 | } |
163 | 168 | |
164 | 169 | |
165 | 170 | |
166 | 171 | public function compile(JsUtils $js=NULL,&$view=NULL){ |
167 | - if(\sizeof($this->_validationParams)>0) |
|
168 | - $this->setProperty("novalidate", ""); |
|
172 | + if(\sizeof($this->_validationParams)>0) { |
|
173 | + $this->setProperty("novalidate", ""); |
|
174 | + } |
|
169 | 175 | return parent::compile($js,$view); |
170 | 176 | } |
171 | 177 | |
172 | 178 | public function run(JsUtils $js) { |
173 | 179 | if(isset($js)){ |
174 | 180 | $compo=$js->semantic()->form("#".$this->identifier); |
175 | - }else{ |
|
181 | + } else{ |
|
176 | 182 | $compo=new Form(); |
177 | 183 | $compo->attach("#".$this->identifier); |
178 | 184 | } |
@@ -185,8 +191,9 @@ discard block |
||
185 | 191 | if($field instanceof HtmlFormFields){ |
186 | 192 | $items=$field->getItems(); |
187 | 193 | foreach ($items as $_field){ |
188 | - if($_field instanceof HtmlFormField) |
|
189 | - $this->addCompoValidation($compo, $_field); |
|
194 | + if($_field instanceof HtmlFormField) { |
|
195 | + $this->addCompoValidation($compo, $_field); |
|
196 | + } |
|
190 | 197 | } |
191 | 198 | } |
192 | 199 | } |
@@ -34,8 +34,9 @@ discard block |
||
34 | 34 | $callback = ", function(){\n{$callback}\n}"; |
35 | 35 | } |
36 | 36 | $str = "$({$element}).{$action}({$speed}{$callback});"; |
37 | - if ($immediatly) |
|
38 | - $this->jquery_code_for_compile[] = $str; |
|
37 | + if ($immediatly) { |
|
38 | + $this->jquery_code_for_compile[] = $str; |
|
39 | + } |
|
39 | 40 | return $str; |
40 | 41 | } |
41 | 42 | |
@@ -73,10 +74,12 @@ discard block |
||
73 | 74 | if (isset($param)) { |
74 | 75 | $param = Javascript::prep_value($param); |
75 | 76 | $str = "$({$element}).{$jQueryCall}({$param});"; |
76 | - } else |
|
77 | - $str = "$({$element}).{$jQueryCall}();"; |
|
78 | - if ($immediatly) |
|
79 | - $this->jquery_code_for_compile[] = $str; |
|
77 | + } else { |
|
78 | + $str = "$({$element}).{$jQueryCall}();"; |
|
79 | + } |
|
80 | + if ($immediatly) { |
|
81 | + $this->jquery_code_for_compile[] = $str; |
|
82 | + } |
|
80 | 83 | return $str; |
81 | 84 | } |
82 | 85 | |
@@ -94,8 +97,9 @@ discard block |
||
94 | 97 | $to = Javascript::prep_element($to); |
95 | 98 | $element = Javascript::prep_element($element); |
96 | 99 | $str = "$({$to}).{$jQueryCall}({$element});"; |
97 | - if ($immediatly) |
|
98 | - $this->jquery_code_for_compile[] = $str; |
|
100 | + if ($immediatly) { |
|
101 | + $this->jquery_code_for_compile[] = $str; |
|
102 | + } |
|
99 | 103 | return $str; |
100 | 104 | } |
101 | 105 | |
@@ -153,10 +157,12 @@ discard block |
||
153 | 157 | if (isset($value)) { |
154 | 158 | $value = Javascript::prep_value($value); |
155 | 159 | $str = "$({$element}).attr(\"$attributeName\",{$value});"; |
156 | - } else |
|
157 | - $str = "$({$element}).attr(\"$attributeName\");"; |
|
158 | - if ($immediatly) |
|
159 | - $this->jquery_code_for_compile[] = $str; |
|
160 | + } else { |
|
161 | + $str = "$({$element}).attr(\"$attributeName\");"; |
|
162 | + } |
|
163 | + if ($immediatly) { |
|
164 | + $this->jquery_code_for_compile[] = $str; |
|
165 | + } |
|
160 | 166 | return $str; |
161 | 167 | } |
162 | 168 | |
@@ -219,8 +225,9 @@ discard block |
||
219 | 225 | |
220 | 226 | $str = "$({$element}).animate({\n$animations\n\t\t}" . $speed . $extra . ");"; |
221 | 227 | |
222 | - if ($immediatly) |
|
223 | - $this->jquery_code_for_compile[] = $str; |
|
228 | + if ($immediatly) { |
|
229 | + $this->jquery_code_for_compile[] = $str; |
|
230 | + } |
|
224 | 231 | return $str; |
225 | 232 | } |
226 | 233 | |
@@ -410,8 +417,9 @@ discard block |
||
410 | 417 | $element = Javascript::prep_element($element); |
411 | 418 | $str = "$({$element}).trigger(\"$event\");"; |
412 | 419 | |
413 | - if ($immediatly) |
|
414 | - $this->jquery_code_for_compile[] = $str; |
|
420 | + if ($immediatly) { |
|
421 | + $this->jquery_code_for_compile[] = $str; |
|
422 | + } |
|
415 | 423 | return $str; |
416 | 424 | } |
417 | 425 | |
@@ -481,8 +489,9 @@ discard block |
||
481 | 489 | $str .= "else{" . $jsCodeIfFalse . "}"; |
482 | 490 | } |
483 | 491 | |
484 | - if ($immediatly) |
|
485 | - $this->jquery_code_for_compile[] = $str; |
|
492 | + if ($immediatly) { |
|
493 | + $this->jquery_code_for_compile[] = $str; |
|
494 | + } |
|
486 | 495 | return $str; |
487 | 496 | } |
488 | 497 | |
@@ -500,11 +509,13 @@ discard block |
||
500 | 509 | private function _doJQuery($element, $jqueryCall, $param = "", $jsCallback = "", $immediatly = false) { |
501 | 510 | $param = Javascript::prep_value($param); |
502 | 511 | $callback = ""; |
503 | - if ($jsCallback != "") |
|
504 | - $callback = ", function(event){\n{$jsCallback}\n}"; |
|
512 | + if ($jsCallback != "") { |
|
513 | + $callback = ", function(event){\n{$jsCallback}\n}"; |
|
514 | + } |
|
505 | 515 | $script = "$(" . Javascript::prep_element($element) . ")." . $jqueryCall . "(" . $param . $callback . ");\n"; |
506 | - if ($immediatly) |
|
507 | - $this->jquery_code_for_compile[] = $script; |
|
516 | + if ($immediatly) { |
|
517 | + $this->jquery_code_for_compile[] = $script; |
|
518 | + } |
|
508 | 519 | return $script; |
509 | 520 | } |
510 | 521 | |
@@ -591,8 +602,9 @@ discard block |
||
591 | 602 | */ |
592 | 603 | public function exec($js, $immediatly = false) { |
593 | 604 | $script = $js . "\n"; |
594 | - if ($immediatly) |
|
595 | - $this->jquery_code_for_compile[] = $script; |
|
605 | + if ($immediatly) { |
|
606 | + $this->jquery_code_for_compile[] = $script; |
|
607 | + } |
|
596 | 608 | return $script; |
597 | 609 | } |
598 | 610 |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | */ |
12 | 12 | trait JsUtilsActionsTrait { |
13 | 13 | |
14 | - abstract public function _add_event($element, $js, $event, $preventDefault = false, $stopPropagation = false, $immediatly = true); |
|
14 | + abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true); |
|
15 | 15 | |
16 | 16 | /** |
17 | 17 | * show or hide with effect |
@@ -27,15 +27,15 @@ discard block |
||
27 | 27 | * defers the execution if set to false |
28 | 28 | * @return string |
29 | 29 | */ |
30 | - protected function _showHideWithEffect($action, $element = 'this', $speed = '', $callback = '', $immediatly = false) { |
|
31 | - $element = Javascript::prep_element($element); |
|
32 | - $speed = $this->_validate_speed($speed); |
|
33 | - if ($callback != '') { |
|
34 | - $callback = ", function(){\n{$callback}\n}"; |
|
30 | + protected function _showHideWithEffect($action, $element='this', $speed='', $callback='', $immediatly=false) { |
|
31 | + $element=Javascript::prep_element($element); |
|
32 | + $speed=$this->_validate_speed($speed); |
|
33 | + if ($callback!='') { |
|
34 | + $callback=", function(){\n{$callback}\n}"; |
|
35 | 35 | } |
36 | - $str = "$({$element}).{$action}({$speed}{$callback});"; |
|
36 | + $str="$({$element}).{$action}({$speed}{$callback});"; |
|
37 | 37 | if ($immediatly) |
38 | - $this->jquery_code_for_compile[] = $str; |
|
38 | + $this->jquery_code_for_compile[]=$str; |
|
39 | 39 | return $str; |
40 | 40 | } |
41 | 41 | |
@@ -51,9 +51,9 @@ discard block |
||
51 | 51 | 'normal', |
52 | 52 | 'fast' |
53 | 53 | ))) { |
54 | - $speed = '"' . $speed . '"'; |
|
54 | + $speed='"'.$speed.'"'; |
|
55 | 55 | } elseif (preg_match("/[^0-9]/", $speed)) { |
56 | - $speed = ''; |
|
56 | + $speed=''; |
|
57 | 57 | } |
58 | 58 | |
59 | 59 | return $speed; |
@@ -68,15 +68,15 @@ discard block |
||
68 | 68 | * @param boolean $immediatly |
69 | 69 | * delayed if false |
70 | 70 | */ |
71 | - public function _genericCallValue($jQueryCall, $element = 'this', $param = "", $immediatly = false) { |
|
72 | - $element = Javascript::prep_element($element); |
|
71 | + public function _genericCallValue($jQueryCall, $element='this', $param="", $immediatly=false) { |
|
72 | + $element=Javascript::prep_element($element); |
|
73 | 73 | if (isset($param)) { |
74 | - $param = Javascript::prep_value($param); |
|
75 | - $str = "$({$element}).{$jQueryCall}({$param});"; |
|
74 | + $param=Javascript::prep_value($param); |
|
75 | + $str="$({$element}).{$jQueryCall}({$param});"; |
|
76 | 76 | } else |
77 | - $str = "$({$element}).{$jQueryCall}();"; |
|
77 | + $str="$({$element}).{$jQueryCall}();"; |
|
78 | 78 | if ($immediatly) |
79 | - $this->jquery_code_for_compile[] = $str; |
|
79 | + $this->jquery_code_for_compile[]=$str; |
|
80 | 80 | return $str; |
81 | 81 | } |
82 | 82 | |
@@ -90,12 +90,12 @@ discard block |
||
90 | 90 | * delayed if false |
91 | 91 | * @return string |
92 | 92 | */ |
93 | - public function _genericCallElement($jQueryCall, $to = 'this', $element, $immediatly = false) { |
|
94 | - $to = Javascript::prep_element($to); |
|
95 | - $element = Javascript::prep_element($element); |
|
96 | - $str = "$({$to}).{$jQueryCall}({$element});"; |
|
93 | + public function _genericCallElement($jQueryCall, $to='this', $element, $immediatly=false) { |
|
94 | + $to=Javascript::prep_element($to); |
|
95 | + $element=Javascript::prep_element($element); |
|
96 | + $str="$({$to}).{$jQueryCall}({$element});"; |
|
97 | 97 | if ($immediatly) |
98 | - $this->jquery_code_for_compile[] = $str; |
|
98 | + $this->jquery_code_for_compile[]=$str; |
|
99 | 99 | return $str; |
100 | 100 | } |
101 | 101 | |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | * defers the execution if set to false |
110 | 110 | * @return string |
111 | 111 | */ |
112 | - public function addClass($element = 'this', $class = '', $immediatly = false) { |
|
112 | + public function addClass($element='this', $class='', $immediatly=false) { |
|
113 | 113 | return $this->_genericCallValue('addClass', $element, $class, $immediatly); |
114 | 114 | } |
115 | 115 | |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | * defers the execution if set to false |
123 | 123 | * @return string |
124 | 124 | */ |
125 | - public function after($to, $element, $immediatly = false) { |
|
125 | + public function after($to, $element, $immediatly=false) { |
|
126 | 126 | return $this->_genericCallElement('after', $to, $element, $immediatly); |
127 | 127 | } |
128 | 128 | |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | * defers the execution if set to false |
136 | 136 | * @return string |
137 | 137 | */ |
138 | - public function before($to, $element, $immediatly = false) { |
|
138 | + public function before($to, $element, $immediatly=false) { |
|
139 | 139 | return $this->_genericCallElement('before', $to, $element, $immediatly); |
140 | 140 | } |
141 | 141 | |
@@ -148,15 +148,15 @@ discard block |
||
148 | 148 | * @param boolean $immediatly |
149 | 149 | * delayed if false |
150 | 150 | */ |
151 | - public function attr($element = 'this', $attributeName, $value = "", $immediatly = false) { |
|
152 | - $element = Javascript::prep_element($element); |
|
151 | + public function attr($element='this', $attributeName, $value="", $immediatly=false) { |
|
152 | + $element=Javascript::prep_element($element); |
|
153 | 153 | if (isset($value)) { |
154 | - $value = Javascript::prep_value($value); |
|
155 | - $str = "$({$element}).attr(\"$attributeName\",{$value});"; |
|
154 | + $value=Javascript::prep_value($value); |
|
155 | + $str="$({$element}).attr(\"$attributeName\",{$value});"; |
|
156 | 156 | } else |
157 | - $str = "$({$element}).attr(\"$attributeName\");"; |
|
157 | + $str="$({$element}).attr(\"$attributeName\");"; |
|
158 | 158 | if ($immediatly) |
159 | - $this->jquery_code_for_compile[] = $str; |
|
159 | + $this->jquery_code_for_compile[]=$str; |
|
160 | 160 | return $str; |
161 | 161 | } |
162 | 162 | |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | * @param boolean $immediatly |
169 | 169 | * defers the execution if set to false |
170 | 170 | */ |
171 | - public function val($element = 'this', $value = '', $immediatly = false) { |
|
171 | + public function val($element='this', $value='', $immediatly=false) { |
|
172 | 172 | return $this->_genericCallValue('val', $element, $value, $immediatly); |
173 | 173 | } |
174 | 174 | |
@@ -180,7 +180,7 @@ discard block |
||
180 | 180 | * @param boolean $immediatly |
181 | 181 | * defers the execution if set to false |
182 | 182 | */ |
183 | - public function html($element = 'this', $value = '', $immediatly = false) { |
|
183 | + public function html($element='this', $value='', $immediatly=false) { |
|
184 | 184 | return $this->_genericCallValue('html', $element, $value, $immediatly); |
185 | 185 | } |
186 | 186 | |
@@ -197,30 +197,30 @@ discard block |
||
197 | 197 | * defers the execution if set to false |
198 | 198 | * @return string |
199 | 199 | */ |
200 | - public function animate($element = 'this', $params = array(), $speed = '', $extra = '', $immediatly = false) { |
|
201 | - $element = Javascript::prep_element($element); |
|
202 | - $speed = $this->_validate_speed($speed); |
|
200 | + public function animate($element='this', $params=array(), $speed='', $extra='', $immediatly=false) { |
|
201 | + $element=Javascript::prep_element($element); |
|
202 | + $speed=$this->_validate_speed($speed); |
|
203 | 203 | |
204 | - $animations = "\t\t\t"; |
|
204 | + $animations="\t\t\t"; |
|
205 | 205 | if (\is_array($params)) { |
206 | 206 | foreach ($params as $param => $value) { |
207 | - $animations .= $param . ': \'' . $value . '\', '; |
|
207 | + $animations.=$param.': \''.$value.'\', '; |
|
208 | 208 | } |
209 | 209 | } |
210 | - $animations = substr($animations, 0, - 2); // remove the last ", " |
|
210 | + $animations=substr($animations, 0, - 2); // remove the last ", " |
|
211 | 211 | |
212 | - if ($speed != '') { |
|
213 | - $speed = ', ' . $speed; |
|
212 | + if ($speed!='') { |
|
213 | + $speed=', '.$speed; |
|
214 | 214 | } |
215 | 215 | |
216 | - if ($extra != '') { |
|
217 | - $extra = ', ' . $extra; |
|
216 | + if ($extra!='') { |
|
217 | + $extra=', '.$extra; |
|
218 | 218 | } |
219 | 219 | |
220 | - $str = "$({$element}).animate({\n$animations\n\t\t}" . $speed . $extra . ");"; |
|
220 | + $str="$({$element}).animate({\n$animations\n\t\t}".$speed.$extra.");"; |
|
221 | 221 | |
222 | 222 | if ($immediatly) |
223 | - $this->jquery_code_for_compile[] = $str; |
|
223 | + $this->jquery_code_for_compile[]=$str; |
|
224 | 224 | return $str; |
225 | 225 | } |
226 | 226 | |
@@ -233,7 +233,7 @@ discard block |
||
233 | 233 | * defers the execution if set to false |
234 | 234 | * @return string |
235 | 235 | */ |
236 | - public function append($to, $element, $immediatly = false) { |
|
236 | + public function append($to, $element, $immediatly=false) { |
|
237 | 237 | return $this->_genericCallElement('append', $to, $element, $immediatly); |
238 | 238 | } |
239 | 239 | |
@@ -246,7 +246,7 @@ discard block |
||
246 | 246 | * defers the execution if set to false |
247 | 247 | * @return string |
248 | 248 | */ |
249 | - public function prepend($to, $element, $immediatly = false) { |
|
249 | + public function prepend($to, $element, $immediatly=false) { |
|
250 | 250 | return $this->_genericCallElement('prepend', $to, $element, $immediatly); |
251 | 251 | } |
252 | 252 | |
@@ -263,7 +263,7 @@ discard block |
||
263 | 263 | * defers the execution if set to false |
264 | 264 | * @return string |
265 | 265 | */ |
266 | - public function fadeIn($element = 'this', $speed = '', $callback = '', $immediatly = false) { |
|
266 | + public function fadeIn($element='this', $speed='', $callback='', $immediatly=false) { |
|
267 | 267 | return $this->_showHideWithEffect("fadeIn", $element, $speed, $callback, $immediatly); |
268 | 268 | } |
269 | 269 | |
@@ -280,7 +280,7 @@ discard block |
||
280 | 280 | * defers the execution if set to false |
281 | 281 | * @return string |
282 | 282 | */ |
283 | - public function fadeOut($element = 'this', $speed = '', $callback = '', $immediatly = false) { |
|
283 | + public function fadeOut($element='this', $speed='', $callback='', $immediatly=false) { |
|
284 | 284 | return $this->_showHideWithEffect("fadeOut", $element, $speed, $callback, $immediatly); |
285 | 285 | } |
286 | 286 | |
@@ -297,7 +297,7 @@ discard block |
||
297 | 297 | * defers the execution if set to false |
298 | 298 | * @return string |
299 | 299 | */ |
300 | - public function slideUp($element = 'this', $speed = '', $callback = '', $immediatly = false) { |
|
300 | + public function slideUp($element='this', $speed='', $callback='', $immediatly=false) { |
|
301 | 301 | return $this->_showHideWithEffect("slideUp", $element, $speed, $callback, $immediatly); |
302 | 302 | } |
303 | 303 | |
@@ -312,7 +312,7 @@ discard block |
||
312 | 312 | * defers the execution if set to false |
313 | 313 | * @return string |
314 | 314 | */ |
315 | - public function removeClass($element = 'this', $class = '', $immediatly = false) { |
|
315 | + public function removeClass($element='this', $class='', $immediatly=false) { |
|
316 | 316 | return $this->_genericCallValue('removeClass', $element, $class, $immediatly); |
317 | 317 | } |
318 | 318 | |
@@ -329,7 +329,7 @@ discard block |
||
329 | 329 | * defers the execution if set to false |
330 | 330 | * @return string |
331 | 331 | */ |
332 | - public function slideDown($element = 'this', $speed = '', $callback = '', $immediatly = false) { |
|
332 | + public function slideDown($element='this', $speed='', $callback='', $immediatly=false) { |
|
333 | 333 | return $this->_showHideWithEffect("slideDown", $element, $speed, $callback, $immediatly); |
334 | 334 | } |
335 | 335 | |
@@ -346,7 +346,7 @@ discard block |
||
346 | 346 | * defers the execution if set to false |
347 | 347 | * @return string |
348 | 348 | */ |
349 | - public function slideToggle($element = 'this', $speed = '', $callback = '', $immediatly = false) { |
|
349 | + public function slideToggle($element='this', $speed='', $callback='', $immediatly=false) { |
|
350 | 350 | return $this->_showHideWithEffect("slideToggle", $element, $speed, $callback, $immediatly); |
351 | 351 | } |
352 | 352 | |
@@ -363,7 +363,7 @@ discard block |
||
363 | 363 | * defers the execution if set to false |
364 | 364 | * @return string |
365 | 365 | */ |
366 | - public function hide($element = 'this', $speed = '', $callback = '', $immediatly = false) { |
|
366 | + public function hide($element='this', $speed='', $callback='', $immediatly=false) { |
|
367 | 367 | return $this->_showHideWithEffect("hide", $element, $speed, $callback, $immediatly); |
368 | 368 | } |
369 | 369 | |
@@ -380,7 +380,7 @@ discard block |
||
380 | 380 | * defers the execution if set to false |
381 | 381 | * @return string |
382 | 382 | */ |
383 | - public function toggle($element = 'this', $speed = '', $callback = '', $immediatly = false) { |
|
383 | + public function toggle($element='this', $speed='', $callback='', $immediatly=false) { |
|
384 | 384 | return $this->_showHideWithEffect("toggle", $element, $speed, $callback, $immediatly); |
385 | 385 | } |
386 | 386 | |
@@ -394,7 +394,7 @@ discard block |
||
394 | 394 | * defers the execution if set to false |
395 | 395 | * @return string |
396 | 396 | */ |
397 | - public function toggleClass($element = 'this', $class = '', $immediatly = false) { |
|
397 | + public function toggleClass($element='this', $class='', $immediatly=false) { |
|
398 | 398 | return $this->_genericCallValue('toggleClass', $element, $class, $immediatly); |
399 | 399 | } |
400 | 400 | |
@@ -406,12 +406,12 @@ discard block |
||
406 | 406 | * @param boolean $immediatly |
407 | 407 | * defers the execution if set to false |
408 | 408 | */ |
409 | - public function trigger($element = 'this', $event = 'click', $immediatly = false) { |
|
410 | - $element = Javascript::prep_element($element); |
|
411 | - $str = "$({$element}).trigger(\"$event\");"; |
|
409 | + public function trigger($element='this', $event='click', $immediatly=false) { |
|
410 | + $element=Javascript::prep_element($element); |
|
411 | + $str="$({$element}).trigger(\"$event\");"; |
|
412 | 412 | |
413 | 413 | if ($immediatly) |
414 | - $this->jquery_code_for_compile[] = $str; |
|
414 | + $this->jquery_code_for_compile[]=$str; |
|
415 | 415 | return $str; |
416 | 416 | } |
417 | 417 | |
@@ -428,7 +428,7 @@ discard block |
||
428 | 428 | * defers the execution if set to false |
429 | 429 | * @return string |
430 | 430 | */ |
431 | - public function show($element = 'this', $speed = '', $callback = '', $immediatly = false) { |
|
431 | + public function show($element='this', $speed='', $callback='', $immediatly=false) { |
|
432 | 432 | return $this->_showHideWithEffect("show", $element, $speed, $callback, $immediatly); |
433 | 433 | } |
434 | 434 | |
@@ -439,18 +439,18 @@ discard block |
||
439 | 439 | * @param array $options |
440 | 440 | * @return string |
441 | 441 | */ |
442 | - public function sortable($element, $options = array()) { |
|
443 | - if (count($options) > 0) { |
|
444 | - $sort_options = array(); |
|
442 | + public function sortable($element, $options=array()) { |
|
443 | + if (count($options)>0) { |
|
444 | + $sort_options=array(); |
|
445 | 445 | foreach ($options as $k => $v) { |
446 | - $sort_options[] = "\n\t\t" . $k . ': ' . $v . ""; |
|
446 | + $sort_options[]="\n\t\t".$k.': '.$v.""; |
|
447 | 447 | } |
448 | - $sort_options = implode(",", $sort_options); |
|
448 | + $sort_options=implode(",", $sort_options); |
|
449 | 449 | } else { |
450 | - $sort_options = ''; |
|
450 | + $sort_options=''; |
|
451 | 451 | } |
452 | 452 | |
453 | - return "$(" . Javascript::prep_element($element) . ").sortable({" . $sort_options . "\n\t});"; |
|
453 | + return "$(".Javascript::prep_element($element).").sortable({".$sort_options."\n\t});"; |
|
454 | 454 | } |
455 | 455 | |
456 | 456 | /** |
@@ -462,8 +462,8 @@ discard block |
||
462 | 462 | * plugin location |
463 | 463 | * @return string |
464 | 464 | */ |
465 | - public function tablesorter($table = '', $options = '') { |
|
466 | - $this->jquery_code_for_compile[] = "\t$(" . Javascript::prep_element($table) . ").tablesorter($options);\n"; |
|
465 | + public function tablesorter($table='', $options='') { |
|
466 | + $this->jquery_code_for_compile[]="\t$(".Javascript::prep_element($table).").tablesorter($options);\n"; |
|
467 | 467 | } |
468 | 468 | |
469 | 469 | /** |
@@ -475,14 +475,14 @@ discard block |
||
475 | 475 | * @param boolean $immediatly |
476 | 476 | * defers the execution if set to false |
477 | 477 | */ |
478 | - public function condition($condition, $jsCodeIfTrue, $jsCodeIfFalse = null, $immediatly = false) { |
|
479 | - $str = "if(" . $condition . "){" . $jsCodeIfTrue . "}"; |
|
478 | + public function condition($condition, $jsCodeIfTrue, $jsCodeIfFalse=null, $immediatly=false) { |
|
479 | + $str="if(".$condition."){".$jsCodeIfTrue."}"; |
|
480 | 480 | if (isset($jsCodeIfFalse)) { |
481 | - $str .= "else{" . $jsCodeIfFalse . "}"; |
|
481 | + $str.="else{".$jsCodeIfFalse."}"; |
|
482 | 482 | } |
483 | 483 | |
484 | 484 | if ($immediatly) |
485 | - $this->jquery_code_for_compile[] = $str; |
|
485 | + $this->jquery_code_for_compile[]=$str; |
|
486 | 486 | return $str; |
487 | 487 | } |
488 | 488 | |
@@ -497,14 +497,14 @@ discard block |
||
497 | 497 | * @param boolean $immediatly |
498 | 498 | * @return string |
499 | 499 | */ |
500 | - private function _doJQuery($element, $jqueryCall, $param = "", $jsCallback = "", $immediatly = false) { |
|
501 | - $param = Javascript::prep_value($param); |
|
502 | - $callback = ""; |
|
503 | - if ($jsCallback != "") |
|
504 | - $callback = ", function(event){\n{$jsCallback}\n}"; |
|
505 | - $script = "$(" . Javascript::prep_element($element) . ")." . $jqueryCall . "(" . $param . $callback . ");\n"; |
|
500 | + private function _doJQuery($element, $jqueryCall, $param="", $jsCallback="", $immediatly=false) { |
|
501 | + $param=Javascript::prep_value($param); |
|
502 | + $callback=""; |
|
503 | + if ($jsCallback!="") |
|
504 | + $callback=", function(event){\n{$jsCallback}\n}"; |
|
505 | + $script="$(".Javascript::prep_element($element).").".$jqueryCall."(".$param.$callback.");\n"; |
|
506 | 506 | if ($immediatly) |
507 | - $this->jquery_code_for_compile[] = $script; |
|
507 | + $this->jquery_code_for_compile[]=$script; |
|
508 | 508 | return $script; |
509 | 509 | } |
510 | 510 | |
@@ -521,7 +521,7 @@ discard block |
||
521 | 521 | * javascript code to execute after the jquery call |
522 | 522 | * @return mixed |
523 | 523 | */ |
524 | - public function doJQuery($element, $jqueryCall, $param = "", $jsCallback = "") { |
|
524 | + public function doJQuery($element, $jqueryCall, $param="", $jsCallback="") { |
|
525 | 525 | return $this->_doJQuery($element, $jqueryCall, $param, $jsCallback, true); |
526 | 526 | } |
527 | 527 | |
@@ -538,7 +538,7 @@ discard block |
||
538 | 538 | * javascript code to execute after the jquery call |
539 | 539 | * @return mixed |
540 | 540 | */ |
541 | - public function doJQueryDeferred($element, $jqueryCall, $param = "", $jsCallback = "") { |
|
541 | + public function doJQueryDeferred($element, $jqueryCall, $param="", $jsCallback="") { |
|
542 | 542 | return $this->_doJQuery($element, $jqueryCall, $param, $jsCallback, false); |
543 | 543 | } |
544 | 544 | |
@@ -556,7 +556,7 @@ discard block |
||
556 | 556 | * @param boolean $immediatly |
557 | 557 | * @return string |
558 | 558 | */ |
559 | - private function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param = "", $preventDefault = false, $stopPropagation = false, $jsCallback = "", $immediatly = true) { |
|
559 | + private function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $preventDefault=false, $stopPropagation=false, $jsCallback="", $immediatly=true) { |
|
560 | 560 | return $this->_add_event($element, $this->_doJQuery($elementToModify, $jqueryCall, $param, $jsCallback), $event, $preventDefault, $stopPropagation, $immediatly); |
561 | 561 | } |
562 | 562 | |
@@ -571,11 +571,11 @@ discard block |
||
571 | 571 | * @param array $parameters |
572 | 572 | * default : array("preventDefault"=>false,"stopPropagation"=>false,"jsCallback"=>'',"immediatly"=>true) |
573 | 573 | */ |
574 | - public function doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param = "", $parameters = array()) { |
|
575 | - $jsCallback = ""; |
|
576 | - $stopPropagation = false; |
|
577 | - $preventDefault = false; |
|
578 | - $immediatly = true; |
|
574 | + public function doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $parameters=array()) { |
|
575 | + $jsCallback=""; |
|
576 | + $stopPropagation=false; |
|
577 | + $preventDefault=false; |
|
578 | + $immediatly=true; |
|
579 | 579 | extract($parameters); |
580 | 580 | return $this->_doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param, $preventDefault, $stopPropagation, $jsCallback, $immediatly); |
581 | 581 | } |
@@ -589,10 +589,10 @@ discard block |
||
589 | 589 | * delayed if false |
590 | 590 | * @return String |
591 | 591 | */ |
592 | - public function exec($js, $immediatly = false) { |
|
593 | - $script = $js . "\n"; |
|
592 | + public function exec($js, $immediatly=false) { |
|
593 | + $script=$js."\n"; |
|
594 | 594 | if ($immediatly) |
595 | - $this->jquery_code_for_compile[] = $script; |
|
595 | + $this->jquery_code_for_compile[]=$script; |
|
596 | 596 | return $script; |
597 | 597 | } |
598 | 598 | |
@@ -606,8 +606,8 @@ discard block |
||
606 | 606 | * @return String |
607 | 607 | */ |
608 | 608 | public function execAtLast($js) { |
609 | - $script = $js . "\n"; |
|
610 | - $this->jquery_code_for_compile_at_last[] = $script; |
|
609 | + $script=$js."\n"; |
|
610 | + $this->jquery_code_for_compile_at_last[]=$script; |
|
611 | 611 | return $script; |
612 | 612 | } |
613 | 613 | |
@@ -622,18 +622,18 @@ discard block |
||
622 | 622 | * default : array("preventDefault"=>false,"stopPropagation"=>false,"immediatly"=>true) |
623 | 623 | * @return String |
624 | 624 | */ |
625 | - public function execOn($event, $element, $js, $parameters = array()) { |
|
626 | - $stopPropagation = false; |
|
627 | - $preventDefault = false; |
|
628 | - $immediatly = true; |
|
625 | + public function execOn($event, $element, $js, $parameters=array()) { |
|
626 | + $stopPropagation=false; |
|
627 | + $preventDefault=false; |
|
628 | + $immediatly=true; |
|
629 | 629 | extract($parameters); |
630 | - $script = $this->_add_event($element, $this->exec($js), $event, $preventDefault, $stopPropagation, $immediatly); |
|
630 | + $script=$this->_add_event($element, $this->exec($js), $event, $preventDefault, $stopPropagation, $immediatly); |
|
631 | 631 | return $script; |
632 | 632 | } |
633 | 633 | |
634 | - public function setJsonToElement($json, $elementClass = "_element", $immediatly = true) { |
|
635 | - $retour = "var data={$json};" . "\n\tdata=($.isPlainObject(data))?data:JSON.parse(data);" . "\n\tvar pk=data['pk'];var object=data['object'];" . "\n\tfor(var field in object){" . "\n\tif($('[data-field='+field+']',$('._element[data-ajax='+pk+']')).length){" . "\n\t\t$('[data-field='+field+']',$('._element[data-ajax='+pk+']')).each(function(){" . "\n\t\t\tif($(this).is('[value]')) { $(this).val(object[field]);} else { $(this).html(object[field]); }" . "\n\t});" . "\n}};\n"; |
|
636 | - $retour .= "\t$(document).trigger('jsonReady',[data]);\n"; |
|
634 | + public function setJsonToElement($json, $elementClass="_element", $immediatly=true) { |
|
635 | + $retour="var data={$json};"."\n\tdata=($.isPlainObject(data))?data:JSON.parse(data);"."\n\tvar pk=data['pk'];var object=data['object'];"."\n\tfor(var field in object){"."\n\tif($('[data-field='+field+']',$('._element[data-ajax='+pk+']')).length){"."\n\t\t$('[data-field='+field+']',$('._element[data-ajax='+pk+']')).each(function(){"."\n\t\t\tif($(this).is('[value]')) { $(this).val(object[field]);} else { $(this).html(object[field]); }"."\n\t});"."\n}};\n"; |
|
636 | + $retour.="\t$(document).trigger('jsonReady',[data]);\n"; |
|
637 | 637 | return $this->exec($retour, $immediatly); |
638 | 638 | } |
639 | 639 | |
@@ -645,13 +645,13 @@ discard block |
||
645 | 645 | * @param array $parameters |
646 | 646 | * default : array("attr"=>"id","preventDefault"=>false,"stopPropagation"=>false,"immediatly"=>true) |
647 | 647 | */ |
648 | - public function setDraggable($element, $parameters = []) { |
|
649 | - $attr = "id"; |
|
650 | - $preventDefault = false; |
|
651 | - $stopPropagation = false; |
|
652 | - $immediatly = true; |
|
648 | + public function setDraggable($element, $parameters=[]) { |
|
649 | + $attr="id"; |
|
650 | + $preventDefault=false; |
|
651 | + $stopPropagation=false; |
|
652 | + $immediatly=true; |
|
653 | 653 | extract($parameters); |
654 | - $script = $this->_add_event($element, Javascript::draggable($attr), "dragstart", $preventDefault, $stopPropagation, $immediatly); |
|
654 | + $script=$this->_add_event($element, Javascript::draggable($attr), "dragstart", $preventDefault, $stopPropagation, $immediatly); |
|
655 | 655 | return $script; |
656 | 656 | } |
657 | 657 | |
@@ -665,13 +665,13 @@ discard block |
||
665 | 665 | * @param string $jsCallback |
666 | 666 | * the js script to call when element is dropped |
667 | 667 | */ |
668 | - public function asDropZone($element, $jsCallback = "", $parameters = []) { |
|
669 | - $stopPropagation = false; |
|
670 | - $immediatly = true; |
|
671 | - $jqueryDone = "append"; |
|
672 | - $script = $this->_add_event($element, '', "dragover", true, $stopPropagation, $immediatly); |
|
668 | + public function asDropZone($element, $jsCallback="", $parameters=[]) { |
|
669 | + $stopPropagation=false; |
|
670 | + $immediatly=true; |
|
671 | + $jqueryDone="append"; |
|
672 | + $script=$this->_add_event($element, '', "dragover", true, $stopPropagation, $immediatly); |
|
673 | 673 | extract($parameters); |
674 | - $script .= $this->_add_event($element, Javascript::dropZone($jqueryDone, $jsCallback), "drop", true, $stopPropagation, $immediatly); |
|
674 | + $script.=$this->_add_event($element, Javascript::dropZone($jqueryDone, $jsCallback), "drop", true, $stopPropagation, $immediatly); |
|
675 | 675 | return $script; |
676 | 676 | } |
677 | 677 | |
@@ -688,14 +688,14 @@ discard block |
||
688 | 688 | * delayed if false |
689 | 689 | * @return string |
690 | 690 | */ |
691 | - public function interval($jsCode, $time, $globalName = null, $immediatly = true) { |
|
692 | - if (! Javascript::isFunction($jsCode)) { |
|
693 | - $jsCode = "function(){\n" . $jsCode . "\n}"; |
|
691 | + public function interval($jsCode, $time, $globalName=null, $immediatly=true) { |
|
692 | + if (!Javascript::isFunction($jsCode)) { |
|
693 | + $jsCode="function(){\n".$jsCode."\n}"; |
|
694 | 694 | } |
695 | 695 | if (isset($globalName)) { |
696 | - $script = "if(window.{$globalName}){clearInterval(window.{$globalName});}\nwindow.{$globalName}=setInterval({$jsCode},{$time});"; |
|
696 | + $script="if(window.{$globalName}){clearInterval(window.{$globalName});}\nwindow.{$globalName}=setInterval({$jsCode},{$time});"; |
|
697 | 697 | } else { |
698 | - $script = "setInterval({$jsCode},{$time});"; |
|
698 | + $script="setInterval({$jsCode},{$time});"; |
|
699 | 699 | } |
700 | 700 | return $this->exec($script, $immediatly); |
701 | 701 | } |
@@ -709,7 +709,7 @@ discard block |
||
709 | 709 | * delayed if false |
710 | 710 | * @return string |
711 | 711 | */ |
712 | - public function clearInterval($globalName, $immediatly = true) { |
|
712 | + public function clearInterval($globalName, $immediatly=true) { |
|
713 | 713 | return $this->exec("if(window.{$globalName}){clearInterval(window.{$globalName});}", $immediatly); |
714 | 714 | } |
715 | 715 | |
@@ -731,20 +731,20 @@ discard block |
||
731 | 731 | * delayed if false |
732 | 732 | * @return string |
733 | 733 | */ |
734 | - public function counter($counterSelector, $value = 0, $limit = 0, $globalName = null, $countDown = true, $immediatly = true) { |
|
735 | - $stop = ""; |
|
734 | + public function counter($counterSelector, $value=0, $limit=0, $globalName=null, $countDown=true, $immediatly=true) { |
|
735 | + $stop=""; |
|
736 | 736 | if ($countDown) { |
737 | - $stop = "if (--timer < " . $limit . ") {clearInterval(interval);display.trigger({type:'counter-end',value: timer,limit:" . $limit . "});}"; |
|
737 | + $stop="if (--timer < ".$limit.") {clearInterval(interval);display.trigger({type:'counter-end',value: timer,limit:".$limit."});}"; |
|
738 | 738 | } else { |
739 | - if ($limit != 0) { |
|
740 | - $stop = "if (++timer > " . $limit . ") {clearInterval(interval);display.trigger({type:'counter-end',value: timer,limit:" . $limit . "});}"; |
|
739 | + if ($limit!=0) { |
|
740 | + $stop="if (++timer > ".$limit.") {clearInterval(interval);display.trigger({type:'counter-end',value: timer,limit:".$limit."});}"; |
|
741 | 741 | } |
742 | 742 | } |
743 | - $global = ""; |
|
743 | + $global=""; |
|
744 | 744 | if (isset($globalName)) { |
745 | - $global = "\nwindow.{$globalName}=interval;"; |
|
745 | + $global="\nwindow.{$globalName}=interval;"; |
|
746 | 746 | } |
747 | - $timer = "var startTimer=function(duration, display) {var timer = duration, days, hours, minutes, seconds; |
|
747 | + $timer="var startTimer=function(duration, display) {var timer = duration, days, hours, minutes, seconds; |
|
748 | 748 | var sh=function(disp,v){if(disp.is('[value]')){disp.val(v);} else {disp.html(v);};}; |
749 | 749 | var shHide=function(v,k,kBefore){if(v==0 && display.find(k).closest('.timer').is(':visible') && (!kBefore || !display.find(kBefore).closest('.timer').is(':visible'))){display.find(k).closest('.timer').hide();}else{sh(display.find(k),v);}}; |
750 | 750 | var pl=function(v,text){return (v>1)?v+' '+text+'s':(v>0)?v+' '+text:'';}; |
@@ -760,12 +760,12 @@ discard block |
||
760 | 760 | minutes = d0(parseInt((timer%3600) / 60, 10)); |
761 | 761 | seconds = d0(parseInt(timer%60, 10)); |
762 | 762 | mainSh(days,hours,minutes,seconds); |
763 | - " . $stop . " |
|
763 | + " . $stop." |
|
764 | 764 | }, 1000); |
765 | - " . $global . " |
|
765 | + " . $global." |
|
766 | 766 | }"; |
767 | - $element = '$("' . $counterSelector . '")'; |
|
768 | - return $this->exec($timer . "\nstartTimer(" . $value . "," . $element . ");", $immediatly); |
|
767 | + $element='$("'.$counterSelector.'")'; |
|
768 | + return $this->exec($timer."\nstartTimer(".$value.",".$element.");", $immediatly); |
|
769 | 769 | } |
770 | 770 | |
771 | 771 | /** |
@@ -787,7 +787,7 @@ discard block |
||
787 | 787 | * count down if true or elapse if false |
788 | 788 | * @return string |
789 | 789 | */ |
790 | - public function counterOn($element, $event, $counterSelector, $value = 0, $limit = 0, $globalName = null, $countDown = true) { |
|
790 | + public function counterOn($element, $event, $counterSelector, $value=0, $limit=0, $globalName=null, $countDown=true) { |
|
791 | 791 | return $this->execOn($event, $element, $this->counter($counterSelector, $value, $limit, $globalName, $countDown, false)); |
792 | 792 | } |
793 | 793 | |
@@ -802,7 +802,7 @@ discard block |
||
802 | 802 | * the active href (if null, window.location.href is used) |
803 | 803 | * @return string |
804 | 804 | */ |
805 | - public function activateLink($target, $property = 'href', $href = null) { |
|
805 | + public function activateLink($target, $property='href', $href=null) { |
|
806 | 806 | return $this->execAtLast($this->_activateLink($target, $property, $href)); |
807 | 807 | } |
808 | 808 | |
@@ -817,14 +817,14 @@ discard block |
||
817 | 817 | * the active href (if null, window.location.href is used) |
818 | 818 | * @return string |
819 | 819 | */ |
820 | - public function _activateLink($target, $property = 'href', $href = null) { |
|
821 | - $js = '$("' . $target . ' [' . $property . ']").removeClass("active");'; |
|
820 | + public function _activateLink($target, $property='href', $href=null) { |
|
821 | + $js='$("'.$target.' ['.$property.']").removeClass("active");'; |
|
822 | 822 | if (isset($href)) { |
823 | - $js .= 'var href="' . $href . '";'; |
|
823 | + $js.='var href="'.$href.'";'; |
|
824 | 824 | } else { |
825 | - $js .= 'var href=window.location.href;'; |
|
825 | + $js.='var href=window.location.href;'; |
|
826 | 826 | } |
827 | - $js .= '$("' . $target . ' [' . $property . ']").each(function(){if(href.includes($(this).attr("' . $property . '"))) $(this).addClass("active");});'; |
|
827 | + $js.='$("'.$target.' ['.$property.']").each(function(){if(href.includes($(this).attr("'.$property.'"))) $(this).addClass("active");});'; |
|
828 | 828 | return $js; |
829 | 829 | } |
830 | 830 | } |
@@ -18,15 +18,15 @@ discard block |
||
18 | 18 | */ |
19 | 19 | class HtmlTab extends HtmlSemCollection { |
20 | 20 | |
21 | - protected $params = []; |
|
21 | + protected $params=[]; |
|
22 | 22 | |
23 | - protected $_activated = false; |
|
23 | + protected $_activated=false; |
|
24 | 24 | |
25 | - public function __construct($identifier, $tabs = array()) { |
|
25 | + public function __construct($identifier, $tabs=array()) { |
|
26 | 26 | parent::__construct($identifier, "div", ""); |
27 | - $menu = new HtmlMenu("menu" . $this->identifier); |
|
27 | + $menu=new HtmlMenu("menu".$this->identifier); |
|
28 | 28 | $menu->asTab(false)->setAttachment(NULL, Side::TOP); |
29 | - $this->content["menu"] = $menu; |
|
29 | + $this->content["menu"]=$menu; |
|
30 | 30 | $this->addItems($tabs); |
31 | 31 | } |
32 | 32 | |
@@ -37,18 +37,18 @@ discard block |
||
37 | 37 | * @return HtmlSegment |
38 | 38 | */ |
39 | 39 | protected function createItem($value) { |
40 | - $count = $this->count(); |
|
41 | - $title = $value; |
|
42 | - $content = NULL; |
|
40 | + $count=$this->count(); |
|
41 | + $title=$value; |
|
42 | + $content=NULL; |
|
43 | 43 | if (\is_array($value)) { |
44 | - $title = @$value[0]; |
|
45 | - $content = @$value[1]; |
|
44 | + $title=@$value[0]; |
|
45 | + $content=@$value[1]; |
|
46 | 46 | } |
47 | - $menuItem = $this->content["menu"]->addItem($title); |
|
47 | + $menuItem=$this->content["menu"]->addItem($title); |
|
48 | 48 | $menuItem->addToProperty("data-tab", $menuItem->getIdentifier()); |
49 | 49 | $menuItem->removeProperty("href"); |
50 | - $result = $this->createSegment($count, $content, $menuItem->getIdentifier()); |
|
51 | - $result->menuTab = $menuItem; |
|
50 | + $result=$this->createSegment($count, $content, $menuItem->getIdentifier()); |
|
51 | + $result->menuTab=$menuItem; |
|
52 | 52 | return $result; |
53 | 53 | } |
54 | 54 | |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | * @return \Ajax\semantic\html\elements\HtmlSegment |
61 | 61 | */ |
62 | 62 | private function createSegment($count, $content, $datatab) { |
63 | - $segment = new HtmlSegment("item-" . $this->identifier . "-" . $count, $content); |
|
63 | + $segment=new HtmlSegment("item-".$this->identifier."-".$count, $content); |
|
64 | 64 | $segment->setAttachment(NULL, Side::BOTTOM) |
65 | 65 | ->addToProperty("class", "tab") |
66 | 66 | ->addToProperty("data-tab", $datatab); |
@@ -77,10 +77,10 @@ discard block |
||
77 | 77 | * @return \Ajax\semantic\html\modules\HtmlTab |
78 | 78 | */ |
79 | 79 | public function setTabContent($index, $content) { |
80 | - $menu = $this->content["menu"]; |
|
81 | - if ($index < $menu->count()) { |
|
82 | - if (isset($this->content[$index]) === false) { |
|
83 | - $this->content[$index] = $this->createSegment($index, $content, $menu->getItem($index) |
|
80 | + $menu=$this->content["menu"]; |
|
81 | + if ($index<$menu->count()) { |
|
82 | + if (isset($this->content[$index])===false) { |
|
83 | + $this->content[$index]=$this->createSegment($index, $content, $menu->getItem($index) |
|
84 | 84 | ->getIdentifier()); |
85 | 85 | } else |
86 | 86 | $this->content[$index]->setContent($content); |
@@ -95,8 +95,8 @@ discard block |
||
95 | 95 | * @return \Ajax\semantic\html\modules\HtmlTab |
96 | 96 | */ |
97 | 97 | public function setTabsContent($contents) { |
98 | - $size = \sizeof($contents); |
|
99 | - for ($i = 0; $i < $size; $i ++) { |
|
98 | + $size=\sizeof($contents); |
|
99 | + for ($i=0; $i<$size; $i++) { |
|
100 | 100 | $this->setTabContent($i, $contents[$i]); |
101 | 101 | } |
102 | 102 | return $this; |
@@ -109,11 +109,11 @@ discard block |
||
109 | 109 | * @return \Ajax\semantic\html\modules\HtmlTab |
110 | 110 | */ |
111 | 111 | public function activate($index) { |
112 | - $item = $this->content["menu"]->getItem($index); |
|
113 | - if ($item != null) { |
|
112 | + $item=$this->content["menu"]->getItem($index); |
|
113 | + if ($item!=null) { |
|
114 | 114 | $item->setActive(true); |
115 | 115 | $this->content[$index]->setActive(true); |
116 | - $this->_activated = true; |
|
116 | + $this->_activated=true; |
|
117 | 117 | } |
118 | 118 | return $this; |
119 | 119 | } |
@@ -147,9 +147,9 @@ discard block |
||
147 | 147 | * @param array $params |
148 | 148 | * @return \Ajax\semantic\html\elements\HtmlSegment |
149 | 149 | */ |
150 | - public function forwardTab($index, JsUtils $js, $title, $initialController, $controller, $action, $params = array()) { |
|
150 | + public function forwardTab($index, JsUtils $js, $title, $initialController, $controller, $action, $params=array()) { |
|
151 | 151 | if (\array_key_exists($index, $this->content)) { |
152 | - $this->content[$index] = $js->forward($initialController, $controller, $action, $params); |
|
152 | + $this->content[$index]=$js->forward($initialController, $controller, $action, $params); |
|
153 | 153 | return $this->content[$index]; |
154 | 154 | } |
155 | 155 | |
@@ -170,9 +170,9 @@ discard block |
||
170 | 170 | * The parameters to pass to the view |
171 | 171 | * @return \Ajax\semantic\html\elements\HtmlSegment |
172 | 172 | */ |
173 | - public function renderViewTab($index, JsUtils $js, $title, $initialController, $viewName, $params = array()) { |
|
173 | + public function renderViewTab($index, JsUtils $js, $title, $initialController, $viewName, $params=array()) { |
|
174 | 174 | if (\array_key_exists($index, $this->content)) { |
175 | - $this->content[$index] = $js->renderContent($initialController, $viewName, $params); |
|
175 | + $this->content[$index]=$js->renderContent($initialController, $viewName, $params); |
|
176 | 176 | return $this->content[$index]; |
177 | 177 | } |
178 | 178 | return $this->addAndRenderViewTab($js, $title, $initialController, $viewName, $params); |
@@ -192,10 +192,10 @@ discard block |
||
192 | 192 | * @param array $params |
193 | 193 | * @return \Ajax\semantic\html\elements\HtmlSegment |
194 | 194 | */ |
195 | - public function addAndForwardTab(JsUtils $js, $title, $initialController, $controller, $action, $params = array()) { |
|
195 | + public function addAndForwardTab(JsUtils $js, $title, $initialController, $controller, $action, $params=array()) { |
|
196 | 196 | \ob_start(); |
197 | 197 | $js->forward($initialController, $controller, $action, $params); |
198 | - $content = \ob_get_clean(); |
|
198 | + $content=\ob_get_clean(); |
|
199 | 199 | return $this->addTab($title, $content); |
200 | 200 | } |
201 | 201 | |
@@ -211,11 +211,11 @@ discard block |
||
211 | 211 | * The parameters to pass to the view |
212 | 212 | * @return \Ajax\semantic\html\elements\HtmlSegment |
213 | 213 | */ |
214 | - public function addAndRenderViewTab(JsUtils $js, $title, $initialController, $viewName, $params = array()) { |
|
214 | + public function addAndRenderViewTab(JsUtils $js, $title, $initialController, $viewName, $params=array()) { |
|
215 | 215 | return $this->addTab($title, $js->renderContent($initialController, $viewName, $params)); |
216 | 216 | } |
217 | 217 | |
218 | - public function setPointing($value = Direction::NONE) { |
|
218 | + public function setPointing($value=Direction::NONE) { |
|
219 | 219 | return $this->content["menu"]->setPointing($value); |
220 | 220 | } |
221 | 221 | |
@@ -250,25 +250,25 @@ discard block |
||
250 | 250 | * @return \Ajax\semantic\html\modules\HtmlTab |
251 | 251 | */ |
252 | 252 | public function setMenu($menu) { |
253 | - $contentSize = \sizeof($this->content); |
|
254 | - for ($i = 0; $i < $contentSize; $i ++) { |
|
255 | - if ($menu->getItem($i) !== NULL) { |
|
253 | + $contentSize=\sizeof($this->content); |
|
254 | + for ($i=0; $i<$contentSize; $i++) { |
|
255 | + if ($menu->getItem($i)!==NULL) { |
|
256 | 256 | if (isset($this->content[$i])) { |
257 | 257 | $menu->getItem($i)->addToProperty("data-tab", $this->content[$i]->getProperty("data-tab")); |
258 | 258 | } |
259 | 259 | } |
260 | 260 | } |
261 | - $menuSize = $menu->count(); |
|
262 | - for ($i = 0; $i < $menuSize; $i ++) { |
|
261 | + $menuSize=$menu->count(); |
|
262 | + for ($i=0; $i<$menuSize; $i++) { |
|
263 | 263 | $menu->getItem($i)->removeProperty("href"); |
264 | - if (isset($this->content[$i]) === false) { |
|
265 | - $this->content[$i] = $this->createSegment($i, "New content", $menu->getItem($i) |
|
264 | + if (isset($this->content[$i])===false) { |
|
265 | + $this->content[$i]=$this->createSegment($i, "New content", $menu->getItem($i) |
|
266 | 266 | ->getIdentifier()); |
267 | 267 | } |
268 | 268 | $menu->getItem($i)->addToProperty("data-tab", $this->content[$i]->getProperty("data-tab")); |
269 | 269 | } |
270 | 270 | |
271 | - $this->content["menu"] = $menu; |
|
271 | + $this->content["menu"]=$menu; |
|
272 | 272 | return $this; |
273 | 273 | } |
274 | 274 | |
@@ -277,14 +277,14 @@ discard block |
||
277 | 277 | * @see BaseHtml::run() |
278 | 278 | */ |
279 | 279 | public function run(JsUtils $js) { |
280 | - if (isset($this->_bsComponent) === false) |
|
281 | - $this->_bsComponent = $js->semantic()->tab("#" . $this->identifier . " .item", $this->params); |
|
280 | + if (isset($this->_bsComponent)===false) |
|
281 | + $this->_bsComponent=$js->semantic()->tab("#".$this->identifier." .item", $this->params); |
|
282 | 282 | $this->addEventsOnRun($js); |
283 | 283 | return $this->_bsComponent; |
284 | 284 | } |
285 | 285 | |
286 | - public function compile(JsUtils $js = NULL, &$view = NULL) { |
|
287 | - if (! $this->_activated && $this->content["menu"]->count() > 0 && \sizeof($this->content) > 1) |
|
286 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
287 | + if (!$this->_activated && $this->content["menu"]->count()>0 && \sizeof($this->content)>1) |
|
288 | 288 | $this->activate(0); |
289 | 289 | return parent::compile($js, $view); |
290 | 290 | } |
@@ -82,8 +82,9 @@ discard block |
||
82 | 82 | if (isset($this->content[$index]) === false) { |
83 | 83 | $this->content[$index] = $this->createSegment($index, $content, $menu->getItem($index) |
84 | 84 | ->getIdentifier()); |
85 | - } else |
|
86 | - $this->content[$index]->setContent($content); |
|
85 | + } else { |
|
86 | + $this->content[$index]->setContent($content); |
|
87 | + } |
|
87 | 88 | } |
88 | 89 | return $this; |
89 | 90 | } |
@@ -277,15 +278,17 @@ discard block |
||
277 | 278 | * @see BaseHtml::run() |
278 | 279 | */ |
279 | 280 | public function run(JsUtils $js) { |
280 | - if (isset($this->_bsComponent) === false) |
|
281 | - $this->_bsComponent = $js->semantic()->tab("#" . $this->identifier . " .item", $this->params); |
|
281 | + if (isset($this->_bsComponent) === false) { |
|
282 | + $this->_bsComponent = $js->semantic()->tab("#" . $this->identifier . " .item", $this->params); |
|
283 | + } |
|
282 | 284 | $this->addEventsOnRun($js); |
283 | 285 | return $this->_bsComponent; |
284 | 286 | } |
285 | 287 | |
286 | 288 | public function compile(JsUtils $js = NULL, &$view = NULL) { |
287 | - if (! $this->_activated && $this->content["menu"]->count() > 0 && \sizeof($this->content) > 1) |
|
288 | - $this->activate(0); |
|
289 | + if (! $this->_activated && $this->content["menu"]->count() > 0 && \sizeof($this->content) > 1) { |
|
290 | + $this->activate(0); |
|
291 | + } |
|
289 | 292 | return parent::compile($js, $view); |
290 | 293 | } |
291 | 294 | } |