Completed
Push — master ( d9189f...847185 )
by Jean-Christophe
03:54
created
Ajax/common/html/HtmlCollection.php 1 patch
Spacing   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -12,36 +12,36 @@  discard block
 block discarded – undo
12 12
  */
13 13
 abstract class HtmlCollection extends HtmlDoubleElement {
14 14
 
15
-	public function __construct($identifier,$tagName="div"){
16
-		parent::__construct($identifier,$tagName);
15
+	public function __construct($identifier, $tagName="div") {
16
+		parent::__construct($identifier, $tagName);
17 17
 		$this->content=array();
18 18
 	}
19 19
 
20
-	public function addItems($items){
21
-		if(JArray::isAssociative($items)){
22
-			foreach ($items as $k=>$v){
23
-				$this->addItem([$k,$v]);
20
+	public function addItems($items) {
21
+		if (JArray::isAssociative($items)) {
22
+			foreach ($items as $k=>$v) {
23
+				$this->addItem([$k, $v]);
24 24
 			}
25
-		}else{
26
-			foreach ($items as $item){
25
+		} else {
26
+			foreach ($items as $item) {
27 27
 				$this->addItem($item);
28 28
 			}
29 29
 		}
30 30
 		return $this;
31 31
 	}
32 32
 
33
-	public function setItems($items){
33
+	public function setItems($items) {
34 34
 		$this->content=$items;
35 35
 		return $this;
36 36
 	}
37 37
 
38
-	public function getItems(){
38
+	public function getItems() {
39 39
 		return $this->content;
40 40
 	}
41 41
 
42
-	protected function getItemToAdd($item){
42
+	protected function getItemToAdd($item) {
43 43
 		$itemO=$item;
44
-		if($this->createCondition($item)===true){
44
+		if ($this->createCondition($item)===true) {
45 45
 			$itemO=$this->createItem($item);
46 46
 		}
47 47
 		return $itemO;
@@ -52,15 +52,15 @@  discard block
 block discarded – undo
52 52
 	 * @param HtmlDoubleElement|string|array $item
53 53
 	 * @return \Ajax\common\html\HtmlDoubleElement
54 54
 	 */
55
-	public function addItem($item){
55
+	public function addItem($item) {
56 56
 		$itemO=$this->getItemToAdd($item);
57 57
 		$this->addContent($itemO);
58 58
 		return $itemO;
59 59
 	}
60 60
 
61
-	public function insertItem($item,$position=0){
61
+	public function insertItem($item, $position=0) {
62 62
 		$itemO=$this->getItemToAdd($item);
63
-		\array_splice( $this->content, $position, 0, array($itemO));
63
+		\array_splice($this->content, $position, 0, array($itemO));
64 64
 		return $itemO;
65 65
 	}
66 66
 
@@ -83,11 +83,11 @@  discard block
 block discarded – undo
83 83
 		return $this;
84 84
 	}
85 85
 
86
-	public function removeItem($index){
86
+	public function removeItem($index) {
87 87
 		return array_splice($this->content, $index, 1);
88 88
 	}
89 89
 
90
-	public function count(){
90
+	public function count() {
91 91
 		return \sizeof($this->content);
92 92
 	}
93 93
 
@@ -98,8 +98,8 @@  discard block
 block discarded – undo
98 98
 		return $this->addItem($function($object));
99 99
 	}
100 100
 
101
-	public function apply($callBack){
102
-		foreach ($this->content as $item){
101
+	public function apply($callBack) {
102
+		foreach ($this->content as $item) {
103 103
 			$callBack($item);
104 104
 		}
105 105
 		return $this;
@@ -119,40 +119,40 @@  discard block
 block discarded – undo
119 119
 	 */
120 120
 	abstract protected function createItem($value);
121 121
 
122
-	protected function createCondition($value){
122
+	protected function createCondition($value) {
123 123
 		return \is_object($value)===false;
124 124
 	}
125 125
 
126
-	protected function contentAs($tagName){
127
-		foreach ($this->content as $item){
126
+	protected function contentAs($tagName) {
127
+		foreach ($this->content as $item) {
128 128
 			$item->setTagName($tagName);
129 129
 		}
130 130
 		return $this;
131 131
 	}
132 132
 
133
-	public function setProperties($properties){
133
+	public function setProperties($properties) {
134 134
 		$i=0;
135
-		foreach ($properties as $k=>$v){
135
+		foreach ($properties as $k=>$v) {
136 136
 			$c=$this->content[$i++];
137
-			if(isset($c))
138
-				$c->setProperty($k,$v);
137
+			if (isset($c))
138
+				$c->setProperty($k, $v);
139 139
 			else
140 140
 				return $this;
141 141
 		}
142 142
 		return $this;
143 143
 	}
144 144
 
145
-	public function setPropertyValues($property,$values){
145
+	public function setPropertyValues($property, $values) {
146 146
 		$i=0;
147
-		if(\is_array($values)===false){
148
-			$values=\array_fill(0, $this->count(),$values);
147
+		if (\is_array($values)===false) {
148
+			$values=\array_fill(0, $this->count(), $values);
149 149
 		}
150
-		foreach ($values as $value){
150
+		foreach ($values as $value) {
151 151
 			$c=$this->content[$i++];
152
-			if(isset($c)){
153
-				$c->setProperty($property,$value);
152
+			if (isset($c)) {
153
+				$c->setProperty($property, $value);
154 154
 			}
155
-			else{
155
+			else {
156 156
 				return $this;
157 157
 			}
158 158
 		}
Please login to merge, or discard this patch.
Ajax/common/html/html5/HtmlTextarea.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -7,27 +7,27 @@
 block discarded – undo
7 7
 
8 8
 class HtmlTextarea extends HtmlDoubleElement {
9 9
 
10
-	public function __construct($identifier,$value=NULL,$placeholder=NULL,$rows=NULL) {
10
+	public function __construct($identifier, $value=NULL, $placeholder=NULL, $rows=NULL) {
11 11
 		parent::__construct($identifier, "textarea");
12 12
 		$this->setProperty("name", $identifier);
13 13
 		$this->setValue($value);
14 14
 		$this->setPlaceholder($placeholder);
15
-		if(isset($rows))
15
+		if (isset($rows))
16 16
 			$this->setRows($rows);
17 17
 	}
18 18
 	public function setValue($value) {
19
-		if(isset($value))
19
+		if (isset($value))
20 20
 			$this->setContent($value);
21 21
 		return $this;
22 22
 	}
23 23
 
24
-	public function setPlaceholder($value){
25
-		if(JString::isNotNull($value))
24
+	public function setPlaceholder($value) {
25
+		if (JString::isNotNull($value))
26 26
 			$this->setProperty("placeholder", $value);
27 27
 		return $this;
28 28
 	}
29 29
 
30
-	public function setRows($count){
30
+	public function setRows($count) {
31 31
 		$this->setProperty("rows", $count);
32 32
 	}
33 33
 }
34 34
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/html/elements/HtmlHeader.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -10,14 +10,14 @@  discard block
 block discarded – undo
10 10
 use Ajax\semantic\html\base\traits\AttachedTrait;
11 11
 
12 12
 class HtmlHeader extends HtmlSemDoubleElement {
13
-	use TextAlignmentTrait,AttachedTrait;
13
+	use TextAlignmentTrait, AttachedTrait;
14 14
 	protected $image;
15 15
 
16 16
 	public function __construct($identifier, $niveau=1, $content=NULL, $type="page") {
17 17
 		parent::__construct($identifier, "div", "ui header");
18 18
 		$this->_template="<%tagName% %properties%>%image%%wrapContentBefore%%content%%wrapContentAfter%</%tagName%>";
19 19
 		if (isset($type)) {
20
-			if ($type == "page") {
20
+			if ($type=="page") {
21 21
 				$this->asPageHeader($niveau);
22 22
 			} else
23 23
 				$this->asContentHeader($niveau);
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 	}
27 27
 
28 28
 	public function asPageHeader($niveau) {
29
-		$this->tagName="h" . $niveau;
29
+		$this->tagName="h".$niveau;
30 30
 	}
31 31
 
32 32
 	public function asContentHeader($niveau) {
@@ -39,25 +39,25 @@  discard block
 block discarded – undo
39 39
 
40 40
 	public function asIcon($icon, $title, $subHeader=NULL) {
41 41
 		$this->addToProperty("class", "icon");
42
-		$this->image=new HtmlIcon("icon-" . $this->identifier, $icon);
42
+		$this->image=new HtmlIcon("icon-".$this->identifier, $icon);
43 43
 		return $this->asTitle($title, $subHeader);
44 44
 	}
45 45
 
46 46
 	public function asImage($src, $title, $subHeader=NULL) {
47
-		$this->image=new HtmlImg("img-" . $this->identifier, $src, $title);
47
+		$this->image=new HtmlImg("img-".$this->identifier, $src, $title);
48 48
 		return $this->asTitle($title, $subHeader);
49 49
 	}
50 50
 
51 51
 	public function asTitle($title, $subHeader=NULL) {
52 52
 		if (!\is_object($title)) {
53
-			$this->content=new HtmlDoubleElement("content-" . $this->identifier, "div");
53
+			$this->content=new HtmlDoubleElement("content-".$this->identifier, "div");
54 54
 			$this->content->setContent($title);
55 55
 		} else {
56 56
 			$this->content=$title;
57 57
 		}
58 58
 		$this->content->setClass("content");
59 59
 		if (isset($subHeader)) {
60
-			$sub=new HtmlDoubleElement("subheader-" . $this->identifier, "div");
60
+			$sub=new HtmlDoubleElement("subheader-".$this->identifier, "div");
61 61
 			$sub->setClass("sub header");
62 62
 			$sub->setContent($subHeader);
63 63
 			$this->content->addContent($sub);
Please login to merge, or discard this patch.
Ajax/semantic/html/elements/HtmlSegmentGroups.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -7,20 +7,20 @@  discard block
 block discarded – undo
7 7
 use Ajax\semantic\html\base\constants\Sens;
8 8
 use Ajax\JsUtils;
9 9
 
10
-class HtmlSegmentGroups extends HtmlSemCollection{
10
+class HtmlSegmentGroups extends HtmlSemCollection {
11 11
 
12 12
 
13
-	public function __construct( $identifier, $items=array()){
14
-		parent::__construct( $identifier, "div","ui segments");
13
+	public function __construct($identifier, $items=array()) {
14
+		parent::__construct($identifier, "div", "ui segments");
15 15
 		$this->addItems($items);
16 16
 	}
17 17
 
18 18
 
19
-	protected function createItem($value){
20
-		return new HtmlSegment("segment-".$this->count(),$value);
19
+	protected function createItem($value) {
20
+		return new HtmlSegment("segment-".$this->count(), $value);
21 21
 	}
22 22
 
23
-	protected function createCondition($value){
23
+	protected function createCondition($value) {
24 24
 		return !($value instanceof HtmlSegment);
25 25
 	}
26 26
 
@@ -29,21 +29,21 @@  discard block
 block discarded – undo
29 29
 	 * @param string $type one of "raised","stacked","piled" default : ""
30 30
 	 * @return \Ajax\semantic\html\elements\HtmlSegmentGroups
31 31
 	 */
32
-	public function setType($type){
32
+	public function setType($type) {
33 33
 		return $this->addToPropertyCtrl("class", $type, SegmentType::getConstants());
34 34
 	}
35 35
 
36
-	public function setSens($sens=Sens::VERTICAL){
36
+	public function setSens($sens=Sens::VERTICAL) {
37 37
 		return $this->addToPropertyCtrl("class", $sens, Sens::getConstants());
38 38
 	}
39 39
 
40
-	public function run(JsUtils $js){
41
-		$result= parent::run($js);
40
+	public function run(JsUtils $js) {
41
+		$result=parent::run($js);
42 42
 		return $result->setItemSelector(".ui.segment");
43 43
 	}
44 44
 
45
-	public static function group($identifier,$items=array(),$type="",$sens=Sens::VERTICAL){
46
-		$group=new HtmlSegmentGroups($identifier,$items);
45
+	public static function group($identifier, $items=array(), $type="", $sens=Sens::VERTICAL) {
46
+		$group=new HtmlSegmentGroups($identifier, $items);
47 47
 		$group->setSens($sens);
48 48
 		return $group->setType($type);
49 49
 	}
Please login to merge, or discard this patch.
Ajax/semantic/html/elements/HtmlIconGroups.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 			$icon=JArray::getValue($value, "icon", 0);
27 27
 			$size=JArray::getValue($value, "size", 1);
28 28
 		}
29
-		$iconO=new HtmlIcon("icon-" . $this->identifier, $icon);
29
+		$iconO=new HtmlIcon("icon-".$this->identifier, $icon);
30 30
 		if (isset($size)) {
31 31
 			$iconO->setSize($size);
32 32
 		}
@@ -34,15 +34,15 @@  discard block
 block discarded – undo
34 34
 	}
35 35
 
36 36
 	protected function createCondition($value) {
37
-		return ($value instanceof HtmlIcon) === false;
37
+		return ($value instanceof HtmlIcon)===false;
38 38
 	}
39 39
 
40 40
 	public function getIcon($index) {
41 41
 		return $this->content[$index];
42 42
 	}
43 43
 
44
-	public function run(JsUtils $js){
45
-		$result= parent::run($js);
44
+	public function run(JsUtils $js) {
45
+		$result=parent::run($js);
46 46
 		return $result->setItemSelector("i");
47 47
 	}
48 48
 
Please login to merge, or discard this patch.
Ajax/semantic/html/content/HtmlAbsractItem.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 
12 12
 abstract class HtmlAbsractItem extends HtmlSemDoubleElement {
13 13
 
14
-	public function __construct($identifier, $baseClass,$content=NULL) {
14
+	public function __construct($identifier, $baseClass, $content=NULL) {
15 15
 		parent::__construct($identifier, "div", $baseClass);
16 16
 		$this->content=array();
17 17
 		$this->initContent($content);
@@ -19,53 +19,53 @@  discard block
 block discarded – undo
19 19
 
20 20
 	abstract protected function initContent($content);
21 21
 
22
-	public function setIcon($icon){
22
+	public function setIcon($icon) {
23 23
 		$this->content["icon"]=new HtmlIcon("icon-".$this->identifier, $icon);
24 24
 	}
25 25
 
26
-	public function setImage($image){
26
+	public function setImage($image) {
27 27
 		$image=new HtmlImg("icon-".$this->identifier, $image);
28 28
 		$image->asAvatar();
29 29
 		$this->content["image"]=$image;
30 30
 	}
31 31
 
32
-	private function createContent(){
33
-		$this->content["content"]=new HtmlSemDoubleElement("content-".$this->identifier,"div","content");
32
+	private function createContent() {
33
+		$this->content["content"]=new HtmlSemDoubleElement("content-".$this->identifier, "div", "content");
34 34
 		return $this->content["content"];
35 35
 	}
36 36
 
37
-	public function setTitle($title,$description=NULL,$baseClass="title"){
38
-		$title=new HtmlSemDoubleElement("","div",$baseClass,$title);
39
-		if(\array_key_exists("content", $this->content)===false){
37
+	public function setTitle($title, $description=NULL, $baseClass="title") {
38
+		$title=new HtmlSemDoubleElement("", "div", $baseClass, $title);
39
+		if (\array_key_exists("content", $this->content)===false) {
40 40
 			$this->createContent();
41 41
 		}
42 42
 		$this->content["content"]->addContent($title);
43
-		if(isset($description)){
44
-			$description=new HtmlSemDoubleElement("","div","description",$description);
43
+		if (isset($description)) {
44
+			$description=new HtmlSemDoubleElement("", "div", "description", $description);
45 45
 			$this->content["content"]->addContent($description);
46 46
 		}
47 47
 		return $this;
48 48
 	}
49 49
 
50
-	public function getPart($partName="header"){
51
-		$content=\array_merge($this->content["content"]->getContent(),array(@$this->content["icon"],@$this->content["image"]));
50
+	public function getPart($partName="header") {
51
+		$content=\array_merge($this->content["content"]->getContent(), array(@$this->content["icon"], @$this->content["image"]));
52 52
 		return $this->getElementByPropertyValue("class", $partName, $content);
53 53
 	}
54 54
 
55
-	public function setActive($value=true){
56
-		if($value){
55
+	public function setActive($value=true) {
56
+		if ($value) {
57 57
 			$this->setTagName("div");
58 58
 			$this->removeProperty("href");
59 59
 			$this->addToPropertyCtrl("class", "active", array("active"));
60
-		}else{
60
+		} else {
61 61
 			$this->removePropertyValue("class", "active");
62 62
 		}
63 63
 		return $this;
64 64
 	}
65 65
 
66
-	public function asLink($href=NULL,$part=NULL){
66
+	public function asLink($href=NULL, $part=NULL) {
67 67
 		$this->setTagName("a");
68
-		if(isset($href))
68
+		if (isset($href))
69 69
 			$this->setProperty("href", $href);
70 70
 		return $this;
71 71
 	}
@@ -77,8 +77,8 @@  discard block
 block discarded – undo
77 77
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile()
78 78
 	 */
79 79
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
80
-		if(\is_array($this->content) && JArray::isAssociative($this->content))
81
-			$this->content=JArray::sortAssociative($this->content, [ "icon","image","content" ]);
80
+		if (\is_array($this->content) && JArray::isAssociative($this->content))
81
+			$this->content=JArray::sortAssociative($this->content, ["icon", "image", "content"]);
82 82
 		return parent::compile($js, $view);
83 83
 	}
84 84
 }
85 85
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/HtmlGrid.php 1 patch
Spacing   +41 added lines, -41 removed lines patch added patch discarded remove patch
@@ -32,16 +32,16 @@  discard block
 block discarded – undo
32 32
 			// }
33 33
 			$this->setWide($numCols);
34 34
 		}
35
-		if($createCols)
35
+		if ($createCols)
36 36
 			$this->setRowsCount($numRows, $numCols);
37 37
 	}
38 38
 
39 39
 	public function asSegment() {
40
-		return $this->addToPropertyCtrl("class", "segment", array ("segment" ));
40
+		return $this->addToPropertyCtrl("class", "segment", array("segment"));
41 41
 	}
42 42
 
43 43
 	public function asContainer() {
44
-		return $this->addToPropertyCtrl("class", "container", array ("container" ));
44
+		return $this->addToPropertyCtrl("class", "container", array("container"));
45 45
 	}
46 46
 
47 47
 	/**
@@ -49,10 +49,10 @@  discard block
 block discarded – undo
49 49
 	 * @param int $wide
50 50
 	 */
51 51
 	public function setWide($wide) {
52
-		if(isset(Wide::getConstants()["W" . $wide])){
53
-			$wide=Wide::getConstants()["W" . $wide];
52
+		if (isset(Wide::getConstants()["W".$wide])) {
53
+			$wide=Wide::getConstants()["W".$wide];
54 54
 			$this->addToPropertyCtrl("class", $wide, Wide::getConstants());
55
-			return $this->addToPropertyCtrl("class", "column", array ("column" ));
55
+			return $this->addToPropertyCtrl("class", "column", array("column"));
56 56
 		}
57 57
 		return $this;
58 58
 	}
@@ -72,9 +72,9 @@  discard block
 block discarded – undo
72 72
 	 * @return mixed
73 73
 	 */
74 74
 	public function addRow($colsCount=NULL) {
75
-		$rowCount=$this->rowCount() + 1;
75
+		$rowCount=$this->rowCount()+1;
76 76
 		$this->setRowsCount($rowCount, $colsCount, true);
77
-		return $this->content[$rowCount - 1];
77
+		return $this->content[$rowCount-1];
78 78
 	}
79 79
 
80 80
 	/**
@@ -83,10 +83,10 @@  discard block
 block discarded – undo
83 83
 	 * @return mixed|\Ajax\semantic\html\collections\HtmlGrid
84 84
 	 */
85 85
 	public function addCol($width=NULL) {
86
-		$colCount=$this->colCount() + 1;
86
+		$colCount=$this->colCount()+1;
87 87
 		$this->setColsCount($colCount, true, $width);
88 88
 		if ($this->hasOnlyCols($this->count()))
89
-			return $this->content[$colCount - 1];
89
+			return $this->content[$colCount-1];
90 90
 		return $this;
91 91
 	}
92 92
 
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
97 97
 	 */
98 98
 	public function addCols($sizes=array()) {
99
-		foreach ( $sizes as $size ) {
99
+		foreach ($sizes as $size) {
100 100
 			$this->addCol($size);
101 101
 		}
102 102
 		return $this;
@@ -110,19 +110,19 @@  discard block
 block discarded – undo
110 110
 	 */
111 111
 	public function setRowsCount($rowsCount, $colsCount=NULL, $force=false) {
112 112
 		$count=$this->count();
113
-		if ($rowsCount < 2 && $force === false) {
114
-			for($i=$count; $i < $colsCount; $i++) {
115
-				$this->addItem(new HtmlGridCol("col-" . $this->identifier . "-" . $i));
113
+		if ($rowsCount<2 && $force===false) {
114
+			for ($i=$count; $i<$colsCount; $i++) {
115
+				$this->addItem(new HtmlGridCol("col-".$this->identifier."-".$i));
116 116
 			}
117 117
 		} else {
118 118
 			if ($this->hasOnlyCols($count)) {
119 119
 				$tmpContent=$this->content;
120 120
 				$item=$this->addItem($colsCount);
121 121
 				$item->setContent($tmpContent);
122
-				$this->content=array ();
122
+				$this->content=array();
123 123
 				$count=1;
124 124
 			}
125
-			for($i=$count; $i < $rowsCount; $i++) {
125
+			for ($i=$count; $i<$rowsCount; $i++) {
126 126
 				$this->addItem($colsCount);
127 127
 			}
128 128
 		}
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
 	}
131 131
 
132 132
 	protected function hasOnlyCols($count) {
133
-		return $count > 0 && $this->content[0] instanceof HtmlGridCol;
133
+		return $count>0 && $this->content[0] instanceof HtmlGridCol;
134 134
 	}
135 135
 
136 136
 	/**
@@ -144,14 +144,14 @@  discard block
 block discarded – undo
144 144
 		if (isset($width)===false) {
145 145
 			$this->setWide($numCols);
146 146
 		}
147
-		if ($toCreate === true) {
147
+		if ($toCreate===true) {
148 148
 			$count=$this->count();
149
-			if ($count == 0 || $this->hasOnlyCols($count)) {
150
-				for($i=$count; $i < $numCols; $i++) {
151
-					$this->addItem(new HtmlGridCol("col-" . $this->identifier . "-" . $i, $width));
149
+			if ($count==0 || $this->hasOnlyCols($count)) {
150
+				for ($i=$count; $i<$numCols; $i++) {
151
+					$this->addItem(new HtmlGridCol("col-".$this->identifier."-".$i, $width));
152 152
 				}
153 153
 			} else {
154
-				for($i=0; $i < $count; $i++) {
154
+				for ($i=0; $i<$count; $i++) {
155 155
 					$this->getItem($i)->setColsCount($numCols);
156 156
 				}
157 157
 			}
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
187 187
 		$count=$this->count();
188 188
 		if ($this->hasOnlyCols($count))
189 189
 			return $count;
190
-		if ($count > 0)
190
+		if ($count>0)
191 191
 			return $this->getItem(0)->count();
192 192
 		return 0;
193 193
 	}
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
 	 * @return \Ajax\semantic\html\collections\HtmlGridCol
200 200
 	 */
201 201
 	public function getCell($row, $col) {
202
-		if ($row < 2 && $this->hasOnlyCols($this->count()))
202
+		if ($row<2 && $this->hasOnlyCols($this->count()))
203 203
 			return $this->getItem($col);
204 204
 		$row=$this->getItem($row);
205 205
 		if (isset($row)) {
@@ -214,8 +214,8 @@  discard block
 block discarded – undo
214 214
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
215 215
 	 */
216 216
 	public function setDivided($vertically=false) {
217
-		$value=($vertically === true) ? "vertically divided" : "divided";
218
-		return $this->addToPropertyCtrl("class", $value, array ("divided" ));
217
+		$value=($vertically===true) ? "vertically divided" : "divided";
218
+		return $this->addToPropertyCtrl("class", $value, array("divided"));
219 219
 	}
220 220
 
221 221
 	/**
@@ -224,15 +224,15 @@  discard block
 block discarded – undo
224 224
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
225 225
 	 */
226 226
 	public function setCelled($internally=false) {
227
-		$value=($internally === true) ? "internally celled" : "celled";
228
-		return $this->addToPropertyCtrl("class", $value, array ("celled","internally celled" ));
227
+		$value=($internally===true) ? "internally celled" : "celled";
228
+		return $this->addToPropertyCtrl("class", $value, array("celled", "internally celled"));
229 229
 	}
230 230
 
231 231
 	/**
232 232
 	 * A grid can have its columns centered
233 233
 	 */
234 234
 	public function setCentered() {
235
-		return $this->addToPropertyCtrl("class", "centered", array ("centered" ));
235
+		return $this->addToPropertyCtrl("class", "centered", array("centered"));
236 236
 	}
237 237
 
238 238
 	/**
@@ -250,7 +250,7 @@  discard block
 block discarded – undo
250 250
 	 */
251 251
 	public function setPadded($value=NULL) {
252 252
 		if (isset($value))
253
-			$this->addToPropertyCtrl("class", $value, array ("vertically","horizontally" ));
253
+			$this->addToPropertyCtrl("class", $value, array("vertically", "horizontally"));
254 254
 		return $this->addToProperty("class", "padded");
255 255
 	}
256 256
 
@@ -260,12 +260,12 @@  discard block
 block discarded – undo
260 260
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
261 261
 	 */
262 262
 	public function setRelaxed($very=false) {
263
-		$value=($very === true) ? "very relaxed" : "relaxed";
264
-		return $this->addToPropertyCtrl("class", $value, array ("relaxed","very relaxed" ));
263
+		$value=($very===true) ? "very relaxed" : "relaxed";
264
+		return $this->addToPropertyCtrl("class", $value, array("relaxed", "very relaxed"));
265 265
 	}
266 266
 
267 267
 	public function setVerticalAlignment($value=VerticalAlignment::MIDDLE) {
268
-		return $this->addToPropertyCtrl("class", $value . " aligned", VerticalAlignment::getConstantValues("aligned"));
268
+		return $this->addToPropertyCtrl("class", $value." aligned", VerticalAlignment::getConstantValues("aligned"));
269 269
 	}
270 270
 
271 271
 	/**
@@ -275,9 +275,9 @@  discard block
 block discarded – undo
275 275
 	 * @see \Ajax\common\html\HtmlCollection::createItem()
276 276
 	 */
277 277
 	protected function createItem($value) {
278
-		if ($this->_createCols === false)
278
+		if ($this->_createCols===false)
279 279
 			$value=null;
280
-		$item=new HtmlGridRow($this->identifier . "-row-" . ($this->count() + 1), $value, $this->_colSizing, $this->_implicitRows);
280
+		$item=new HtmlGridRow($this->identifier."-row-".($this->count()+1), $value, $this->_colSizing, $this->_implicitRows);
281 281
 		return $item;
282 282
 	}
283 283
 
@@ -288,15 +288,15 @@  discard block
 block discarded – undo
288 288
 	public function setValues($values, $force=true) {
289 289
 		$count=$this->count();
290 290
 		$valuesSize=\sizeof($values);
291
-		if ($this->_createCols === false || $force === true) {
292
-			for($i=$count; $i < $valuesSize; $i++) {
291
+		if ($this->_createCols===false || $force===true) {
292
+			for ($i=$count; $i<$valuesSize; $i++) {
293 293
 				$colSize=\sizeof($values[$i]);
294
-				$this->addItem(new HtmlGridRow($this->identifier . "-row-" . ($this->count() + 1), $colSize, $this->_colSizing, $this->_implicitRows));
294
+				$this->addItem(new HtmlGridRow($this->identifier."-row-".($this->count()+1), $colSize, $this->_colSizing, $this->_implicitRows));
295 295
 			}
296 296
 		}
297
-		$count=\min(array ($this->count(),$valuesSize ));
298
-		for($i=0; $i < $count; $i++) {
299
-			$this->content[$i]->setValues($values[$i], $this->_createCols === false);
297
+		$count=\min(array($this->count(), $valuesSize));
298
+		for ($i=0; $i<$count; $i++) {
299
+			$this->content[$i]->setValues($values[$i], $this->_createCols===false);
300 300
 		}
301 301
 	}
302 302
 
Please login to merge, or discard this patch.
Ajax/common/html/HtmlDoubleElement.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -27,15 +27,15 @@  discard block
 block discarded – undo
27 27
 		return $this->content;
28 28
 	}
29 29
 
30
-	public function addContent($content,$before=false) {
30
+	public function addContent($content, $before=false) {
31 31
 		if (!\is_array($this->content)) {
32
-			if(isset($this->content))
33
-				$this->content=array ($this->content);
32
+			if (isset($this->content))
33
+				$this->content=array($this->content);
34 34
 			else
35 35
 				$this->content=array();
36 36
 		}
37
-		if($before)
38
-			array_unshift($this->content,$content);
37
+		if ($before)
38
+			array_unshift($this->content, $content);
39 39
 		else
40 40
 			$this->content []=$content;
41 41
 		return $this;
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 		if ($this->content instanceof HtmlDoubleElement) {
51 51
 			$this->content->run($js);
52 52
 		} else if (\is_array($this->content)) {
53
-			foreach ( $this->content as $itemContent ) {
53
+			foreach ($this->content as $itemContent) {
54 54
 				if ($itemContent instanceof HtmlDoubleElement) {
55 55
 					$itemContent->run($js);
56 56
 				}
@@ -67,19 +67,19 @@  discard block
 block discarded – undo
67 67
 		return $this;
68 68
 	}
69 69
 
70
-	public function getContentInstances($class){
71
-		return $this->_getContentInstances($class,$this->content);
70
+	public function getContentInstances($class) {
71
+		return $this->_getContentInstances($class, $this->content);
72 72
 	}
73 73
 
74
-	protected function _getContentInstances($class,$content){
74
+	protected function _getContentInstances($class, $content) {
75 75
 		$instances=[];
76
-		if($content instanceof $class){
76
+		if ($content instanceof $class) {
77 77
 			$instances[]=$content;
78
-		}elseif($content instanceof HtmlDoubleElement){
79
-			$instances=\array_merge($instances,$content->getContentInstances($class));
80
-		}elseif (\is_array($content)){
81
-			foreach ($content as $element){
82
-				$instances=\array_merge($instances,$this->_getContentInstances($class, $element));
78
+		}elseif ($content instanceof HtmlDoubleElement) {
79
+			$instances=\array_merge($instances, $content->getContentInstances($class));
80
+		}elseif (\is_array($content)) {
81
+			foreach ($content as $element) {
82
+				$instances=\array_merge($instances, $this->_getContentInstances($class, $element));
83 83
 			}
84 84
 		}
85 85
 		return $instances;
Please login to merge, or discard this patch.
Ajax/common/html/html5/HtmlInput.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 
9 9
 class HtmlInput extends HtmlSingleElement {
10 10
 	protected $_placeholder;
11
-	public function __construct($identifier,$type="text",$value=NULL,$placeholder=NULL) {
11
+	public function __construct($identifier, $type="text", $value=NULL, $placeholder=NULL) {
12 12
 		parent::__construct($identifier, "input");
13 13
 		$this->setProperty("name", $identifier);
14 14
 		$this->setValue($value);
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
 	}
18 18
 
19 19
 	public function setValue($value) {
20
-		if(isset($value))
20
+		if (isset($value))
21 21
 		$this->setProperty("value", $value);
22 22
 		return $this;
23 23
 	}
@@ -26,19 +26,19 @@  discard block
 block discarded – undo
26 26
 		return $this->setProperty("type", $value);
27 27
 	}
28 28
 
29
-	public function setPlaceholder($value){
30
-		if(JString::isNotNull($value))
29
+	public function setPlaceholder($value) {
30
+		if (JString::isNotNull($value))
31 31
 			$this->_placeholder=$value;
32 32
 		return $this;
33 33
 	}
34 34
 
35
-	public function compile(JsUtils $js=NULL,&$view=NULL){
35
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
36 36
 		$value=$this->_placeholder;
37
-		if(JString::isNull($value)){
38
-			if(JString::isNotNull($this->getProperty("name")))
37
+		if (JString::isNull($value)) {
38
+			if (JString::isNotNull($this->getProperty("name")))
39 39
 				$value=\ucfirst($this->getProperty("name"));
40 40
 		}
41 41
 		$this->setProperty("placeholder", $value);
42
-		return parent::compile($js,$view);
42
+		return parent::compile($js, $view);
43 43
 	}
44 44
 }
45 45
\ No newline at end of file
Please login to merge, or discard this patch.