Completed
Push — master ( 138cdf...e53430 )
by Jean-Christophe
03:16
created
Ajax/semantic/html/modules/HtmlProgress.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -17,17 +17,17 @@  discard block
 block discarded – undo
17 17
 		$this->createBar();
18 18
 		if (isset($label))
19 19
 			$this->setLabel($label);
20
-		$this->_states=[ State::SUCCESS,State::WARNING,State::ERROR,State::ACTIVE,State::DISABLED ];
20
+		$this->_states=[State::SUCCESS, State::WARNING, State::ERROR, State::ACTIVE, State::DISABLED];
21 21
 		$this->addToProperty("class", $attributes);
22 22
 	}
23 23
 
24 24
 	public function setLabel($label) {
25
-		$this->content["label"]=new HtmlSemDoubleElement("lbl-" . $this->identifier, "div", "label", $label);
25
+		$this->content["label"]=new HtmlSemDoubleElement("lbl-".$this->identifier, "div", "label", $label);
26 26
 		return $this;
27 27
 	}
28 28
 
29 29
 	private function createBar() {
30
-		$bar=new HtmlSemDoubleElement("bar-" . $this->identifier, "div", "bar", new HtmlSemDoubleElement("progress-" . $this->identifier, "div", "progress"));
30
+		$bar=new HtmlSemDoubleElement("bar-".$this->identifier, "div", "bar", new HtmlSemDoubleElement("progress-".$this->identifier, "div", "progress"));
31 31
 		$this->content["bar"]=$bar;
32 32
 		return $this;
33 33
 	}
@@ -63,20 +63,20 @@  discard block
 block discarded – undo
63 63
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile()
64 64
 	 */
65 65
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
66
-		$this->content=JArray::sortAssociative($this->content, [ "bar","label" ]);
66
+		$this->content=JArray::sortAssociative($this->content, ["bar", "label"]);
67 67
 		return parent::compile($js, $view);
68 68
 	}
69 69
 
70 70
 	public function jsSetValue($value) {
71
-		return '$("#' . $this->identifier . '").progress({value:' . $value . '});';
71
+		return '$("#'.$this->identifier.'").progress({value:'.$value.'});';
72 72
 	}
73 73
 
74 74
 	public function jsIncValue() {
75
-		return '$("#' . $this->identifier . '").progress("increment");';
75
+		return '$("#'.$this->identifier.'").progress("increment");';
76 76
 	}
77 77
 
78 78
 	public function jsDecValue() {
79
-		return '$("#' . $this->identifier . '").progress("decrement");';
79
+		return '$("#'.$this->identifier.'").progress("decrement");';
80 80
 	}
81 81
 
82 82
 	/**
@@ -98,12 +98,12 @@  discard block
 block discarded – undo
98 98
 			$percent=JArray::getDefaultValue($array, "percent", $percent);
99 99
 			$ratio=JArray::getDefaultValue($array, "ratio", $ratio);
100 100
 		}
101
-		$this->_params["text"]="%{active  : " . \var_export($active, true) . ",error: " . \var_export($error, true) . ",success : " . \var_export($success, true) . ",warning : " . \var_export($warning, true) . ",percent : " . \var_export($percent, true) . ",ratio   : " . \var_export($ratio, true) . "}%";
101
+		$this->_params["text"]="%{active  : ".\var_export($active, true).",error: ".\var_export($error, true).",success : ".\var_export($success, true).",warning : ".\var_export($warning, true).",percent : ".\var_export($percent, true).",ratio   : ".\var_export($ratio, true)."}%";
102 102
 		return $this;
103 103
 	}
104 104
 
105 105
 	public function onChange($jsCode) {
106
-		$this->addBehavior($this->_params, "onChange", $jsCode,"%function(percent, value, total){","}%");
106
+		$this->addBehavior($this->_params, "onChange", $jsCode, "%function(percent, value, total){", "}%");
107 107
 		return $this;
108 108
 	}
109 109
 
@@ -112,8 +112,8 @@  discard block
 block discarded – undo
112 112
 	 * @see BaseHtml::run()
113 113
 	 */
114 114
 	public function run(JsUtils $js) {
115
-		if (isset($this->_bsComponent) === false)
116
-			$this->_bsComponent=$js->semantic()->progress("#" . $this->identifier, $this->_params);
115
+		if (isset($this->_bsComponent)===false)
116
+			$this->_bsComponent=$js->semantic()->progress("#".$this->identifier, $this->_params);
117 117
 		$this->addEventsOnRun($js);
118 118
 		return $this->_bsComponent;
119 119
 	}
Please login to merge, or discard this patch.
Ajax/semantic/html/base/traits/BaseTrait.php 2 patches
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -13,8 +13,8 @@  discard block
 block discarded – undo
13 13
  * @property string $identifier
14 14
  */
