Passed
Push — master ( 008e10...57c450 )
by Jean-Christophe
02:05
created
Ajax/semantic/html/collections/form/HtmlForm.php 2 patches
Braces   +22 added lines, -15 removed lines patch added patch discarded remove patch
@@ -52,8 +52,9 @@  discard block
 block discarded – undo
52 52
 	 */
53 53
 	public function addHeader($title, $niveau=1, $dividing=true) {
54 54
 		$header=new HtmlHeader("", $niveau, $title);
55
-		if ($dividing)
56
-			$header->setDividing();
55
+		if ($dividing) {
56
+					$header->setDividing();
57
+		}
57 58
 		return $this->addItem($header);
58 59
 	}
59 60
 
@@ -81,8 +82,9 @@  discard block
 block discarded – undo
81 82
 					if (\is_string($end)) {
82 83
 						$label=$end;
83 84
 						\array_pop($fields);
84
-					} else
85
-						$label=NULL;
85
+					} else {
86
+											$label=NULL;
87
+					}
86 88
 				}
87 89
 				$this->_fields=\array_merge($this->_fields, $fields);
88 90
 				$fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count(), $fields);
@@ -146,27 +148,31 @@  discard block
 block discarded – undo
146 148
 	 */
147 149
 	public function addMessage($identifier, $content, $header=NULL, $icon=NULL, $type=NULL) {
148 150
 		$message=new HtmlMessage($identifier, $content);
149
-		if (isset($header))
150
-			$message->addHeader($header);
151
-		if (isset($icon))
152
-			$message->setIcon($icon);
153
-		if (isset($type))
154
-			$message->setStyle($type);
151
+		if (isset($header)) {
152
+					$message->addHeader($header);
153
+		}
154
+		if (isset($icon)) {
155
+					$message->setIcon($icon);
156
+		}
157
+		if (isset($type)) {
158
+					$message->setStyle($type);
159
+		}
155 160
 		return $this->addItem($message);
156 161
 	}
157 162
 
158 163
 
159 164
 
160 165
 	public function compile(JsUtils $js=NULL,&$view=NULL){
161
-		if(\sizeof($this->_validationParams)>0)
162
-			$this->setProperty("novalidate", "");
166
+		if(\sizeof($this->_validationParams)>0) {
167
+					$this->setProperty("novalidate", "");
168
+		}
163 169
 		return parent::compile($js,$view);
164 170
 	}
165 171
 
166 172
 	public function run(JsUtils $js) {
167 173
 		if(isset($js)){
168 174
 			$compo=$js->semantic()->form("#".$this->identifier);
169
-		}else{
175
+		} else{
170 176
 			$compo=new Form();
171 177
 			$compo->attach("#".$this->identifier);
172 178
 		}
@@ -179,8 +185,9 @@  discard block
 block discarded – undo
179 185
 			if($field instanceof HtmlFormFields){
180 186
 				$items=$field->getItems();
181 187
 				foreach ($items as $_field){
182
-					if($_field instanceof HtmlFormField)
183
-						$compo=$this->addCompoValidation($compo, $_field);
188
+					if($_field instanceof HtmlFormField) {
189
+											$compo=$this->addCompoValidation($compo, $_field);
190
+					}
184 191
 				}
185 192
 			}
186 193
 		}
Please login to merge, or discard this patch.
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 				$compo=$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
 						$compo=$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
 			$compo=$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
 
@@ -218,7 +218,7 @@  discard block
 block discarded – undo
218 218
 		return $this->_validationParams;
219 219
 	}
220 220
 
