Completed
Push — master ( f58e0b...3dd4a0 )
by Jean-Christophe
03:31
created
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/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.
Ajax/semantic/html/base/traits/AttachedTrait.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,6 +16,6 @@
 block discarded – undo
16 16
 		if (isset($toElement)) {
17 17
 			$toElement->setAttached(true);
18 18
 		}
19
-		return $this->addToPropertyCtrl("class", $side . " attached", Side::getConstantValues("attached"));
19
+		return $this->addToPropertyCtrl("class", $side." attached", Side::getConstantValues("attached"));
20 20
 	}
21 21
 }
22 22
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/table/traits/TableTrait.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,13 +1,13 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 namespace Ajax\semantic\html\collections\table\traits;
3 3
 
4
-trait TableTrait{
4
+trait TableTrait {
5 5
 	/**
6 6
 	 * @return HtmlTable
7 7
 	 */
8 8
 	abstract protected function getTable();
9 9
 
10
-	protected function addToPropertyTable($property,$value){
10
+	protected function addToPropertyTable($property, $value) {
11 11
 		return $this->getTable()->addToProperty($property, $value);
12 12
 	}
13 13
 
@@ -18,15 +18,15 @@  discard block
 block discarded – undo
18 18
 	public function setBasic($very=false) {
19 19
 		$table=$this->getTable();
20 20
 		if ($very)
21
-			$table->addToPropertyCtrl("class", "very", array ("very" ));
22
-		return $table->addToPropertyCtrl("class", "basic", array ("basic" ));
21
+			$table->addToPropertyCtrl("class", "very", array("very"));
22
+		return $table->addToPropertyCtrl("class", "basic", array("basic"));
23 23
 	}
24 24
 
25 25
 	public function setCompact($very=false) {
26 26
 		$table=$this->getTable();
27 27
 		if ($very)
28
-			$table->addToPropertyCtrl("class", "very", array ("very" ));
29
-		return $table->addToPropertyCtrl("class", "compact", array ("compact" ));
28
+			$table->addToPropertyCtrl("class", "very", array("very"));
29
+		return $table->addToPropertyCtrl("class", "compact", array("compact"));
30 30
 	}
31 31
 
32 32
 	public function setCollapsing() {
Please login to merge, or discard this patch.
Ajax/service/Javascript.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -6,8 +6,8 @@
 block discarded – undo
6 6
 	public static $preventDefault="\nif(event && event.preventDefault) event.preventDefault();\n";
7 7
 	public static $stopPropagation="\nif(event && event.stopPropagation) event.stopPropagation();\n";
8 8
 
9
-	public static function containsCode($expression){
10
-		return strrpos($expression, 'this')!==false||strrpos($expression, 'event')!==false||strrpos($expression, 'self')!==false;
9
+	public static function containsCode($expression) {
10
+		return strrpos($expression, 'this')!==false || strrpos($expression, 'event')!==false || strrpos($expression, 'self')!==false;
11 11
 	}
12 12
 
13 13
 	/**
Please login to merge, or discard this patch.
Ajax/common/html/HtmlSingleElement.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 	}
14 14
 
15 15
 	public function setClass($classNames) {
16
-		if(\is_array($classNames)){
16
+		if (\is_array($classNames)) {
17 17
 			$classNames=implode(" ", $classNames);
18 18
 		}
19 19
 		$this->setProperty("class", $classNames);
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 	}
22 22
 
23 23
 	public function addClass($classNames) {
24
-		if(\is_array($classNames)){
24
+		if (\is_array($classNames)) {
25 25
 			$classNames=implode(" ", $classNames);
26 26
 		}
27 27
 		$this->addToProperty("class", $classNames);
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 	 */
53 53
 	public function fromArray($array) {
54 54
 		$array=parent::fromArray($array);
55
-		foreach ( $array as $key => $value ) {
55
+		foreach ($array as $key => $value) {
56 56
 			$this->setProperty($key, $value);
57 57
 		}
58 58
 		return $array;
Please login to merge, or discard this patch.
Ajax/common/html/traits/BaseHtmlPropertiesTrait.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -8,12 +8,12 @@  discard block
 block discarded – undo
8 8
  * @author jc
9 9
  *
10 10
  */
11
-trait BaseHtmlPropertiesTrait{
11
+trait BaseHtmlPropertiesTrait {
12 12
 
13
-	protected $properties=array ();
13
+	protected $properties=array();
14 14
 	abstract protected function ctrl($name, $value, $typeCtrl);
15 15
 	abstract protected function removeOldValues(&$oldValue, $allValues);
16
-	abstract protected function _getElementBy($callback,$elements);
16
+	abstract protected function _getElementBy($callback, $elements);
17 17
 	public function getProperties() {
18 18
 		return $this->properties;
19 19
 	}
@@ -39,13 +39,13 @@  discard block
 block discarded – undo
39 39
 
40 40
 	public function addToProperty($name, $value, $separator=" ") {
41 41
 		if (\is_array($value)) {
42
-			foreach ( $value as $v ) {
42
+			foreach ($value as $v) {
43 43
 				$this->addToProperty($name, $v, $separator);
44 44
 			}
45
-		} else if ($value !== "" && $this->propertyContains($name, $value) === false) {
45
+		} else if ($value!=="" && $this->propertyContains($name, $value)===false) {
46 46
 			$v=@$this->properties[$name];
47
-			if (isset($v) && $v !== "")
48
-				$v=$v . $separator . $value;
47
+			if (isset($v) && $v!=="")
48
+				$v=$v.$separator.$value;
49 49
 				else
50 50
 					$v=$value;
51 51
 
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
 	}
84 84
 
85 85
 	public function addToPropertyCtrlCheck($name, $value, $typeCtrl) {
86
-		if ($this->ctrl($name, $value, $typeCtrl) === true) {
86
+		if ($this->ctrl($name, $value, $typeCtrl)===true) {
87 87
 			return $this->addToProperty($name, $value);
88 88
 		}
89 89
 		return $this;
@@ -104,12 +104,12 @@  discard block
 block discarded – undo
104 104
 	}
105 105
 
106 106
 	protected function setPropertyCtrl($name, $value, $typeCtrl) {
107
-		if ($this->ctrl($name, $value, $typeCtrl) === true)
107
+		if ($this->ctrl($name, $value, $typeCtrl)===true)
108 108
 			return $this->setProperty($name, $value);
109 109
 			return $this;
110 110
 	}
111 111
 
112
-	protected function getElementByPropertyValue($propertyName,$value, $elements) {
113
-		return $this->_getElementBy(function($element) use ($propertyName,$value){return $element->propertyContains($propertyName, $value) === true;}, $elements);
112
+	protected function getElementByPropertyValue($propertyName, $value, $elements) {
113
+		return $this->_getElementBy(function($element) use ($propertyName, $value){return $element->propertyContains($propertyName, $value)===true; }, $elements);
114 114
 	}
115 115
 }
116 116
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/html/content/InternalPopup.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -14,64 +14,64 @@
 block discarded – undo
14 14
 	protected $params;
15 15
 	protected $semElement;
16 16
 
17
-	public function __construct($semElement,$title="",$content="",$variation=NULL,$params=array()){
17
+	public function __construct($semElement, $title="", $content="", $variation=NULL, $params=array()) {
18 18
 		$this->semElement=$semElement;
19 19
 		$this->title=$title;
20 20
 		$this->content=$content;
21
-		$this->setAttributes($variation,$params);
21
+		$this->setAttributes($variation, $params);
22 22
 	}
23 23
 
24 24
 	public function setHtml($html) {
25
-		$this->html= $html;
25
+		$this->html=$html;
26 26
 		return $this;
27 27
 	}
28 28
 
29
-	public function setAttributes($variation=NULL,$params=array()){
29
+	public function setAttributes($variation=NULL, $params=array()) {
30 30
 		$this->variation=$variation;
31 31
 		$this->params=$params;
32 32
 	}
33 33
 
34
-	public function onShow($jsCode){
34
+	public function onShow($jsCode) {
35 35
 		$this->params["onShow"]=$jsCode;
36 36
 	}
37 37
 
38
-	public function compile(JsUtils $js=NULL){
39
-		if(JString::isNotNull($this->title)){
38
+	public function compile(JsUtils $js=NULL) {
39
+		if (JString::isNotNull($this->title)) {
40 40
 			$this->semElement->addToProperty("data-title", $this->title);
41 41
 		}
42
-		if(JString::isNotNull($this->content)){
42
+		if (JString::isNotNull($this->content)) {
43 43
 			$this->semElement->addToProperty("data-content", $this->content);
44 44
 		}
45 45
 		$this->_compileHtml($js);
46
-		if(JString::isNotNull($this->variation)){
46
+		if (JString::isNotNull($this->variation)) {
47 47
 			$this->semElement->addToProperty("data-variation", $this->variation);
48 48
 		}
49 49
 	}
50 50
 
51
-	private function _compileHtml(JsUtils $js=NULL){
52
-		if(JString::isNotNull($this->html)){
51
+	private function _compileHtml(JsUtils $js=NULL) {
52
+		if (JString::isNotNull($this->html)) {
53 53
 			$html=$this->html;
54
-			if(\is_array($html)){
54
+			if (\is_array($html)) {
55 55
 				\array_walk($html, function(&$item) use($js){
56
-					if($item instanceof HtmlSemDoubleElement){
56
+					if ($item instanceof HtmlSemDoubleElement) {
57 57
 						$comp=$item->compile($js);
58
-						if(isset($js)){
58
+						if (isset($js)) {
59 59
 							$bs=$item->run($js);
60
-							if(isset($bs))
60
+							if (isset($bs))
61 61
 								$this->params['onShow']=$bs->getScript();
62 62
 						}
63 63
 						$item=$comp;
64 64
 					}
65 65
 				});
66
-				$html=\implode("",$html);
66
+				$html=\implode("", $html);
67 67
 			}
68 68
 			$html=\str_replace("\"", "'", $html);
69 69
 			$this->semElement->addToProperty("data-html", $html);
70 70
 		}
71 71
 	}
72 72
 
73
-	public function run(JsUtils $js){
74
-		$js->semantic()->popup("#".$this->semElement->getIdentifier(),$this->params);
73
+	public function run(JsUtils $js) {
74
+		$js->semantic()->popup("#".$this->semElement->getIdentifier(), $this->params);
75 75
 	}
76 76
 
77 77
 }
78 78
\ No newline at end of file
Please login to merge, or discard this patch.