Completed
Push — master ( 691772...2b1feb )
by Jean-Christophe
03:46
created
Ajax/semantic/html/content/view/ContentPartTrait.php 3 patches
Doc Comments   +5 added lines patch added patch discarded remove patch
@@ -7,6 +7,11 @@
 block discarded – undo
7 7
  * @property mixed $content
8 8
  */
9 9
 trait ContentPartTrait{
10
+
11
+	/**
12
+	 * @param \Ajax\semantic\html\elements\HtmlButtonGroups $element
13
+	 * @param string $partKey
14
+	 */
10 15
 	public function addElementInPart($element,$partKey,$before=false,$force=false){
11 16
 		$part=$this->getPart($partKey,null,$force);
12 17
 		if($part instanceof  HtmlSemDoubleElement){
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -6,24 +6,24 @@
 block discarded – undo
6 6
  * @author jc
7 7
  * @property mixed $content
8 8
  */
9
-trait ContentPartTrait{
10
-	public function addElementInPart($element,$partKey,$before=false,$force=false){
11
-		$part=$this->getPart($partKey,null,$force);
12
-		if($part instanceof  HtmlSemDoubleElement){
9
+trait ContentPartTrait {
10
+	public function addElementInPart($element, $partKey, $before=false, $force=false) {
11
+		$part=$this->getPart($partKey, null, $force);
12
+		if ($part instanceof  HtmlSemDoubleElement) {
13 13
 			$this->content[$partKey]=$part;
14
-			$part->addContent($element,$before);
14
+			$part->addContent($element, $before);
15 15
 		}
16 16
 		return $this;
17 17
 	}
18 18
 
19
-	public function getPart($partKey, $index=NULL,$force=false) {
19
+	public function getPart($partKey, $index=NULL, $force=false) {
20 20
 		if (\array_key_exists($partKey, $this->content)) {
21 21
 			if (isset($index))
22 22
 				return $this->content[$partKey][$index];
23 23
 			return $this->content[$partKey];
24 24
 		}
25
-		if($force){
26
-			return new HtmlSemDoubleElement($partKey."-".$this->identifier,"div",$partKey);
25
+		if ($force) {
26
+			return new HtmlSemDoubleElement($partKey."-".$this->identifier, "div", $partKey);
27 27
 		}
28 28
 		return NULL;
29 29
 	}
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -18,8 +18,9 @@
 block discarded – undo
18 18
 
19 19
 	public function getPart($partKey, $index=NULL,$force=false) {
20 20
 		if (\array_key_exists($partKey, $this->content)) {
21
-			if (isset($index))
22
-				return $this->content[$partKey][$index];
21
+			if (isset($index)) {
22
+							return $this->content[$partKey][$index];
23
+			}
23 24
 			return $this->content[$partKey];
24 25
 		}
25 26
 		if($force){
Please login to merge, or discard this patch.
Ajax/semantic/html/content/view/HtmlViewContent.php 3 patches
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -12,6 +12,10 @@
 block discarded – undo
12 12
 
13 13
 class HtmlViewContent extends HtmlSemDoubleElement {
14 14
 	use ContentPartTrait;
15
+
16
+	/**
17
+	 * @param string $identifier
18
+	 */
15 19
 	public function __construct($identifier, $content=array()) {
16 20
 		parent::__construct($identifier, "div", "content",[]);
17 21
 		$this->setContent($content);
Please login to merge, or discard this patch.
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -13,11 +13,11 @@  discard block
 block discarded – undo
13 13
 class HtmlViewContent extends HtmlSemDoubleElement {
14 14
 	use ContentPartTrait;
15 15
 	public function __construct($identifier, $content=array()) {
16
-		parent::__construct($identifier, "div", "content",[]);
16
+		parent::__construct($identifier, "div", "content", []);
17 17
 		$this->setContent($content);
18 18
 	}
19 19
 
20
-	public function setContent($value){
20
+	public function setContent($value) {
21 21
 		if (\is_array($value)) {
22 22
 			$header=JArray::getValue($value, "header", 0);
23 23
 			$metas=JArray::getValue($value, "metas", 1);
@@ -27,24 +27,24 @@  discard block
 block discarded – undo
27 27
 			if (isset($image)) {
28 28
 				$this->addImage($image);
29 29
 			}
30
-			$this->addHeaderContent($header, $metas, $description,$extra);
30
+			$this->addHeaderContent($header, $metas, $description, $extra);
31 31
 		} else
32 32
 			$this->addContent($value);
33 33
 	}
34 34
 
35
-	public function addElement($content, $baseClass="",$part=NULL) {
35
+	public function addElement($content, $baseClass="", $part=NULL) {
36 36
 		$count=\sizeof($this->content);
37
-		$result=new HtmlViewContent("element-" . $count . "-" . $this->identifier, $content);
37
+		$result=new HtmlViewContent("element-".$count."-".$this->identifier, $content);
38 38
 		$result->setClass($baseClass);
39 39
 		$this->addContent($result);
40 40
 		return $result;
41 41
 	}
42 42
 
43 43
 	public function addMeta($value, $direction=Direction::LEFT) {
44
-		if (\array_key_exists("meta", $this->content) === false) {
45
-			$this->content["meta"]=new HtmlSemDoubleElement("meta-" . $this->identifier, "div", "meta", array ());
44
+		if (\array_key_exists("meta", $this->content)===false) {
45
+			$this->content["meta"]=new HtmlSemDoubleElement("meta-".$this->identifier, "div", "meta", array());
46 46
 		}
47
-		if ($direction === Direction::RIGHT) {
47
+		if ($direction===Direction::RIGHT) {
48 48
 			$value=new HtmlSemDoubleElement("", "span", "", $value);
49 49
 			$value->setFloated($direction);
50 50
 		}
@@ -53,8 +53,8 @@  discard block
 block discarded – undo
53 53
 	}
54 54
 
55 55
 	public function addExtra($value) {
56
-		if (\array_key_exists("extra", $this->content) === false) {
57
-			$this->content["extra"]=new HtmlSemDoubleElement("extra-" . $this->identifier, "div", "extra", array ());
56
+		if (\array_key_exists("extra", $this->content)===false) {
57
+			$this->content["extra"]=new HtmlSemDoubleElement("extra-".$this->identifier, "div", "extra", array());
58 58
 		}
59 59
 		$this->content["extra"]->addContent($value);
60 60
 		return $this->content["extra"];
@@ -75,15 +75,15 @@  discard block
 block discarded – undo
75 75
 	 * @param boolean $before
76 76
 	 * @return HtmlButtonGroups
77 77
 	 */
78
-	public function addContentButtons($elements=array(), $asIcons=false,$part="extra",$before=false){
79
-		$buttons=new HtmlButtonGroups("buttons-".$this->identifier,$elements,$asIcons);
80
-		$this->addElementInPart($buttons,$part, $before,true);
78
+	public function addContentButtons($elements=array(), $asIcons=false, $part="extra", $before=false) {
79
+		$buttons=new HtmlButtonGroups("buttons-".$this->identifier, $elements, $asIcons);
80
+		$this->addElementInPart($buttons, $part, $before, true);
81 81
 		return $buttons;
82 82
 	}
83 83
 
84 84
 	public function addMetas($metas) {
85 85
 		if (\is_array($metas)) {
86
-			foreach ( $metas as $meta ) {
86
+			foreach ($metas as $meta) {
87 87
 				$this->addMeta($meta);
88 88
 			}
89 89
 		} else
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 	}
93 93
 
94 94
 	public function addContentIcon($icon, $caption=NULL, $direction=Direction::LEFT) {
95
-		if ($direction === Direction::RIGHT) {
95
+		if ($direction===Direction::RIGHT) {
96 96
 			if (isset($caption)) {
97 97
 				$result=new HtmlSemDoubleElement("", "span", "", $caption);
98 98
 				$result->addIcon($icon);
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
 	}
111 111
 
112 112
 	public function addContentText($caption, $direction=Direction::LEFT) {
113
-		if ($direction === Direction::RIGHT) {
113
+		if ($direction===Direction::RIGHT) {
114 114
 			$result=new HtmlSemDoubleElement("", "span", "", $caption);
115 115
 			$this->addContent($result);
116 116
 			$result->setFloated($direction);
@@ -120,20 +120,20 @@  discard block
 block discarded – undo
120 120
 	}
121 121
 
122 122
 	public function addContentIcons($icons, $direction=Direction::LEFT) {
123
-		foreach ( $icons as $icon ) {
123
+		foreach ($icons as $icon) {
124 124
 			$this->addContentIcon($icon, NULL, $direction);
125 125
 		}
126 126
 		return $this;
127 127
 	}
128 128
 
129
-	public function addHeaderContent($header, $metas=array(), $description=NULL,$extra=NULL) {
130
-		if(isset($header))
129
+	public function addHeaderContent($header, $metas=array(), $description=NULL, $extra=NULL) {
130
+		if (isset($header))
131 131
 			$this->addElement($header, "header");
132 132
 		$this->addMetas($metas);
133 133
 		if (isset($description)) {
134 134
 			$this->addElement($description, "description");
135 135
 		}
136
-		if(isset($extra)){
136
+		if (isset($extra)) {
137 137
 			$this->addExtra($extra);
138 138
 		}
139 139
 		return $this;
Please login to merge, or discard this patch.
Braces   +15 added lines, -10 removed lines patch added patch discarded remove patch
@@ -28,8 +28,9 @@  discard block
 block discarded – undo
28 28
 				$this->addImage($image);
29 29
 			}
30 30
 			$this->addHeaderContent($header, $metas, $description,$extra);
31
-		} else
32
-			$this->addContent($value);
31
+		} else {
32
+					$this->addContent($value);
33
+		}
33 34
 	}
34 35
 
35 36
 	public function addElement($content, $baseClass="",$part=NULL) {
@@ -62,8 +63,9 @@  discard block
 block discarded – undo
62 63
 
63 64
 	public function addImage($src="", $alt="", $size=NULL) {
64 65
 		$image=new HtmlImg("img-", $src, $alt);
65
-		if (isset($size))
66
-			$image->setSize($size);
66
+		if (isset($size)) {
67
+					$image->setSize($size);
68
+		}
67 69
 		$this->content['image']=$image;
68 70
 		return $image;
69 71
 	}
@@ -86,8 +88,9 @@  discard block
 block discarded – undo
86 88
 			foreach ( $metas as $meta ) {
87 89
 				$this->addMeta($meta);
88 90
 			}
89
-		} else
90
-			$this->addMeta($metas);
91
+		} else {
92
+					$this->addMeta($metas);
93
+		}
91 94
 		return $this;
92 95
 	}
93 96
 
@@ -114,8 +117,9 @@  discard block
 block discarded – undo
114 117
 			$result=new HtmlSemDoubleElement("", "span", "", $caption);
115 118
 			$this->addContent($result);
116 119
 			$result->setFloated($direction);
117
-		} else
118
-			$result=$this->addContent($caption);
120
+		} else {
121
+					$result=$this->addContent($caption);
122
+		}
119 123
 		return $result;
120 124
 	}
121 125
 
@@ -127,8 +131,9 @@  discard block
 block discarded – undo
127 131
 	}
128 132
 
129 133
 	public function addHeaderContent($header, $metas=array(), $description=NULL,$extra=NULL) {
130
-		if(isset($header))
131
-			$this->addElement($header, "header");
134
+		if(isset($header)) {
135
+					$this->addElement($header, "header");
136
+		}
132 137
 		$this->addMetas($metas);
133 138
 		if (isset($description)) {
134 139
 			$this->addElement($description, "description");
Please login to merge, or discard this patch.
Ajax/semantic/html/content/view/HtmlViewItem.php 2 patches
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -16,14 +16,14 @@  discard block
 block discarded – undo
16 16
 abstract class HtmlViewItem extends HtmlSemDoubleElement {
17 17
 	use ContentPartTrait;
18 18
 
19
-	public function __construct($identifier,$baseClass,$content=NULL) {
19
+	public function __construct($identifier, $baseClass, $content=NULL) {
20 20
 		parent::__construct($identifier, "div", $baseClass);
21 21
 		$this->content=["content"=>new HtmlViewContent("content-".$this->identifier)];
22
-		if(isset($content))
22
+		if (isset($content))
23 23
 			$this->setContent($content);
24 24
 	}
25 25
 
26
-	public function setContent($value){
26
+	public function setContent($value) {
27 27
 		if (\is_array($value)) {
28 28
 			$image=JArray::getValue($value, "image", 0);
29 29
 			$content=JArray::getValue($value, "content", 1);
@@ -31,25 +31,25 @@  discard block
 block discarded – undo
31 31
 			if (isset($image)) {
32 32
 				$this->addImage($image);
33 33
 			}
34
-			if(isset($content))
34
+			if (isset($content))
35 35
 				$this->content["content"]->setContent($content);
36
-			if(isset($extra))
36
+			if (isset($extra))
37 37
 				$this->addExtraContent($extra);
38 38
 		}
39 39
 	}
40 40
 
41 41
 	private function createContent($content, $baseClass="content") {
42 42
 		$count=\sizeof($this->content);
43
-		$result=new HtmlViewContent("content-" . $count . "-" . $this->identifier, $content);
43
+		$result=new HtmlViewContent("content-".$count."-".$this->identifier, $content);
44 44
 		$result->setClass($baseClass);
45 45
 		return $result;
46 46
 	}
47 47
 
48 48
 	private function addElementIn($key, $element) {
49
-		if (\array_key_exists($key, $this->content) === false) {
49
+		if (\array_key_exists($key, $this->content)===false) {
50 50
 			$this->content[$key]=[];
51 51
 		}
52
-		if($this->content[$key] instanceof HtmlViewContent)
52
+		if ($this->content[$key] instanceof HtmlViewContent)
53 53
 			$this->content[$key]->addElement($element);
54 54
 		else
55 55
 			$this->content[$key][]=$element;
@@ -59,25 +59,25 @@  discard block
 block discarded – undo
59 59
 
60 60
 	public function addHeader($header, $niveau=4, $type="page") {
61 61
 		if (!$header instanceof HtmlHeader) {
62
-			$header=new HtmlHeader("header-" . $this->identifier, $niveau, $header, $type);
62
+			$header=new HtmlHeader("header-".$this->identifier, $niveau, $header, $type);
63 63
 		}
64
-		return $this->addElementIn("header",$this->createContent($header));
64
+		return $this->addElementIn("header", $this->createContent($header));
65 65
 	}
66 66
 
67 67
 	public function addImage($image, $title="") {
68 68
 		if (!$image instanceof HtmlImage) {
69
-			$image=new HtmlImage("image-" . $this->identifier, $image, $title);
69
+			$image=new HtmlImage("image-".$this->identifier, $image, $title);
70 70
 		}
71 71
 		$image->setClass("ui image");
72
-		return $this->content["image"]= $image;
72
+		return $this->content["image"]=$image;
73 73
 	}
74 74
 
75
-	public function addReveal($visibleContent, $hiddenContent=NULL, $type=RevealType::FADE, $attributeType=NULL,$key="extra-content") {
75
+	public function addReveal($visibleContent, $hiddenContent=NULL, $type=RevealType::FADE, $attributeType=NULL, $key="extra-content") {
76 76
 		$reveal=$visibleContent;
77 77
 		if (!$visibleContent instanceof HtmlReveal) {
78
-			$reveal=new HtmlReveal("reveral-" . $this->identifier, $visibleContent, $hiddenContent, $type, $attributeType);
78
+			$reveal=new HtmlReveal("reveral-".$this->identifier, $visibleContent, $hiddenContent, $type, $attributeType);
79 79
 		}
80
-		return $this->content[$key]= $reveal;
80
+		return $this->content[$key]=$reveal;
81 81
 	}
82 82
 
83 83
 	public function addRevealImage($visibleContent, $hiddenContent=NULL, $type=RevealType::FADE, $attributeType=NULL) {
@@ -85,11 +85,11 @@  discard block
 block discarded – undo
85 85
 		if (!$visibleContent instanceof HtmlReveal) {
86 86
 			return $this->addReveal(new HtmlImage("", $visibleContent), new HtmlImage("", $hiddenContent), $type, $attributeType);
87 87
 		}
88
-		return $this->content["image"]= $reveal;
88
+		return $this->content["image"]=$reveal;
89 89
 	}
90 90
 
91 91
 	public function addExtraContent($content=array()) {
92
-		return $this->content["extra-content"]= $this->createContent($content, "extra content");
92
+		return $this->content["extra-content"]=$this->createContent($content, "extra content");
93 93
 	}
94 94
 
95 95
 	/*public function addContent($content=array(), $before=false) {
@@ -107,23 +107,23 @@  discard block
 block discarded – undo
107 107
 	 * @param boolean $before
108 108
 	 * @return HtmlButtonGroups
109 109
 	 */
110
-	public function addContentButtons($elements=array(), $asIcons=false,$part="extra",$before=false){
111
-		return $this->content["content"]->addContentButtons($elements,$asIcons,$part, $before);
110
+	public function addContentButtons($elements=array(), $asIcons=false, $part="extra", $before=false) {
111
+		return $this->content["content"]->addContentButtons($elements, $asIcons, $part, $before);
112 112
 	}
113 113
 
114 114
 
115 115
 
116
-	public function addItemHeaderContent($header, $metas=array(), $description=NULL,$extra=NULL) {
117
-		return $this->content["content"]->addHeaderContent($header, $metas, $description,$extra);
116
+	public function addItemHeaderContent($header, $metas=array(), $description=NULL, $extra=NULL) {
117
+		return $this->content["content"]->addHeaderContent($header, $metas, $description, $extra);
118 118
 	}
119 119
 
120 120
 	public function addItemContent($content=array()) {
121 121
 		$count=\sizeof($this->content);
122
-		return $this->addElementIn("content", new HtmlViewContent("content-" . $count . "-" . $this->identifier, $content));
122
+		return $this->addElementIn("content", new HtmlViewContent("content-".$count."-".$this->identifier, $content));
123 123
 	}
124 124
 
125 125
 	public function getItemContent() {
126
-		return $this->getPart("content",null,true);
126
+		return $this->getPart("content", null, true);
127 127
 	}
128 128
 
129 129
 	public function getItemExtraContent() {
@@ -145,13 +145,13 @@  discard block
 block discarded – undo
145 145
 	 * @see HtmlSemDoubleElement::compile()
146 146
 	 */
147 147
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
148
-		$this->content=JArray::sortAssociative($this->content, ["header","image","content","extra-content"]);
148
+		$this->content=JArray::sortAssociative($this->content, ["header", "image", "content", "extra-content"]);
149 149
 		return parent::compile($js, $view);
150 150
 	}
151 151
 
152
-	public function asLink($href="",$target=NULL) {
152
+	public function asLink($href="", $target=NULL) {
153 153
 		$this->addToProperty("class", "link");
154
-		if ($href !== "") {
154
+		if ($href!=="") {
155 155
 			$this->setProperty("href", $href);
156 156
 			if (isset($target))
157 157
 				$this->setProperty("target", $target);
Please login to merge, or discard this patch.
Braces   +17 added lines, -12 removed lines patch added patch discarded remove patch
@@ -19,8 +19,9 @@  discard block
 block discarded – undo
19 19
 	public function __construct($identifier,$baseClass,$content=NULL) {
20 20
 		parent::__construct($identifier, "div", $baseClass);
21 21
 		$this->content=["content"=>new HtmlViewContent("content-".$this->identifier)];
22
-		if(isset($content))
23
-			$this->setContent($content);
22
+		if(isset($content)) {
23
+					$this->setContent($content);
24
+		}
24 25
 	}
25 26
 
26 27
 	public function setContent($value){
@@ -31,10 +32,12 @@  discard block
 block discarded – undo
31 32
 			if (isset($image)) {
32 33
 				$this->addImage($image);
33 34
 			}
34
-			if(isset($content))
35
-				$this->content["content"]->setContent($content);
36
-			if(isset($extra))
37
-				$this->addExtraContent($extra);
35
+			if(isset($content)) {
36
+							$this->content["content"]->setContent($content);
37
+			}
38
+			if(isset($extra)) {
39
+							$this->addExtraContent($extra);
40
+			}
38 41
 		}
39 42
 	}
40 43
 
@@ -49,10 +52,11 @@  discard block
 block discarded – undo
49 52
 		if (\array_key_exists($key, $this->content) === false) {
50 53
 			$this->content[$key]=[];
51 54
 		}
52
-		if($this->content[$key] instanceof HtmlViewContent)
53
-			$this->content[$key]->addElement($element);
54
-		else
55
-			$this->content[$key][]=$element;
55
+		if($this->content[$key] instanceof HtmlViewContent) {
56
+					$this->content[$key]->addElement($element);
57
+		} else {
58
+					$this->content[$key][]=$element;
59
+		}
56 60
 		return $element;
57 61
 	}
58 62
 
@@ -153,8 +157,9 @@  discard block
 block discarded – undo
153 157
 		$this->addToProperty("class", "link");
154 158
 		if ($href !== "") {
155 159
 			$this->setProperty("href", $href);
156
-			if (isset($target))
157
-				$this->setProperty("target", $target);
160
+			if (isset($target)) {
161
+							$this->setProperty("target", $target);
162
+			}
158 163
 		}
159 164
 		return $this;
160 165
 	}
Please login to merge, or discard this patch.
Ajax/semantic/html/elements/HtmlButton.php 2 patches
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 	}
57 57
 
58 58
 	public function setFocusable($value=true) {
59
-		if ($value === true)
59
+		if ($value===true)
60 60
 			$this->setProperty("tabindex", "0");
61 61
 		else {
62 62
 			$this->removeProperty("tabindex");
@@ -66,14 +66,14 @@  discard block
 block discarded – undo
66 66
 
67 67
 	public function setAnimated($content, $animation="") {
68 68
 		$this->setTagName("div");
69
-		$this->addToProperty("class", "animated " . $animation);
70
-		$visible=new HtmlSemDoubleElement("visible-" . $this->identifier, "div");
69
+		$this->addToProperty("class", "animated ".$animation);
70
+		$visible=new HtmlSemDoubleElement("visible-".$this->identifier, "div");
71 71
 		$visible->setClass("visible content");
72 72
 		$visible->setContent($this->content);
73
-		$hidden=new HtmlSemDoubleElement("hidden-" . $this->identifier, "div");
73
+		$hidden=new HtmlSemDoubleElement("hidden-".$this->identifier, "div");
74 74
 		$hidden->setClass("hidden content");
75 75
 		$hidden->setContent($content);
76
-		$this->content=array ($visible,$hidden );
76
+		$this->content=array($visible, $hidden);
77 77
 		return $hidden;
78 78
 	}
79 79
 
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 	public function asIcon($icon) {
86 86
 		$iconO=$icon;
87 87
 		if (\is_string($icon)) {
88
-			$iconO=new HtmlIcon("icon-" . $this->identifier, $icon);
88
+			$iconO=new HtmlIcon("icon-".$this->identifier, $icon);
89 89
 		}
90 90
 		$this->addToProperty("class", "icon");
91 91
 		$this->content=$iconO;
@@ -105,13 +105,13 @@  discard block
 block discarded – undo
105 105
 	 * @return HtmlLabel
106 106
 	 */
107 107
 	public function addLabel($label, $before=false, $icon=NULL) {
108
-		$this->tagName="div";$prefix="";
109
-		if($before)
108
+		$this->tagName="div"; $prefix="";
109
+		if ($before)
110 110
 			$prefix="left ";
111 111
 		$this->addToProperty("class", $prefix."labeled");
112
-		$this->content=new HtmlButton("button-" . $this->identifier, $this->content);
112
+		$this->content=new HtmlButton("button-".$this->identifier, $this->content);
113 113
 		$this->content->setTagName("div");
114
-		$label=new HtmlLabel("label-" . $this->identifier, $label, $icon,"a");
114
+		$label=new HtmlLabel("label-".$this->identifier, $label, $icon, "a");
115 115
 		$label->setBasic();
116 116
 		$this->addContent($label, $before);
117 117
 		return $label;
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
 	 */
124 124
 	public function fromArray($array) {
125 125
 		$array=parent::fromArray($array);
126
-		foreach ( $array as $key => $value ) {
126
+		foreach ($array as $key => $value) {
127 127
 			$this->setProperty($key, $value);
128 128
 		}
129 129
 		return $array;
@@ -137,11 +137,11 @@  discard block
 block discarded – undo
137 137
 		return $this->addToProperty("class", "positive");
138 138
 	}
139 139
 
140
-	public function setColor($color){
140
+	public function setColor($color) {
141 141
 		//TODO check button content
142
-		if(\is_array($this->content)){
143
-			foreach ($this->content as $content){
144
-				if($content instanceof HtmlButton)
142
+		if (\is_array($this->content)) {
143
+			foreach ($this->content as $content) {
144
+				if ($content instanceof HtmlButton)
145 145
 					$content->setColor($color);
146 146
 			}
147 147
 		}
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
 	 * @return HtmlButton
200 200
 	 */
201 201
 	public static function social($identifier, $social, $value=NULL) {
202
-		if ($value === NULL)
202
+		if ($value===NULL)
203 203
 			$value=\ucfirst($social);
204 204
 		$return=new HtmlButton($identifier, $value);
205 205
 		$return->addIcon($social);
@@ -236,8 +236,8 @@  discard block
 block discarded – undo
236 236
 	 * {@inheritDoc}
237 237
 	 * @see HtmlSemDoubleElement::asLink()
238 238
 	 */
239
-	public function asLink($href=NULL,$target=NULL) {
240
-		$lnk=new HtmlLink("lnk-".$this->identifier,$href,$this->content,$target);
239
+	public function asLink($href=NULL, $target=NULL) {
240
+		$lnk=new HtmlLink("lnk-".$this->identifier, $href, $this->content, $target);
241 241
 		$this->content=$lnk;
242 242
 		return $this;
243 243
 	}
Please login to merge, or discard this patch.
Braces   +14 added lines, -11 removed lines patch added patch discarded remove patch
@@ -56,9 +56,9 @@  discard block
 block discarded – undo
56 56
 	}
57 57
 
58 58
 	public function setFocusable($value=true) {
59
-		if ($value === true)
60
-			$this->setProperty("tabindex", "0");
61
-		else {
59
+		if ($value === true) {
60
+					$this->setProperty("tabindex", "0");
61
+		} else {
62 62
 			$this->removeProperty("tabindex");
63 63
 		}
64 64
 		return $this;
@@ -106,8 +106,9 @@  discard block
 block discarded – undo
106 106
 	 */
107 107
 	public function addLabel($label, $before=false, $icon=NULL) {
108 108
 		$this->tagName="div";$prefix="";
109
-		if($before)
110
-			$prefix="left ";
109
+		if($before) {
110
+					$prefix="left ";
111
+		}
111 112
 		$this->addToProperty("class", $prefix."labeled");
112 113
 		$this->content=new HtmlButton("button-" . $this->identifier, $this->content);
113 114
 		$this->content->setTagName("div");
@@ -141,12 +142,13 @@  discard block
 block discarded – undo
141 142
 		//TODO check button content
142 143
 		if(\is_array($this->content)){
143 144
 			foreach ($this->content as $content){
144
-				if($content instanceof HtmlButton)
145
-					$content->setColor($color);
145
+				if($content instanceof HtmlButton) {
146
+									$content->setColor($color);
147
+				}
146 148
 			}
149
+		} else {
150
+					parent::setColor($color);
147 151
 		}
148
-		else
149
-			parent::setColor($color);
150 152
 		return $this;
151 153
 	}
152 154
 
@@ -199,8 +201,9 @@  discard block
 block discarded – undo
199 201
 	 * @return HtmlButton
200 202
 	 */
201 203
 	public static function social($identifier, $social, $value=NULL) {
202
-		if ($value === NULL)
203
-			$value=\ucfirst($social);
204
+		if ($value === NULL) {
205
+					$value=\ucfirst($social);
206
+		}
204 207
 		$return=new HtmlButton($identifier, $value);
205 208
 		$return->addIcon($social);
206 209
 		return $return->addToPropertyCtrl("class", $social, Social::getConstants());
Please login to merge, or discard this patch.
Ajax/semantic/html/elements/HtmlLabel.php 3 patches
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -99,12 +99,12 @@
 block discarded – undo
99 99
 	}
100 100
 
101 101
 	/**
102
-	*  Adds an image
103
-	* @param string $src
104
-	* @param string $alt
105
-	* @param boolean $before
106
-	* @return HtmlImg
107
-	*/
102
+	 *  Adds an image
103
+	 * @param string $src
104
+	 * @param string $alt
105
+	 * @param boolean $before
106
+	 * @return HtmlImg
107
+	 */
108 108
 	public function addImage($src, $alt="", $before=true) {
109 109
 		$img=new HtmlImg("image-" . $this->identifier, $src, $alt);
110 110
 		$img->setClass("");
Please login to merge, or discard this patch.
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
  * @version 1.001
18 18
  */
19 19
 class HtmlLabel extends HtmlSemDoubleElement {
20
-	use LabeledIconTrait,HasTimeoutTrait;
20
+	use LabeledIconTrait, HasTimeoutTrait;
21 21
 
22 22
 	public function __construct($identifier, $caption="", $icon=NULL, $tagName="div") {
23 23
 		parent::__construct($identifier, $tagName, "ui label");
@@ -32,10 +32,10 @@  discard block
 block discarded – undo
32 32
 	 * @return HtmlLabel
33 33
 	 */
34 34
 	public function setPointing($value=Direction::NONE) {
35
-		if($value==="left" || $value==="right")
35
+		if ($value==="left" || $value==="right")
36 36
 			return $this->addToPropertyCtrl("class", $value." pointing", Direction::getConstantValues("pointing"));
37 37
 		else
38
-			return $this->addToPropertyCtrl("class", "pointing ".$value, Direction::getConstantValues("pointing",true));
38
+			return $this->addToPropertyCtrl("class", "pointing ".$value, Direction::getConstantValues("pointing", true));
39 39
 	}
40 40
 
41 41
 	/**
@@ -44,15 +44,15 @@  discard block
 block discarded – undo
44 44
 	 * @return HtmlLabel
45 45
 	 */
46 46
 	public function toCorner($side="left") {
47
-		return $this->addToPropertyCtrl("class", $side . " corner", array ("right corner","left corner" ));
47
+		return $this->addToPropertyCtrl("class", $side." corner", array("right corner", "left corner"));
48 48
 	}
49 49
 
50
-	public function setHorizontal(){
51
-		return $this->addToPropertyCtrl("class", "hozizontal",array("horizontal"));
50
+	public function setHorizontal() {
51
+		return $this->addToPropertyCtrl("class", "hozizontal", array("horizontal"));
52 52
 	}
53 53
 
54
-	public function setFloating(){
55
-		return $this->addToPropertyCtrl("class", "floating",array("floating"));
54
+	public function setFloating() {
55
+		return $this->addToPropertyCtrl("class", "floating", array("floating"));
56 56
 	}
57 57
 
58 58
 	/**
@@ -63,9 +63,9 @@  discard block
 block discarded – undo
63 63
 		return $this->addToProperty("class", "tag");
64 64
 	}
65 65
 
66
-	public function setEmpty(){
66
+	public function setEmpty() {
67 67
 		$this->content=NULL;
68
-		return $this->addToPropertyCtrl("class", "empty",array("empty"));
68
+		return $this->addToPropertyCtrl("class", "empty", array("empty"));
69 69
 	}
70 70
 
71 71
 	public function setBasic() {
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 	 */
82 82
 	public function addEmphasisImage($src, $alt="", $before=true) {
83 83
 		$this->addToProperty("class", "image");
84
-		return $this->addImage($src,$alt,$before);
84
+		return $this->addImage($src, $alt, $before);
85 85
 	}
86 86
 
87 87
 	/**
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 	 * @return HtmlImg
93 93
 	 */
94 94
 	public function addAvatarImage($src, $alt="", $before=true) {
95
-		$img=$this->addImage($src,$alt,$before);
95
+		$img=$this->addImage($src, $alt, $before);
96 96
 		$img->setClass("ui image");
97 97
 		$img->asAvatar();
98 98
 		return $img;
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
 	* @return HtmlImg
107 107
 	*/
108 108
 	public function addImage($src, $alt="", $before=true) {
109
-		$img=new HtmlImg("image-" . $this->identifier, $src, $alt);
109
+		$img=new HtmlImg("image-".$this->identifier, $src, $alt);
110 110
 		$img->setClass("");
111 111
 		$this->addContent($img, $before);
112 112
 		return $img;
@@ -118,21 +118,21 @@  discard block
 block discarded – undo
118 118
 	 * @return HtmlDoubleElement
119 119
 	 */
120 120
 	public function addDetail($detail) {
121
-		$div=new HtmlSemDoubleElement("detail-" . $this->identifier, $this->tagName,"detail");
121
+		$div=new HtmlSemDoubleElement("detail-".$this->identifier, $this->tagName, "detail");
122 122
 		$div->setContent($detail);
123 123
 		$this->addContent($div);
124 124
 		return $div;
125 125
 	}
126 126
 
127 127
 	public function asRibbon($direction=Direction::NONE) {
128
-		return $this->addToPropertyCtrl("class", $direction." ribbon", array ("ribbon","right ribbon","left ribbon" ));
128
+		return $this->addToPropertyCtrl("class", $direction." ribbon", array("ribbon", "right ribbon", "left ribbon"));
129 129
 	}
130 130
 
131
-	public function setAttached($side=Side::TOP,$direction=Direction::NONE){
132
-		if($direction!==Direction::NONE)
133
-			return $this->addToPropertyCtrl("class", $side." ".$direction." attached",Side::getConstantValues($direction." attached"));
131
+	public function setAttached($side=Side::TOP, $direction=Direction::NONE) {
132
+		if ($direction!==Direction::NONE)
133
+			return $this->addToPropertyCtrl("class", $side." ".$direction." attached", Side::getConstantValues($direction." attached"));
134 134
 		else
135
-			return $this->addToPropertyCtrl("class", $side." attached",Side::getConstantValues("attached"));
135
+			return $this->addToPropertyCtrl("class", $side." attached", Side::getConstantValues("attached"));
136 136
 	}
137 137
 
138 138
 	public static function ribbon($identifier, $caption) {
Please login to merge, or discard this patch.
Braces   +13 added lines, -10 removed lines patch added patch discarded remove patch
@@ -22,8 +22,9 @@  discard block
 block discarded – undo
22 22
 	public function __construct($identifier, $caption="", $icon=NULL, $tagName="div") {
23 23
 		parent::__construct($identifier, $tagName, "ui label");
24 24
 		$this->content=$caption;
25
-		if (isset($icon))
26
-			$this->addIcon($icon);
25
+		if (isset($icon)) {
26
+					$this->addIcon($icon);
27
+		}
27 28
 	}
28 29
 
29 30
 	/**
@@ -32,10 +33,11 @@  discard block
 block discarded – undo
32 33
 	 * @return HtmlLabel
33 34
 	 */
34 35
 	public function setPointing($value=Direction::NONE) {
35
-		if($value==="left" || $value==="right")
36
-			return $this->addToPropertyCtrl("class", $value." pointing", Direction::getConstantValues("pointing"));
37
-		else
38
-			return $this->addToPropertyCtrl("class", "pointing ".$value, Direction::getConstantValues("pointing",true));
36
+		if($value==="left" || $value==="right") {
37
+					return $this->addToPropertyCtrl("class", $value." pointing", Direction::getConstantValues("pointing"));
38
+		} else {
39
+					return $this->addToPropertyCtrl("class", "pointing ".$value, Direction::getConstantValues("pointing",true));
40
+		}
39 41
 	}
40 42
 
41 43
 	/**
@@ -129,10 +131,11 @@  discard block
 block discarded – undo
129 131
 	}
130 132
 
131 133
 	public function setAttached($side=Side::TOP,$direction=Direction::NONE){
132
-		if($direction!==Direction::NONE)
133
-			return $this->addToPropertyCtrl("class", $side." ".$direction." attached",Side::getConstantValues($direction." attached"));
134
-		else
135
-			return $this->addToPropertyCtrl("class", $side." attached",Side::getConstantValues("attached"));
134
+		if($direction!==Direction::NONE) {
135
+					return $this->addToPropertyCtrl("class", $side." ".$direction." attached",Side::getConstantValues($direction." attached"));
136
+		} else {
137
+					return $this->addToPropertyCtrl("class", $side." attached",Side::getConstantValues("attached"));
138
+		}
136 139
 	}
137 140
 
138 141
 	public static function ribbon($identifier, $caption) {
Please login to merge, or discard this patch.
Ajax/common/traits/JqueryAjaxTrait.php 2 patches
Braces   +32 added lines, -24 removed lines patch added patch discarded remove patch
@@ -48,8 +48,9 @@  discard block
 block discarded – undo
48 48
 		}
49 49
 		$retour.="$.".$method."(url,".$params.").done(function( data ) {\n";
50 50
 		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback)."});\n";
51
-		if ($immediatly)
52
-			$this->jquery_code_for_compile[]=$retour;
51
+		if ($immediatly) {
52
+					$this->jquery_code_for_compile[]=$retour;
53
+		}
53 54
 		return $retour;
54 55
 	}
55 56
 
@@ -67,15 +68,17 @@  discard block
 block discarded – undo
67 68
 		$url=$this->_correctAjaxUrl($url);
68 69
 		$retour="url='".$url."';";
69 70
 		$slash="/";
70
-		if(JString::endswith($url, "/")===true)
71
-			$slash="";
71
+		if(JString::endswith($url, "/")===true) {
72
+					$slash="";
73
+		}
72 74
 		if(JString::isNotNull($attr)){
73
-			if ($attr==="value")
74
-				$retour.="url=url+'".$slash."'+$(this).val();\n";
75
-			elseif ($attr==="html")
76
-			$retour.="url=url+'".$slash."'+$(this).html();\n";
77
-			elseif($attr!==null && $attr!=="")
78
-					$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
75
+			if ($attr==="value") {
76
+							$retour.="url=url+'".$slash."'+$(this).val();\n";
77
+			} elseif ($attr==="html") {
78
+						$retour.="url=url+'".$slash."'+$(this).html();\n";
79
+			} elseif($attr!==null && $attr!=="") {
80
+								$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
81
+			}
79 82
 		}
80 83
 		return $retour;
81 84
 	}
@@ -85,13 +88,14 @@  discard block
 block discarded – undo
85 88
 		if ($responseElement!=="") {
86 89
 			if(isset($ajaxTransition)){
87 90
 				$call=$this->setAjaxDataCall($ajaxTransition);
88
-			}elseif(isset($this->ajaxTransition)){
91
+			} elseif(isset($this->ajaxTransition)){
89 92
 				$call=$this->ajaxTransition;
90 93
 			}
91
-			if(\is_callable($call))
92
-				$retour="\t".$call($responseElement,$jqueryDone).";\n";
93
-			else
94
-				$retour="\t$({$responseElement}).{$jqueryDone}( data );\n";
94
+			if(\is_callable($call)) {
95
+							$retour="\t".$call($responseElement,$jqueryDone).";\n";
96
+			} else {
97
+							$retour="\t$({$responseElement}).{$jqueryDone}( data );\n";
98
+			}
95 99
 		}
96 100
 		$retour.="\t".$jsCallback."\n";
97 101
 		return $retour;
@@ -105,8 +109,9 @@  discard block
 block discarded – undo
105 109
 	}
106 110
 
107 111
 	protected function _correctAjaxUrl($url) {
108
-		if ($url!=="/" && JString::endsWith($url, "/")===true)
109
-			$url=substr($url, 0, strlen($url)-1);
112
+		if ($url!=="/" && JString::endsWith($url, "/")===true) {
113
+					$url=substr($url, 0, strlen($url)-1);
114
+		}
110 115
 		if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
111 116
 			$url=$this->jsUtils->getUrl($url);
112 117
 		}
@@ -130,8 +135,9 @@  discard block
 block discarded – undo
130 135
 				$retour.="\t".$jsCallback."\n".
131 136
 						"\t$(document).trigger('jsonReady',[data]);\n".
132 137
 						"});\n";
133
-				if ($immediatly)
134
-					$this->jquery_code_for_compile[]=$retour;
138
+				if ($immediatly) {
139
+									$this->jquery_code_for_compile[]=$retour;
140
+				}
135 141
 					return $retour;
136 142
 	}
137 143
 
@@ -171,7 +177,7 @@  discard block
 block discarded – undo
171 177
 		if($context===null){
172 178
 			$parent="$('".$maskSelector."').parent()";
173 179
 			$newElm = "$('#'+newId)";
174
-		}else{
180
+		} else{
175 181
 			$parent=$context;
176 182
 			$newElm = $context.".find('#'+newId)";
177 183
 		}
@@ -184,8 +190,9 @@  discard block
 block discarded – undo
184 190
 		$retour.="\t}\n"."\tfor(var key in value){\n"."\t\t\tvar html = $('<div />').append($(newElm).clone()).html();\n"."\t\t\tif(html.indexOf('__'+key+'__')>-1){\n"."\t\t\t\tcontent=$(html.split('__'+key+'__').join(value[key]));\n"."\t\t\t\t$(newElm).replaceWith(content);newElm=content;\n"."\t\t\t}\n"."\t\tvar sel='[data-id=\"'+key+'\"]';if($(sel,newElm).length){\n"."\t\t\tvar selElm=$(sel,newElm);\n"."\t\t\t if(selElm.is('[value]')) { selElm.attr('value',value[key]);selElm.val(value[key]);} else { selElm.html(value[key]); }\n"."\t\t}\n"."}\n"."\t$(newElm).show(true);"."\n"."\t$(newElm).removeClass('hide');"."});\n";
185 191
 		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
186 192
 		$retour.="\t".$jsCallback."\n"."});\n";
187
-		if ($immediatly)
188
-			$this->jquery_code_for_compile[]=$retour;
193
+		if ($immediatly) {
194
+					$this->jquery_code_for_compile[]=$retour;
195
+		}
189 196
 			return $retour;
190 197
 	}
191 198
 	/**
@@ -226,8 +233,9 @@  discard block
 block discarded – undo
226 233
 			}});\n";
227 234
 			$retour.="$('#".$form."').submit();\n";
228 235
 		}
229
-		if ($immediatly)
230
-			$this->jquery_code_for_compile[]=$retour;
236
+		if ($immediatly) {
237
+					$this->jquery_code_for_compile[]=$retour;
238
+		}
231 239
 			return $retour;
232 240
 	}
233 241
 
Please login to merge, or discard this patch.
Spacing   +46 added lines, -46 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
 	protected $ajaxTransition;
18 18
 	protected $ajaxLoader='<span></span><span></span><span></span><span></span><span></span>';
19 19
 
20
-	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
20
+	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true);
21 21
 	protected function addLoading(&$retour, $responseElement) {
22 22
 		$loading_notifier='<div class="ajax-loader">';
23 23
 		if ($this->ajaxLoader=='') {
@@ -30,66 +30,66 @@  discard block
 block discarded – undo
30 30
 		$retour.="\t\t$({$responseElement}).prepend('{$loading_notifier}');\n";
31 31
 	}
32 32
 
33
-	public function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$jqueryDone="html",$ajaxTransition=null,$immediatly=false) {
34
-		return $this->_ajax("get", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$jqueryDone,$ajaxTransition,$immediatly);
33
+	public function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $jqueryDone="html", $ajaxTransition=null, $immediatly=false) {
34
+		return $this->_ajax("get", $url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition, $immediatly);
35 35
 	}
36
-	public function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$jqueryDone="html",$ajaxTransition=null,$immediatly=false) {
37
-		return $this->_ajax("post", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$jqueryDone,$ajaxTransition,$immediatly);
36
+	public function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $jqueryDone="html", $ajaxTransition=null, $immediatly=false) {
37
+		return $this->_ajax("post", $url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition, $immediatly);
38 38
 	}
39 39
 
40
-	protected function _ajax($method,$url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$jqueryDone="html",$ajaxTransition=null,$immediatly=false) {
41
-		if(JString::isNull($params)){$params="{}";}
40
+	protected function _ajax($method, $url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $jqueryDone="html", $ajaxTransition=null, $immediatly=false) {
41
+		if (JString::isNull($params)) {$params="{}"; }
42 42
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
43 43
 		$retour=$this->_getAjaxUrl($url, $attr);
44 44
 		$responseElement=$this->_getResponseElement($responseElement);
45 45
 		$retour.="var self=this;\n";
46
-		if($hasLoader===true){
46
+		if ($hasLoader===true) {
47 47
 			$this->addLoading($retour, $responseElement);
48 48
 		}
49 49
 		$retour.="$.".$method."(url,".$params.").done(function( data ) {\n";
50
-		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback)."});\n";
50
+		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback)."});\n";
51 51
 		if ($immediatly)
52 52
 			$this->jquery_code_for_compile[]=$retour;
53 53
 		return $retour;
54 54
 	}
55 55
 
56
-	protected function setAjaxDataCall($params){
56
+	protected function setAjaxDataCall($params) {
57 57
 		$result=null;
58
-		if(!\is_callable($params)){
59
-			$result=function ($responseElement,$jqueryDone="html") use($params){
60
-				return AjaxTransition::{$params}($responseElement,$jqueryDone);
58
+		if (!\is_callable($params)) {
59
+			$result=function($responseElement, $jqueryDone="html") use($params){
60
+				return AjaxTransition::{$params}($responseElement, $jqueryDone);
61 61
 			};
62 62
 		}
63 63
 		return $result;
64 64
 	}
65 65
 
66
-	protected function _getAjaxUrl($url,$attr){
66
+	protected function _getAjaxUrl($url, $attr) {
67 67
 		$url=$this->_correctAjaxUrl($url);
68 68
 		$retour="url='".$url."';";
69 69
 		$slash="/";
70
-		if(JString::endswith($url, "/")===true)
70
+		if (JString::endswith($url, "/")===true)
71 71
 			$slash="";
72
-		if(JString::isNotNull($attr)){
72
+		if (JString::isNotNull($attr)) {
73 73
 			if ($attr==="value")
74 74
 				$retour.="url=url+'".$slash."'+$(this).val();\n";
75 75
 			elseif ($attr==="html")
76 76
 			$retour.="url=url+'".$slash."'+$(this).html();\n";
77
-			elseif($attr!==null && $attr!=="")
77
+			elseif ($attr!==null && $attr!=="")
78 78
 					$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
79 79
 		}
80 80
 		return $retour;
81 81
 	}
82 82
 
83
-	protected function _getOnAjaxDone($responseElement,$jqueryDone,$ajaxTransition,$jsCallback){
84
-		$retour="";$call=null;
83
+	protected function _getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback) {
84
+		$retour=""; $call=null;
85 85
 		if ($responseElement!=="") {
86
-			if(isset($ajaxTransition)){
86
+			if (isset($ajaxTransition)) {
87 87
 				$call=$this->setAjaxDataCall($ajaxTransition);
88
-			}elseif(isset($this->ajaxTransition)){
88
+			}elseif (isset($this->ajaxTransition)) {
89 89
 				$call=$this->ajaxTransition;
90 90
 			}
91
-			if(\is_callable($call))
92
-				$retour="\t".$call($responseElement,$jqueryDone).";\n";
91
+			if (\is_callable($call))
92
+				$retour="\t".$call($responseElement, $jqueryDone).";\n";
93 93
 			else
94 94
 				$retour="\t$({$responseElement}).{$jqueryDone}( data );\n";
95 95
 		}
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
 		return $retour;
98 98
 	}
99 99
 
100
-	protected function _getResponseElement($responseElement){
100
+	protected function _getResponseElement($responseElement) {
101 101
 		if ($responseElement!=="") {
102 102
 			$responseElement=Javascript::prep_value($responseElement);
103 103
 		}
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
 	protected function _correctAjaxUrl($url) {
108 108
 		if ($url!=="/" && JString::endsWith($url, "/")===true)
109 109
 			$url=substr($url, 0, strlen($url)-1);
110
-		if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
110
+		if (strncmp($url, 'http://', 7)!=0 && strncmp($url, 'https://', 8)!=0) {
111 111
 			$url=$this->jsUtils->getUrl($url);
112 112
 		}
113 113
 		return $url;
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
 	 * @param string $jsCallback javascript code to execute after the request
122 122
 	 * @param boolean $immediatly
123 123
 	 */
124
-	public function _json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document",$immediatly=false) {
124
+	public function _json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document", $immediatly=false) {
125 125
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
126 126
 		$retour=$this->_getAjaxUrl($url, $attr);
127 127
 		$retour.="$.{$method}(url,".$params.").done(function( data ) {\n";
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
 	 * @param string $url the request address
143 143
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true)
144 144
 	 */
145
-	public function _jsonOn($event,$element, $url,$parameters=array()) {
145
+	public function _jsonOn($event, $element, $url, $parameters=array()) {
146 146
 		$preventDefault=true;
147 147
 		$stopPropagation=true;
148 148
 		$jsCallback=null;
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
 		$params="{}";
153 153
 		$immediatly=true;
154 154
 		extract($parameters);
155
-		return $this->_add_event($element, $this->_json($url,$method, $params,$jsCallback, $attr,$context), $event, $preventDefault, $stopPropagation,$immediatly);
155
+		return $this->_add_event($element, $this->_json($url, $method, $params, $jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation, $immediatly);
156 156
 	}
157 157
 
158 158
 	/**
@@ -165,22 +165,22 @@  discard block
 block discarded – undo
165 165
 	 * @param string $rowClass the css class for the new element
166 166
 	 * @param boolean $immediatly
167 167
 	 */
168
-	public function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context=null,$rowClass="_json",$immediatly=false) {
168
+	public function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context=null, $rowClass="_json", $immediatly=false) {
169 169
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
170 170
 		$retour=$this->_getAjaxUrl($url, $attr);
171
-		if($context===null){
171
+		if ($context===null) {
172 172
 			$parent="$('".$maskSelector."').parent()";
173
-			$newElm = "$('#'+newId)";
174
-		}else{
173
+			$newElm="$('#'+newId)";
174
+		} else {
175 175
 			$parent=$context;
176
-			$newElm = $context.".find('#'+newId)";
176
+			$newElm=$context.".find('#'+newId)";
177 177
 		}
178 178
 		$appendTo="\t\tnewElm.appendTo(".$parent.");\n";
179 179
 		$retour.="var self = $(this);\n$.{$method}(url,".$params.").done(function( data ) {\n";
180 180
 		$retour.=$parent.".find('._json').remove();";
181 181
 		$retour.="\tdata=$.parseJSON(data);$.each(data, function(index, value) {\n"."\tvar created=false;var maskElm=$('".$maskSelector."').first();maskElm.hide();"."\tvar newId=(maskElm.attr('id') || 'mask')+'-'+index;"."\tvar newElm=".$newElm.";\n"."\tif(!newElm.length){\n"."\t\tnewElm=maskElm.clone();
182 182
 				newElm.attr('id',newId);\n;newElm.addClass('{$rowClass}').removeClass('_jsonArrayModel');\nnewElm.find('[id]').each(function(){ var newId=$(this).attr('id')+'-'+index;$(this).attr('id',newId).removeClass('_jsonArrayChecked');});\n";
183
-		$retour.= $appendTo;
183
+		$retour.=$appendTo;
184 184
 		$retour.="\t}\n"."\tfor(var key in value){\n"."\t\t\tvar html = $('<div />').append($(newElm).clone()).html();\n"."\t\t\tif(html.indexOf('__'+key+'__')>-1){\n"."\t\t\t\tcontent=$(html.split('__'+key+'__').join(value[key]));\n"."\t\t\t\t$(newElm).replaceWith(content);newElm=content;\n"."\t\t\t}\n"."\t\tvar sel='[data-id=\"'+key+'\"]';if($(sel,newElm).length){\n"."\t\t\tvar selElm=$(sel,newElm);\n"."\t\t\t if(selElm.is('[value]')) { selElm.attr('value',value[key]);selElm.val(value[key]);} else { selElm.html(value[key]); }\n"."\t\t}\n"."}\n"."\t$(newElm).show(true);"."\n"."\t$(newElm).removeClass('hide');"."});\n";
185 185
 		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
186 186
 		$retour.="\t".$jsCallback."\n"."});\n";
@@ -195,30 +195,30 @@  discard block
 block discarded – undo
195 195
 	 * @param string $url the request address
196 196
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get", "context"=>null)
197 197
 	 */
198
-	public function _jsonArrayOn($event,$element, $maskSelector,$url,$parameters=array()) {
198
+	public function _jsonArrayOn($event, $element, $maskSelector, $url, $parameters=array()) {
199 199
 		$preventDefault=true;
200 200
 		$stopPropagation=true;
201 201
 		$jsCallback=null;
202 202
 		$attr="id";
203 203
 		$method="get";
204
-		$context = null;
204
+		$context=null;
205 205
 		$params="{}";
206 206
 		$immediatly=true;
207 207
 		extract($parameters);
208
-		return $this->_add_event($element, $this->_jsonArray($maskSelector,$url,$method, $params,$jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation,$immediatly);
208
+		return $this->_add_event($element, $this->_jsonArray($maskSelector, $url, $method, $params, $jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation, $immediatly);
209 209
 	}
210 210
 
211
-	public function _postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true,$jqueryDone="html",$ajaxTransition=null,$immediatly=false) {
211
+	public function _postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true, $jqueryDone="html", $ajaxTransition=null, $immediatly=false) {
212 212
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
213 213
 		$retour=$this->_getAjaxUrl($url, $attr);
214 214
 		$retour.="\nvar params=$('#".$form."').serialize();\n";
215 215
 		$responseElement=$this->_getResponseElement($responseElement);
216 216
 		$retour.="var self=this;\n";
217
-		if($hasLoader===true){
217
+		if ($hasLoader===true) {
218 218
 			$this->addLoading($retour, $responseElement);
219 219
 		}
220 220
 		$retour.="$.post(url,params).done(function( data ) {\n";
221
-		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback)."});\n";
221
+		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback)."});\n";
222 222
 
223 223
 		if ($validation) {
224 224
 			$retour="$('#".$form."').validate({submitHandler: function(form) {
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
241 241
 	 * @param string $responseElement
242 242
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxTransition"=>null,"jqueryDone"=>"html")
243 243
 	 */
244
-	public function _getOn($event,$element, $url, $params="{}", $responseElement="", $parameters=array()) {
244
+	public function _getOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
245 245
 		$preventDefault=true;
246 246
 		$stopPropagation=true;
247 247
 		$jsCallback=null;
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
251 251
 		$jqueryDone="html";
252 252
 		$ajaxTransition=null;
253 253
 		extract($parameters);
254
-		return $this->_add_event($element, $this->_get($url, $params, $responseElement, $jsCallback, $attr,$hasLoader,$jqueryDone,$ajaxTransition), $event, $preventDefault, $stopPropagation,$immediatly);
254
+		return $this->_add_event($element, $this->_get($url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition), $event, $preventDefault, $stopPropagation, $immediatly);
255 255
 	}
256 256
 
257 257
 	/**
@@ -264,7 +264,7 @@  discard block
 block discarded – undo
264 264
 	 * @param string $responseElement
265 265
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxTransition"=>null)
266 266
 	 */
267
-	public function _postOn($event,$element, $url, $params="{}", $responseElement="", $parameters=array()) {
267
+	public function _postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
268 268
 		$preventDefault=true;
269 269
 		$stopPropagation=true;
270 270
 		$jsCallback=null;
@@ -274,7 +274,7 @@  discard block
 block discarded – undo
274 274
 		$jqueryDone="html";
275 275
 		$ajaxTransition=null;
276 276
 		extract($parameters);
277
-		return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr,$hasLoader,$jqueryDone,$ajaxTransition), $event, $preventDefault, $stopPropagation,$immediatly);
277
+		return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition), $event, $preventDefault, $stopPropagation, $immediatly);
278 278
 	}
279 279
 
280 280
 	/**
@@ -287,7 +287,7 @@  discard block
 block discarded – undo
287 287
 	 * @param string $responseElement
288 288
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxTransition"=>null,"immediatly"=>true)
289 289
 	 */
290
-	public function _postFormOn($event,$element, $url, $form, $responseElement="", $parameters=array()) {
290
+	public function _postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) {
291 291
 		$preventDefault=true;
292 292
 		$stopPropagation=true;
293 293
 		$validation=false;
@@ -298,6 +298,6 @@  discard block
 block discarded – undo
298 298
 		$jqueryDone="html";
299 299
 		$ajaxTransition=null;
300 300
 		extract($parameters);
301
-		return $this->_add_event($element, $this->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr,$hasLoader,$jqueryDone,$ajaxTransition), $event, $preventDefault, $stopPropagation,$immediatly);
301
+		return $this->_add_event($element, $this->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition), $event, $preventDefault, $stopPropagation, $immediatly);
302 302
 	}
303 303
 }
Please login to merge, or discard this patch.
Ajax/Bootstrap.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -176,8 +176,8 @@  discard block
 block discarded – undo
176 176
 	 * @param string $tagName container tagName
177 177
 	 * @return HtmlListgroup
178 178
 	 */
179
-	public function htmlListgroup($identifier,$items=array(),$tagName="ul"){
180
-		$listGroup=new HtmlListgroup($identifier,$tagName);
179
+	public function htmlListgroup($identifier, $items=array(), $tagName="ul") {
180
+		$listGroup=new HtmlListgroup($identifier, $tagName);
181 181
 		$listGroup->addItems($items);
182 182
 		return $this->addHtmlComponent($listGroup);
183 183
 	}
@@ -202,8 +202,8 @@  discard block
 block discarded – undo
202 202
 	 * @param string $onClick
203 203
 	 * @return HtmlSplitbutton
204 204
 	 */
205
-	public function htmlSplitbutton($identifier,$value="", $items=array(), $cssStyle="btn-default", $onClick=NULL) {
206
-		return $this->addHtmlComponent(new HtmlSplitbutton($identifier, $value, $items, $cssStyle,$onClick));
205
+	public function htmlSplitbutton($identifier, $value="", $items=array(), $cssStyle="btn-default", $onClick=NULL) {
206
+		return $this->addHtmlComponent(new HtmlSplitbutton($identifier, $value, $items, $cssStyle, $onClick));
207 207
 	}
208 208
 
209 209
 	/**
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
 	 * @param string $identifier
212 212
 	 * @return HtmlInputgroup
213 213
 	 */
214
-	public function htmlInputgroup($identifier){
214
+	public function htmlInputgroup($identifier) {
215 215
 		return $this->addHtmlComponent(new HtmlInputgroup($identifier));
216 216
 	}
217 217
 
@@ -223,8 +223,8 @@  discard block
 block discarded – undo
223 223
 	 * @param function $hrefFunction the function who generates the href elements. default : function($e){return $e->getContent()}
224 224
 	 * @return HtmlBreadcrumbs
225 225
 	 */
226
-	public function htmlBreadcrumbs($identifier,$elements=array(),$autoActive=true,$startIndex=0,$hrefFunction=NULL){
227
-		return $this->addHtmlComponent(new HtmlBreadcrumbs($identifier,$elements,$autoActive,$startIndex,$hrefFunction));
226
+	public function htmlBreadcrumbs($identifier, $elements=array(), $autoActive=true, $startIndex=0, $hrefFunction=NULL) {
227
+		return $this->addHtmlComponent(new HtmlBreadcrumbs($identifier, $elements, $autoActive, $startIndex, $hrefFunction));
228 228
 	}
229 229
 
230 230
 	/**
@@ -236,8 +236,8 @@  discard block
 block discarded – undo
236 236
 	 * @param int $active The active page
237 237
 	 * @return HtmlPagination
238 238
 	 */
239
-	public function htmlPagination($identifier,$from=1,$to=1,$active=NULL,$countVisible=NULL){
240
-		return $this->addHtmlComponent(new HtmlPagination($identifier,$from,$to,$active,$countVisible));
239
+	public function htmlPagination($identifier, $from=1, $to=1, $active=NULL, $countVisible=NULL) {
240
+		return $this->addHtmlComponent(new HtmlPagination($identifier, $from, $to, $active, $countVisible));
241 241
 	}
242 242
 
243 243
 	/**
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
 	 * @param int $numCols
249 249
 	 * @return HtmlGridSystem
250 250
 	 */
251
-	public function htmlGridSystem($identifier,$numRows=1,$numCols=NULL){
252
-		return $this->addHtmlComponent(new HtmlGridSystem($identifier,$numRows,$numCols));
251
+	public function htmlGridSystem($identifier, $numRows=1, $numCols=NULL) {
252
+		return $this->addHtmlComponent(new HtmlGridSystem($identifier, $numRows, $numCols));
253 253
 	}
254 254
 }
Please login to merge, or discard this patch.
Ajax/semantic/html/elements/HtmlLabelGroups.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -15,9 +15,9 @@  discard block
 block discarded – undo
15 15
  */
16 16
 class HtmlLabelGroups extends HtmlSemCollection {
17 17
 
18
-	public function __construct($identifier,$labels=array(), $attributes=array()) {
18
+	public function __construct($identifier, $labels=array(), $attributes=array()) {
19 19
 		parent::__construct($identifier, "div", "ui labels");
20
-		$this->_states=\array_merge(Size::getConstants(),Color::getConstants(),["tag","circular"]);
20
+		$this->_states=\array_merge(Size::getConstants(), Color::getConstants(), ["tag", "circular"]);
21 21
 		$this->addItems($labels);
22 22
 		$this->setStates($attributes);
23 23
 	}
@@ -31,12 +31,12 @@  discard block
 block discarded – undo
31 31
 			$icon=JArray::getValue($value, "icon", 1);
32 32
 			$tagName=JArray::getValue($value, "tagName", 2);
33 33
 		}
34
-		$labelO=new HtmlLabel("label-" . $this->identifier, $caption,$icon,$tagName);
34
+		$labelO=new HtmlLabel("label-".$this->identifier, $caption, $icon, $tagName);
35 35
 		return $labelO;
36 36
 	}
37 37
 
38 38
 	protected function createCondition($value) {
39
-		return ($value instanceof HtmlLabel) === false;
39
+		return ($value instanceof HtmlLabel)===false;
40 40
 	}
41 41
 
42 42
 }
Please login to merge, or discard this patch.
Ajax/semantic/html/elements/HtmlContainer.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -14,11 +14,11 @@
 block discarded – undo
14 14
 class HtmlContainer extends HtmlSemDoubleElement {
15 15
 	use TextAlignmentTrait;
16 16
 	public function __construct($identifier, $content="") {
17
-		parent::__construct($identifier, "div","ui container");
17
+		parent::__construct($identifier, "div", "ui container");
18 18
 		$this->content=$content;
19 19
 	}
20 20
 
21
-	public function asText(){
21
+	public function asText() {
22 22
 		return $this->addToProperty("class", "text");
23 23
 	}
24 24
 }
Please login to merge, or discard this patch.