Completed
Push — master ( a98604...b5066b )
by Jean-Christophe
03:23
created
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,10 +137,10 @@  discard block
 block discarded – undo
137 137
 		return $this->addToProperty("class", "positive");
138 138
 	}
139 139
 
140
-	public function setColor($color){
141
-		if(\is_array($this->content)){
142
-			foreach ($this->content as $content){
143
-				if($content instanceof HtmlButton)
140
+	public function setColor($color) {
141
+		if (\is_array($this->content)) {
142
+			foreach ($this->content as $content) {
143
+				if ($content instanceof HtmlButton)
144 144
 					$content->setColor($color);
145 145
 			}
146 146
 		}
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
198 198
 	 * @return HtmlButton
199 199
 	 */
200 200
 	public static function social($identifier, $social, $value=NULL) {
201
-		if ($value === NULL)
201
+		if ($value===NULL)
202 202
 			$value=\ucfirst($social);
203 203
 		$return=new HtmlButton($identifier, $value);
204 204
 		$return->addIcon($social);
@@ -235,8 +235,8 @@  discard block
 block discarded – undo
235 235
 	 * {@inheritDoc}
236 236
 	 * @see HtmlSemDoubleElement::asLink()
237 237
 	 */
238
-	public function asLink($href=NULL,$target=NULL) {
239
-		$lnk=new HtmlLink("lnk-".$this->identifier,$href,$this->content,$target);
238
+	public function asLink($href=NULL, $target=NULL) {
239
+		$lnk=new HtmlLink("lnk-".$this->identifier, $href, $this->content, $target);
240 240
 		$this->content=$lnk;
241 241
 		return $this;
242 242
 	}
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");
@@ -140,12 +141,13 @@  discard block
 block discarded – undo
140 141
 	public function setColor($color){
141 142
 		if(\is_array($this->content)){
142 143
 			foreach ($this->content as $content){
143
-				if($content instanceof HtmlButton)
144
-					$content->setColor($color);
144
+				if($content instanceof HtmlButton) {
145
+									$content->setColor($color);
146
+				}
145 147
 			}
148
+		} else {
149
+					parent::setColor($color);
146 150
 		}
147
-		else
148
-			parent::setColor($color);
149 151
 		return $this;
150 152
 	}
151 153
 
@@ -198,8 +200,9 @@  discard block
 block discarded – undo
198 200
 	 * @return HtmlButton
199 201
 	 */
200 202
 	public static function social($identifier, $social, $value=NULL) {
201
-		if ($value === NULL)
202
-			$value=\ucfirst($social);
203
+		if ($value === NULL) {
204
+					$value=\ucfirst($social);
205
+		}
203 206
 		$return=new HtmlButton($identifier, $value);
204 207
 		$return->addIcon($social);
205 208
 		return $return->addToPropertyCtrl("class", $social, Social::getConstants());
Please login to merge, or discard this patch.
Ajax/ui/components/Autocomplete.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@
 block discarded – undo
50 50
 	 * @return $this
51 51
 	 */
52 52
 	public function setSource($source) {
53
-		$source=str_ireplace(array (
53
+		$source=str_ireplace(array(
54 54
 				"\"",
55 55
 				"'"
56 56
 		), "%quote%", $source);
Please login to merge, or discard this patch.
Ajax/semantic/components/Modal.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -16,11 +16,11 @@
 block discarded – undo
16 16
 		return $this;
17 17
 	}
18 18
 
19
-	public function showDimmer(){
19
+	public function showDimmer() {
20 20
 		return $this->setBehavior("hide dimmer");
21 21
 	}
22 22
 
23
-	public function setInverted(){
23
+	public function setInverted() {
24 24
 		$this->params["inverted"]=true;
25 25
 	}
26 26
 }
Please login to merge, or discard this patch.
Ajax/semantic/html/base/traits/BaseTrait.php 2 patches
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -15,8 +15,8 @@  discard block
 block discarded – undo
15 15
  * @property HtmlSemDoubleElement $_self
16 16
  */
17 17
 trait BaseTrait {
18
-	protected $_variations=[ ];
19
-	protected $_states=[ ];
18
+	protected $_variations=[];
19
+	protected $_states=[];
20 20
 	protected $_baseClass;
21 21
 
22 22
 	abstract protected function setPropertyCtrl($name, $value, $typeCtrl);
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 
30 30
 	abstract public function setProperty($name, $value);
31 31
 
32
-	abstract public function addContent($content,$before=false);
32
+	abstract public function addContent($content, $before=false);
33 33
 
34 34
 	abstract public function onCreate($jsCode);
35 35
 
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 		$this->_self->setProperty("class", $this->_self->getBaseClass());
51 51
 		if (\is_string($variations))
52 52
 			$variations=\explode(" ", $variations);
53
-		foreach ( $variations as $variation ) {
53
+		foreach ($variations as $variation) {
54 54
 			$this->_self->addVariation($variation);
55 55
 		}
56 56
 		return $this;
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 	public function addVariations($variations=array()) {
65 65
 		if (\is_string($variations))
66 66
 			$variations=\explode(" ", $variations);
67
-		foreach ( $variations as $variation ) {
67
+		foreach ($variations as $variation) {
68 68
 			$this->_self->addVariation($variation);
69 69
 		}
70 70
 		return $this;
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 	public function addStates($states=array()) {
74 74
 		if (\is_string($states))
75 75
 			$states=\explode(" ", $states);
76
-		foreach ( $states as $state ) {
76
+		foreach ($states as $state) {
77 77
 			$this->_self->addState($state);
78 78
 		}
79 79
 		return $this;
@@ -83,17 +83,17 @@  discard block
 block discarded – undo
83 83
 		$this->_self->setProperty("class", $this->_self->getBaseClass());
84 84
 		if (\is_string($states))
85 85
 			$states=\explode(" ", $states);
86
-		foreach ( $states as $state ) {
86
+		foreach ($states as $state) {
87 87
 			$this->_self->addState($state);
88 88
 		}
89 89
 		return $this;
90 90
 	}
91 91
 
92 92
 	public function addIcon($icon, $before=true) {
93
-		return $this->_self->addContent(new HtmlIcon("icon-" . $this->_self->getIdentifier(), $icon), $before);
93
+		return $this->_self->addContent(new HtmlIcon("icon-".$this->_self->getIdentifier(), $icon), $before);
94 94
 	}
95 95
 
96
-	public function addSticky($context="body"){
96
+	public function addSticky($context="body") {
97 97
 		$this->_self->onCreate("$('#".$this->_self->getIdentifier()."').sticky({ context: '".$context."'});");
98 98
 		return $this;
99 99
 	}
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
 	 * @return HtmlSemDoubleElement
115 115
 	 */
116 116
 	public function setDisabled($disable=true) {
117
-		if($disable)
117
+		if ($disable)
118 118
 			$this->_self->addToProperty("class", "disabled");
119 119
 		return $this;
120 120
 	}
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
 	 *
141 141
 	 * @return HtmlSemDoubleElement
142 142
 	 */
143
-	public function asHeader(){
143
+	public function asHeader() {
144 144
 		return $this->_self->addToProperty("class", "header");
145 145
 	}
146 146
 
@@ -148,15 +148,15 @@  discard block
 block discarded – undo
148 148
 	 * show it is currently the active user selection
149 149
 	 * @return HtmlSemDoubleElement
150 150
 	 */
151
-	public function setActive($value=true){
152
-		if($value)
151
+	public function setActive($value=true) {
152
+		if ($value)
153 153
 			$this->_self->addToProperty("class", "active");
154 154
 		return $this;
155 155
 	}
156 156
 
157
-	public function setAttached($value=true){
158
-		if($value)
159
-			$this->_self->addToPropertyCtrl("class", "attached", array ("attached" ));
157
+	public function setAttached($value=true) {
158
+		if ($value)
159
+			$this->_self->addToPropertyCtrl("class", "attached", array("attached"));
160 160
 		return $this;
161 161
 	}
162 162
 
@@ -164,13 +164,13 @@  discard block
 block discarded – undo
164 164
 	 * can be formatted to appear on dark backgrounds
165 165
 	 */
166 166
 	public function setInverted($recursive=true) {
167
-		if($recursive===true){
167
+		if ($recursive===true) {
168 168
 			$content=$this->_self->getContent();
169
-			if($content instanceof HtmlSemDoubleElement)
169
+			if ($content instanceof HtmlSemDoubleElement)
170 170
 				$content->setInverted($recursive);
171
-			elseif(\is_array($content) || $content instanceof \Traversable){
172
-				foreach ($content as $elm){
173
-					if($elm instanceof  HtmlSemDoubleElement){
171
+			elseif (\is_array($content) || $content instanceof \Traversable) {
172
+				foreach ($content as $elm) {
173
+					if ($elm instanceof  HtmlSemDoubleElement) {
174 174
 						$elm->setInverted($recursive);
175 175
 					}
176 176
 				}
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
 	}
185 185
 
186 186
 	public function setFloated($direction="right") {
187
-		return $this->_self->addToPropertyCtrl("class", $direction . " floated", Direction::getConstantValues("floated"));
187
+		return $this->_self->addToPropertyCtrl("class", $direction." floated", Direction::getConstantValues("floated"));
188 188
 	}
189 189
 
190 190
 	public function floatRight() {
@@ -199,14 +199,14 @@  discard block
 block discarded – undo
199 199
 		return $this->_baseClass;
200 200
 	}
201 201
 
202
-	protected function addBehavior(&$array,$key,$value,$before="",$after=""){
203
-		if(\is_string($value)){
204
-			if(isset($array[$key])){
202
+	protected function addBehavior(&$array, $key, $value, $before="", $after="") {
203
+		if (\is_string($value)) {
204
+			if (isset($array[$key])) {
205 205
 				$p=JString::replaceAtFirstAndLast($array[$key], $before, "", $after, "");
206 206
 				$array[$key]=$before.$p.$value.$after;
207
-			}else
207
+			} else
208 208
 				$array[$key]=$before.$value.$after;
209
-		}else{
209
+		} else {
210 210
 			$array[$key]=$value;
211 211
 		}
212 212
 		return $this;
Please login to merge, or discard this patch.
Braces   +28 added lines, -20 removed lines patch added patch discarded remove patch
@@ -48,8 +48,9 @@  discard block
 block discarded – undo
48 48
 
49 49
 	public function setVariations($variations) {
50 50
 		$this->_self->setProperty("class", $this->_self->getBaseClass());
51
-		if (\is_string($variations))
52
-			$variations=\explode(" ", $variations);
51
+		if (\is_string($variations)) {
52
+					$variations=\explode(" ", $variations);
53
+		}
53 54
 		foreach ( $variations as $variation ) {
54 55
 			$this->_self->addVariation($variation);
55 56
 		}
@@ -62,8 +63,9 @@  discard block
 block discarded – undo
62 63
 	}
63 64
 
64 65
 	public function addVariations($variations=array()) {
65
-		if (\is_string($variations))
66
-			$variations=\explode(" ", $variations);
66
+		if (\is_string($variations)) {
67
+					$variations=\explode(" ", $variations);
68
+		}
67 69
 		foreach ( $variations as $variation ) {
68 70
 			$this->_self->addVariation($variation);
69 71
 		}
@@ -71,8 +73,9 @@  discard block
 block discarded – undo
71 73
 	}
72 74
 
73 75
 	public function addStates($states=array()) {
74
-		if (\is_string($states))
75
-			$states=\explode(" ", $states);
76
+		if (\is_string($states)) {
77
+					$states=\explode(" ", $states);
78
+		}
76 79
 		foreach ( $states as $state ) {
77 80
 			$this->_self->addState($state);
78 81
 		}
@@ -81,8 +84,9 @@  discard block
 block discarded – undo
81 84
 
82 85
 	public function setStates($states) {
83 86
 		$this->_self->setProperty("class", $this->_self->getBaseClass());
84
-		if (\is_string($states))
85
-			$states=\explode(" ", $states);
87
+		if (\is_string($states)) {
88
+					$states=\explode(" ", $states);
89
+		}
86 90
 		foreach ( $states as $state ) {
87 91
 			$this->_self->addState($state);
88 92
 		}
@@ -114,8 +118,9 @@  discard block
 block discarded – undo
114 118
 	 * @return HtmlSemDoubleElement
115 119
 	 */
116 120
 	public function setDisabled($disable=true) {
117
-		if($disable)
118
-			$this->_self->addToProperty("class", "disabled");
121
+		if($disable) {
122
+					$this->_self->addToProperty("class", "disabled");
123
+		}
119 124
 		return $this;
120 125
 	}
121 126
 
@@ -149,14 +154,16 @@  discard block
 block discarded – undo
149 154
 	 * @return HtmlSemDoubleElement
150 155
 	 */
151 156
 	public function setActive($value=true){
152
-		if($value)
153
-			$this->_self->addToProperty("class", "active");
157
+		if($value) {
158
+					$this->_self->addToProperty("class", "active");
159
+		}
154 160
 		return $this;
155 161
 	}
156 162
 
157 163
 	public function setAttached($value=true){
158
-		if($value)
159
-			$this->_self->addToPropertyCtrl("class", "attached", array ("attached" ));
164
+		if($value) {
165
+					$this->_self->addToPropertyCtrl("class", "attached", array ("attached" ));
166
+		}
160 167
 		return $this;
161 168
 	}
162 169
 
@@ -166,9 +173,9 @@  discard block
 block discarded – undo
166 173
 	public function setInverted($recursive=true) {
167 174
 		if($recursive===true){
168 175
 			$content=$this->_self->getContent();
169
-			if($content instanceof HtmlSemDoubleElement)
170
-				$content->setInverted($recursive);
171
-			elseif(\is_array($content) || $content instanceof \Traversable){
176
+			if($content instanceof HtmlSemDoubleElement) {
177
+							$content->setInverted($recursive);
178
+			} elseif(\is_array($content) || $content instanceof \Traversable){
172 179
 				foreach ($content as $elm){
173 180
 					if($elm instanceof  HtmlSemDoubleElement){
174 181
 						$elm->setInverted($recursive);
@@ -204,9 +211,10 @@  discard block
 block discarded – undo
204 211
 			if(isset($array[$key])){
205 212
 				$p=JString::replaceAtFirstAndLast($array[$key], $before, "", $after, "");
206 213
 				$array[$key]=$before.$p.$value.$after;
207
-			}else
208
-				$array[$key]=$before.$value.$after;
209
-		}else{
214
+			} else {
215
+							$array[$key]=$before.$value.$after;
216
+			}
217
+		} else{
210 218
 			$array[$key]=$value;
211 219
 		}
212 220
 		return $this;
Please login to merge, or discard this patch.
Ajax/common/traits/JsUtilsInternalTrait.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -2,9 +2,9 @@  discard block
 block discarded – undo
2 2
 namespace Ajax\common\traits;
3 3
 use Ajax\common\BaseGui;
4 4
 
5
-trait JsUtilsInternalTrait{
5
+trait JsUtilsInternalTrait {
6 6
 
7
-	protected $jquery_code_for_compile=array ();
7
+	protected $jquery_code_for_compile=array();
8 8
 
9 9
 	protected function _addToCompile($jsScript) {
10 10
 		$this->jquery_code_for_compile[]=$jsScript;
@@ -14,9 +14,9 @@  discard block
 block discarded – undo
14 14
 	 * @param BaseGui $library
15 15
 	 * @param mixed $view
16 16
 	 */
17
-	protected function _compileLibrary(BaseGui $library=NULL, &$view=NULL){
17
+	protected function _compileLibrary(BaseGui $library=NULL, &$view=NULL) {
18 18
 		if ($library!=NULL) {
19
-			if(isset($view))
19
+			if (isset($view))
20 20
 				$library->compileHtml($this, $view);
21 21
 			if ($library->isAutoCompile()) {
22 22
 				$library->compile(true);
@@ -24,20 +24,20 @@  discard block
 block discarded – undo
24 24
 		}
25 25
 	}
26 26
 
27
-	protected function defer($script){
27
+	protected function defer($script) {
28 28
 		$result="window.defer=function (method) {if (window.jQuery) method(); else setTimeout(function() { defer(method) }, 50);};";
29 29
 		$result.="window.defer(function(){".$script."})";
30 30
 		return $result;
31 31
 	}
32 32
 
33
-	protected function ready($script){
33
+	protected function ready($script) {
34 34
 		$result='$(document).ready(function() {'."\n";
35 35
 		$result.=$script.'})';
36 36
 		return $result;
37 37
 	}
38 38
 
39 39
 	protected function minify($input) {
40
-		if(trim($input) === "") return $input;
40
+		if (trim($input)==="") return $input;
41 41
 		return preg_replace(
42 42
 				array(
43 43
 						// Remove comment(s)
Please login to merge, or discard this patch.
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -16,8 +16,9 @@  discard block
 block discarded – undo
16 16
 	 */
17 17
 	protected function _compileLibrary(BaseGui $library=NULL, &$view=NULL){
18 18
 		if ($library!=NULL) {
19
-			if(isset($view))
20
-				$library->compileHtml($this, $view);
19
+			if(isset($view)) {
20
+							$library->compileHtml($this, $view);
21
+			}
21 22
 			if ($library->isAutoCompile()) {
22 23
 				$library->compile(true);
23 24
 			}
@@ -37,7 +38,9 @@  discard block
 block discarded – undo
37 38
 	}
38 39
 
39 40
 	protected function minify($input) {
40
-		if(trim($input) === "") return $input;
41
+		if(trim($input) === "") {
42
+			return $input;
43
+		}
41 44
 		return preg_replace(
42 45
 				array(
43 46
 						// Remove comment(s)
Please login to merge, or discard this patch.
Ajax/semantic/html/base/traits/AttachedTrait.php 2 patches
Doc Comments   +5 added lines patch added patch discarded remove patch
@@ -7,6 +7,11 @@
 block discarded – undo
7 7
 use Ajax\common\html\HtmlDoubleElement;
8 8
 
9 9
 trait AttachedTrait {
10
+
11
+	/**
12
+	 * @param string $name
13
+	 * @param string $value
14
+	 */
10 15
 	abstract public function addToPropertyCtrl($name, $value, $typeCtrl);
11 16
 	/**
12 17
 	 * @param HtmlSemDoubleElement $toElement
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,6 +17,6 @@
 block discarded – undo
17 17
 		if (isset($toElement) && \method_exists($toElement, "setAttached")) {
18 18
 			$toElement->setAttached(true);
19 19
 		}
20
-		return $this->addToPropertyCtrl("class", $side . " attached", Side::getConstantValues("attached"));
20
+		return $this->addToPropertyCtrl("class", $side." attached", Side::getConstantValues("attached"));
21 21
 	}
22 22
 }
Please login to merge, or discard this patch.