Completed
Push — master ( ec2f1c...349ff5 )
by Jean-Christophe
04:00
created
Ajax/semantic/traits/SemanticComponentsTrait.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -127,8 +127,8 @@  discard block
 block discarded – undo
127 127
 	 * @param string|array $params
128 128
 	 * @return Modal
129 129
 	 */
130
-	public function modal($attachTo=NULL, $params=NULL,$paramsParts=NULL) {
131
-		$result= $this->addComponent(new Modal($this->js), $attachTo, $params);
130
+	public function modal($attachTo=NULL, $params=NULL, $paramsParts=NULL) {
131
+		$result=$this->addComponent(new Modal($this->js), $attachTo, $params);
132 132
 		$result->setParamParts($paramsParts);
133 133
 		return $result;
134 134
 	}
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
 	 * @return Tab
140 140
 	 */
141 141
 	public function tab($attachTo=NULL, $params=NULL) {
142
-		$result= $this->addComponent(new Tab($this->js), $attachTo, $params);
142
+		$result=$this->addComponent(new Tab($this->js), $attachTo, $params);
143 143
 		return $result;
144 144
 	}
145 145
 
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
 	 * @return Shape
150 150
 	 */
151 151
 	public function shape($attachTo=NULL, $params=NULL) {
152
-		$result= $this->addComponent(new Shape($this->js), $attachTo, $params);
152
+		$result=$this->addComponent(new Shape($this->js), $attachTo, $params);
153 153
 		return $result;
154 154
 	}
155 155
 
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
 	 * @return Form
160 160
 	 */
161 161
 	public function form($attachTo=NULL, $params=NULL) {
162
-		$result= $this->addComponent(new Form($this->js), $attachTo, $params);
162
+		$result=$this->addComponent(new Form($this->js), $attachTo, $params);
163 163
 		return $result;
164 164
 	}
165 165
 
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 function Composer\Autoload\includeFile;
22 22
 
23 23
 class Semantic extends BaseGui {
24
-	use SemanticComponentsTrait,SemanticHtmlElementsTrait,SemanticHtmlCollectionsTrait,
25
-	SemanticHtmlModulesTrait,SemanticHtmlViewsTrait;
24
+	use SemanticComponentsTrait, SemanticHtmlElementsTrait, SemanticHtmlCollectionsTrait,
25
+	SemanticHtmlModulesTrait, SemanticHtmlViewsTrait;
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/semantic/components/Form.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -20,15 +20,15 @@  discard block
 block discarded – undo
20 20
 		$this->params["fields"]=[];
21 21
 	}
22 22
 
23
-	public function addField($identifier){
23
+	public function addField($identifier) {
24 24
 		$this->params["fields"][$identifier]=new FieldValidation($identifier);
25 25
 	}
26 26
 
27
-	public function setInline($value){
27
+	public function setInline($value) {
28 28
 		return $this->setParam("inline", true);
29 29
 	}
30 30
 
31
-	public function setOn($value){
31
+	public function setOn($value) {
32 32
 		return $this->setParam("on", $value);
33 33
 	}
34 34
 
@@ -40,33 +40,33 @@  discard block
 block discarded – undo
40 40
 	 * @param mixed $value
41 41
 	 * @param string|NULL $prompt
42 42
 	 */
43
-	public function addFieldRule($identifier,$type,$prompt=NULL,$value=NULL){
44
-		if(isset($this->params["fields"][$identifier])===false){
43
+	public function addFieldRule($identifier, $type, $prompt=NULL, $value=NULL) {
44
+		if (isset($this->params["fields"][$identifier])===false) {
45 45
 			$this->addField($identifier);
46 46
 		}
47
-		$this->params["fields"][$identifier]->addRule($type,$prompt,$value);
47
+		$this->params["fields"][$identifier]->addRule($type, $prompt, $value);
48 48
 	}
49 49
 
50 50
 	/**
51 51
 	 * @param FieldValidation $fieldValidation
52 52
 	 */
53
-	public function addFieldValidation($fieldValidation){
53
+	public function addFieldValidation($fieldValidation) {
54 54
 		$this->params["fields"][$fieldValidation->getIdentifier()]=$fieldValidation;
55 55
 	}
56 56
 
57
-	public function setJs(JsUtils $js){
57
+	public function setJs(JsUtils $js) {
58 58
 		$this->js=$js;
59 59
 	}
60 60
 
61 61
 	public function getScript() {
62 62
 		$allParams=$this->params;
63
-		$this->jquery_code_for_compile=array ();
63
+		$this->jquery_code_for_compile=array();
64 64
 		$this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).{$this->uiName}(".$this->getParamsAsJSON($allParams).");";
65 65
 		$this->compileEvents();
66 66
 		return $this->compileJQueryCode();
67 67
 	}
68 68
 
69
-	public function onValid($jsCode){
69
+	public function onValid($jsCode) {
70 70
 		$this->addComponentEvent("onValid", $jsCode);
71 71
 	}
72 72
 }
73 73
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/components/SimpleSemExtComponent.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -12,9 +12,9 @@  discard block
 block discarded – undo
12 12
 		$this->paramParts=array();
13 13
 	}
14 14
 
15
-	protected function generateParamParts(){
15
+	protected function generateParamParts() {
16 16
 		$results=[];
17
-		foreach ($this->paramParts as $paramPart){
17
+		foreach ($this->paramParts as $paramPart) {
18 18
 			$results[]="{$this->uiName}(".\implode(",", $paramPart).")";
19 19
 		}
20 20
 		return \implode(".", $results);
@@ -22,9 +22,9 @@  discard block
 block discarded – undo
22 22
 
23 23
 	public function getScript() {
24 24
 		$allParams=$this->params;
25
-		$this->jquery_code_for_compile=array ();
25
+		$this->jquery_code_for_compile=array();
26 26
 		$paramParts="";
27
-		if(\sizeof($this->paramParts)>0){
27
+		if (\sizeof($this->paramParts)>0) {
28 28
 			$paramParts=".".$this->generateParamParts();
29 29
 		}
30 30
 		$this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).{$this->uiName}(".$this->getParamsAsJSON($allParams).")".$paramParts.";";
@@ -37,8 +37,8 @@  discard block
 block discarded – undo
37 37
 		return $this;
38 38
 	}
39 39
 
40
-	public function addComponentEvent($event,$jsCode){
41
-		$jsCode=str_ireplace("\"","%quote%", $jsCode);
40
+	public function addComponentEvent($event, $jsCode) {
41
+		$jsCode=str_ireplace("\"", "%quote%", $jsCode);
42 42
 		return $this->setParam($event, "%function(){".$jsCode."}%");
43 43
 	}
44 44
 
Please login to merge, or discard this patch.
Ajax/semantic/components/validation/FieldValidation.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@  discard block
 block discarded – undo
7 7
  * @version 1.001
8 8
  * Generates a JSON field validator
9 9
  */
10
-class FieldValidation implements \JsonSerializable{
10
+class FieldValidation implements \JsonSerializable {
11 11
 	/**
12 12
 	 * @var string
13 13
 	 */
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 
25 25
 	protected $optional;
26 26
 
27
-	public function __construct($identifier){
27
+	public function __construct($identifier) {
28 28
 		$this->identifier=$identifier;
29 29
 		$this->rules=[];
30 30
 	}
@@ -42,20 +42,20 @@  discard block
 block discarded – undo
42 42
 		return $this->rules;
43 43
 	}
44 44
 
45
-	public function addRule($type,$prompt=NULL,$value=NULL){
46
-		if($type instanceof  Rule)
45
+	public function addRule($type, $prompt=NULL, $value=NULL) {
46
+		if ($type instanceof  Rule)
47 47
 			$this->rules[]=$type;
48
-		else if(\is_array($type)){
48
+		else if (\is_array($type)) {
49 49
 			$value=JArray::getValue($type, "value", 2);
50 50
 			$prompt=JArray::getValue($type, "prompt", 1);
51 51
 			$type=JArray::getValue($type, "type", 0);
52
-			$this->rules[]=new Rule($type,$prompt,$value);
53
-		}else
54
-			$this->rules[]=new Rule($type,$prompt,$value);
52
+			$this->rules[]=new Rule($type, $prompt, $value);
53
+		} else
54
+			$this->rules[]=new Rule($type, $prompt, $value);
55 55
 	}
56 56
 
57
-	public function jsonSerialize(){
58
-		return ["identifier"=>$this->identifier,"rules"=>$this->rules];
57
+	public function jsonSerialize() {
58
+		return ["identifier"=>$this->identifier, "rules"=>$this->rules];
59 59
 	}
60 60
 
61 61
 	public function setDepends($depends) {
Please login to merge, or discard this patch.
Ajax/semantic/components/validation/Rule.php 1 patch
Spacing   +47 added lines, -47 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@  discard block
 block discarded – undo
5 5
  * @version 1.001
6 6
  * Generates a JSON Rule for the validation of a field
7 7
  */
8
-class Rule implements \JsonSerializable{
8
+class Rule implements \JsonSerializable {
9 9
 	/**
10 10
 	 * @var string
11 11
 	 */
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
 	 */
21 21
 	private $value;
22 22
 
23
-	public function __construct($type,$prompt=NULL,$value=NULL){
23
+	public function __construct($type, $prompt=NULL, $value=NULL) {
24 24
 		$this->type=$type;
25 25
 		$this->prompt=$prompt;
26 26
 		$this->value=$value;
@@ -54,10 +54,10 @@  discard block
 block discarded – undo
54 54
 	}
55 55
 
56 56
 	public function jsonSerialize() {
57
-		$result= ["type"=>$this->type];
58
-		if(isset($this->prompt))
57
+		$result=["type"=>$this->type];
58
+		if (isset($this->prompt))
59 59
 			$result["prompt"]=$this->prompt;
60
-		if(isset($this->value))
60
+		if (isset($this->value))
61 61
 			$result["value"]=$this->value;
62 62
 		return $result;
63 63
 	}
@@ -68,8 +68,8 @@  discard block
 block discarded – undo
68 68
 	 * @param string $prompt
69 69
 	 * @return \Ajax\semantic\components\validation\Rule
70 70
 	 */
71
-	public static function match($name,$prompt=NULL){
72
-		return new Rule("match[".$name."]",$prompt);
71
+	public static function match($name, $prompt=NULL) {
72
+		return new Rule("match[".$name."]", $prompt);
73 73
 	}
74 74
 
75 75
 	/**
@@ -78,8 +78,8 @@  discard block
 block discarded – undo
78 78
 	 * @param string $prompt
79 79
 	 * @return \Ajax\semantic\components\validation\Rule
80 80
 	 */
81
-	public static function different($name,$prompt=NULL){
82
-		return new Rule("different[".$name."]",$prompt);
81
+	public static function different($name, $prompt=NULL) {
82
+		return new Rule("different[".$name."]", $prompt);
83 83
 	}
84 84
 
85 85
 	/**
@@ -89,78 +89,78 @@  discard block
 block discarded – undo
89 89
 	 * @param string $prompt
90 90
 	 * @return \Ajax\semantic\components\validation\Rule
91 91
 	 */
92
-	public static function integer($min=NULL,$max=NULL,$prompt=NULL){
93
-		if(\is_int($min) && \is_int($max))
94
-			return new Rule("integer[{$min}..{$max}]",$prompt);
95
-		return new Rule("integer",$prompt);
92
+	public static function integer($min=NULL, $max=NULL, $prompt=NULL) {
93
+		if (\is_int($min) && \is_int($max))
94
+			return new Rule("integer[{$min}..{$max}]", $prompt);
95
+		return new Rule("integer", $prompt);
96 96
 	}
97 97
 
98
-	public static function decimal($prompt=NULL){
99
-		return new Rule("decimal",$prompt);
98
+	public static function decimal($prompt=NULL) {
99
+		return new Rule("decimal", $prompt);
100 100
 	}
101 101
 
102
-	public static function number($prompt=NULL){
103
-		return new Rule("number",$prompt);
102
+	public static function number($prompt=NULL) {
103
+		return new Rule("number", $prompt);
104 104
 	}
105 105
 
106
-	public static function is($value,$prompt=NULL){
107
-		return new Rule("is[".$value."]",$prompt);
106
+	public static function is($value, $prompt=NULL) {
107
+		return new Rule("is[".$value."]", $prompt);
108 108
 	}
109 109
 
110
-	public static function isExactly($value,$prompt=NULL){
111
-		return new Rule("isExactly[".$value."]",$prompt);
110
+	public static function isExactly($value, $prompt=NULL) {
111
+		return new Rule("isExactly[".$value."]", $prompt);
112 112
 	}
113 113
 
114
-	public static function not($value,$prompt=NULL){
115
-		return new Rule("not[".$value."]",$prompt);
114
+	public static function not($value, $prompt=NULL) {
115
+		return new Rule("not[".$value."]", $prompt);
116 116
 	}
117 117
 
118
-	public static function notExactly($value,$prompt=NULL){
119
-		return new Rule("notExactly[".$value."]",$prompt);
118
+	public static function notExactly($value, $prompt=NULL) {
119
+		return new Rule("notExactly[".$value."]", $prompt);
120 120
 	}
121 121
 
122
-	public static function contains($value,$prompt=NULL){
123
-		return new Rule("contains[".$value."]",$prompt);
122
+	public static function contains($value, $prompt=NULL) {
123
+		return new Rule("contains[".$value."]", $prompt);
124 124
 	}
125 125
 
126
-	public static function containsExactly($value,$prompt=NULL){
127
-		return new Rule("containsExactly[".$value."]",$prompt);
126
+	public static function containsExactly($value, $prompt=NULL) {
127
+		return new Rule("containsExactly[".$value."]", $prompt);
128 128
 	}
129 129
 
130
-	public static function doesntContain($value,$prompt=NULL){
131
-		return new Rule("doesntContain[".$value."]",$prompt);
130
+	public static function doesntContain($value, $prompt=NULL) {
131
+		return new Rule("doesntContain[".$value."]", $prompt);
132 132
 	}
133 133
 
134
-	public static function doesntContainExactly($value,$prompt=NULL){
135
-		return new Rule("doesntContainExactly[".$value."]",$prompt);
134
+	public static function doesntContainExactly($value, $prompt=NULL) {
135
+		return new Rule("doesntContainExactly[".$value."]", $prompt);
136 136
 	}
137 137
 
138
-	public static function minCount($value,$prompt=NULL){
139
-		return new Rule("minCount[".$value."]",$prompt);
138
+	public static function minCount($value, $prompt=NULL) {
139
+		return new Rule("minCount[".$value."]", $prompt);
140 140
 	}
141 141
 
142
-	public static function maxCount($value,$prompt=NULL){
143
-		return new Rule("maxCount[".$value."]",$prompt);
142
+	public static function maxCount($value, $prompt=NULL) {
143
+		return new Rule("maxCount[".$value."]", $prompt);
144 144
 	}
145 145
 
146
-	public static function exactCount($value,$prompt=NULL){
147
-		return new Rule("exactCount[".$value."]",$prompt);
146
+	public static function exactCount($value, $prompt=NULL) {
147
+		return new Rule("exactCount[".$value."]", $prompt);
148 148
 	}
149 149
 
150
-	public static function email($prompt=NULL){
151
-		return new Rule("email",$prompt);
150
+	public static function email($prompt=NULL) {
151
+		return new Rule("email", $prompt);
152 152
 	}
153 153
 
154
-	public static function url($prompt=NULL){
155
-		return new Rule("url",$prompt);
154
+	public static function url($prompt=NULL) {
155
+		return new Rule("url", $prompt);
156 156
 	}
157 157
 
158
-	public static function regExp($value,$prompt=NULL){
159
-		return new Rule("regExp",$prompt,$value);
158
+	public static function regExp($value, $prompt=NULL) {
159
+		return new Rule("regExp", $prompt, $value);
160 160
 	}
161 161
 
162
-	public static function custom($name,$jsFunction){
163
-		return "$.fn.form.settings.rules.".$name." =".$jsFunction ;
162
+	public static function custom($name, $jsFunction) {
163
+		return "$.fn.form.settings.rules.".$name." =".$jsFunction;
164 164
 	}
165 165
 
166 166
 }
167 167
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/traits/TextFieldsTrait.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -5,12 +5,12 @@
 block discarded – undo
5 5
 trait TextFieldsTrait {
6 6
 
7 7
 	public abstract function getField();
8
-	public function setPlaceholder($value){
8
+	public function setPlaceholder($value) {
9 9
 		$this->getField()->setPlaceholder($value);
10 10
 		return $this;
11 11
 	}
12 12
 
13
-	public function setValue($value){
13
+	public function setValue($value) {
14 14
 		$this->getField()->setValue($value);
15 15
 		return $this;
16 16
 	}
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/traits/FieldTrait.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -11,51 +11,51 @@
 block discarded – undo
11 11
 
12 12
 	public abstract function addToProperty($name, $value, $separator=" ");
13 13
 	public abstract function addLabel($caption, $style="label-default", $leftSeparator=" ");
14
-	public abstract function addContent($content,$before=false);
14
+	public abstract function addContent($content, $before=false);
15 15
 	public function setFocus() {
16 16
 		$this->addToProperty("class", State::FOCUS);
17 17
 	}
18 18
 
19 19
 	public function addLoading() {
20
-		if ($this->_hasIcon === false) {
20
+		if ($this->_hasIcon===false) {
21 21
 			throw new \Exception("Input must have an icon for showing a loader, use addIcon before");
22 22
 		}
23 23
 		return $this->addToProperty("class", State::LOADING);
24 24
 	}
25 25
 
26 26
 	public function labeled($label, $direction=Direction::LEFT, $icon=NULL) {
27
-		$labelO=$this->addLabel($label,$direction===Direction::LEFT,$icon);
28
-		$this->addToProperty("class", $direction . " labeled");
27
+		$labelO=$this->addLabel($label, $direction===Direction::LEFT, $icon);
28
+		$this->addToProperty("class", $direction." labeled");
29 29
 		return $labelO;
30 30
 	}
31 31
 
32 32
 	public function labeledToCorner($icon, $direction=Direction::LEFT) {
33
-		return $this->labeled("", $direction . " corner", $icon)->toCorner($direction);
33
+		return $this->labeled("", $direction." corner", $icon)->toCorner($direction);
34 34
 	}
35 35
 
36 36
 	public function addAction($action, $direction=Direction::RIGHT, $icon=NULL, $labeled=false) {
37 37
 		$actionO=$action;
38
-		if (\is_object($action) === false) {
39
-			$actionO=new HtmlButton("action-" . $this->identifier, $action);
38
+		if (\is_object($action)===false) {
39
+			$actionO=new HtmlButton("action-".$this->identifier, $action);
40 40
 			if (isset($icon))
41 41
 				$actionO->addIcon($icon, true, $labeled);
42 42
 		}
43
-		$this->addToProperty("class", $direction . " action");
44
-		$this->addContent($actionO, \strstr($direction, Direction::LEFT) !== false);
43
+		$this->addToProperty("class", $direction." action");
44
+		$this->addContent($actionO, \strstr($direction, Direction::LEFT)!==false);
45 45
 		return $actionO;
46 46
 	}
47 47
 
48
-	public function addDropdown($label="", $items=array(),$direction=Direction::RIGHT){
49
-		$labelO=new HtmlDropdown("dd-".$this->identifier,$label,$items);
50
-		$labelO->asSelect("select-".$this->identifier,false,true);
51
-		return $this->labeled($labelO,$direction);
48
+	public function addDropdown($label="", $items=array(), $direction=Direction::RIGHT) {
49
+		$labelO=new HtmlDropdown("dd-".$this->identifier, $label, $items);
50
+		$labelO->asSelect("select-".$this->identifier, false, true);
51
+		return $this->labeled($labelO, $direction);
52 52
 	}
53 53
 
54 54
 	public function setTransparent() {
55 55
 		return $this->addToProperty("class", "transparent");
56 56
 	}
57 57
 
58
-	public function setReadonly(){
58
+	public function setReadonly() {
59 59
 		$this->getField()->setProperty("readonly", "");
60 60
 	}
61 61
 
Please login to merge, or discard this patch.
Ajax/semantic/html/elements/HtmlInput.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -9,13 +9,13 @@
 block discarded – undo
9 9
 use Ajax\semantic\html\collections\form\traits\FieldTrait;
10 10
 
11 11
 class HtmlInput extends HtmlSemDoubleElement {
12
-	use IconTrait,TextFieldsTrait,FieldTrait;
12
+	use IconTrait, TextFieldsTrait, FieldTrait;
13 13
 
14 14
 	public function __construct($identifier, $type="text", $value="", $placeholder="") {
15
-		parent::__construct("div-" . $identifier, "div", "ui input");
16
-		$this->content=[ "field" => new \Ajax\common\html\html5\HtmlInput($identifier, $type, $value, $placeholder) ];
17
-		$this->_states=[ State::DISABLED,State::FOCUS,State::ERROR ];
18
-		$this->_variations=[ Variation::TRANSPARENT ];
15
+		parent::__construct("div-".$identifier, "div", "ui input");
16
+		$this->content=["field" => new \Ajax\common\html\html5\HtmlInput($identifier, $type, $value, $placeholder)];
17
+		$this->_states=[State::DISABLED, State::FOCUS, State::ERROR];
18
+		$this->_variations=[Variation::TRANSPARENT];
19 19
 	}
20 20
 
21 21
 	public function getField() {
Please login to merge, or discard this patch.