Completed
Push — master ( bda9b8...aa1d0c )
by Jean-Christophe
03:12
created
Ajax/semantic/html/collections/form/traits/FieldsTrait.php 2 patches
Braces   +4 added lines, -3 removed lines patch added patch discarded remove patch
@@ -18,11 +18,12 @@
 block discarded – undo
18 18
 		if(\is_array($value)){
19 19
 			$itemO=new HtmlFormInput(JArray::getDefaultValue($value, "id",""),JArray::getDefaultValue($value, "label",null),JArray::getDefaultValue($value, "type", "text"),JArray::getDefaultValue($value, "value",""),JArray::getDefaultValue($value, "placeholder",JArray::getDefaultValue($value, "label",null)));
20 20
 			return $itemO;
21
-		}elseif(\is_object($value)){
21
+		} elseif(\is_object($value)){
22 22
 			$itemO=new HtmlFormField("field-".$this->identifier, $value);
23 23
 			return $itemO;
24
-		}else
25
-			return new HtmlFormInput($value);
24
+		} else {
25
+					return new HtmlFormInput($value);
26
+		}
26 27
 	}
27 28
 
28 29
 	protected function createCondition($value){
Please login to merge, or discard this patch.
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -11,46 +11,46 @@  discard block
 block discarded – undo
11 11
 use Ajax\semantic\html\collections\form\HtmlFormField;
12 12
 
13 13
 trait FieldsTrait {
14
-	public abstract function addFields($fields=NULL,$label=NULL);
14
+	public abstract function addFields($fields=NULL, $label=NULL);
15 15
 	public abstract function addItem($item);
16 16
 
17
-	protected function createItem($value){
18
-		if(\is_array($value)){
19
-			$itemO=new HtmlFormInput(JArray::getDefaultValue($value, "id",""),JArray::getDefaultValue($value, "label",null),JArray::getDefaultValue($value, "type", "text"),JArray::getDefaultValue($value, "value",""),JArray::getDefaultValue($value, "placeholder",JArray::getDefaultValue($value, "label",null)));
17
+	protected function createItem($value) {
18
+		if (\is_array($value)) {
19
+			$itemO=new HtmlFormInput(JArray::getDefaultValue($value, "id", ""), JArray::getDefaultValue($value, "label", null), JArray::getDefaultValue($value, "type", "text"), JArray::getDefaultValue($value, "value", ""), JArray::getDefaultValue($value, "placeholder", JArray::getDefaultValue($value, "label", null)));
20 20
 			return $itemO;
21
-		}elseif(\is_object($value)){
21
+		}elseif (\is_object($value)) {
22 22
 			$itemO=new HtmlFormField("field-".$this->identifier, $value);
23 23
 			return $itemO;
24
-		}else
24
+		} else
25 25
 			return new HtmlFormInput($value);
26 26
 	}
27 27
 
28
-	protected function createCondition($value){
28
+	protected function createCondition($value) {
29 29
 		return \is_object($value)===false || $value instanceof \Ajax\semantic\html\elements\HtmlInput;
30 30
 	}
31 31
 
32
-	public function addInputs($inputs,$fieldslabel=null){
32
+	public function addInputs($inputs, $fieldslabel=null) {
33 33
 		$fields=array();
34
-		foreach ($inputs as $input){
34
+		foreach ($inputs as $input) {
35 35
 			\extract($input);
36
-			$f=new HtmlFormInput("","");
36
+			$f=new HtmlFormInput("", "");
37 37
 			$f->fromArray($input);
38 38
 			$fields[]=$f;
39 39
 		}
40
-		return $this->addFields($fields,$fieldslabel);
40
+		return $this->addFields($fields, $fieldslabel);
41 41
 	}
42 42
 
43
-	public function addFieldRule($index,$type,$prompt=NULL,$value=NULL){
43
+	public function addFieldRule($index, $type, $prompt=NULL, $value=NULL) {
44 44
 		$field=$this->getItem($index);
45
-		if(isset($field)){
46
-			$field->addRule($type,$prompt,$value);
45
+		if (isset($field)) {
46
+			$field->addRule($type, $prompt, $value);
47 47
 		}
48 48
 		return $this;
49 49
 	}
50 50
 
51
-	public function addFieldRules($index,$rules){
51
+	public function addFieldRules($index, $rules) {
52 52
 		$field=$this->getItem($index);
53
-		if(isset($field)){
53
+		if (isset($field)) {
54 54
 			$field->addRules($rules);
55 55
 		}
56 56
 		return $this;
@@ -64,8 +64,8 @@  discard block
 block discarded – undo
64 64
 	 * @param boolean $multiple
65 65
 	 * @return \Ajax\common\html\HtmlDoubleElement
66 66
 	 */
67
-	public function addDropdown($identifier,$items=array(), $label=NULL,$value=NULL,$multiple=false){
68
-		return $this->addItem(new HtmlFormDropdown($identifier,$items,$label,$value,$multiple));
67
+	public function addDropdown($identifier, $items=array(), $label=NULL, $value=NULL, $multiple=false) {
68
+		return $this->addItem(new HtmlFormDropdown($identifier, $items, $label, $value, $multiple));
69 69
 	}
70 70
 
71 71
 	/**
@@ -76,23 +76,23 @@  discard block
 block discarded – undo
76 76
 	 * @param string $placeholder
77 77
 	 * @return HtmlFormInput
78 78
 	 */
79
-	public function addInput($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL){
80
-		return $this->addItem(new HtmlFormInput($identifier,$label,$type,$value,$placeholder));
79
+	public function addInput($identifier, $label=NULL, $type="text", $value=NULL, $placeholder=NULL) {
80
+		return $this->addItem(new HtmlFormInput($identifier, $label, $type, $value, $placeholder));
81 81
 	}
82 82
 
83
-	public function addPassword($identifier, $label=NULL){
84
-		return $this->addItem(new HtmlFormInput($identifier,$label,"password","",""));
83
+	public function addPassword($identifier, $label=NULL) {
84
+		return $this->addItem(new HtmlFormInput($identifier, $label, "password", "", ""));
85 85
 	}
86 86
 
87
-	public function addButton($identifier,$value,$cssStyle=NULL,$onClick=NULL){
88
-		return $this->addItem(new HtmlButton($identifier,$value,$cssStyle,$onClick));
87
+	public function addButton($identifier, $value, $cssStyle=NULL, $onClick=NULL) {
88
+		return $this->addItem(new HtmlButton($identifier, $value, $cssStyle, $onClick));
89 89
 	}
90 90
 
91
-	public function addCheckbox($identifier, $label=NULL,$value=NULL,$type=NULL){
92
-		return $this->addItem(new HtmlFormCheckbox($identifier,$label,$value,$type));
91
+	public function addCheckbox($identifier, $label=NULL, $value=NULL, $type=NULL) {
92
+		return $this->addItem(new HtmlFormCheckbox($identifier, $label, $value, $type));
93 93
 	}
94 94
 
95
-	public function addRadio($identifier, $name,$label=NULL,$value=NULL){
96
-		return $this->addItem(new HtmlFormRadio($identifier,$name,$label,$value));
95
+	public function addRadio($identifier, $name, $label=NULL, $value=NULL) {
96
+		return $this->addItem(new HtmlFormRadio($identifier, $name, $label, $value));
97 97
 	}
98 98
 }
99 99
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/traits/CheckboxTrait.php 2 patches
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -33,17 +33,17 @@  discard block
 block discarded – undo
33 33
 		return $this->getHtmlCk()->attachEvents($events);
34 34
 	}
35 35
 
36
-	public function getField(){
36
+	public function getField() {
37 37
 		return $this->content["field"]->getField();
38 38
 	}
39 39
 
40
-	public function getHtmlCk(){
40
+	public function getHtmlCk() {
41 41
 		return $this->content["field"];
42 42
 	}
43 43
 
44
-	public function getDataField(){
45
-		$field= $this->getField();
46
-		if($field instanceof AbstractCheckbox)
44
+	public function getDataField() {
45
+		$field=$this->getField();
46
+		if ($field instanceof AbstractCheckbox)
47 47
 			$field=$field->getField();
48 48
 			return $field;
49 49
 	}
@@ -53,10 +53,10 @@  discard block
 block discarded – undo
53 53
 	 * @param boolean $value
54 54
 	 * @return \Ajax\semantic\html\collections\form\traits\CheckboxTrait
55 55
 	 */
56
-	public function setChecked($value=true){
57
-		if($value===true){
56
+	public function setChecked($value=true) {
57
+		if ($value===true) {
58 58
 			$this->getDataField()->setProperty("checked", "checked");
59
-		}else{
59
+		} else {
60 60
 			$this->getDataField()->removeProperty("checked");
61 61
 		}
62 62
 		return $this;
Please login to merge, or discard this patch.
Braces   +4 added lines, -3 removed lines patch added patch discarded remove patch
@@ -43,8 +43,9 @@  discard block
 block discarded – undo
43 43
 
44 44
 	public function getDataField(){
45 45
 		$field= $this->getField();
46
-		if($field instanceof AbstractCheckbox)
47
-			$field=$field->getField();
46
+		if($field instanceof AbstractCheckbox) {
47
+					$field=$field->getField();
48
+		}
48 49
 			return $field;
49 50
 	}
50 51
 
@@ -56,7 +57,7 @@  discard block
 block discarded – undo
56 57
 	public function setChecked($value=true){
57 58
 		if($value===true){
58 59
 			$this->getDataField()->setProperty("checked", "checked");
59
-		}else{
60
+		} else{
60 61
 			$this->getDataField()->removeProperty("checked");
61 62
 		}
62 63
 		return $this;
Please login to merge, or discard this patch.
Ajax/semantic/html/modules/checkbox/AbstractCheckbox.php 2 patches
Braces   +7 added lines, -5 removed lines patch added patch discarded remove patch
@@ -13,14 +13,15 @@  discard block
 block discarded – undo
13 13
 		$field=new \Ajax\common\html\html5\HtmlInput($identifier, $inputType, $value);
14 14
 		$field->setProperty("name", $name);
15 15
 		$this->setField($field);
16
-		if (isset($label))
17
-			$this->setLabel($label);
16
+		if (isset($label)) {
17
+					$this->setLabel($label);
18
+		}
18 19
 	}
19 20
 
20 21
 	public function setChecked($value=true){
21 22
 		if($value===true){
22 23
 			$this->getField()->setProperty("checked", "checked");
23
-		}else{
24
+		} else{
24 25
 			$this->getField()->removeProperty("checked");
25 26
 		}
26 27
 		return $this;
@@ -49,8 +50,9 @@  discard block
 block discarded – undo
49 50
 	 * @return mixed
50 51
 	 */
51 52
 	public function getLabel() {
52
-		if (\array_key_exists("label", $this->content))
53
-			return $this->content["label"];
53
+		if (\array_key_exists("label", $this->content)) {
54
+					return $this->content["label"];
55
+		}
54 56
 	}
55 57
 
56 58
 	/**
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@  discard block
 block discarded – undo
7 7
 use Ajax\JsUtils;
8 8
 
9 9
 abstract class AbstractCheckbox extends HtmlSemDoubleElement {
10
-	protected $_params=array ();
10
+	protected $_params=array();
11 11
 
12 12
 	public function __construct($identifier, $name=NULL, $label=NULL, $value=NULL, $inputType="checkbox", $type="checkbox") {
13 13
 		parent::__construct("ck-".$identifier, "div", "ui ".$type);
@@ -18,10 +18,10 @@  discard block
 block discarded – undo
18 18
 			$this->setLabel($label);
19 19
 	}
20 20
 
21
-	public function setChecked($value=true){
22
-		if($value===true){
21
+	public function setChecked($value=true) {
22
+		if ($value===true) {
23 23
 			$this->getField()->setProperty("checked", "checked");
24
-		}else{
24
+		} else {
25 25
 			$this->getField()->removeProperty("checked");
26 26
 		}
27 27
 		return $this;
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
 	 * @return \Ajax\semantic\html\collections\form\AbstractHtmlFormRadioCheckbox
84 84
 	 */
85 85
 	public function attachEvent($selector, $action=NULL) {
86
-		if (isset($action)!==false||\is_numeric($action)===true) {
86
+		if (isset($action)!==false || \is_numeric($action)===true) {
87 87
 			$js='$("#%identifier%").checkbox("attach events", "'.$selector.'", "'.$action.'");';
88 88
 		} else {
89 89
 			$js='$("#%identifier%").checkbox("attach events", "'.$selector.'");';
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 	 */
100 100
 	public function attachEvents($events=array()) {
101 101
 		if (\is_array($events)) {
102
-			foreach ( $events as $action => $selector ) {
102
+			foreach ($events as $action => $selector) {
103 103
 				$this->attachEvent($selector, $action);
104 104
 			}
105 105
 		}
@@ -110,16 +110,16 @@  discard block
 block discarded – undo
110 110
 		return $this->addToProperty("class", "fitted");
111 111
 	}
112 112
 
113
-	public function setOnChecked($jsCode){
113
+	public function setOnChecked($jsCode) {
114 114
 		$this->_params["onChecked"]=$jsCode;
115 115
 	}
116 116
 
117
-	public function setOnUnchecked($jsCode){
117
+	public function setOnUnchecked($jsCode) {
118 118
 		$this->_params["onUnchecked"]=$jsCode;
119 119
 	}
120 120
 
121 121
 	public function run(JsUtils $js) {
122
-			$this->_bsComponent=$js->semantic()->checkbox("#" . $this->identifier, $this->_params);
122
+			$this->_bsComponent=$js->semantic()->checkbox("#".$this->identifier, $this->_params);
123 123
 			return parent::run($js);
124 124
 	}
125 125
 }
126 126
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/Semantic.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -21,8 +21,8 @@  discard block
 block discarded – undo
21 21
 use Ajax\semantic\traits\SemanticWidgetsTrait;
22 22
 
23 23
 class Semantic extends BaseGui {
24
-	use SemanticComponentsTrait,SemanticHtmlElementsTrait,SemanticHtmlCollectionsTrait,
25
-	SemanticHtmlModulesTrait,SemanticHtmlViewsTrait,SemanticWidgetsTrait;
24
+	use SemanticComponentsTrait, SemanticHtmlElementsTrait, SemanticHtmlCollectionsTrait,
25
+	SemanticHtmlModulesTrait, SemanticHtmlViewsTrait, SemanticWidgetsTrait;
26 26
 
27 27
 	private $language;
28 28
 
@@ -110,12 +110,12 @@  discard block
 block discarded – undo
110 110
 		return $this->addHtmlComponent(new HtmlSticky($identifier, $content));
111 111
 	}
112 112
 
113
-	public function setLanguage($language){
114
-		if($language!==$this->language){
113
+	public function setLanguage($language) {
114
+		if ($language!==$this->language) {
115 115
 			$file=\realpath(dirname(__FILE__)."/semantic/components/validation/languages/".$language.".js");
116
-			if(\file_exists($file)){
116
+			if (\file_exists($file)) {
117 117
 				$script=\file_get_contents($file);
118
-				$this->js->exec($script,true);
118
+				$this->js->exec($script, true);
119 119
 				$this->language=$language;
120 120
 			}
121 121
 		}
Please login to merge, or discard this patch.
Ajax/common/components/SimpleComponent.php 2 patches
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -17,18 +17,18 @@  discard block
 block discarded – undo
17 17
 
18 18
 	public function __construct(JsUtils $js) {
19 19
 		parent::__construct($js);
20
-		$this->events=array ();
20
+		$this->events=array();
21 21
 	}
22 22
 
23 23
 	protected function compileEvents() {
24
-		foreach ( $this->events as $event => $jsCode ) {
25
-			if($event=="execute"){
24
+		foreach ($this->events as $event => $jsCode) {
25
+			if ($event=="execute") {
26 26
 				$this->jquery_code_for_compile []=$jsCode;
27
-			}else if($event=="beforeExecute"){
27
+			} else if ($event=="beforeExecute") {
28 28
 				\array_unshift($this->jquery_code_for_compile, $jsCode);
29
-			}else{
29
+			} else {
30 30
 				$selector=$this->attachTo;
31
-				if(isset($this->itemSelector)){
31
+				if (isset($this->itemSelector)) {
32 32
 					$selector.=" ".$this->itemSelector;
33 33
 				}
34 34
 				$this->jquery_code_for_compile []="$( \"".$selector."\" ).on(\"".$event."\" , function( event, data ) {".$jsCode."});";
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 		$result=implode("\n", $this->jquery_code_for_compile);
41 41
 		$result=str_ireplace("\"%", "", $result);
42 42
 		$result=str_ireplace("%\"", "", $result);
43
-		$result=str_replace(array (
43
+		$result=str_replace(array(
44 44
 				"\\n",
45 45
 				"\\r",
46 46
 				"\\t"
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 
51 51
 	public function getScript() {
52 52
 		$allParams=$this->params;
53
-		$this->jquery_code_for_compile=array ();
53
+		$this->jquery_code_for_compile=array();
54 54
 		$this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).{$this->uiName}(".$this->getParamsAsJSON($allParams).");";
55 55
 		$this->compileEvents();
56 56
 		return $this->compileJQueryCode();
Please login to merge, or discard this patch.
Braces   +5 added lines, -4 removed lines patch added patch discarded remove patch
@@ -24,9 +24,9 @@  discard block
 block discarded – undo
24 24
 		foreach ( $this->events as $event => $jsCode ) {
25 25
 			if($event=="execute"){
26 26
 				$this->jquery_code_for_compile []=$jsCode;
27
-			}else if($event=="beforeExecute"){
27
+			} else if($event=="beforeExecute"){
28 28
 				\array_unshift($this->jquery_code_for_compile, $jsCode);
29
-			}else{
29
+			} else{
30 30
 				$selector=$this->attachTo;
31 31
 				if(isset($this->itemSelector)){
32 32
 					$selector.=" ".$this->itemSelector;
@@ -75,8 +75,9 @@  discard block
 block discarded – undo
75 75
 
76 76
 	protected function setParamCtrl($key, $value, $typeCtrl) {
77 77
 		if (is_array($typeCtrl)) {
78
-			if (array_search($value, $typeCtrl)===false)
79
-				throw new \Exception("La valeur passée a propriété `".$key."` pour le composant `".$this->uiName."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
78
+			if (array_search($value, $typeCtrl)===false) {
79
+							throw new \Exception("La valeur passée a propriété `".$key."` pour le composant `".$this->uiName."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
80
+			}
80 81
 		} else {
81 82
 			if (!$typeCtrl($value)) {
82 83
 				throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$key." au composant ".$this->uiName);
Please login to merge, or discard this patch.
Ajax/common/traits/JqueryAjaxTrait.php 2 patches
Spacing   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
 	protected $ajaxLoader='<span></span><span></span><span></span><span></span><span></span>';
16 16
 
17 17
 	public abstract function _prep_value($value);
18
-	public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
18
+	public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true);
19 19
 	protected function addLoading(&$retour, $responseElement) {
20 20
 		$loading_notifier='<div class="ajax-loader">';
21 21
 		if ($this->ajaxLoader=='') {
@@ -28,20 +28,20 @@  discard block
 block discarded – undo
28 28
 		$retour.="\t\t$({$responseElement}).prepend('{$loading_notifier}');\n";
29 29
 	}
30 30
 
31
-	public function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
32
-		return $this->_ajax("get", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$immediatly);
31
+	public function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
32
+		return $this->_ajax("get", $url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $immediatly);
33 33
 	}
34
-	public function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
35
-		return $this->_ajax("post", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$immediatly);
34
+	public function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
35
+		return $this->_ajax("post", $url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $immediatly);
36 36
 	}
37 37
 
38
-	protected function _ajax($method,$url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
39
-		if(JString::isNull($params)){$params="{}";}
38
+	protected function _ajax($method, $url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
39
+		if (JString::isNull($params)) {$params="{}"; }
40 40
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
41 41
 		$retour=$this->_getAjaxUrl($url, $attr);
42 42
 		$responseElement=$this->_getResponseElement($responseElement);
43 43
 		$retour.="var self=this;\n";
44
-		if($hasLoader===true){
44
+		if ($hasLoader===true) {
45 45
 			$this->addLoading($retour, $responseElement);
46 46
 		}
47 47
 		$retour.="$.".$method."(url,".$params.").done(function( data ) {\n";
@@ -51,30 +51,30 @@  discard block
 block discarded – undo
51 51
 			return $retour;
52 52
 	}
53 53
 
54
-	protected function _getAjaxUrl($url,$attr){
54
+	protected function _getAjaxUrl($url, $attr) {
55 55
 		$url=$this->_correctAjaxUrl($url);
56 56
 		$retour="url='".$url."';\n";
57 57
 		$slash="/";
58
-		if(JString::endswith($url, "/")===true)
58
+		if (JString::endswith($url, "/")===true)
59 59
 			$slash="";
60
-		if(JString::isNotNull($attr)){
60
+		if (JString::isNotNull($attr)) {
61 61
 			if ($attr==="value")
62 62
 				$retour.="url=url+'".$slash."'+$(this).val();\n";
63 63
 			elseif ($attr==="html")
64 64
 			$retour.="url=url+'".$slash."'+$(this).html();\n";
65
-			elseif($attr!=null && $attr!=="")
65
+			elseif ($attr!=null && $attr!=="")
66 66
 					$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
67 67
 		}
68 68
 		return $retour;
69 69
 	}
70 70
 
71
-	protected function _getOnAjaxDone($responseElement,$jsCallback){
71
+	protected function _getOnAjaxDone($responseElement, $jsCallback) {
72 72
 		$retour="";
73 73
 		if ($responseElement!=="") {
74
-			if(JString::startswith($responseElement, "\"-")===true){
74
+			if (JString::startswith($responseElement, "\"-")===true) {
75 75
 				$responseElement=\str_replace("\"-", "\"", $responseElement);
76 76
 				$retour="\t$({$responseElement}).replaceWith( data );\n";
77
-			}else{
77
+			} else {
78 78
 				$retour="\t$({$responseElement}).html( data );\n";
79 79
 			}
80 80
 		}
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 		return $retour;
83 83
 	}
84 84
 
85
-	protected function _getResponseElement($responseElement){
85
+	protected function _getResponseElement($responseElement) {
86 86
 		if ($responseElement!=="") {
87 87
 			$responseElement=$this->_prep_value($responseElement);
88 88
 		}
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 	protected function _correctAjaxUrl($url) {
93 93
 		if ($url!=="/" && JString::endsWith($url, "/")===true)
94 94
 			$url=substr($url, 0, strlen($url)-1);
95
-		if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
95
+		if (strncmp($url, 'http://', 7)!=0 && strncmp($url, 'https://', 8)!=0) {
96 96
 			$url=$this->jsUtils->getUrl($url);
97 97
 		}
98 98
 		return $url;
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
 	 * @param string $jsCallback javascript code to execute after the request
107 107
 	 * @param boolean $immediatly
108 108
 	 */
109
-	public function _json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document",$immediatly=false) {
109
+	public function _json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document", $immediatly=false) {
110 110
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
111 111
 		$retour=$this->_getAjaxUrl($url, $attr);
112 112
 		$retour.="$.{$method}(url,".$params.").done(function( data ) {\n";
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
 	 * @param string $url the request address
128 128
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true)
129 129
 	 */
130
-	public function _jsonOn($event,$element, $url,$parameters=array()) {
130
+	public function _jsonOn($event, $element, $url, $parameters=array()) {
131 131
 		$preventDefault=true;
132 132
 		$stopPropagation=true;
133 133
 		$jsCallback=null;
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
 		$params="{}";
138 138
 		$immediatly=true;
139 139
 		extract($parameters);
140
-		return $this->_add_event($element, $this->_json($url,$method, $params,$jsCallback, $attr,$context), $event, $preventDefault, $stopPropagation,$immediatly);
140
+		return $this->_add_event($element, $this->_json($url, $method, $params, $jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation, $immediatly);
141 141
 	}
142 142
 
143 143
 	/**
@@ -149,19 +149,19 @@  discard block
 block discarded – undo
149 149
 	 * @param string $context jquery DOM element, array container.
150 150
 	 * @param boolean $immediatly
151 151
 	 */
152
-	public function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context=null,$immediatly=false) {
152
+	public function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context=null, $immediatly=false) {
153 153
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
154 154
 		$retour=$this->_getAjaxUrl($url, $attr);
155
-		if($context===null){
155
+		if ($context===null) {
156 156
 			$appendTo="\t\tnewElm.appendTo($('".$maskSelector."').parent());\n";
157
-			$newElm = "$('#'+newId)";
158
-		}else{
157
+			$newElm="$('#'+newId)";
158
+		} else {
159 159
 			$appendTo="\t\tnewElm.appendTo(".$context.");\n";
160
-			$newElm = $context.".find('#'+newId)";
160
+			$newElm=$context.".find('#'+newId)";
161 161
 		}
162 162
 		$retour.="var self = $(this);\n$.{$method}(url,".$params.").done(function( data ) {\n";
163 163
 		$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();newElm.attr('id',newId);\n";
164
-		$retour.= $appendTo;
164
+		$retour.=$appendTo;
165 165
 		$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";
166 166
 		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
167 167
 		$retour.="\t".$jsCallback."\n"."});\n";
@@ -176,26 +176,26 @@  discard block
 block discarded – undo
176 176
 	 * @param string $url the request address
177 177
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get", "context"=>null)
178 178
 	 */
179
-	public function _jsonArrayOn($event,$element, $maskSelector,$url,$parameters=array()) {
179
+	public function _jsonArrayOn($event, $element, $maskSelector, $url, $parameters=array()) {
180 180
 		$preventDefault=true;
181 181
 		$stopPropagation=true;
182 182
 		$jsCallback=null;
183 183
 		$attr="id";
184 184
 		$method="get";
185
-		$context = null;
185
+		$context=null;
186 186
 		$params="{}";
187 187
 		$immediatly=true;
188 188
 		extract($parameters);
189
-		return $this->_add_event($element, $this->_jsonArray($maskSelector,$url,$method, $params,$jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation,$immediatly);
189
+		return $this->_add_event($element, $this->_jsonArray($maskSelector, $url, $method, $params, $jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation, $immediatly);
190 190
 	}
191 191
 
192
-	public function _postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
192
+	public function _postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
193 193
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
194 194
 		$retour=$this->_getAjaxUrl($url, $attr);
195 195
 		$retour.="\nvar params=$('#".$form."').serialize();\n";
196 196
 		$responseElement=$this->_getResponseElement($responseElement);
197 197
 		$retour.="var self=this;\n";
198
-		if($hasLoader===true){
198
+		if ($hasLoader===true) {
199 199
 			$this->addLoading($retour, $responseElement);
200 200
 		}
201 201
 		$retour.="$.post(url,params).done(function( data ) {\n";
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
 	 * @param string $responseElement
223 223
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true)
224 224
 	 */
225
-	public function _getOn($event,$element, $url, $params="{}", $responseElement="", $parameters=array()) {
225
+	public function _getOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
226 226
 		$preventDefault=true;
227 227
 		$stopPropagation=true;
228 228
 		$jsCallback=null;
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
230 230
 		$hasLoader=true;
231 231
 		$immediatly=true;
232 232
 		extract($parameters);
233
-		return $this->_add_event($element, $this->_get($url, $params, $responseElement, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation,$immediatly);
233
+		return $this->_add_event($element, $this->_get($url, $params, $responseElement, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation, $immediatly);
234 234
 	}
235 235
 
236 236
 	/**
@@ -243,7 +243,7 @@  discard block
 block discarded – undo
243 243
 	 * @param string $responseElement
244 244
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true)
245 245
 	 */
246
-	public function _postOn($event,$element, $url, $params="{}", $responseElement="", $parameters=array()) {
246
+	public function _postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
247 247
 		$preventDefault=true;
248 248
 		$stopPropagation=true;
249 249
 		$jsCallback=null;
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
251 251
 		$hasLoader=true;
252 252
 		$immediatly=true;
253 253
 		extract($parameters);
254
-		return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation,$immediatly);
254
+		return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader), $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,"validation"=>false,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true)
266 266
 	 */
267
-	public function _postFormOn($event,$element, $url, $form, $responseElement="", $parameters=array()) {
267
+	public function _postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) {
268 268
 		$preventDefault=true;
269 269
 		$stopPropagation=true;
270 270
 		$validation=false;
@@ -273,6 +273,6 @@  discard block
 block discarded – undo
273 273
 		$hasLoader=true;
274 274
 		$immediatly=true;
275 275
 		extract($parameters);
276
-		return $this->_add_event($element, $this->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation,$immediatly);
276
+		return $this->_add_event($element, $this->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation, $immediatly);
277 277
 	}
278 278
 }
279 279
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +27 added lines, -20 removed lines patch added patch discarded remove patch
@@ -46,8 +46,9 @@  discard block
 block discarded – undo
46 46
 		}
47 47
 		$retour.="$.".$method."(url,".$params.").done(function( data ) {\n";
48 48
 		$retour.=$this->_getOnAjaxDone($responseElement, $jsCallback)."});\n";
49
-		if ($immediatly)
50
-			$this->jquery_code_for_compile[]=$retour;
49
+		if ($immediatly) {
50
+					$this->jquery_code_for_compile[]=$retour;
51
+		}
51 52
 			return $retour;
52 53
 	}
53 54
 
@@ -55,15 +56,17 @@  discard block
 block discarded – undo
55 56
 		$url=$this->_correctAjaxUrl($url);
56 57
 		$retour="url='".$url."';\n";
57 58
 		$slash="/";
58
-		if(JString::endswith($url, "/")===true)
59
-			$slash="";
59
+		if(JString::endswith($url, "/")===true) {
60
+					$slash="";
61
+		}
60 62
 		if(JString::isNotNull($attr)){
61
-			if ($attr==="value")
62
-				$retour.="url=url+'".$slash."'+$(this).val();\n";
63
-			elseif ($attr==="html")
64
-			$retour.="url=url+'".$slash."'+$(this).html();\n";
65
-			elseif($attr!=null && $attr!=="")
66
-					$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
63
+			if ($attr==="value") {
64
+							$retour.="url=url+'".$slash."'+$(this).val();\n";
65
+			} elseif ($attr==="html") {
66
+						$retour.="url=url+'".$slash."'+$(this).html();\n";
67
+			} elseif($attr!=null && $attr!=="") {
68
+								$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
69
+			}
67 70
 		}
68 71
 		return $retour;
69 72
 	}
@@ -74,7 +77,7 @@  discard block
 block discarded – undo
74 77
 			if(JString::startswith($responseElement, "\"-")===true){
75 78
 				$responseElement=\str_replace("\"-", "\"", $responseElement);
76 79
 				$retour="\t$({$responseElement}).replaceWith( data );\n";
77
-			}else{
80
+			} else{
78 81
 				$retour="\t$({$responseElement}).html( data );\n";
79 82
 			}
80 83
 		}
@@ -90,8 +93,9 @@  discard block
 block discarded – undo
90 93
 	}
91 94
 
92 95
 	protected function _correctAjaxUrl($url) {
93
-		if ($url!=="/" && JString::endsWith($url, "/")===true)
94
-			$url=substr($url, 0, strlen($url)-1);
96
+		if ($url!=="/" && JString::endsWith($url, "/")===true) {
97
+					$url=substr($url, 0, strlen($url)-1);
98
+		}
95 99
 		if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
96 100
 			$url=$this->jsUtils->getUrl($url);
97 101
 		}
@@ -115,8 +119,9 @@  discard block
 block discarded – undo
115 119
 				$retour.="\t".$jsCallback."\n".
116 120
 						"\t$(document).trigger('jsonReady',[data]);\n".
117 121
 						"});\n";
118
-				if ($immediatly)
119
-					$this->jquery_code_for_compile[]=$retour;
122
+				if ($immediatly) {
123
+									$this->jquery_code_for_compile[]=$retour;
124
+				}
120 125
 					return $retour;
121 126
 	}
122 127
 
@@ -155,7 +160,7 @@  discard block
 block discarded – undo
155 160
 		if($context===null){
156 161
 			$appendTo="\t\tnewElm.appendTo($('".$maskSelector."').parent());\n";
157 162
 			$newElm = "$('#'+newId)";
158
-		}else{
163
+		} else{
159 164
 			$appendTo="\t\tnewElm.appendTo(".$context.");\n";
160 165
 			$newElm = $context.".find('#'+newId)";
161 166
 		}
@@ -165,8 +170,9 @@  discard block
 block discarded – undo
165 170
 		$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";
166 171
 		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
167 172
 		$retour.="\t".$jsCallback."\n"."});\n";
168
-		if ($immediatly)
169
-			$this->jquery_code_for_compile[]=$retour;
173
+		if ($immediatly) {
174
+					$this->jquery_code_for_compile[]=$retour;
175
+		}
170 176
 			return $retour;
171 177
 	}
172 178
 	/**
@@ -207,8 +213,9 @@  discard block
 block discarded – undo
207 213
 			}});\n";
208 214
 			$retour.="$('#".$form."').submit();\n";
209 215
 		}
210
-		if ($immediatly)
211
-			$this->jquery_code_for_compile[]=$retour;
216
+		if ($immediatly) {
217
+					$this->jquery_code_for_compile[]=$retour;
218
+		}
212 219
 			return $retour;
213 220
 	}
214 221
 
Please login to merge, or discard this patch.
Ajax/semantic/widgets/datatable/Pagination.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -8,34 +8,34 @@  discard block
 block discarded – undo
8 8
 	private $page_count;
9 9
 	private $pages_visibles;
10 10
 
11
-	public function __construct($items_per_page=10,$pages_visibles=4,$page=1){
11
+	public function __construct($items_per_page=10, $pages_visibles=4, $page=1) {
12 12
 		$this->items_per_page=$items_per_page;
13 13
 		$this->page=$page;
14 14
 		$this->pages_visibles=$pages_visibles;
15 15
 		$this->visible=true;
16 16
 	}
17 17
 
18
-	public function getObjects($objects){
19
-		$offset = ($this->page - 1) * $this->items_per_page;
18
+	public function getObjects($objects) {
19
+		$offset=($this->page-1)*$this->items_per_page;
20 20
 		$os=$objects;
21
-		if(\is_array($os)===false){
21
+		if (\is_array($os)===false) {
22 22
 			$os=[];
23
-			foreach ($objects as $o){
23
+			foreach ($objects as $o) {
24 24
 				$os[]=$o;
25 25
 			}
26 26
 		}
27
-		$this->page_count = 0;
27
+		$this->page_count=0;
28 28
 		$row_count=\sizeof($os);
29
-		if (0 === $row_count) {
29
+		if (0===$row_count) {
30 30
 			$this->visible=false;
31 31
 		} else {
32 32
 			$this->visible=true;
33
-			$this->page_count = (int)ceil($row_count / $this->items_per_page);
34
-			if($this->page > $this->page_count+1) {
35
-				$this->page = 1;
33
+			$this->page_count=(int)ceil($row_count/$this->items_per_page);
34
+			if ($this->page>$this->page_count+1) {
35
+				$this->page=1;
36 36
 			}
37 37
 		}
38
-		return array_slice($os, $offset,$this->items_per_page);
38
+		return array_slice($os, $offset, $this->items_per_page);
39 39
 	}
40 40
 
41 41
 	public function getItemsPerPage() {
@@ -69,14 +69,14 @@  discard block
 block discarded – undo
69 69
 		return $this->page_count;
70 70
 	}
71 71
 
72
-	public function getPagesNumbers(){
73
-		$middle= (int)ceil(($this->pages_visibles-1)/ 2);
72
+	public function getPagesNumbers() {
73
+		$middle=(int)ceil(($this->pages_visibles-1)/2);
74 74
 		$first=$this->page-$middle;
75
-		if($first<1){
75
+		if ($first<1) {
76 76
 			$first=1;
77 77
 		}
78 78
 		$last=$first+$this->pages_visibles-1;
79
-		if($last>$this->page_count){
79
+		if ($last>$this->page_count) {
80 80
 			$last=$this->page_count;
81 81
 		}
82 82
 		return \range($first, $last);
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/menus/HtmlPaginationMenu.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -7,20 +7,20 @@
 block discarded – undo
7 7
 
8 8
 use Ajax\semantic\html\elements\HtmlIcon;
9 9
 
10
-class HtmlPaginationMenu extends HtmlMenu{
10
+class HtmlPaginationMenu extends HtmlMenu {
11 11
 	private $_page;
12
-	public function __construct( $identifier, $items=array() ){
13
-		parent::__construct( $identifier,$items);
12
+	public function __construct($identifier, $items=array()) {
13
+		parent::__construct($identifier, $items);
14 14
 	}
15 15
 	/**
16 16
 	 * {@inheritDoc}
17 17
 	 * @see \Ajax\common\html\BaseHtml::compile()
18 18
 	 */
19
-	public function compile(JsUtils $js=NULL,&$view=NULL){
20
-		$this->insertItem(new HtmlIcon("", "left chevron"))->setProperty("data-page", \max([1,$this->_page-1]));
21
-		$this->addItem(new HtmlIcon("", "right chevron"))->setProperty("data-page", \min([\sizeof($this->content)-2,$this->_page+1]));
19
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
20
+		$this->insertItem(new HtmlIcon("", "left chevron"))->setProperty("data-page", \max([1, $this->_page-1]));
21
+		$this->addItem(new HtmlIcon("", "right chevron"))->setProperty("data-page", \min([\sizeof($this->content)-2, $this->_page+1]));
22 22
 		$this->asPagination();
23
-		return parent::compile($js,$view);
23
+		return parent::compile($js, $view);
24 24
 	}
25 25
 
26 26
 	public function setActiveItem($index) {
Please login to merge, or discard this patch.
Ajax/semantic/html/elements/HtmlInput.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -10,13 +10,13 @@  discard block
 block discarded – undo
10 10
 use Ajax\JsUtils;
11 11
 
12 12
 class HtmlInput extends HtmlSemDoubleElement {
13
-	use IconTrait,TextFieldsTrait,FieldTrait;
13
+	use IconTrait, TextFieldsTrait, FieldTrait;
14 14
 
15 15
 	public function __construct($identifier, $type="text", $value="", $placeholder="") {
16
-		parent::__construct("div-" . $identifier, "div", "ui input");
17
-		$this->content=[ "field" => new \Ajax\common\html\html5\HtmlInput($identifier, $type, $value, $placeholder) ];
18
-		$this->_states=[ State::DISABLED,State::FOCUS,State::ERROR ];
19
-		$this->_variations=[ Variation::TRANSPARENT ];
16
+		parent::__construct("div-".$identifier, "div", "ui input");
17
+		$this->content=["field" => new \Ajax\common\html\html5\HtmlInput($identifier, $type, $value, $placeholder)];
18
+		$this->_states=[State::DISABLED, State::FOCUS, State::ERROR];
19
+		$this->_variations=[Variation::TRANSPARENT];
20 20
 	}
21 21
 
22 22
 	public function getField() {
@@ -36,11 +36,11 @@  discard block
 block discarded – undo
36 36
 
37 37
 	public function run(JsUtils $js) {
38 38
 		$result=parent::run($js);
39
-		$result->attach("#" . $this->getDataField()->getIdentifier());
39
+		$result->attach("#".$this->getDataField()->getIdentifier());
40 40
 		return $result;
41 41
 	}
42 42
 
43
-	public function setTransparent(){
43
+	public function setTransparent() {
44 44
 		return $this->addToProperty("class", "transparent");
45 45
 	}
46 46
 }
47 47
\ No newline at end of file
Please login to merge, or discard this patch.