Completed
Push — master ( ab500e...03e9d9 )
by Jean-Christophe
04:23
created
Ajax/common/html/html5/HtmlLinkTrait.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -4,7 +4,7 @@
 block discarded – undo
4 4
 
5 5
 trait HtmlLinkTrait {
6 6
 
7
-	abstract public function setProperty($name,$value);
7
+	abstract public function setProperty($name, $value);
8 8
 	abstract public function getProperty($name);
9 9
 
10 10
 	public function setHref($value) {
Please login to merge, or discard this patch.
Ajax/semantic/html/base/traits/LabeledIconTrait.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 trait LabeledIconTrait {
14 14
 
15 15
 	abstract public function addToProperty($name, $value, $separator=" ");
16
-	abstract public function addContent($content,$before=false);
16
+	abstract public function addContent($content, $before=false);
17 17
 
18 18
 	/**
19 19
 	 * Adds an icon before or after
@@ -22,17 +22,17 @@  discard block
 block discarded – undo
22 22
 	 * @param boolean $labeled
23 23
 	 * @return \Ajax\semantic\html\elements\HtmlIcon
24 24
 	 */
25
-	public function addIcon($icon,$before=true,$labeled=false){
25
+	public function addIcon($icon, $before=true, $labeled=false) {
26 26
 		$iconO=$icon;
27
-		if(\is_string($icon)){
27
+		if (\is_string($icon)) {
28 28
 			$iconO=new HtmlIcon("icon-".$this->identifier, $icon);
29 29
 		}
30
-		if($labeled!==false){
31
-			$direction=($before===true)?Direction::LEFT:Direction::RIGHT;
30
+		if ($labeled!==false) {
31
+			$direction=($before===true) ? Direction::LEFT : Direction::RIGHT;
32 32
 			$this->addToProperty("class", $direction." labeled icon");
33 33
 			$this->tagName="div";
34 34
 		}
35
-		$this->addContent($iconO,$before);
35
+		$this->addContent($iconO, $before);
36 36
 		return $iconO;
37 37
 	}
38 38
 }
39 39
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/html/elements/html5/HtmlImg.php 1 patch
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 asAvatar($caption=NULL) {
17
-		if (isset($caption))
18
-			$this->wrap("", $caption);
17
+		if (isset($caption)) {
18
+					$this->wrap("", $caption);
19
+		}
19 20
 			return $this->addToProperty("class", "avatar");
20 21
 	}
21 22
 
Please login to merge, or discard this patch.
Ajax/semantic/html/modules/HtmlDimmer.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -18,14 +18,14 @@  discard block
 block discarded – undo
18 18
 	}
19 19
 
20 20
 	public function setContent($content) {
21
-		$this->content=new HtmlSemDoubleElement("content-" . $this->identifier, "div", "content", new HtmlSemDoubleElement("", "div", "center", $content));
21
+		$this->content=new HtmlSemDoubleElement("content-".$this->identifier, "div", "content", new HtmlSemDoubleElement("", "div", "center", $content));
22 22
 		return $this;
23 23
 	}
24 24
 
25 25
 	public function asIcon($icon, $title, $subHeader=NULL) {
26
-		$header=new HtmlHeader("header-" . $this->identifier);
26
+		$header=new HtmlHeader("header-".$this->identifier);
27 27
 		$header->asIcon($icon, $title, $subHeader);
28
-		if ($this->_inverted === false)
28
+		if ($this->_inverted===false)
29 29
 			$header->setInverted();
30 30
 		return $this->setContent($header);
31 31
 	}
@@ -42,13 +42,13 @@  discard block
 block discarded – undo
42 42
 
43 43
 	public function run(JsUtils $js) {
44 44
 		if ($this->_container instanceof HtmlSingleElement)
45
-			$this->_bsComponent=$js->semantic()->dimmer("#" . $this->_container->getIdentifier(), $this->_params);
45
+			$this->_bsComponent=$js->semantic()->dimmer("#".$this->_container->getIdentifier(), $this->_params);
46 46
 		return parent::run($js);
47 47
 	}
48 48
 
49 49
 	public function jsShow() {
50 50
 		if (isset($this->_container))
51
-			return '$("#.' . $this->_container->getIdentifier() . ').dimmer("show");';
51
+			return '$("#.'.$this->_container->getIdentifier().').dimmer("show");';
52 52
 	}
53 53
 
54 54
 	public function setBlurring() {
Please login to merge, or discard this patch.
Braces   +9 added lines, -6 removed lines patch added patch discarded remove patch
@@ -25,8 +25,9 @@  discard block
 block discarded – undo
25 25
 	public function asIcon($icon, $title, $subHeader=NULL) {
26 26
 		$header=new HtmlHeader("header-" . $this->identifier);
27 27
 		$header->asIcon($icon, $title, $subHeader);
28
-		if ($this->_inverted === false)
29
-			$header->setInverted();
28
+		if ($this->_inverted === false) {
29
+					$header->setInverted();
30
+		}
30 31
 		return $this->setContent($header);
31 32
 	}
32 33
 
@@ -41,14 +42,16 @@  discard block
 block discarded – undo
41 42
 	}
42 43
 
43 44
 	public function run(JsUtils $js) {
44
-		if ($this->_container instanceof HtmlSingleElement)
45
-			$this->_bsComponent=$js->semantic()->dimmer("#" . $this->_container->getIdentifier(), $this->_params);
45
+		if ($this->_container instanceof HtmlSingleElement) {
46
+					$this->_bsComponent=$js->semantic()->dimmer("#" . $this->_container->getIdentifier(), $this->_params);
47
+		}
46 48
 		return parent::run($js);
47 49
 	}
48 50
 
49 51
 	public function jsShow() {
50
-		if (isset($this->_container))
51
-			return '$("#.' . $this->_container->getIdentifier() . ').dimmer("show");';
52
+		if (isset($this->_container)) {
53
+					return '$("#.' . $this->_container->getIdentifier() . ').dimmer("show");';
54
+		}
52 55
 	}
53 56
 
54 57
 	public function setBlurring() {
Please login to merge, or discard this patch.
Ajax/semantic/html/modules/HtmlSearch.php 2 patches
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -21,10 +21,12 @@
 block discarded – undo
21 21
 
22 22
 	private function createField($placeholder=NULL, $icon=NULL) {
23 23
 		$field=new HtmlInput($this->identifier);
24
-		if (isset($placeholder))
25
-			$field->setPlaceholder($placeholder);
26
-		if (isset($icon))
27
-			$field->addIcon($icon, Direction::RIGHT);
24
+		if (isset($placeholder)) {
25
+					$field->setPlaceholder($placeholder);
26
+		}
27
+		if (isset($icon)) {
28
+					$field->addIcon($icon, Direction::RIGHT);
29
+		}
28 30
 		//TODO check getField
29 31
 		$field->getDataField()->setClass("prompt");
30 32
 		$this->content["field"]=$field;
Please login to merge, or discard this patch.
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -8,12 +8,12 @@  discard block
 block discarded – undo
8 8
 use Ajax\semantic\html\base\constants\Direction;
9 9
 
10 10
 class HtmlSearch extends HtmlSemDoubleElement {
11
-	private $_elements=array ();
12
-	private $_searchFields=array ("title" );
11
+	private $_elements=array();
12
+	private $_searchFields=array("title");
13 13
 	private $_local=false;
14 14
 
15 15
 	public function __construct($identifier, $placeholder=NULL, $icon=NULL) {
16
-		parent::__construct("search-" . $identifier, "div", "ui search", array ());
16
+		parent::__construct("search-".$identifier, "div", "ui search", array());
17 17
 		$this->_identifier=$identifier;
18 18
 		$this->createField($placeholder, $icon);
19 19
 		$this->createResult();
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
 	}
34 34
 
35 35
 	private function createResult() {
36
-		$this->content["result"]=new HtmlSemDoubleElement("results-" . $this->identifier, "div", "results");
36
+		$this->content["result"]=new HtmlSemDoubleElement("results-".$this->identifier, "div", "results");
37 37
 		return $this->content["result"];
38 38
 	}
39 39
 
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 	}
51 51
 
52 52
 	public function setUrl($url) {
53
-		$this->_params["apiSettings"]="%{url: %quote%" . $url . "%quote%}%";
53
+		$this->_params["apiSettings"]="%{url: %quote%".$url."%quote%}%";
54 54
 		return $this;
55 55
 	}
56 56
 
@@ -73,16 +73,16 @@  discard block
 block discarded – undo
73 73
 	}
74 74
 
75 75
 	public function run(JsUtils $js) {
76
-		$this->_params["onSelect"]='%function(result,response){$(%quote%#' . $this->identifier . '%quote%).trigger(%quote%onSelect%quote%, {%quote%result%quote%: result, %quote%response%quote%:response} );}%';
76
+		$this->_params["onSelect"]='%function(result,response){$(%quote%#'.$this->identifier.'%quote%).trigger(%quote%onSelect%quote%, {%quote%result%quote%: result, %quote%response%quote%:response} );}%';
77 77
 		$searchFields=\json_encode($this->_searchFields);
78 78
 		$searchFields=str_ireplace("\"", "%quote%", $searchFields);
79
-		$this->_params["searchFields"]="%" . $searchFields . "%";
80
-		if ($this->_local === true) {
79
+		$this->_params["searchFields"]="%".$searchFields."%";
80
+		if ($this->_local===true) {
81 81
 			$this->_params["source"]="%content%";
82
-			$this->addEvent("beforeExecute", "var content=" . $this->resultsToJson() . ";");
82
+			$this->addEvent("beforeExecute", "var content=".$this->resultsToJson().";");
83 83
 		}
84
-		if (isset($this->_bsComponent) === false) {
85
-			$this->_bsComponent=$js->semantic()->search("#" . $this->identifier, $this->_params);
84
+		if (isset($this->_bsComponent)===false) {
85
+			$this->_bsComponent=$js->semantic()->search("#".$this->identifier, $this->_params);
86 86
 		}
87 87
 		$this->addEventsOnRun($js);
88 88
 		return $this->_bsComponent;
Please login to merge, or discard this patch.
Ajax/semantic/html/modules/HtmlProgress.php 2 patches
Braces   +9 added lines, -6 removed lines patch added patch discarded remove patch
@@ -12,11 +12,13 @@  discard block
 block discarded – undo
12 12
 
13 13
 	public function __construct($identifier, $value=NULL, $label=NULL, $attributes=array()) {
14 14
 		parent::__construct($identifier, "div", "ui progress");
15
-		if (isset($value))
16
-			$this->setProperty("data-percent", $value);
15
+		if (isset($value)) {
16
+					$this->setProperty("data-percent", $value);
17
+		}
17 18
 		$this->createBar();
18
-		if (isset($label))
19
-			$this->setLabel($label);
19
+		if (isset($label)) {
20
+					$this->setLabel($label);
21
+		}
20 22
 		$this->_states=[ State::SUCCESS,State::WARNING,State::ERROR,State::ACTIVE,State::DISABLED ];
21 23
 		$this->addToProperty("class", $attributes);
22 24
 	}
@@ -111,8 +113,9 @@  discard block
 block discarded – undo
111 113
 	 * @see BaseHtml::run()
112 114
 	 */
113 115
 	public function run(JsUtils $js) {
114
-		if (isset($this->_bsComponent) === false)
115
-			$this->_bsComponent=$js->semantic()->progress("#" . $this->identifier, $this->_params);
116
+		if (isset($this->_bsComponent) === false) {
117
+					$this->_bsComponent=$js->semantic()->progress("#" . $this->identifier, $this->_params);
118
+		}
116 119
 		$this->addEventsOnRun($js);
117 120
 		return $this->_bsComponent;
118 121
 	}
Please login to merge, or discard this 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/common/traits/JqueryEventsTrait.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
  */
11 11
 
12 12
 trait JqueryEventsTrait {
13
-	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
13
+	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true);
14 14
 
15 15
 	/**
16 16
 	 * Blur
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 	 */
53 53
 	public function _click($element='this', $js=array(), $ret_false=TRUE) {
54 54
 		if (!is_array($js)) {
55
-			$js=array (
55
+			$js=array(
56 56
 					$js
57 57
 			);
58 58
 		}
Please login to merge, or discard this patch.
Ajax/semantic/html/base/traits/IconTrait.php 2 patches
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -15,18 +15,18 @@  discard block
 block discarded – undo
15 15
 	private $_hasIcon=false;
16 16
 
17 17
 	abstract protected function addToPropertyCtrl($name, $value, $typeCtrl);
18
-	abstract public function addContent($content,$before=false);
18
+	abstract public function addContent($content, $before=false);
19 19
 
20
-	public function addIcon($icon,$direction=Direction::LEFT){
21
-		if($this->_hasIcon===false){
20
+	public function addIcon($icon, $direction=Direction::LEFT) {
21
+		if ($this->_hasIcon===false) {
22 22
 			$iconO=$icon;
23
-			if(\is_string($icon)){
23
+			if (\is_string($icon)) {
24 24
 				$iconO=new HtmlIcon("icon-".$this->identifier, $icon);
25 25
 			}
26 26
 			$this->addToPropertyCtrl("class", $direction." icon", Direction::getConstantValues("icon"));
27
-			$this->addContent($iconO,$direction===Direction::LEFT);
27
+			$this->addContent($iconO, $direction===Direction::LEFT);
28 28
 			$this->_hasIcon=true;
29
-		}else{
29
+		} else {
30 30
 			$iconO=$this->getIcon();
31 31
 			$iconO->setIcon($icon);
32 32
 			$this->addToPropertyCtrl("class", $direction." icon", Direction::getConstantValues("icon"));
@@ -34,10 +34,10 @@  discard block
 block discarded – undo
34 34
 		return $iconO;
35 35
 	}
36 36
 
37
-	public function getIcon(){
38
-		if(\is_array($this->content)){
39
-			foreach ($this->content as $item){
40
-				if($item instanceof HtmlIcon)
37
+	public function getIcon() {
38
+		if (\is_array($this->content)) {
39
+			foreach ($this->content as $item) {
40
+				if ($item instanceof HtmlIcon)
41 41
 					return $item;
42 42
 			}
43 43
 		}
Please login to merge, or discard this patch.
Braces   +4 added lines, -3 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 			$this->addToPropertyCtrl("class", $direction." icon", Direction::getConstantValues("icon"));
27 27
 			$this->addContent($iconO,$direction===Direction::LEFT);
28 28
 			$this->_hasIcon=true;
29
-		}else{
29
+		} else{
30 30
 			$iconO=$this->getIcon();
31 31
 			$iconO->setIcon($icon);
32 32
 			$this->addToPropertyCtrl("class", $direction." icon", Direction::getConstantValues("icon"));
@@ -37,8 +37,9 @@  discard block
 block discarded – undo
37 37
 	public function getIcon(){
38 38
 		if(\is_array($this->content)){
39 39
 			foreach ($this->content as $item){
40
-				if($item instanceof HtmlIcon)
41
-					return $item;
40
+				if($item instanceof HtmlIcon) {
41
+									return $item;
42
+				}
42 43
 			}
43 44
 		}
44 45
 	}
Please login to merge, or discard this patch.
Ajax/semantic/html/base/traits/TableElementTrait.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
25 25
 	}
26 26
 
27 27
 	public function setDisabled($disable=true) {
28
-		if($disable)
28
+		if ($disable)
29 29
 			$this->addState(State::DISABLED);
30 30
 		return $this;
31 31
 	}
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -25,8 +25,9 @@
 block discarded – undo
25 25
 	}
26 26
 
27 27
 	public function setDisabled($disable=true) {
28
-		if($disable)
29
-			$this->addState(State::DISABLED);
28
+		if($disable) {
29
+					$this->addState(State::DISABLED);
30
+		}
30 31
 		return $this;
31 32
 	}
32 33
 }
33 34
\ No newline at end of file
Please login to merge, or discard this patch.