15 15
 trait BaseTrait {
16
-	protected $_variations=[ ];
17
-	protected $_states=[ ];
16
+	protected $_variations=[];
17
+	protected $_states=[];
18 18
 	protected $_baseClass;
19 19
 
20 20
 	abstract protected function setPropertyCtrl($name, $value, $typeCtrl);
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 
28 28
 	abstract public function setProperty($name, $value);
29 29
 
30
-	abstract public function addContent($content,$before=false);
30
+	abstract public function addContent($content, $before=false);
31 31
 
32 32
 	abstract public function onCreate($jsCode);
33 33
 
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 		$this->setProperty("class", $this->_baseClass);
49 49
 		if (\is_string($variations))
50 50
 			$variations=\explode(" ", $variations);
51
-		foreach ( $variations as $variation ) {
51
+		foreach ($variations as $variation) {
52 52
 			$this->addVariation($variation);
53 53
 		}
54 54
 		return $this;
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 	public function addVariations($variations=array()) {
63 63
 		if (\is_string($variations))
64 64
 			$variations=\explode(" ", $variations);
65
-		foreach ( $variations as $variation ) {
65
+		foreach ($variations as $variation) {
66 66
 			$this->addVariation($variation);
67 67
 		}
68 68
 		return $this;
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 	public function addStates($states=array()) {
72 72
 		if (\is_string($states))
73 73
 			$states=\explode(" ", $states);
74
-		foreach ( $states as $state ) {
74
+		foreach ($states as $state) {
75 75
 			$this->addState($state);
76 76
 		}
77 77
 		return $this;
@@ -81,17 +81,17 @@  discard block
 block discarded – undo
81 81
 		$this->setProperty("class", $this->_baseClass);
82 82
 		if (\is_string($states))
83 83
 			$states=\explode(" ", $states);
84
-		foreach ( $states as $state ) {
84
+		foreach ($states as $state) {
85 85
 			$this->addState($state);
86 86
 		}
87 87
 		return $this;
88 88
 	}
89 89
 
90 90
 	public function addIcon($icon, $before=true) {
91
-		return $this->addContent(new HtmlIcon("icon-" . $this->identifier, $icon), $before);
91
+		return $this->addContent(new HtmlIcon("icon-".$this->identifier, $icon), $before);
92 92
 	}
93 93
 
94
-	public function addSticky($context="body"){
94
+	public function addSticky($context="body") {
95 95
 		$this->onCreate("$('#".$this->identifier."').sticky({ context: '".$context."'});");
96 96
 		return $this;
97 97
 	}
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
 	 * @return \Ajax\semantic\html\elements\HtmlSemDoubleElement
113 113
 	 */
114 114
 	public function setDisabled($disable=true) {
115
-		if($disable)
115
+		if ($disable)
116 116
 			$this->addToProperty("class", "disabled");
117 117
 		return $this;
118 118
 	}
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
 	 *
139 139
 	 * @return \Ajax\semantic\html\base\HtmlSemDoubleElement
140 140
 	 */
141
-	public function asHeader(){
141
+	public function asHeader() {
142 142
 		return $this->addToProperty("class", "header");
143 143
 	}
144 144
 
@@ -146,15 +146,15 @@  discard block
 block discarded – undo
146 146
 	 * show it is currently the active user selection
147 147
 	 * @return \Ajax\semantic\html\base\HtmlSemDoubleElement
148 148
 	 */
149
-	public function setActive($value=true){
150
-		if($value)
149
+	public function setActive($value=true) {
150
+		if ($value)
151 151
 			$this->addToProperty("class", "active");
152 152
 		return $this;
153 153
 	}
154 154
 
155
-	public function setAttached($value=true){
156
-		if($value)
157
-			$this->addToPropertyCtrl("class", "attached", array ("attached" ));
155
+	public function setAttached($value=true) {
156
+		if ($value)
157
+			$this->addToPropertyCtrl("class", "attached", array("attached"));
158 158
 		return $this;
159 159
 	}
160 160
 
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
 	}
171 171
 
172 172
 	public function setFloated($direction="right") {
173
-		return $this->addToPropertyCtrl("class", $direction . " floated", Direction::getConstantValues("floated"));
173
+		return $this->addToPropertyCtrl("class", $direction." floated", Direction::getConstantValues("floated"));
174 174
 	}
175 175
 
176 176
 	public function floatRight() {
@@ -185,14 +185,14 @@  discard block
 block discarded – undo
185 185
 		return $this->_baseClass;
186 186
 	}
187 187
 
188
-	protected function addBehavior(&$array,$key,$value,$before="",$after=""){
189
-		if(\is_string($value)){
190
-			if(isset($array[$key])){
188
+	protected function addBehavior(&$array, $key, $value, $before="", $after="") {
189
+		if (\is_string($value)) {
190
+			if (isset($array[$key])) {
191 191
 				$p=JString::replaceAtFirstAndLast($array[$key], $before, "", $after, "");
192 192
 				$array[$key]=$before.$p.$value.$after;
193
-			}else
193
+			} else
194 194
 				$array[$key]=$before.$value.$after;
195
-		}else
195
+		} else
196 196
 			$array[$key]=$value;
197 197
 		return $this;
198 198
 	}
Please login to merge, or discard this patch.
Braces   +27 added lines, -18 removed lines patch added patch discarded remove patch
@@ -46,8 +46,9 @@  discard block
 block discarded – undo
46 46
 
47 47
 	public function setVariations($variations) {
48 48
 		$this->setProperty("class", $this->_baseClass);
49
-		if (\is_string($variations))
50
-			$variations=\explode(" ", $variations);
49
+		if (\is_string($variations)) {
50
+					$variations=\explode(" ", $variations);
51
+		}
51 52
 		foreach ( $variations as $variation ) {
52 53
 			$this->addVariation($variation);
53 54
 		}
@@ -60,8 +61,9 @@  discard block
 block discarded – undo
60 61
 	}
61 62
 
62 63
 	public function addVariations($variations=array()) {
63
-		if (\is_string($variations))
64
-			$variations=\explode(" ", $variations);
64
+		if (\is_string($variations)) {
65
+					$variations=\explode(" ", $variations);
66
+		}
65 67
 		foreach ( $variations as $variation ) {
66 68
 			$this->addVariation($variation);
67 69
 		}
@@ -69,8 +71,9 @@  discard block
 block discarded – undo
69 71
 	}
70 72
 
71 73
 	public function addStates($states=array()) {
72
-		if (\is_string($states))
73
-			$states=\explode(" ", $states);
74
+		if (\is_string($states)) {
75
+					$states=\explode(" ", $states);
76
+		}
74 77
 		foreach ( $states as $state ) {
75 78
 			$this->addState($state);
76 79
 		}
@@ -79,8 +82,9 @@  discard block
 block discarded – undo
79 82
 
80 83
 	public function setStates($states) {
81 84
 		$this->setProperty("class", $this->_baseClass);
82
-		if (\is_string($states))
83
-			$states=\explode(" ", $states);
85
+		if (\is_string($states)) {
86
+					$states=\explode(" ", $states);
87
+		}
84 88
 		foreach ( $states as $state ) {
85 89
 			$this->addState($state);
86 90
 		}
@@ -112,8 +116,9 @@  discard block
 block discarded – undo
112 116
 	 * @return \Ajax\semantic\html\elements\HtmlSemDoubleElement
113 117
 	 */
114 118
 	public function setDisabled($disable=true) {
115
-		if($disable)
116
-			$this->addToProperty("class", "disabled");
119
+		if($disable) {
120
+					$this->addToProperty("class", "disabled");
121
+		}
117 122
 		return $this;
118 123
 	}
119 124
 
@@ -147,14 +152,16 @@  discard block
 block discarded – undo
147 152
 	 * @return \Ajax\semantic\html\base\HtmlSemDoubleElement
148 153
 	 */
149 154
 	public function setActive($value=true){
150
-		if($value)
151
-			$this->addToProperty("class", "active");
155
+		if($value) {
156
+					$this->addToProperty("class", "active");
157
+		}
152 158
 		return $this;
153 159
 	}
154 160
 
155 161
 	public function setAttached($value=true){
156
-		if($value)
157
-			$this->addToPropertyCtrl("class", "attached", array ("attached" ));
162
+		if($value) {
163
+					$this->addToPropertyCtrl("class", "attached", array ("attached" ));
164
+		}
158 165
 		return $this;
159 166
 	}
160 167
 
@@ -190,10 +197,12 @@  discard block
 block discarded – undo
190 197
 			if(isset($array[$key])){
191 198
 				$p=JString::replaceAtFirstAndLast($array[$key], $before, "", $after, "");
192 199
 				$array[$key]=$before.$p.$value.$after;
193
-			}else
194
-				$array[$key]=$before.$value.$after;
195
-		}else
196
-			$array[$key]=$value;
200
+			} else {
201
+							$array[$key]=$before.$value.$after;
202
+			}
203
+		} else {
204
+					$array[$key]=$value;
205
+		}
197 206
 		return $this;
198 207
 	}
199 208
 }
200 209
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/HtmlForm.php 1 patch
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
  */
22 22
 class HtmlForm extends HtmlSemCollection {
23 23
 
24
-	use FieldsTrait,FormTrait;
24
+	use FieldsTrait, FormTrait;
25 25
 	/**
26 26
 	 * @var array
27 27
 	 */
@@ -34,14 +34,14 @@  discard block
 block discarded – undo
34 34
 
35 35
 	public function __construct($identifier, $elements=array()) {
36 36
 		parent::__construct($identifier, "form", "ui form");
37
-		$this->_states=[ State::ERROR,State::SUCCESS,State::WARNING,State::DISABLED ];
37
+		$this->_states=[State::ERROR, State::SUCCESS, State::WARNING, State::DISABLED];
38 38
 		$this->setProperty("name", $this->identifier);
39
-		$this->_fields=array ();
39
+		$this->_fields=array();
40 40
 		$this->addItems($elements);
41 41
 		$this->_validationParams=[];
42 42
 	}
43 43
 
44
-	protected function getForm(){
44
+	protected function getForm() {
45 45
 		return $this;
46 46
 	}
47 47
 
@@ -62,8 +62,8 @@  discard block
 block discarded – undo
62 62
 	 * @param string $caption
63 63
 	 * @return \Ajax\semantic\html\collections\form\HtmlForm
64 64
 	 */
65
-	public function addDivider($caption=NULL){
66
-		return $this->addContent(new HtmlDivider("",$caption));
65
+	public function addDivider($caption=NULL) {
66
+		return $this->addContent(new HtmlDivider("", $caption));
67 67
 	}
68 68
 
69 69
 	public function addFields($fields=NULL, $label=NULL) {
@@ -79,12 +79,12 @@  discard block
 block discarded – undo
79 79
 						$label=NULL;
80 80
 				}
81 81
 				$this->_fields=\array_merge($this->_fields, $fields);
82
-				$fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count(), $fields);
82
+				$fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count(), $fields);
83 83
 			}
84 84
 			if (isset($label))
85 85
 				$fields=new HtmlFormField("", $fields, $label);
86 86
 		} else {
87
-			$fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count());
87
+			$fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count());
88 88
 		}
89 89
 		$this->addItem($fields);
90 90
 		return $fields;
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 
93 93
 	public function addItem($item) {
94 94
 		$item=parent::addItem($item);
95
-		if (\is_subclass_of($item, HtmlFormField::class) === true) {
95
+		if (\is_subclass_of($item, HtmlFormField::class)===true) {
96 96
 			$this->_fields[]=$item;
97 97
 		}
98 98
 		return $item;
@@ -146,39 +146,39 @@  discard block
 block discarded – undo
146 146
 
147 147
 
148 148
 
149
-	public function compile(JsUtils $js=NULL,&$view=NULL){
150
-		if(\sizeof($this->_validationParams)>0)
149
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
150
+		if (\sizeof($this->_validationParams)>0)
151 151
 			$this->setProperty("novalidate", "");
152
-		return parent::compile($js,$view);
152
+		return parent::compile($js, $view);
153 153
 	}
154 154
 
155 155
 	public function run(JsUtils $js) {
156
-		if(isset($js)){
156
+		if (isset($js)) {
157 157
 			$compo=$js->semantic()->form("#".$this->identifier);
158
-		}else{
158
+		} else {
159 159
 			$compo=new Form();
160 160
 			$compo->attach("#".$this->identifier);
161 161
 		}
162
-		foreach ($this->_fields as $field){
163
-			if($field instanceof HtmlFormField){
162
+		foreach ($this->_fields as $field) {
163
+			if ($field instanceof HtmlFormField) {
164 164
 				$compo=$this->addCompoValidation($compo, $field);
165 165
 			}
166 166
 		}
167
-		foreach ($this->content as $field){
168
-			if($field instanceof HtmlFormFields){
167
+		foreach ($this->content as $field) {
168
+			if ($field instanceof HtmlFormFields) {
169 169
 				$items=$field->getItems();
170
-				foreach ($items as $_field){
171
-					if($_field instanceof HtmlFormField)
170
+				foreach ($items as $_field) {
171
+					if ($_field instanceof HtmlFormField)
172 172
 						$compo=$this->addCompoValidation($compo, $_field);
173 173
 				}
174 174
 			}
175 175
 		}
176
-		$this->_runValidationParams($compo,$js);
176
+		$this->_runValidationParams($compo, $js);
177 177
 		return $this->_bsComponent;
178 178
 	}
179 179
 
180
-	public function addValidationParam($paramName,$paramValue,$before="",$after=""){
181
-		$this->addBehavior($this->_validationParams, $paramName, $paramValue,$before,$after);
180
+	public function addValidationParam($paramName, $paramValue, $before="", $after="") {
181
+		$this->addBehavior($this->_validationParams, $paramName, $paramValue, $before, $after);
182 182
 		return $this;
183 183
 	}
184 184
 
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
191 191
 		return $this->_validationParams;
192 192
 	}
193 193
 
194
-	public function removeValidationParam($param){
194
+	public function removeValidationParam($param) {
195 195
 		unset($this->_validationParams[$param]);
196 196
 		return $this;
197 197
 	}
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/traits/FormTrait.php 1 patch
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -12,28 +12,28 @@  discard block
 block discarded – undo
12 12
  * @author jc
13 13
  *
14 14
  */
15
-trait FormTrait{
15
+trait FormTrait {
16 16
 
17 17
 	/**
18 18
 	 * @return HtmlForm
19 19
 	 */
20 20
 	abstract protected function getForm();
21 21
 
22
-	protected function addCompoValidation($compo,$field){
22
+	protected function addCompoValidation($compo, $field) {
23 23
 		$validation=$field->getValidation();
24
-		if(isset($validation)){
24
+		if (isset($validation)) {
25 25
 			$validation->setIdentifier($field->getDataField()->getIdentifier());
26 26
 			$compo->addFieldValidation($validation);
27 27
 		}
28 28
 		return $compo;
29 29
 	}
30 30
 
31
-	protected function _runValidationParams(&$compo,JsUtils $js=NULL){
31
+	protected function _runValidationParams(&$compo, JsUtils $js=NULL) {
32 32
 		$form=$this->getForm();
33 33
 		$params=$form->getValidationParams();
34
-		if(isset($params["_ajaxSubmit"]) && $params["_ajaxSubmit"] instanceof AjaxCall){
34
+		if (isset($params["_ajaxSubmit"]) && $params["_ajaxSubmit"] instanceof AjaxCall) {
35 35
 			$compilation=$params["_ajaxSubmit"]->compile($js);
36
-			$compilation=str_ireplace("\"","%quote%", $compilation);
36
+			$compilation=str_ireplace("\"", "%quote%", $compilation);
37 37
 			$this->onSuccess($compilation);
38 38
 			$form->removeValidationParam("_ajaxSubmit");
39 39
 		}
@@ -51,14 +51,14 @@  discard block
 block discarded – undo
51 51
 		return $this;
52 52
 	}
53 53
 
54
-	public function setAttached($value=true){
54
+	public function setAttached($value=true) {
55 55
 		$form=$this->getForm();
56
-		if($value)
57
-			$form->addToPropertyCtrl("class", "attached", array ("attached" ));
56
+		if ($value)
57
+			$form->addToPropertyCtrl("class", "attached", array("attached"));
58 58
 		return $form;
59 59
 	}
60 60
 
61
-	public function addErrorMessage(){
61
+	public function addErrorMessage() {
62 62
 		return $this->getForm()->addContent((new HtmlMessage(""))->setError());
63 63
 	}
64 64
 
@@ -73,38 +73,38 @@  discard block
 block discarded – undo
73 73
 	 * @param string $responseElement
74 74
 	 * @return \Ajax\semantic\html\collections\form\HtmlForm
75 75
 	 */
76
-	public function submitOn($event,$identifier,$url,$responseElement){
76
+	public function submitOn($event, $identifier, $url, $responseElement) {
77 77
 		$form=$this->getForm();
78 78
 		$elem=$form->getElementById($identifier, $form->getContent());
79
-		if(isset($elem)){
80
-			$this->_buttonAsSubmit($elem, $event,$url,$responseElement);
79
+		if (isset($elem)) {
80
+			$this->_buttonAsSubmit($elem, $event, $url, $responseElement);
81 81
 		}
82 82
 		return $form;
83 83
 	}
84 84
 
85
-	public function submitOnClick($identifier,$url,$responseElement){
85
+	public function submitOnClick($identifier, $url, $responseElement) {
86 86
 		return $this->submitOn("click", $identifier, $url, $responseElement);
87 87
 	}
88 88
 
89
-	public function addSubmit($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL){
90
-		$bt=$this->getForm()->addButton($identifier, $value,$cssStyle);
91
-		return $this->_buttonAsSubmit($bt, "click",$url,$responseElement);
89
+	public function addSubmit($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL) {
90
+		$bt=$this->getForm()->addButton($identifier, $value, $cssStyle);
91
+		return $this->_buttonAsSubmit($bt, "click", $url, $responseElement);
92 92
 	}
93 93
 
94
-	protected function _buttonAsSubmit(HtmlButton &$button,$event,$url,$responseElement=NULL,$parameters=NULL){
94
+	protected function _buttonAsSubmit(HtmlButton&$button, $event, $url, $responseElement=NULL, $parameters=NULL) {
95 95
 		$form=$this->getForm();
96
-		if(isset($url) && isset($responseElement)){
97
-			$button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');",true,true);
98
-			$params=["form"=>$form->getIdentifier(),"responseElement"=>$responseElement,"url"=>$url,"stopPropagation"=>true];
99
-			if(\is_array($parameters))
100
-				$params=\array_merge($params,$parameters);
96
+		if (isset($url) && isset($responseElement)) {
97
+			$button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');", true, true);
98
+			$params=["form"=>$form->getIdentifier(), "responseElement"=>$responseElement, "url"=>$url, "stopPropagation"=>true];
99
+			if (\is_array($parameters))
100
+				$params=\array_merge($params, $parameters);
101 101
 			$form->addValidationParam("_ajaxSubmit", new AjaxCall("postForm", $params));
102 102
 		}
103 103
 		return $button;
104 104
 	}
105 105
 
106
-	public function addReset($identifier,$value,$cssStyle=NULL){
107
-		$bt=$this->getForm()->addButton($identifier, $value,$cssStyle);
106
+	public function addReset($identifier, $value, $cssStyle=NULL) {
107
+		$bt=$this->getForm()->addButton($identifier, $value, $cssStyle);
108 108
 		$bt->setProperty("type", "reset");
109 109
 		return $bt;
110 110
 	}
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
 	 * @param string $jsCode
115 115
 	 * @return \Ajax\semantic\html\collections\form\HtmlForm
116 116
 	 */
117
-	public function onValid($jsCode){
117
+	public function onValid($jsCode) {
118 118
 		$form=$this->getForm();
119 119
 		$form->addValidationParam("onValid", "%function(){".$jsCode."}%");
120 120
 		return $form;
@@ -125,9 +125,9 @@  discard block
 block discarded – undo
125 125
 	 * @param string $jsCode can use event and fields parameters
126 126
 	 * @return HtmlForm
127 127
 	 */
128
-	public function onSuccess($jsCode){
128
+	public function onSuccess($jsCode) {
129 129
 		$form=$this->getForm();
130
-		$form->addValidationParam("onSuccess", $jsCode,"%function(event,fields){","}%");
130
+		$form->addValidationParam("onSuccess", $jsCode, "%function(event,fields){", "}%");
131 131
 		return $form;
132 132
 	}
133 133
 }
134 134
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/HtmlFormField.php 2 patches
Spacing   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -14,34 +14,34 @@  discard block
 block discarded – undo
14 14
 	use FieldTrait;
15 15
 	protected $_container;
16 16
 	protected $_validation;
17
-	public function __construct($identifier, $field,$label=NULL) {
18
-		parent::__construct($identifier, "div","field");
17
+	public function __construct($identifier, $field, $label=NULL) {
18
+		parent::__construct($identifier, "div", "field");
19 19
 		$this->content=array();
20
-		$this->_states=[State::ERROR,State::DISABLED];
21
-		if(isset($label) && $label!=="")
20
+		$this->_states=[State::ERROR, State::DISABLED];
21
+		if (isset($label) && $label!=="")
22 22
 			$this->setLabel($label);
23 23
 		$this->setField($field);
24 24
 		$this->_validation=NULL;
25 25
 	}
26 26
 
27
-	public function addPointingLabel($label,$pointing=Direction::NONE){
28
-		$labelO=new HtmlLabel("",$label);
27
+	public function addPointingLabel($label, $pointing=Direction::NONE) {
28
+		$labelO=new HtmlLabel("", $label);
29 29
 		$labelO->setPointing($pointing);
30
-		$this->addContent($labelO,$pointing==="below" || $pointing==="right");
30
+		$this->addContent($labelO, $pointing==="below" || $pointing==="right");
31 31
 		return $labelO;
32 32
 	}
33 33
 
34
-	public function setLabel($label){
34
+	public function setLabel($label) {
35 35
 		$labelO=$label;
36
-		if(\is_string($label)){
37
-			$labelO=new HtmlSemDoubleElement("","label","");
36
+		if (\is_string($label)) {
37
+			$labelO=new HtmlSemDoubleElement("", "label", "");
38 38
 			$labelO->setContent($label);
39
-			$labelO->setProperty("for", \str_replace("field-", "",$this->identifier));
39
+			$labelO->setProperty("for", \str_replace("field-", "", $this->identifier));
40 40
 		}
41 41
 		$this->content["label"]=$labelO;
42 42
 	}
43 43
 
44
-	public function setField($field){
44
+	public function setField($field) {
45 45
 		$this->content["field"]=$field;
46 46
 	}
47 47
 
@@ -49,8 +49,8 @@  discard block
 block discarded – undo
49 49
 	 * Returns the label or null
50 50
 	 * @return mixed
51 51
 	 */
52
-	public function getLabel(){
53
-		if(\array_key_exists("label", $this->content))
52
+	public function getLabel() {
53
+		if (\array_key_exists("label", $this->content))
54 54
 			return $this->content["label"];
55 55
 	}
56 56
 
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 	 * Return the field
59 59
 	 * @return mixed
60 60
 	 */
61
-	public function getField(){
61
+	public function getField() {
62 62
 		return $this->content["field"];
63 63
 	}
64 64
 
@@ -66,14 +66,14 @@  discard block
 block discarded – undo
66 66
 	 * Return the field with data
67 67
 	 * @return mixed
68 68
 	 */
69
-	public function getDataField(){
69
+	public function getDataField() {
70 70
 		return $this->content["field"];
71 71
 	}
72 72
 
73 73
 	/**
74 74
 	 * puts the label before or behind
75 75
 	 */
76
-	public function swapLabel(){
76
+	public function swapLabel() {
77 77
 		$label=$this->getLabel();
78 78
 		unset($this->content["label"]);
79 79
 		$this->content["label"]=$label;
@@ -84,31 +84,31 @@  discard block
 block discarded – undo
84 84
 	 * @param int $width
85 85
 	 * @return \Ajax\semantic\html\collections\form\HtmlFormField
86 86
 	 */
87
-	public function setWidth($width){
88
-		if(\is_int($width)){
87
+	public function setWidth($width) {
88
+		if (\is_int($width)) {
89 89
 			$width=Wide::getConstants()["W".$width];
90 90
 		}
91 91
 		$this->addToPropertyCtrl("class", $width, Wide::getConstants());
92
-		if(isset($this->_container)){
92
+		if (isset($this->_container)) {
93 93
 			$this->_container->setEqualWidth(false);
94 94
 		}
95
-		return $this->addToPropertyCtrl("class", "wide",array("wide"));
95
+		return $this->addToPropertyCtrl("class", "wide", array("wide"));
96 96
 	}
97 97
 
98 98
 	/**
99 99
 	 * Field displays an error state
100 100
 	 * @return \Ajax\semantic\html\collections\form\HtmlFormField
101 101
 	 */
102
-	public function setError(){
102
+	public function setError() {
103 103
 		return $this->addToProperty("class", "error");
104 104
 	}
105 105
 
106
-	public function setInline(){
106
+	public function setInline() {
107 107
 		return $this->addToProperty("class", "inline");
108 108
 	}
109 109
 
110
-	public function jsState($state){
111
-		return $this->jsDoJquery("addClass",$state);
110
+	public function jsState($state) {
111
+		return $this->jsDoJquery("addClass", $state);
112 112
 	}
113 113
 
114 114
 	public function setContainer($_container) {
@@ -116,39 +116,39 @@  discard block
 block discarded – undo
116 116
 		return $this;
117 117
 	}
118 118
 
119
-	public function setReadonly(){
119
+	public function setReadonly() {
120 120
 		$this->getField()->setProperty("readonly", "");
121 121
 	}
122 122
 
123
-	public function addRule($type,$prompt=NULL,$value=NULL){
123
+	public function addRule($type, $prompt=NULL, $value=NULL) {
124 124
 		$field=$this->getDataField();
125
-		if(isset($field)){
126
-			if(!isset($this->_validation)){
125
+		if (isset($field)) {
126
+			if (!isset($this->_validation)) {
127 127
 				$this->_validation=new FieldValidation($field->getIdentifier());
128 128
 			}
129
-			if($type==="empty"){
130
-				$this->addToProperty("class","required");
129
+			if ($type==="empty") {
130
+				$this->addToProperty("class", "required");
131 131
 			}
132
-			$this->_validation->addRule($type,$prompt,$value);
132
+			$this->_validation->addRule($type, $prompt, $value);
133 133
 		}
134 134
 		return $this;
135 135
 	}
136 136
 
137
-	public function addRules(array $rules){
138
-		foreach ($rules as $rule){
137
+	public function addRules(array $rules) {
138
+		foreach ($rules as $rule) {
139 139
 			$this->addRule($rule);
140 140
 		}
141 141
 		return $this;
142 142
 	}
143 143
 
144
-	public function setRules(array $rules){
144
+	public function setRules(array $rules) {
145 145
 		$this->_validation=null;
146 146
 		return $this->addRules($rules);
147 147
 	}
148 148
 
149
-	public function addIcon($icon,$direction=Direction::LEFT){
149
+	public function addIcon($icon, $direction=Direction::LEFT) {
150 150
 		$field=$this->getField();
151
-		return $field->addIcon($icon,$direction);
151
+		return $field->addIcon($icon, $direction);
152 152
 	}
153 153
 
154 154
 	public function getValidation() {
Please login to merge, or discard this patch.
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -18,8 +18,9 @@  discard block
 block discarded – undo
18 18
 		parent::__construct($identifier, "div","field");
19 19
 		$this->content=array();
20 20
 		$this->_states=[State::ERROR,State::DISABLED];
21
-		if(isset($label) && $label!=="")
22
-			$this->setLabel($label);
21
+		if(isset($label) && $label!=="") {
22
+					$this->setLabel($label);
23
+		}
23 24
 		$this->setField($field);
24 25
 		$this->_validation=NULL;
25 26
 	}
@@ -50,8 +51,9 @@  discard block
 block discarded – undo
50 51
 	 * @return mixed
51 52
 	 */
52 53
 	public function getLabel(){
53
-		if(\array_key_exists("label", $this->content))
54
-			return $this->content["label"];
54
+		if(\array_key_exists("label", $this->content)) {
55
+					return $this->content["label"];
56
+		}
55 57
 	}
56 58
 
57 59
 	/**
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/HtmlMessage.php 1 patch
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -30,42 +30,42 @@  discard block
 block discarded – undo
30 30
 	 * @param string|HtmlSemDoubleElement $header
31 31
 	 * @return \Ajax\semantic\html\collections\HtmlMessage
32 32
 	 */
33
-	public function addHeader($header){
33
+	public function addHeader($header) {
34 34
 		$headerO=$header;
35
-		if(\is_string($header)){
36
-			$headerO=new HtmlSemDoubleElement("header-".$this->identifier,"div");
35
+		if (\is_string($header)) {
36
+			$headerO=new HtmlSemDoubleElement("header-".$this->identifier, "div");
37 37
 			$headerO->setClass("header");
38 38
 			$headerO->setContent($header);
39 39
 		}
40
-		return $this->addContent($headerO,true);
40
+		return $this->addContent($headerO, true);
41 41
 	}
42 42
 
43
-	public function setHeader($header){
43
+	public function setHeader($header) {
44 44
 		return $this->addHeader($header);
45 45
 	}
46 46
 
47
-	public function addList($elements,$ordered=false){
48
-		$list=new HtmlList("list-".$this->identifier,$elements);
47
+	public function addList($elements, $ordered=false) {
48
+		$list=new HtmlList("list-".$this->identifier, $elements);
49 49
 		$list->setOrdered($ordered);
50 50
 		$list->setClass("ui list");
51 51
 		$this->addContent($list);
52 52
 	}
53 53
 
54
-	public function setIcon($icon){
54
+	public function setIcon($icon) {
55 55
 		$this->addToProperty("class", "icon");
56
-		$this->wrapContent("<div class='content'>","</div>");
56
+		$this->wrapContent("<div class='content'>", "</div>");
57 57
 		$this->icon=new HtmlIcon("icon-".$this->identifier, $icon);
58 58
 		return $this;
59 59
 	}
60 60
 
61
-	public function addLoader($loaderIcon="notched circle"){
61
+	public function addLoader($loaderIcon="notched circle") {
62 62
 		$this->setIcon($loaderIcon);
63 63
 		$this->icon->addToIcon("loading");
64 64
 		return $this;
65 65
 	}
66 66
 
67
-	public function setDismissable($dismiss=true){
68
-		if($dismiss===true)
67
+	public function setDismissable($dismiss=true) {
68
+		if ($dismiss===true)
69 69
 			$this->close=new HtmlIcon("close-".$this->identifier, "close");
70 70
 		else
71 71
 			$this->close=NULL;
@@ -76,38 +76,38 @@  discard block
 block discarded – undo
76 76
 	 * {@inheritDoc}
77 77
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::run()
78 78
 	 */
79
-	public function run(JsUtils $js){
79
+	public function run(JsUtils $js) {
80 80
 		parent::run($js);
81
-		if(isset($this->close)){
81
+		if (isset($this->close)) {
82 82
 			$js->execOn("click", "#".$this->identifier." .close", "$(this).closest('.message').transition('fade')");
83 83
 		}
84 84
 	}
85 85
 
86
-	public function setState($visible=true){
87
-		$visible=($visible===true)?"visible":"hidden";
88
-		return $this->addToPropertyCtrl("class", $visible, array("visible","hidden"));
86
+	public function setState($visible=true) {
87
+		$visible=($visible===true) ? "visible" : "hidden";
88
+		return $this->addToPropertyCtrl("class", $visible, array("visible", "hidden"));
89 89
 	}
90 90
 
91
-	public function setVariation($value="floating"){
92
-		return $this->addToPropertyCtrl("class", $value, array("floating","compact"));
91
+	public function setVariation($value="floating") {
92
+		return $this->addToPropertyCtrl("class", $value, array("floating", "compact"));
93 93
 	}
94 94
 
95
-	public function setStyle($style){
95
+	public function setStyle($style) {
96 96
 		return $this->addToPropertyCtrl("class", $style, Style::getConstants());
97 97
 	}
98 98
 
99
-	public function setError(){
99
+	public function setError() {
100 100
 		return $this->setStyle("error");
101 101
 	}
102 102
 
103
-	public function setWarning(){
103
+	public function setWarning() {
104 104
 		return $this->setStyle("warning");
105 105
 	}
106 106
 
107
-	public function setMessage($message){
108
-		if(\is_array($this->content)){
107
+	public function setMessage($message) {
108
+		if (\is_array($this->content)) {
109 109
 			$this->content[\sizeof($this->content)-1]=$message;
110
-		}else
110
+		} else
111 111
 			$this->setContent($message);
112 112
 	}
113 113
 }
114 114
\ No newline at end of file
Please login to merge, or discard this patch.