221
-	public function removeValidationParam($param){
221
+	public function removeValidationParam($param) {
222 222
 		unset($this->_validationParams[$param]);
223 223
 		return $this;
224 224
 	}
Please login to merge, or discard this patch.
Ajax/semantic/components/validation/FieldValidation.php 2 patches
Braces   +6 added lines, -5 removed lines patch added patch discarded remove patch
@@ -49,15 +49,16 @@
 block discarded – undo
49 49
 	 * @return Rule
50 50
 	 */
51 51
 	public function addRule($type,$prompt=NULL,$value=NULL){
52
-		if($type instanceof  Rule)
53
-			$rule=$type;
54
-		else if(\is_array($type)){
52
+		if($type instanceof  Rule) {
53
+					$rule=$type;
54
+		} else if(\is_array($type)){
55 55
 			$value=JArray::getValue($type, "value", 2);
56 56
 			$prompt=JArray::getValue($type, "prompt", 1);
57 57
 			$type=JArray::getValue($type, "type", 0);
58 58
 			$rule=new Rule($type,$prompt,$value);
59
-		}else
60
-			$rule=new Rule($type,$prompt,$value);
59
+		} else {
60
+					$rule=new Rule($type,$prompt,$value);
61
+		}
61 62
 		$this->rules[]=$rule;
62 63
 		return $rule;
63 64
 	}
Please login to merge, or discard this patch.
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@  discard block
 block discarded – undo
7 7
  * @version 1.001
8 8
  * Generates a JSON field validator
9 9
  */
10
-class FieldValidation implements \JsonSerializable{
10
+class FieldValidation implements \JsonSerializable {
11 11
 	/**
12 12
 	 * @var string
13 13
 	 */
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 
25 25
 	protected $optional;
26 26
 
27
-	public function __construct($identifier){
27
+	public function __construct($identifier) {
28 28
 		$this->identifier=$identifier;
29 29
 		$this->rules=[];
30 30
 	}
@@ -48,26 +48,26 @@  discard block
 block discarded – undo
48 48
 	 * @param string $value
49 49
 	 * @return Rule
50 50
 	 */
51
-	public function addRule($type,$prompt=NULL,$value=NULL){
52
-		if($type instanceof  Rule)
51
+	public function addRule($type, $prompt=NULL, $value=NULL) {
52
+		if ($type instanceof  Rule)
53 53
 			$rule=$type;
54
-		else if(\is_array($type)){
54
+		else if (\is_array($type)) {
55 55
 			$value=JArray::getValue($type, "value", 2);
56 56
 			$prompt=JArray::getValue($type, "prompt", 1);
57 57
 			$type=JArray::getValue($type, "type", 0);
58
-			$rule=new Rule($type,$prompt,$value);
59
-		}else
60
-			$rule=new Rule($type,$prompt,$value);
58
+			$rule=new Rule($type, $prompt, $value);
59
+		} else
60
+			$rule=new Rule($type, $prompt, $value);
61 61
 		$this->rules[]=$rule;
62 62
 		return $rule;
63 63
 	}
64 64
 
65
-	public function jsonSerialize(){
66
-		$result=["identifier"=>$this->identifier,"rules"=>$this->rules];
67
-		if($this->optional){
65
+	public function jsonSerialize() {
66
+		$result=["identifier"=>$this->identifier, "rules"=>$this->rules];
67
+		if ($this->optional) {
68 68
 			$result["optional"]=true;
69 69
 		}
70
-		if(isset($this->depends)){
70
+		if (isset($this->depends)) {
71 71
 			$result["depends"]=$this->depends;
72 72
 		}
73 73
 		return $result;
Please login to merge, or discard this patch.
Ajax/semantic/components/Dropdown.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -17,8 +17,8 @@  discard block
 block discarded – undo
17 17
 	 * @param string $action one of "select","auto","activate","combo","nothing","hide"
18 18
 	 * @return \Ajax\semantic\components\Dropdown
19 19
 	 */
20
-	public function setAction($action){
21
-		return $this->setParamCtrl("action", $action,array("select","auto","activate","combo","nothing","hide"));
20
+	public function setAction($action) {
21
+		return $this->setParamCtrl("action", $action, array("select", "auto", "activate", "combo", "nothing", "hide"));
22 22
 	}
23 23
 
24 24
 	/**
@@ -26,15 +26,15 @@  discard block
 block discarded – undo
26 26
 	 * @param string $event Event used to trigger dropdown (Hover, Click, Custom Event)
27 27
 	 * @return \Ajax\semantic\components\Dropdown
28 28
 	 */
29
-	public function setOn($event){
29
+	public function setOn($event) {
30 30
 		return $this->setParam("on", $event);
31 31
 	}
32 32
 
33
-	public function setFullTextSearch($value){
33
+	public function setFullTextSearch($value) {
34 34
 		return $this->setParam("fullTextSearch", $value);
35 35
 	}
36 36
 
37
-	public function setShowOnFocus($value){
37
+	public function setShowOnFocus($value) {
38 38
 		return $this->setParam("showOnFocus", $value);
39 39
 	}
40 40
 }
Please login to merge, or discard this patch.
Ajax/common/traits/JsUtilsEventsTrait.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -11,11 +11,11 @@  discard block
 block discarded – undo
11 11
 trait JsUtilsEventsTrait {
12 12
 
13 13
 
14
-	protected $jquery_events=array (
15
-			"bind","blur","change","click","dblclick","delegate","die","error","focus","focusin","focusout","hover","keydown","keypress","keyup","live","load","mousedown","mousseenter","mouseleave","mousemove","mouseout","mouseover","mouseup","off","on","one","ready","resize","scroll","select","submit","toggle","trigger","triggerHandler","undind","undelegate","unload"
14
+	protected $jquery_events=array(
15
+			"bind", "blur", "change", "click", "dblclick", "delegate", "die", "error", "focus", "focusin", "focusout", "hover", "keydown", "keypress", "keyup", "live", "load", "mousedown", "mousseenter", "mouseleave", "mousemove", "mouseout", "mouseover", "mouseup", "off", "on", "one", "ready", "resize", "scroll", "select", "submit", "toggle", "trigger", "triggerHandler", "undind", "undelegate", "unload"
16 16
 	);
17 17
 
18
-	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
18
+	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true);
19 19
 
20 20
 	/**
21 21
 	 * Outputs a javascript library blur event
@@ -37,8 +37,8 @@  discard block
 block discarded – undo
37 37
 	 * @param boolean $stopPropagation
38 38
 	 * @return string
39 39
 	 */
40
-	public function change($element='this', $js='',$preventDefault=false,$stopPropagation=false) {
41
-		return $this->_add_event($element, $js, 'change',$preventDefault,$stopPropagation);
40
+	public function change($element='this', $js='', $preventDefault=false, $stopPropagation=false) {
41
+		return $this->_add_event($element, $js, 'change', $preventDefault, $stopPropagation);
42 42
 	}
43 43
 
44 44
 	/**
@@ -51,9 +51,9 @@  discard block
 block discarded – undo
51 51
 	 * @param boolean $stopPropagation
52 52
 	 * @return string
53 53
 	 */
54
-	public function click($element='this', $js='', $ret_false=TRUE,$preventDefault=false,$stopPropagation=false) {
54
+	public function click($element='this', $js='', $ret_false=TRUE, $preventDefault=false, $stopPropagation=false) {
55 55
 		if (!is_array($js)) {
56
-			$js=array (
56
+			$js=array(
57 57
 					$js
58 58
 			);
59 59
 		}
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 			$js[]="return false;";
63 63
 		}
64 64
 
65
-		return $this->_add_event($element, $js, 'click',$preventDefault,$stopPropagation);
65
+		return $this->_add_event($element, $js, 'click', $preventDefault, $stopPropagation);
66 66
 	}
67 67
 
68 68
 	/**
Please login to merge, or discard this patch.
Ajax/service/AjaxCall.php 2 patches
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -14,8 +14,9 @@
 block discarded – undo
14 14
 	}
15 15
 
16 16
 	public function compile(JsUtils $js=null) {
17
-		if ($js===null)
18
-			return;
17
+		if ($js===null) {
18
+					return;
19
+		}
19 20
 		$params="{}";
20 21
 		$stopPropagation=true;
21 22
 		$preventDefault=true;
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -23,21 +23,21 @@  discard block
 block discarded – undo
23 23
 		$this->parameters["immediatly"]=false;
24 24
 		extract($this->parameters);
25 25
 		$result=$this->_eventPreparing($preventDefault, $stopPropagation);
26
-		switch($this->method) {
26
+		switch ($this->method) {
27 27
 			case "get":
28 28
 				$result.=$js->getDeferred($url, $responseElement, $this->parameters);
29 29
 				break;
30 30
 			case "post":
31
-				$result.=$js->postDeferred($url, $params,$responseElement, $this->parameters);
31
+				$result.=$js->postDeferred($url, $params, $responseElement, $this->parameters);
32 32
 				break;
33 33
 			case "postForm":
34 34
 				$result.=$js->postFormDeferred($url, $form, $responseElement, $this->parameters);
35 35
 				break;
36 36
 			case "json":
37
-				$result.=$js->jsonDeferred($url,$method,$this->parameters);
37
+				$result.=$js->jsonDeferred($url, $method, $this->parameters);
38 38
 				break;
39 39
 			case "jsonArray":
40
-				$result.=$js->jsonArrayDeferred($modelSelector, $url,$method,$this->parameters);
40
+				$result.=$js->jsonArrayDeferred($modelSelector, $url, $method, $this->parameters);
41 41
 				break;
42 42
 			default:
43 43
 				break;
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 		return $result;
46 46
 	}
47 47
 
48
-	protected function _eventPreparing($preventDefault,$stopPropagation){
48
+	protected function _eventPreparing($preventDefault, $stopPropagation) {
49 49
 		$result="";
50 50
 		if ($preventDefault===true) {
51 51
 			$result.=Javascript::$preventDefault;
Please login to merge, or discard this patch.
Ajax/common/html/PropertyWrapper.php 2 patches
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -25,8 +25,9 @@
 block discarded – undo
25 25
 
26 26
 	private static function containsElement($input) {
27 27
 		foreach ( $input as $v ) {
28
-			if (\is_object($v) || \is_array($v))
29
-				return true;
28
+			if (\is_object($v) || \is_array($v)) {
29
+							return true;
30
+			}
30 31
 		}
31 32
 		return false;
32 33
 	}
Please login to merge, or discard this patch.
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -12,8 +12,8 @@  discard block
 block discarded – undo
12 12
 		}
13 13
 		$output="";
14 14
 		if (\is_array($input)) {
15
-			if (sizeof($input) > 0) {
16
-				if (self::containsElement($input) === false) {
15
+			if (sizeof($input)>0) {
16
+				if (self::containsElement($input)===false) {
17 17
 					$output=self::wrapStrings($input, $separator=' ', $valueQuote='"');
18 18
 				} else {
19 19
 					$output=self::wrapObjects($input, $js, $view, $separator, $valueQuote);
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 	}
25 25
 
26 26
 	private static function containsElement($input) {
27
-		foreach ( $input as $v ) {
27
+		foreach ($input as $v) {
28 28
 			if (\is_object($v) || \is_array($v))
29 29
 				return true;
30 30
 		}
@@ -32,9 +32,9 @@  discard block
 block discarded – undo
32 32
 	}
33 33
 
34 34
 	public static function wrapStrings($input, $separator=' ', $valueQuote='"') {
35
-		if (JArray::isAssociative($input) === true) {
36
-			$result=implode($separator, array_map(function ($v, $k) use($valueQuote) {
37
-				return $k . '=' . $valueQuote . $v . $valueQuote;
35
+		if (JArray::isAssociative($input)===true) {
36
+			$result=implode($separator, array_map(function($v, $k) use($valueQuote) {
37
+				return $k.'='.$valueQuote.$v.$valueQuote;
38 38
 			}, $input, array_keys($input)));
39 39
 		} else {
40 40
 			$result=implode($separator, $input);
@@ -43,30 +43,30 @@  discard block
 block discarded – undo
43 43
 	}
44 44
 
45 45
 	public static function wrapObjects($input, $js=NULL, $view=null, $separator=' ', $valueQuote='"') {
46
-		return implode($separator, array_map(function ($v) use($js, $view,$separator, $valueQuote) {
47
-			if(\is_string($v)){
46
+		return implode($separator, array_map(function($v) use($js, $view, $separator, $valueQuote) {
47
+			if (\is_string($v)) {
48 48
 				return $v;
49 49
 			}
50
-			if ($v instanceof BaseHtml){
51
-				return $v->compile($js,$view);
50
+			if ($v instanceof BaseHtml) {
51
+				return $v->compile($js, $view);
52 52
 			}
53 53
 			if (\is_array($v)) {
54
-				return self::wrap($v, $js, $view,$separator, $valueQuote);
54
+				return self::wrap($v, $js, $view, $separator, $valueQuote);
55 55
 			}
56
-			if(!\is_callable($v)){
56
+			if (!\is_callable($v)) {
57 57
 				return $v;
58 58
 			}
59 59
 		}, $input));
60 60
 	}
61 61
 
62
-	protected static function wrapValue($value,$js=NULL, $separator=' ', $valueQuote='"'){
62
+	protected static function wrapValue($value, $js=NULL, $separator=' ', $valueQuote='"') {
63 63
 		if (\is_array($value)) {
64 64
 			return self::wrap($value, $js, $separator, $valueQuote);
65 65
 		}
66
-		if ($value instanceof BaseHtml){
66
+		if ($value instanceof BaseHtml) {
67 67
 			return $value->compile($js);
68 68
 		}
69
-		if(!\is_callable($value)){
69
+		if (!\is_callable($value)) {
70 70
 			return $value;
71 71
 		}
72 72
 		return '';
Please login to merge, or discard this patch.
Ajax/semantic/html/content/table/HtmlTR.php 2 patches
Braces   +15 added lines, -10 removed lines patch added patch discarded remove patch
@@ -120,25 +120,29 @@  discard block
 block discarded – undo
120 120
 	}
121 121
 
122 122
 	public function getColPosition($colIndex) {
123
-		if($this->_container->_isMerged()!==true)
124
-			return $colIndex;
123
+		if($this->_container->_isMerged()!==true) {
124
+					return $colIndex;
125
+		}
125 126
 		$pos=0;
126 127
 		$rows=$this->_container->getContent();
127 128
 		for($i=0; $i < $this->_row; $i++) {
128 129
 			$max=\min($colIndex, $rows[$i]->count());
129 130
 			for($j=0; $j < $max; $j++) {
130 131
 				$rowspan=$rows[$i]->getItem($j)->getRowspan();
131
-				if ($rowspan + $i > $this->_row)
132
-					$pos++;
132
+				if ($rowspan + $i > $this->_row) {
133
+									$pos++;
134
+				}
133 135
 			}
134 136
 		}
135
-		if ($pos > $colIndex)
136
-			return NULL;
137
+		if ($pos > $colIndex) {
138
+					return NULL;
139
+		}
137 140
 		$count=$this->count();
138 141
 		for($i=0; $i < $count; $i++) {
139 142
 			$pos+=$this->content[$i]->getColspan();
140
-			if ($pos >= $colIndex + 1)
141
-				return $i;
143
+			if ($pos >= $colIndex + 1) {
144
+							return $i;
145
+			}
142 146
 		}
143 147
 		return null;
144 148
 	}
@@ -161,8 +165,9 @@  discard block
 block discarded – undo
161 165
 	public function containsStr($needle) {
162 166
 		$cells=$this->content;
163 167
 		foreach ( $cells as $cell ) {
164
-			if (\strpos($cell->getContent(), $needle) !== false)
165
-				return true;
168
+			if (\strpos($cell->getContent(), $needle) !== false) {
169
+							return true;
170
+			}
166 171
 		}
167 172
 		return false;
168 173
 	}
Please login to merge, or discard this patch.
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -20,19 +20,19 @@  discard block
 block discarded – undo
20 20
 
21 21
 	public function __construct($identifier) {
22 22
 		parent::__construct($identifier, "tr", "");
23
-		$this->_states=[ State::ACTIVE,State::POSITIVE,State::NEGATIVE,State::WARNING,State::ERROR,State::DISABLED ];
23
+		$this->_states=[State::ACTIVE, State::POSITIVE, State::NEGATIVE, State::WARNING, State::ERROR, State::DISABLED];
24 24
 	}
25 25
 
26 26
 	public function setColCount($colCount) {
27 27
 		$count=$this->count();
28
-		for($i=$count; $i < $colCount; $i++) {
28
+		for ($i=$count; $i<$colCount; $i++) {
29 29
 			$item=$this->addItem(NULL);
30 30
 			$item->setTagName($this->_tdTagName);
31 31
 		}
32 32
 		return $this;
33 33
 	}
34 34
 
35
-	public function getColCount(){
35
+	public function getColCount() {
36 36
 		return $this->count();
37 37
 	}
38 38
 
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 	/**
53 53
 	 * @return HtmlTD
54 54
 	 */
55
-	public function getItem($index){
55
+	public function getItem($index) {
56 56
 		return parent::getItem($index);
57 57
 	}
58 58
 
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
 	 * @param mixed $values
76 76
 	 */
77 77
 	public function setValues($values=array()) {
78
-		return $this->_addOrSetValues($values, function(HtmlTD &$cell,$value){$cell->setValue($value);});
78
+		return $this->_addOrSetValues($values, function(HtmlTD &$cell, $value) {$cell->setValue($value); });
79 79
 	}
80 80
 
81 81
 	/**
@@ -83,27 +83,27 @@  discard block
 block discarded – undo
83 83
 	 * @param mixed $values
84 84
 	 */
85 85
 	public function addValues($values=array()) {
86
-		return $this->_addOrSetValues($values, function(HtmlTD &$cell,$value){$cell->addValue($value);});
86
+		return $this->_addOrSetValues($values, function(HtmlTD &$cell, $value) {$cell->addValue($value); });
87 87
 	}
88 88
 
89 89
 	/**
90 90
 	 * Sets or adds values to the row cols
91 91
 	 * @param mixed $values
92 92
 	 */
93
-	protected function _addOrSetValues($values,$callback) {
93
+	protected function _addOrSetValues($values, $callback) {
94 94
 		$count=$this->count();
95 95
 		if (!\is_array($values)) {
96 96
 			$values=\array_fill(0, $count, $values);
97 97
 		} else {
98
-			if (JArray::isAssociative($values) === true) {
98
+			if (JArray::isAssociative($values)===true) {
99 99
 				$values=\array_values($values);
100 100
 			}
101 101
 		}
102 102
 		$count=\min(\sizeof($values), $count);
103 103
 
104
-		for($i=0; $i < $count; $i++) {
104
+		for ($i=0; $i<$count; $i++) {
105 105
 			$cell=$this->content[$i];
106
-			$callback($cell,$values[$i]);
106
+			$callback($cell, $values[$i]);
107 107
 		}
108 108
 		return $this;
109 109
 	}
@@ -124,31 +124,31 @@  discard block
 block discarded – undo
124 124
 
125 125
 	public function mergeRow($colIndex=0) {
126 126
 		$row=$this->getItem($colIndex);
127
-		if(isset($row)){
127
+		if (isset($row)) {
128 128
 			$this->getItem($colIndex)->mergeRow();
129 129
 		}
130 130
 		return $this;
131 131
 	}
132 132
 
133 133
 	public function getColPosition($colIndex) {
134
-		if($this->_container->_isMerged()!==true)
134
+		if ($this->_container->_isMerged()!==true)
135 135
 			return $colIndex;
136 136
 		$pos=0;
137 137
 		$rows=$this->_container->getContent();
138
-		for($i=0; $i < $this->_row; $i++) {
138
+		for ($i=0; $i<$this->_row; $i++) {
139 139
 			$max=\min($colIndex, $rows[$i]->count());
140
-			for($j=0; $j < $max; $j++) {
140
+			for ($j=0; $j<$max; $j++) {
141 141
 				$rowspan=$rows[$i]->getItem($j)->getRowspan();
142
-				if ($rowspan + $i > $this->_row)
142
+				if ($rowspan+$i>$this->_row)
143 143
 					$pos++;
144 144
 			}
145 145
 		}
146
-		if ($pos > $colIndex)
146
+		if ($pos>$colIndex)
147 147
 			return NULL;
148 148
 		$count=$this->count();
149
-		for($i=0; $i < $count; $i++) {
149
+		for ($i=0; $i<$count; $i++) {
150 150
 			$pos+=$this->content[$i]->getColspan();
151
-			if ($pos >= $colIndex + 1)
151
+			if ($pos>=$colIndex+1)
152 152
 				return $i;
153 153
 		}
154 154
 		return null;
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
 
157 157
 	public function conditionalCellFormat($callback, $format) {
158 158
 		$cells=$this->content;
159
-		foreach ( $cells as $cell ) {
159
+		foreach ($cells as $cell) {
160 160
 			$cell->conditionalCellFormat($callback, $format);
161 161
 		}
162 162
 		return $this;
@@ -171,8 +171,8 @@  discard block
 block discarded – undo
171 171
 
172 172
 	public function containsStr($needle) {
173 173
 		$cells=$this->content;
174
-		foreach ( $cells as $cell ) {
175
-			if (\strpos($cell->getContent(), $needle) !== false)
174
+		foreach ($cells as $cell) {
175
+			if (\strpos($cell->getContent(), $needle)!==false)
176 176
 				return true;
177 177
 		}
178 178
 		return false;
@@ -185,13 +185,13 @@  discard block
 block discarded – undo
185 185
 
186 186
 	public function applyCells($callback) {
187 187
 		$cells=$this->content;
188
-		foreach ( $cells as $cell ) {
188
+		foreach ($cells as $cell) {
189 189
 			$cell->apply($callback);
190 190
 		}
191 191
 		return $this;
192 192
 	}
193 193
 
194
-	public function toDelete($colIndex){
194
+	public function toDelete($colIndex) {
195 195
 		$this->getItem($colIndex)->toDelete();
196 196
 		return $this;
197 197
 	}
Please login to merge, or discard this patch.
Ajax/semantic/html/modules/HtmlModal.php 2 patches
Braces   +7 added lines, -6 removed lines patch added patch discarded remove patch
@@ -43,8 +43,7 @@  discard block
 block discarded – undo
43 43
 			foreach ($actions as $action){
44 44
 				$this->addAction($action);
45 45
 			}
46
-		}
47
-		else{
46
+		} else{
48 47
 			$this->addAction($actions);
49 48
 		}
50 49
 		return $this;
@@ -64,8 +63,9 @@  discard block
 block discarded – undo
64 63
 				$class="cancel";
65 64
 			}
66 65
 			$action=new HtmlButton("action-".$this->identifier."-".JArray::count($this->content["actions"]->getContent()),$action);
67
-			if($class!=="")
68
-				$action->addToProperty("class", $class);
66
+			if($class!=="") {
67
+							$action->addToProperty("class", $class);
68
+			}
69 69
 		}
70 70
 		return $this->addElementInPart($action, "actions");
71 71
 	}
@@ -174,8 +174,9 @@  discard block
 block discarded – undo
174 174
 	 * @see BaseHtml::run()
175 175
 	 */
176 176
 	public function run(JsUtils $js) {
177
-		if(isset($this->_bsComponent)===false)
178
-			$this->_bsComponent=$js->semantic()->modal("#".$this->identifier,$this->_params,$this->_paramParts);
177
+		if(isset($this->_bsComponent)===false) {
178
+					$this->_bsComponent=$js->semantic()->modal("#".$this->identifier,$this->_params,$this->_paramParts);
179
+		}
179 180
 		$this->addEventsOnRun($js);
180 181
 		return $this->_bsComponent;
181 182
 	}
Please login to merge, or discard this patch.
Spacing   +50 added lines, -50 removed lines patch added patch discarded remove patch
@@ -15,36 +15,36 @@  discard block
 block discarded – undo
15 15
 	protected $_paramParts=array();
16 16
 
17 17
 	public function __construct($identifier, $header="", $content="", $actions=null) {
18
-		parent::__construct($identifier, "div","ui modal");
19
-		if(isset($header)){
18
+		parent::__construct($identifier, "div", "ui modal");
19
+		if (isset($header)) {
20 20
 			$this->setHeader($header);
21 21
 		}
22
-		if(isset($content)){
22
+		if (isset($content)) {
23 23
 			$this->setContent($content);
24 24
 		}
25
-		if(isset($actions)){
25
+		if (isset($actions)) {
26 26
 			$this->setActions($actions);
27 27
 		}
28 28
 	}
29 29
 
30 30
 	public function setHeader($value) {
31
-		$this->content["header"]=new HtmlSemDoubleElement("header-" . $this->identifier, "a", "header", $value);
31
+		$this->content["header"]=new HtmlSemDoubleElement("header-".$this->identifier, "a", "header", $value);
32 32
 		return $this;
33 33
 	}
34 34
 
35 35
 	public function setContent($value) {
36
-		$this->content["content"]=new HtmlSemDoubleElement("content-" . $this->identifier, "div", "content", $value);
36
+		$this->content["content"]=new HtmlSemDoubleElement("content-".$this->identifier, "div", "content", $value);
37 37
 		return $this;
38 38
 	}
39 39
 
40 40
 	public function setActions($actions) {
41
-		$this->content["actions"]=new HtmlSemDoubleElement("content-" . $this->identifier, "div", "actions");
42
-		if(\is_array($actions)){
43
-			foreach ($actions as $action){
41
+		$this->content["actions"]=new HtmlSemDoubleElement("content-".$this->identifier, "div", "actions");
42
+		if (\is_array($actions)) {
43
+			foreach ($actions as $action) {
44 44
 				$this->addAction($action);
45 45
 			}
46 46
 		}
47
-		else{
47
+		else {
48 48
 			$this->addAction($actions);
49 49
 		}
50 50
 		return $this;
@@ -54,17 +54,17 @@  discard block
 block discarded – undo
54 54
 	 * @param string|BaseHtml $action
55 55
 	 * @return HtmlButton
56 56
 	 */
57
-	public function addAction($action){
58
-		if(!$action instanceof BaseHtml){
57
+	public function addAction($action) {
58
+		if (!$action instanceof BaseHtml) {
59 59
 			$class="";
60
-			if(\array_search($action, ["Okay","Yes","Validate"])!==false){
60
+			if (\array_search($action, ["Okay", "Yes", "Validate"])!==false) {
61 61
 				$class="approve";
62 62
 			}
63
-			if(\array_search($action, ["Close","Cancel","No"])!==false){
63
+			if (\array_search($action, ["Close", "Cancel", "No"])!==false) {
64 64
 				$class="cancel";
65 65
 			}
66
-			$action=new HtmlButton("action-".$this->identifier."-".JArray::count($this->content["actions"]->getContent()),$action);
67
-			if($class!=="")
66
+			$action=new HtmlButton("action-".$this->identifier."-".JArray::count($this->content["actions"]->getContent()), $action);
67
+			if ($class!=="")
68 68
 				$action->addToProperty("class", $class);
69 69
 		}
70 70
 		return $this->addElementInPart($action, "actions");
@@ -74,66 +74,66 @@  discard block
 block discarded – undo
74 74
 	 * @param int $index
75 75
 	 * @return HtmlButton
76 76
 	 */
77
-	public function getAction($index){
77
+	public function getAction($index) {
78 78
 		return $this->content["actions"]->getContent()[$index];
79 79
 	}
80 80
 
81
-	public function addContent($content,$before=false){
82
-		$this->content["content"]->addContent($content,$before);
81
+	public function addContent($content, $before=false) {
82
+		$this->content["content"]->addContent($content, $before);
83 83
 		return $this;
84 84
 	}
85 85
 
86
-	public function addImageContent($image,$description=NULL){
86
+	public function addImageContent($image, $description=NULL) {
87 87
 		$content=$this->content["content"];
88
-		if(isset($description)){
89
-			$description=new HtmlSemDoubleElement("description-".$this->identifier,"div","description",$description);
90
-			$content->addContent($description,true);
88
+		if (isset($description)) {
89
+			$description=new HtmlSemDoubleElement("description-".$this->identifier, "div", "description", $description);
90
+			$content->addContent($description, true);
91 91
 		}
92
-		if($image!==""){
93
-			$img=new HtmlImage("image-".$this->identifier,$image,"","medium");
94
-			$content->addContent($img,true);
95
-			$content->addToProperty("class","image");
92
+		if ($image!=="") {
93
+			$img=new HtmlImage("image-".$this->identifier, $image, "", "medium");
94
+			$content->addContent($img, true);
95
+			$content->addToProperty("class", "image");
96 96
 		}
97 97
 		return $this;
98 98
 	}
99 99
 
100
-	public function addIconContent($icon,$description=NULL){
100
+	public function addIconContent($icon, $description=NULL) {
101 101
 		$content=$this->content["content"];
102
-		if(isset($description)){
103
-			$description=new HtmlSemDoubleElement("description-".$this->identifier,"div","description",$description);
104
-			$content->addContent($description,true);
102
+		if (isset($description)) {
103
+			$description=new HtmlSemDoubleElement("description-".$this->identifier, "div", "description", $description);
104
+			$content->addContent($description, true);
105 105
 		}
106
-		if($icon!==""){
107
-			$img=new HtmlIcon("image-".$this->identifier,$icon);
108
-			$content->addContent($img,true);
109
-			$content->addToProperty("class","image");
106
+		if ($icon!=="") {
107
+			$img=new HtmlIcon("image-".$this->identifier, $icon);
108
+			$content->addContent($img, true);
109
+			$content->addToProperty("class", "image");
110 110
 		}
111 111
 		return $this;
112 112
 	}
113 113
 
114
-	private function addElementInPart($element,$part) {
114
+	private function addElementInPart($element, $part) {
115 115
 		$this->content[$part]->addContent($element);
116 116
 		return $element;
117 117
 	}
118 118
 
119
-	public function showDimmer($value){
120
-		$value=$value?"show":"hide";
119
+	public function showDimmer($value) {
120
+		$value=$value ? "show" : "hide";
121 121
 		$this->_paramParts[]=["'".$value." dimmer'"];
122 122
 		return $this;
123 123
 	}
124 124
 
125
-	public function setInverted($recursive=true){
125
+	public function setInverted($recursive=true) {
126 126
 		$this->_params["inverted"]=true;
127 127
 		return $this;
128 128
 	}
129 129
 
130
-	public function setBasic(){
130
+	public function setBasic() {
131 131
 		return $this->addToProperty("class", "basic");
132 132
 	}
133 133
 
134 134
 
135
-	public function setTransition($value){
136
-		$this->_paramParts[]=["'setting'","'transition'","'".$value."'"];
135
+	public function setTransition($value) {
136
+		$this->_paramParts[]=["'setting'", "'transition'", "'".$value."'"];
137 137
 	}
138 138
 
139 139
 	/**
@@ -143,8 +143,8 @@  discard block
 block discarded – undo
143 143
 	 * @param string $viewName
144 144
 	 * @param array $params The parameters to pass to the view
145 145
 	 */
146
-	public function renderView(JsUtils $js,$initialController,$viewName, $params=array()) {
147
-		return $this->setContent($js->renderContent($initialController, $viewName,$params));
146
+	public function renderView(JsUtils $js, $initialController, $viewName, $params=array()) {
147
+		return $this->setContent($js->renderContent($initialController, $viewName, $params));
148 148
 	}
149 149
 
150 150
 	/**
@@ -155,8 +155,8 @@  discard block
 block discarded – undo
155 155
 	 * @param string $actionName the action name
156 156
 	 * @param array $params
157 157
 	 */
158
-	public function forward(JsUtils $js,$initialControllerInstance,$controllerName,$actionName,$params=NULL){
159
-		return $this->setContent($js->forward($initialControllerInstance, $controllerName, $actionName,$params));
158
+	public function forward(JsUtils $js, $initialControllerInstance, $controllerName, $actionName, $params=NULL) {
159
+		return $this->setContent($js->forward($initialControllerInstance, $controllerName, $actionName, $params));
160 160
 	}
161 161
 
162 162
 	/**
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile()
167 167
 	 */
168 168
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
169
-		$this->content=JArray::sortAssociative($this->content, ["header","content","actions" ]);
169
+		$this->content=JArray::sortAssociative($this->content, ["header", "content", "actions"]);
170 170
 		return parent::compile($js, $view);
171 171
 	}
172 172
 	/*
@@ -174,8 +174,8 @@  discard block
 block discarded – undo
174 174
 	 * @see BaseHtml::run()
175 175
 	 */
176 176
 	public function run(JsUtils $js) {
177
-		if(isset($this->_bsComponent)===false)
178
-			$this->_bsComponent=$js->semantic()->modal("#".$this->identifier,$this->_params,$this->_paramParts);
177
+		if (isset($this->_bsComponent)===false)
178
+			$this->_bsComponent=$js->semantic()->modal("#".$this->identifier, $this->_params, $this->_paramParts);
179 179
 		$this->addEventsOnRun($js);
180 180
 		return $this->_bsComponent;
181 181
 	}
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
 		return $this->jsDo("hide");
189 189
 	}
190 190
 
191
-	public function onHidden($js){
191
+	public function onHidden($js) {
192 192
 		$this->_params["onHidden"]=$js;
193 193
 	}
194 194
 }
Please login to merge, or discard this patch.
Ajax/semantic/html/modules/HtmlDropdown.php 2 patches
Braces   +24 added lines, -19 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 		if(isset($value)){
37 37
 			if($value instanceof HtmlSemDoubleElement){
38 38
 				$text=$value;
39
-			}else{
39
+			} else{
40 40
 				$text=new HtmlSemDoubleElement("text-".$this->identifier,"div");
41 41
 				$text->setClass("text");
42 42
 				$this->setValue($value);
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
 		}
110 110
 		if(!$item instanceof HtmlDropdownItem){
111 111
 			$itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items),$item,$value,$image,$description);
112
-		}elseif($itemO instanceof HtmlDropdownItem){
112
+		} elseif($itemO instanceof HtmlDropdownItem){
113 113
 			$this->addToProperty("class", "vertical");
114 114
 		}
115 115
 		return $itemO;
@@ -123,8 +123,9 @@  discard block
 block discarded – undo
123 123
 	}
124 124
 
125 125
 	public function addInput($name){
126
-		if(!isset($name))
127
-			$name="input-".$this->identifier;
126
+		if(!isset($name)) {
127
+					$name="input-".$this->identifier;
128
+		}
128 129
 		$this->setAction("activate");
129 130
 		$this->input=new HtmlInput($name,"hidden");
130 131
 		$this->input->setIdentifier("input-".$this->identifier);
@@ -183,7 +184,7 @@  discard block
 block discarded – undo
183 184
 			foreach ($items as $k=>$v){
184 185
 				$this->addItem($v)->setData($k);
185 186
 			}
186
-		}else{
187
+		} else{
187 188
 			foreach ($items as $item){
188 189
 				$this->addItem($item);
189 190
 			}
@@ -205,8 +206,7 @@  discard block
 block discarded – undo
205 206
 			$c=$this->items[$i++];
206 207
 			if(isset($c)){
207 208
 				$c->setProperty($property,$value);
208
-			}
209
-			else{
209
+			} else{
210 210
 				return $this;
211 211
 			}
212 212
 		}
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
 		if($dropdown===false){
238 238
 			$this->_template=include dirname(__FILE__).'/../templates/tplDropdownMenu.php';
239 239
 			$dropdown="menu";
240
-		}else{
240
+		} else{
241 241
 			$dropdown="dropdown";
242 242
 			$this->mClass="menu";
243 243
 		}
@@ -258,22 +258,25 @@  discard block
 block discarded – undo
258 258
 
259 259
 	public function asButton($floating=false){
260 260
 		$this->removeArrow();
261
-		if($floating)
262
-			$this->addToProperty("class", "floating");
261
+		if($floating) {
262
+					$this->addToProperty("class", "floating");
263
+		}
263 264
 		$this->removePropertyValue("class", "selection");
264 265
 		return $this->addToProperty("class", "button");
265 266
 	}
266 267
 
267 268
 	public function asSelect($name=NULL,$multiple=false,$selection=true){
268 269
 		$this->_multiple=$multiple;
269
-		if(isset($name))
270
-			$this->addInput($name);
270
+		if(isset($name)) {
271
+					$this->addInput($name);
272
+		}
271 273
 		if($multiple){
272 274
 			$this->addToProperty("class", "multiple");
273 275
 		}
274 276
 		if ($selection){
275
-			if($this->propertyContains("class", "button")===false)
276
-				$this->addToPropertyCtrl("class", "selection",array("selection"));
277
+			if($this->propertyContains("class", "button")===false) {
278
+							$this->addToPropertyCtrl("class", "selection",array("selection"));
279
+			}
277 280
 		}
278 281
 		return $this;
279 282
 	}
@@ -284,8 +287,9 @@  discard block
 block discarded – undo
284 287
 	}
285 288
 
286 289
 	public function setSelect($name=NULL,$multiple=false){
287
-		if(!isset($name))
288
-			$name="select-".$this->identifier;
290
+		if(!isset($name)) {
291
+					$name="select-".$this->identifier;
292
+		}
289 293
 		$this->input=null;
290 294
 		if($multiple){
291 295
 			$this->setProperty("multiple", true);
@@ -321,12 +325,13 @@  discard block
 block discarded – undo
321 325
 		$value=$this->value;
322 326
 		if(isset($this->input) && isset($value)){
323 327
 			$this->input->setProperty("value", $value);
324
-		}else{
328
+		} else{
325 329
 			$this->setProperty("value", $value);
326 330
 		}
327 331
 			$textElement=$this->getElementById("text-".$this->identifier, $this->content);
328
-			if(isset($textElement) && ($textElement instanceof HtmlDoubleElement) && !$this->_multiple)
329
-				$textElement->setContent($value);
332
+			if(isset($textElement) && ($textElement instanceof HtmlDoubleElement) && !$this->_multiple) {
333
+							$textElement->setContent($value);
334
+			}
330 335
 		return $this;
331 336
 	}
332 337
 
Please login to merge, or discard this patch.
Spacing   +101 added lines, -101 removed lines patch added patch discarded remove patch
@@ -14,29 +14,29 @@  discard block
 block discarded – undo
14 14
 use Ajax\common\html\HtmlDoubleElement;
15 15
 
16 16
 class HtmlDropdown extends HtmlSemDoubleElement {
17
-	use FieldTrait,LabeledIconTrait {
17
+	use FieldTrait, LabeledIconTrait {
18 18
 		addIcon as addIconP;
19 19
 	}
20 20
 	protected $mClass="menu";
21 21
 	protected $mTagName="div";
22
-	protected $items=array ();
23
-	protected $_params=array("action"=>"nothing","on"=>"hover","showOnFocus"=>false);
22
+	protected $items=array();
23
+	protected $_params=array("action"=>"nothing", "on"=>"hover", "showOnFocus"=>false);
24 24
 	protected $input;
25 25
 	protected $value;
26 26
 	protected $_associative;
27 27
 	protected $_multiple;
28 28
 
29
-	public function __construct($identifier, $value="", $items=array(),$associative=true) {
29
+	public function __construct($identifier, $value="", $items=array(), $associative=true) {
30 30
 		parent::__construct($identifier, "div");
31 31
 		$this->_template=include dirname(__FILE__).'/../templates/tplDropdown.php';
32 32
 		$this->setProperty("class", "ui dropdown");
33 33
 		$this->_multiple=false;
34 34
 		$content=[];
35
-		if(isset($value)){
36
-			if($value instanceof HtmlSemDoubleElement){
35
+		if (isset($value)) {
36
+			if ($value instanceof HtmlSemDoubleElement) {
37 37
 				$text=$value;
38
-			}else{
39
-				$text=new HtmlSemDoubleElement("text-".$this->identifier,"div");
38
+			} else {
39
+				$text=new HtmlSemDoubleElement("text-".$this->identifier, "div");
40 40
 				$text->setClass("text");
41 41
 				$this->setValue($value);
42 42
 			}
@@ -49,33 +49,33 @@  discard block
 block discarded – undo
49 49
 		$this->addItems($items);
50 50
 	}
51 51
 
52
-	public function getField(){
52
+	public function getField() {
53 53
 		return $this->input;
54 54
 	}
55 55
 
56
-	public function getDataField(){
56
+	public function getDataField() {
57 57
 		return $this->input;
58 58
 	}
59 59
 
60
-	public function addItem($item,$value=NULL,$image=NULL,$description=NULL){
61
-		$itemO=$this->beforeAddItem($item,$value,$image,$description);
60
+	public function addItem($item, $value=NULL, $image=NULL, $description=NULL) {
61
+		$itemO=$this->beforeAddItem($item, $value, $image, $description);
62 62
 		$this->items[]=$itemO;
63 63
 		return $itemO;
64 64
 	}
65 65
 
66
-	public function addIcon($icon,$before=true,$labeled=false){
66
+	public function addIcon($icon, $before=true, $labeled=false) {
67 67
 		$this->removeArrow();
68
-		$this->addIconP($icon,$before,$labeled);
68
+		$this->addIconP($icon, $before, $labeled);
69 69
 		$elm=$this->getElementById("text-".$this->identifier, $this->content);
70
-		if(isset($elm)){
70
+		if (isset($elm)) {
71 71
 			$elm->setWrapAfter("");
72 72
 		}
73 73
 		return $this;
74 74
 	}
75 75
 
76
-	public function addIcons($icons){
76
+	public function addIcons($icons) {
77 77
 		$count=$this->count();
78
-		for ($i=0;$i<\sizeof($icons) && $i<$count;$i++){
78
+		for ($i=0; $i<\sizeof($icons) && $i<$count; $i++) {
79 79
 			$this->getItem($i)->addIcon($icons[$i]);
80 80
 		}
81 81
 	}
@@ -86,33 +86,33 @@  discard block
 block discarded – undo
86 86
 	 * @param int $position
87 87
 	 * @return HtmlDropdownItem
88 88
 	 */
89
-	public function insertItem($item,$position=0){
89
+	public function insertItem($item, $position=0) {
90 90
 		$itemO=$this->beforeAddItem($item);
91
-		 $start = array_slice($this->items, 0, $position);
92
-		 $end = array_slice($this->items, $position);
93
-		 $start[] = $item;
91
+		 $start=array_slice($this->items, 0, $position);
92
+		 $end=array_slice($this->items, $position);
93
+		 $start[]=$item;
94 94
 		 $this->items=array_merge($start, $end);
95 95
 		 return $itemO;
96 96
 	}
97 97
 
98
-	protected function removeArrow(){
99
-		if(\sizeof($this->content)>1){
98
+	protected function removeArrow() {
99
+		if (\sizeof($this->content)>1) {
100 100
 			unset($this->content["arrow"]);
101 101
 			$this->content=\array_values($this->content);
102 102
 		}
103 103
 	}
104 104
 
105
-	protected function beforeAddItem($item,$value=NULL,$image=NULL,$description=NULL){
105
+	protected function beforeAddItem($item, $value=NULL, $image=NULL, $description=NULL) {
106 106
 		$itemO=$item;
107
-		if(\is_array($item)){
107
+		if (\is_array($item)) {
108 108
 			$description=JArray::getValue($item, "description", 3);
109 109
 			$value=JArray::getValue($item, "value", 1);
110 110
 			$image=JArray::getValue($item, "image", 2);
111 111
 			$item=JArray::getValue($item, "item", 0);
112 112
 		}
113
-		if(!$item instanceof HtmlDropdownItem){
114
-			$itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items),$item,$value,$image,$description);
115
-		}elseif($itemO instanceof HtmlDropdownItem){
113
+		if (!$item instanceof HtmlDropdownItem) {
114
+			$itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items), $item, $value, $image, $description);
115
+		}elseif ($itemO instanceof HtmlDropdownItem) {
116 116
 			$this->addToProperty("class", "vertical");
117 117
 		}
118 118
 		return $itemO;
@@ -125,11 +125,11 @@  discard block
 block discarded – undo
125 125
 		$this->addItem($function($object));
126 126
 	}
127 127
 
128
-	public function addInput($name){
129
-		if(!isset($name))
128
+	public function addInput($name) {
129
+		if (!isset($name))
130 130
 			$name="input-".$this->identifier;
131 131
 		$this->setAction("activate");
132
-		$this->input=new HtmlInput($name,"hidden");
132
+		$this->input=new HtmlInput($name, "hidden");
133 133
 		$this->input->setIdentifier("input-".$this->identifier);
134 134
 		return $this->input;
135 135
 	}
@@ -140,15 +140,15 @@  discard block
 block discarded – undo
140 140
 	 * @param string $icon
141 141
 	 * @return HtmlDropdownItem
142 142
 	 */
143
-	public function addSearchInputItem($placeHolder=NULL,$icon=NULL){
144
-		return $this->addItem(HtmlDropdownItem::searchInput($placeHolder,$icon));
143
+	public function addSearchInputItem($placeHolder=NULL, $icon=NULL) {
144
+		return $this->addItem(HtmlDropdownItem::searchInput($placeHolder, $icon));
145 145
 	}
146 146
 
147 147
 	/**
148 148
 	 * Adds a divider item
149 149
 	 * @return HtmlDropdownItem
150 150
 	 */
151
-	public function addDividerItem(){
151
+	public function addDividerItem() {
152 152
 		return $this->addItem(HtmlDropdownItem::divider());
153 153
 	}
154 154
 
@@ -158,8 +158,8 @@  discard block
 block discarded – undo
158 158
 	 * @param string $icon
159 159
 	 * @return HtmlDropdownItem
160 160
 	 */
161
-	public function addHeaderItem($caption=NULL,$icon=NULL){
162
-		return $this->addItem(HtmlDropdownItem::header($caption,$icon));
161
+	public function addHeaderItem($caption=NULL, $icon=NULL) {
162
+		return $this->addItem(HtmlDropdownItem::header($caption, $icon));
163 163
 	}
164 164
 
165 165
 	/**
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
168 168
 	 * @param string $color
169 169
 	 * @return HtmlDropdownItem
170 170
 	 */
171
-	public function addCircularLabelItem($caption,$color){
171
+	public function addCircularLabelItem($caption, $color) {
172 172
 		return $this->addItem(HtmlDropdownItem::circular($caption, $color));
173 173
 	}
174 174
 
@@ -177,17 +177,17 @@  discard block
 block discarded – undo
177 177
 	 * @param string $image
178 178
 	 * @return \Ajax\semantic\html\content\HtmlDropdownItem
179 179
 	 */
180
-	public function addMiniAvatarImageItem($caption,$image){
180
+	public function addMiniAvatarImageItem($caption, $image) {
181 181
 		return $this->addItem(HtmlDropdownItem::avatar($caption, $image));
182 182
 	}
183 183
 
184
-	public function addItems($items){
185
-		if(\is_array($items) && $this->_associative){
186
-			foreach ($items as $k=>$v){
184
+	public function addItems($items) {
185
+		if (\is_array($items) && $this->_associative) {
186
+			foreach ($items as $k=>$v) {
187 187
 				$this->addItem($v)->setData($k);
188 188
 			}
189
-		}else{
190
-			foreach ($items as $item){
189
+		} else {
190
+			foreach ($items as $item) {
191 191
 				$this->addItem($item);
192 192
 			}
193 193
 		}
@@ -199,98 +199,98 @@  discard block
 block discarded – undo
199 199
 	 * @param array|mixed $values
200 200
 	 * @return $this
201 201
 	 */
202
-	public function setPropertyValues($property,$values){
202
+	public function setPropertyValues($property, $values) {
203 203
 		$i=0;
204
-		if(\is_array($values)===false){
205
-			$values=\array_fill(0, $this->count(),$values);
204
+		if (\is_array($values)===false) {
205
+			$values=\array_fill(0, $this->count(), $values);
206 206
 		}
207
-		foreach ($values as $value){
207
+		foreach ($values as $value) {
208 208
 			$c=$this->items[$i++];
209
-			if(isset($c)){
210
-				$c->setProperty($property,$value);
209
+			if (isset($c)) {
210
+				$c->setProperty($property, $value);
211 211
 			}
212
-			else{
212
+			else {
213 213
 				return $this;
214 214
 			}
215 215
 		}
216 216
 		return $this;
217 217
 	}
218 218
 
219
-	public function each($callBack){
220
-		foreach ($this->items as $index=>$value){
221
-			$callBack($index,$value);
219
+	public function each($callBack) {
220
+		foreach ($this->items as $index=>$value) {
221
+			$callBack($index, $value);
222 222
 		}
223 223
 		return $this;
224 224
 	}
225 225
 
226
-	public function getItem($index){
226
+	public function getItem($index) {
227 227
 		return $this->items[$index];
228 228
 	}
229 229
 
230 230
 	/**
231 231
 	 * @return int
232 232
 	 */
233
-	public function count(){
233
+	public function count() {
234 234
 		return \sizeof($this->items);
235 235
 	}
236 236
 	/**
237 237
 	 * @param boolean $dropdown
238 238
 	 */
239
-	public function asDropdown($dropdown){
240
-		if($dropdown===false){
239
+	public function asDropdown($dropdown) {
240
+		if ($dropdown===false) {
241 241
 			$this->_template=include dirname(__FILE__).'/../templates/tplDropdownMenu.php';
242 242
 			$dropdown="menu";
243
-		}else{
243
+		} else {
244 244
 			$dropdown="dropdown";
245 245
 			$this->mClass="menu";
246 246
 		}
247
-		return $this->addToPropertyCtrl("class", $dropdown,array("menu","dropdown"));
247
+		return $this->addToPropertyCtrl("class", $dropdown, array("menu", "dropdown"));
248 248
 	}
249 249
 
250
-	public function setVertical(){
251
-		return $this->addToPropertyCtrl("class", "vertical",array("vertical"));
250
+	public function setVertical() {
251
+		return $this->addToPropertyCtrl("class", "vertical", array("vertical"));
252 252
 	}
253 253
 
254
-	public function setInline(){
255
-		return $this->addToPropertyCtrl("class", "inline",["inline"]);
254
+	public function setInline() {
255
+		return $this->addToPropertyCtrl("class", "inline", ["inline"]);
256 256
 	}
257 257
 
258
-	public function setSimple(){
259
-		return $this->addToPropertyCtrl("class", "simple",array("simple"));
258
+	public function setSimple() {
259
+		return $this->addToPropertyCtrl("class", "simple", array("simple"));
260 260
 	}
261 261
 
262
-	public function asButton($floating=false){
262
+	public function asButton($floating=false) {
263 263
 		$this->removeArrow();
264
-		if($floating)
264
+		if ($floating)
265 265
 			$this->addToProperty("class", "floating");
266 266
 		$this->removePropertyValue("class", "selection");
267 267
 		return $this->addToProperty("class", "button");
268 268
 	}
269 269
 
270
-	public function asSelect($name=NULL,$multiple=false,$selection=true){
270
+	public function asSelect($name=NULL, $multiple=false, $selection=true) {
271 271
 		$this->_multiple=$multiple;
272
-		if(isset($name))
272
+		if (isset($name))
273 273
 			$this->addInput($name);
274
-		if($multiple){
274
+		if ($multiple) {
275 275
 			$this->addToProperty("class", "multiple");
276 276
 		}
277
-		if ($selection){
278
-			if($this->propertyContains("class", "button")===false)
279
-				$this->addToPropertyCtrl("class", "selection",array("selection"));
277
+		if ($selection) {
278
+			if ($this->propertyContains("class", "button")===false)
279
+				$this->addToPropertyCtrl("class", "selection", array("selection"));
280 280
 		}
281 281
 		return $this;
282 282
 	}
283 283
 
284
-	public function asSearch($name=NULL,$multiple=false,$selection=true){
285
-		$this->asSelect($name,$multiple,$selection);
284
+	public function asSearch($name=NULL, $multiple=false, $selection=true) {
285
+		$this->asSelect($name, $multiple, $selection);
286 286
 		return $this->addToProperty("class", "search");
287 287
 	}
288 288
 
289
-	public function setSelect($name=NULL,$multiple=false){
290
-		if(!isset($name))
289
+	public function setSelect($name=NULL, $multiple=false) {
290
+		if (!isset($name))
291 291
 			$name="select-".$this->identifier;
292 292
 		$this->input=null;
293
-		if($multiple){
293
+		if ($multiple) {
294 294
 			$this->setProperty("multiple", true);
295 295
 			$this->addToProperty("class", "multiple");
296 296
 		}
@@ -298,42 +298,42 @@  discard block
 block discarded – undo
298 298
 		$this->tagName="select";
299 299
 		$this->setProperty("name", $name);
300 300
 		$this->content=null;
301
-		foreach ($this->items as $item){
301
+		foreach ($this->items as $item) {
302 302
 			$item->asOption();
303 303
 		}
304 304
 		return $this;
305 305
 	}
306 306
 
307
-	public function asSubmenu($pointing=NULL){
307
+	public function asSubmenu($pointing=NULL) {
308 308
 		$this->setClass("ui dropdown link item");
309
-		if(isset($pointing)){
309
+		if (isset($pointing)) {
310 310
 			$this->setPointing($pointing);
311 311
 		}
312 312
 		return $this;
313 313
 	}
314 314
 
315
-	public function setPointing($value=Direction::NONE){
316
-		return $this->addToPropertyCtrl("class", $value." pointing",Direction::getConstantValues("pointing"));
315
+	public function setPointing($value=Direction::NONE) {
316
+		return $this->addToPropertyCtrl("class", $value." pointing", Direction::getConstantValues("pointing"));
317 317
 	}
318 318
 
319
-	public function setValue($value){
319
+	public function setValue($value) {
320 320
 		$this->value=$value;
321 321
 		return $this;
322 322
 	}
323 323
 	
324
-	public function setDefaultText($text){
325
-		$this->content["text"]=new HtmlSemDoubleElement("","div","default text",$text);
324
+	public function setDefaultText($text) {
325
+		$this->content["text"]=new HtmlSemDoubleElement("", "div", "default text", $text);
326 326
 	}
327 327
 	
328
-	private function applyValue(){
328
+	private function applyValue() {
329 329
 		$value=$this->value;
330
-		if(isset($this->input) && isset($value)){
330
+		if (isset($this->input) && isset($value)) {
331 331
 			$this->input->setProperty("value", $value);
332
-		}else{
332
+		} else {
333 333
 			$this->setProperty("value", $value);
334 334
 		}
335 335
 			$textElement=$this->getElementById("text-".$this->identifier, $this->content);
336
-			if(isset($textElement) && ($textElement instanceof HtmlDoubleElement) && !$this->_multiple)
336
+			if (isset($textElement) && ($textElement instanceof HtmlDoubleElement) && !$this->_multiple)
337 337
 				$textElement->setContent($value);
338 338
 		return $this;
339 339
 	}
@@ -343,9 +343,9 @@  discard block
 block discarded – undo
343 343
 	 * @see BaseHtml::run()
344 344
 	 */
345 345
 	public function run(JsUtils $js) {
346
-		if($this->propertyContains("class", "simple")===false){
347
-			if(isset($this->_bsComponent)===false){
348
-				$this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier,$this->_params);
346
+		if ($this->propertyContains("class", "simple")===false) {
347
+			if (isset($this->_bsComponent)===false) {
348
+				$this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier, $this->_params);
349 349
 				$this->_bsComponent->setItemSelector(".item");
350 350
 			}
351 351
 			$this->addEventsOnRun($js);
@@ -353,41 +353,41 @@  discard block
 block discarded – undo
353 353
 		}
354 354
 	}
355 355
 
356
-	public function setCompact(){
356
+	public function setCompact() {
357 357
 		return $this->addToPropertyCtrl("class", "compact", array("compact"));
358 358
 	}
359 359
 
360
-	public function setAction($action){
360
+	public function setAction($action) {
361 361
 		$this->_params["action"]=$action;
362 362
 	}
363 363
 
364
-	public function setOn($on){
364
+	public function setOn($on) {
365 365
 		$this->_params["on"]=$on;
366 366
 	}
367 367
 
368
-	public function setShowOnFocus($value){
368
+	public function setShowOnFocus($value) {
369 369
 		$this->_params["showOnFocus"]=$value;
370 370
 	}
371 371
 
372
-	public function setFullTextSearch($value){
372
+	public function setFullTextSearch($value) {
373 373
 		$this->_params["fullTextSearch"]=$value;
374 374
 	}
375 375
 
376 376
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
377 377
 		$this->applyValue();
378
-		return parent::compile($js,$view);
378
+		return parent::compile($js, $view);
379 379
 	}
380 380
 
381 381
 	public function getInput() {
382 382
 		return $this->input;
383 383
 	}
384 384
 
385
-	public function setIcon($icon="dropdown"){
385
+	public function setIcon($icon="dropdown") {
386 386
 		$this->content["arrow"]=new HtmlIcon($this->identifier."-icon", $icon);
387 387
 		return $this;
388 388
 	}
389 389
 
390
-	public function jsAddItem($caption){
390
+	public function jsAddItem($caption) {
391 391
 		$js="var first=$('#{$this->identifier} .item').first();if(first!=undefined){var new =first.clone();first.parent().append(new);first.html('{$caption}};')";
392 392
 		return $js;
393 393
 	}
Please login to merge, or discard this patch.