Completed
Push — master ( f4e97d...0ed595 )
by Jean-Christophe
03:13
created
Ajax/semantic/html/collections/form/HtmlFormInput.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -8,16 +8,16 @@
 block discarded – undo
8 8
 class HtmlFormInput extends HtmlFormField {
9 9
 	use TextFieldsTrait;
10 10
 
11
-	public function __construct($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL) {
12
-		if(!isset($placeholder) && $type==="text")
11
+	public function __construct($identifier, $label=NULL, $type="text", $value=NULL, $placeholder=NULL) {
12
+		if (!isset($placeholder) && $type==="text")
13 13
 			$placeholder=$label;
14
-		parent::__construct("field-".$identifier, new HtmlInput($identifier,$type,$value,$placeholder), $label);
14
+		parent::__construct("field-".$identifier, new HtmlInput($identifier, $type, $value, $placeholder), $label);
15 15
 	}
16 16
 
17
-	public function getDataField(){
18
-		$field= $this->getField();
17
+	public function getDataField() {
18
+		$field=$this->getField();
19 19
 		//TODO check getField
20
-		if($field instanceof HtmlInput)
20
+		if ($field instanceof HtmlInput)
21 21
 			$field=$field->getDataField();
22 22
 		return $field;
23 23
 	}
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/HtmlFormTextarea.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -9,17 +9,17 @@  discard block
 block discarded – undo
9 9
 class HtmlFormTextarea extends HtmlFormField {
10 10
 	use TextFieldsTrait;
11 11
 
12
-	public function __construct($identifier, $label=NULL,$value=NULL,$placeholder=NULL,$rows=NULL) {
13
-		if(!isset($placeholder))
12
+	public function __construct($identifier, $label=NULL, $value=NULL, $placeholder=NULL, $rows=NULL) {
13
+		if (!isset($placeholder))
14 14
 			$placeholder=$label;
15
-		parent::__construct("field-".$identifier, new HtmlTextarea($identifier,$value,$placeholder,$rows), $label);
15
+		parent::__construct("field-".$identifier, new HtmlTextarea($identifier, $value, $placeholder, $rows), $label);
16 16
 	}
17 17
 
18 18
 	/**
19 19
 	 * Defines the textarea row count
20 20
 	 * @param int $count
21 21
 	 */
22
-	public function setRows($count){
22
+	public function setRows($count) {
23 23
 		$this->getField()->setRows($count);
24 24
 	}
25 25
 
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 		return $this->content["field"];
28 28
 	}
29 29
 
30
-	public function setName($name){
31
-		$this->getDataField()->setProperty("name",$name);
30
+	public function setName($name) {
31
+		$this->getDataField()->setProperty("name", $name);
32 32
 	}
33 33
 }
34 34
\ 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   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -6,19 +6,19 @@
 block discarded – undo
6 6
 
7 7
 	abstract public function getDataField();
8 8
 	abstract public function addToProperty($name, $value, $separator=" ");
9
-	public function setPlaceholder($value){
9
+	public function setPlaceholder($value) {
10 10
 		$this->getDataField()->setPlaceholder($value);
11 11
 		return $this;
12 12
 	}
13 13
 
14
-	public function setValue($value){
14
+	public function setValue($value) {
15 15
 		$this->getDataField()->setValue($value);
16 16
 		return $this;
17 17
 	}
18 18
 
19
-	public function setInputType($type){
20
-		if($type==="hidden")
21
-			$this->addToProperty("style","display:none;");
19
+	public function setInputType($type) {
20
+		if ($type==="hidden")
21
+			$this->addToProperty("style", "display:none;");
22 22
 		$this->getDataField()->setInputType($type);
23 23
 		return $this;
24 24
 	}
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/traits/FieldTrait.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -11,14 +11,14 @@  discard block
 block discarded – undo
11 11
 
12 12
 	abstract public function addToProperty($name, $value, $separator=" ");
13 13
 	abstract public function addLabel($caption, $style="label-default", $leftSeparator=" ");
14
-	abstract public function addContent($content,$before=false);
14
+	abstract public function addContent($content, $before=false);
15 15
 	abstract public function getField();
16 16
 	public function setFocus() {
17 17
 		$this->getField()->addToProperty("class", State::FOCUS);
18 18
 	}
19 19
 
20 20
 	public function addLoading() {
21
-		if ($this->_hasIcon === false) {
21
+		if ($this->_hasIcon===false) {
22 22
 			throw new \Exception("Input must have an icon for showing a loader, use addIcon before");
23 23
 		}
24 24
 		return $this->addToProperty("class", State::LOADING);
@@ -26,44 +26,44 @@  discard block
 block discarded – undo
26 26
 
27 27
 	public function labeled($label, $direction=Direction::LEFT, $icon=NULL) {
28 28
 		$field=$this->getField();
29
-		$labelO=$field->addLabel($label,$direction===Direction::LEFT,$icon);
30
-		$field->addToProperty("class", $direction . " labeled");
29
+		$labelO=$field->addLabel($label, $direction===Direction::LEFT, $icon);
30
+		$field->addToProperty("class", $direction." labeled");
31 31
 		return $labelO;
32 32
 	}
33 33
 
34 34
 	public function labeledToCorner($icon, $direction=Direction::LEFT) {
35
-		return $this->labeled("", $direction . " corner", $icon)->toCorner($direction);
35
+		return $this->labeled("", $direction." corner", $icon)->toCorner($direction);
36 36
 	}
37 37
 
38 38
 	public function addAction($action, $direction=Direction::RIGHT, $icon=NULL, $labeled=false) {
39 39
 		$field=$this->getField();
40 40
 		$actionO=$action;
41
-		if (\is_object($action) === false) {
42
-			$actionO=new HtmlButton("action-" . $this->identifier, $action);
41
+		if (\is_object($action)===false) {
42
+			$actionO=new HtmlButton("action-".$this->identifier, $action);
43 43
 			if (isset($icon))
44 44
 				$actionO->addIcon($icon, true, $labeled);
45 45
 		}
46
-		$field->addToProperty("class", $direction . " action");
47
-		$field->addContent($actionO, \strstr($direction, Direction::LEFT) !== false);
46
+		$field->addToProperty("class", $direction." action");
47
+		$field->addContent($actionO, \strstr($direction, Direction::LEFT)!==false);
48 48
 		return $actionO;
49 49
 	}
50 50
 
51
-	public function addDropdown($label="", $items=array(),$direction=Direction::RIGHT){
52
-		$labelO=new HtmlDropdown("dd-".$this->identifier,$label,$items);
53
-		$labelO->asSelect("select-".$this->identifier,false,true);
54
-		return $this->labeled($labelO,$direction);
51
+	public function addDropdown($label="", $items=array(), $direction=Direction::RIGHT) {
52
+		$labelO=new HtmlDropdown("dd-".$this->identifier, $label, $items);
53
+		$labelO->asSelect("select-".$this->identifier, false, true);
54
+		return $this->labeled($labelO, $direction);
55 55
 	}
56 56
 
57 57
 	public function setTransparent() {
58 58
 		return $this->getField()->addToProperty("class", "transparent");
59 59
 	}
60 60
 
61
-	public function setReadonly(){
61
+	public function setReadonly() {
62 62
 		$this->getDataField()->setProperty("readonly", "");
63 63
 	}
64 64
 
65
-	public function setName($name){
66
-		$this->getDataField()->setProperty("name",$name);
65
+	public function setName($name) {
66
+		$this->getDataField()->setProperty("name", $name);
67 67
 	}
68 68
 
69 69
 }
70 70
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/HtmlMessage.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -31,38 +31,38 @@  discard block
 block discarded – undo
31 31
 	 * @param string|HtmlSemDoubleElement $header
32 32
 	 * @return \Ajax\semantic\html\collections\HtmlMessage
33 33
 	 */
34
-	public function addHeader($header){
34
+	public function addHeader($header) {
35 35
 		$headerO=$header;
36
-		if(\is_string($header)){
37
-			$headerO=new HtmlSemDoubleElement("header-".$this->identifier,"div");
36
+		if (\is_string($header)) {
37
+			$headerO=new HtmlSemDoubleElement("header-".$this->identifier, "div");
38 38
 			$headerO->setClass("header");
39 39
 			$headerO->setContent($header);
40 40
 		}
41
-		return $this->addContent($headerO,true);
41
+		return $this->addContent($headerO, true);
42 42
 	}
43 43
 
44
-	public function addList($elements,$ordered=false){
45
-		$list=new HtmlList("list-".$this->identifier,$elements);
44
+	public function addList($elements, $ordered=false) {
45
+		$list=new HtmlList("list-".$this->identifier, $elements);
46 46
 		$list->setOrdered($ordered);
47 47
 		$list->setClass("ui list");
48 48
 		$this->addContent($list);
49 49
 	}
50 50
 
51
-	public function setIcon($icon){
51
+	public function setIcon($icon) {
52 52
 		$this->addToProperty("class", "icon");
53
-		$this->wrapContent("<div class='content'>","</div>");
53
+		$this->wrapContent("<div class='content'>", "</div>");
54 54
 		$this->icon=new HtmlIcon("icon-".$this->identifier, $icon);
55 55
 		return $this;
56 56
 	}
57 57
 
58
-	public function addLoader($loaderIcon="notched circle"){
58
+	public function addLoader($loaderIcon="notched circle") {
59 59
 		$this->setIcon($loaderIcon);
60 60
 		$this->icon->addToIcon("loading");
61 61
 		return $this;
62 62
 	}
63 63
 
64
-	public function setDismissable($dismiss=true){
65
-		if($dismiss===true)
64
+	public function setDismissable($dismiss=true) {
65
+		if ($dismiss===true)
66 66
 			$this->close=new HtmlIcon("close-".$this->identifier, "close");
67 67
 		else
68 68
 			$this->close=NULL;
@@ -73,34 +73,34 @@  discard block
 block discarded – undo
73 73
 	 * {@inheritDoc}
74 74
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::run()
75 75
 	 */
76
-	public function run(JsUtils $js){
76
+	public function run(JsUtils $js) {
77 77
 		parent::run($js);
78
-		if(isset($this->close)){
78
+		if (isset($this->close)) {
79 79
 			$js->execOn("click", "#".$this->identifier." .close", "$(this).closest('.message').transition('fade')");
80 80
 		}
81 81
 	}
82 82
 
83
-	public function setState($visible=true){
84
-		$visible=($visible===true)?"visible":"hidden";
85
-		return $this->addToPropertyCtrl("class", $visible, array("visible","hidden"));
83
+	public function setState($visible=true) {
84
+		$visible=($visible===true) ? "visible" : "hidden";
85
+		return $this->addToPropertyCtrl("class", $visible, array("visible", "hidden"));
86 86
 	}
87 87
 
88
-	public function setVariation($value="floating"){
89
-		return $this->addToPropertyCtrl("class", $value, array("floating","compact"));
88
+	public function setVariation($value="floating") {
89
+		return $this->addToPropertyCtrl("class", $value, array("floating", "compact"));
90 90
 	}
91 91
 
92
-	public function setStyle($style){
92
+	public function setStyle($style) {
93 93
 		return $this->addToPropertyCtrl("class", $style, Style::getConstants());
94 94
 	}
95 95
 
96
-	public function setError(){
96
+	public function setError() {
97 97
 		return $this->setStyle("error");
98 98
 	}
99 99
 
100
-	public function setMessage($message){
101
-		if(\is_array($this->content)){
100
+	public function setMessage($message) {
101
+		if (\is_array($this->content)) {
102 102
 			$this->content[\sizeof($this->content)-1]=$message;
103
-		}else
103
+		} else
104 104
 			$this->setContent($message);
105 105
 	}
106 106
 }
107 107
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/widgets/dataform/DataForm.php 1 patch
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -17,48 +17,48 @@  discard block
 block discarded – undo
17 17
  * @since 2.2
18 18
  */
19 19
 class DataForm extends Widget {
20
-	use FormFieldAsTrait,FormTrait;
20
+	use FormFieldAsTrait, FormTrait;
21 21
 
22 22
 	public function __construct($identifier, $modelInstance=NULL) {
23
-		parent::__construct($identifier, null,$modelInstance);
23
+		parent::__construct($identifier, null, $modelInstance);
24 24
 		$this->_instanceViewer=new FormInstanceViewer();
25 25
 		$this->content=["form"=>new HtmlForm($identifier)];
26 26
 		$this->_toolbarPosition=PositionInTable::BEFORETABLE;
27 27
 	}
28 28
 
29
-	public function compile(JsUtils $js=NULL,&$view=NULL){
29
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
30 30
 		$this->_instanceViewer->setInstance($this->_modelInstance);
31 31
 
32 32
 		$form=$this->content["form"];
33 33
 		$this->_generateContent($form);
34 34
 
35
-		if(isset($this->_toolbar)){
35
+		if (isset($this->_toolbar)) {
36 36
 			$this->_setToolbarPosition($form);
37 37
 		}
38
-		$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"form",PositionInTable::AFTERTABLE]);
39
-		return parent::compile($js,$view);
38
+		$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "form", PositionInTable::AFTERTABLE]);
39
+		return parent::compile($js, $view);
40 40
 	}
41 41
 
42 42
 	/**
43 43
 	 * @param HtmlForm $form
44 44
 	 */
45
-	protected function _generateContent($form){
46
-		$values= $this->_instanceViewer->getValues();
45
+	protected function _generateContent($form) {
46
+		$values=$this->_instanceViewer->getValues();
47 47
 		$count=$this->_instanceViewer->count();
48 48
 
49 49
 		$separators=$this->_instanceViewer->getSeparators();
50 50
 		$size=\sizeof($separators);
51
-		if($size===1){
52
-			foreach ($values as $v){
51
+		if ($size===1) {
52
+			foreach ($values as $v) {
53 53
 				$form->addField($v);
54 54
 			}
55
-		}else{
55
+		} else {
56 56
 			$separators[]=$count;
57
-			for($i=0;$i<$size;$i++){
58
-				$fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]);
59
-				if(\sizeof($fields)===1){
57
+			for ($i=0; $i<$size; $i++) {
58
+				$fields=\array_slice($values, $separators[$i]+1, $separators[$i+1]-$separators[$i]);
59
+				if (\sizeof($fields)===1) {
60 60
 					$form->addField($fields[0]);
61
-				}else
61
+				} else
62 62
 					$form->addFields($fields);
63 63
 			}
64 64
 		}
@@ -67,11 +67,11 @@  discard block
 block discarded – undo
67 67
 	/**
68 68
 	 * @return HtmlForm
69 69
 	 */
70
-	protected function getForm(){
70
+	protected function getForm() {
71 71
 		return $this->content["form"];
72 72
 	}
73 73
 
74
-	public function addSeparatorAfter($fieldNum){
74
+	public function addSeparatorAfter($fieldNum) {
75 75
 		$this->_instanceViewer->addSeparatorAfter($fieldNum);
76 76
 		return $this;
77 77
 	}
@@ -85,26 +85,26 @@  discard block
 block discarded – undo
85 85
 		return $this;
86 86
 	}
87 87
 
88
-	public function addSubmitInToolbar($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL){
89
-		$button=new HtmlButton($identifier,$value,$cssStyle);
90
-		$this->_buttonAsSubmit($button,"click",$url,$responseElement);
88
+	public function addSubmitInToolbar($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL) {
89
+		$button=new HtmlButton($identifier, $value, $cssStyle);
90
+		$this->_buttonAsSubmit($button, "click", $url, $responseElement);
91 91
 		return $this->addInToolbar($button);
92 92
 	}
93 93
 
94
-	public function fieldAsSubmit($index,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$attributes=NULL){
95
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle){
96
-			$button=new HtmlButton($id,$value,$cssStyle);
97
-			$this->_buttonAsSubmit($button,"click",$url,$responseElement);
94
+	public function fieldAsSubmit($index, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $attributes=NULL) {
95
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($url, $responseElement, $cssStyle){
96
+			$button=new HtmlButton($id, $value, $cssStyle);
97
+			$this->_buttonAsSubmit($button, "click", $url, $responseElement);
98 98
 			return $button;
99
-		}, $index,$attributes);
99
+		}, $index, $attributes);
100 100
 	}
101 101
 
102
-	public function fieldAsReset($index,$cssStyle=NULL,$attributes=NULL){
103
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($cssStyle){
104
-			$button=new HtmlButton($id,$value,$cssStyle);
102
+	public function fieldAsReset($index, $cssStyle=NULL, $attributes=NULL) {
103
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($cssStyle){
104
+			$button=new HtmlButton($id, $value, $cssStyle);
105 105
 			$button->setProperty("type", "reset");
106 106
 			return $button;
107
-		}, $index,$attributes);
107
+		}, $index, $attributes);
108 108
 	}
109 109
 
110 110
 	/**
Please login to merge, or discard this patch.
Ajax/semantic/widgets/dataform/FormInstanceViewer.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -9,42 +9,42 @@
 block discarded – undo
9 9
 class FormInstanceViewer extends InstanceViewer {
10 10
 	protected $separators;
11 11
 
12
-	public function __construct($identifier,$instance=NULL, $captions=NULL) {
13
-		parent::__construct($identifier,$instance=NULL, $captions=NULL);
12
+	public function __construct($identifier, $instance=NULL, $captions=NULL) {
13
+		parent::__construct($identifier, $instance=NULL, $captions=NULL);
14 14
 		$this->separators=[-1];
15 15
 	}
16 16
 
17
-	protected function _beforeAddProperty($index,&$field){
18
-		if(JString::endswith($field, "\n")===true){
17
+	protected function _beforeAddProperty($index, &$field) {
18
+		if (JString::endswith($field, "\n")===true) {
19 19
 			$this->addSeparatorAfter($index);
20 20
 		}
21
-		if($index>1 && JString::startswith($field, "\n")===true){
21
+		if ($index>1 && JString::startswith($field, "\n")===true) {
22 22
 			$this->addSeparatorAfter($index-1);
23 23
 		}
24 24
 		$field=\str_replace("\n", "", $field);
25 25
 	}
26 26
 
27
-	protected function _getDefaultValue($name,$value,$index){
27
+	protected function _getDefaultValue($name, $value, $index) {
28 28
 		$caption=$this->getCaption($index);
29
-		$input=new HtmlFormInput($this->widgetIdentifier."-".$name,$caption,"text",$value);
29
+		$input=new HtmlFormInput($this->widgetIdentifier."-".$name, $caption, "text", $value);
30 30
 		$input->setName($name);
31 31
 		return $input;
32 32
 	}
33 33
 
34
-	public function getFieldName($index){
34
+	public function getFieldName($index) {
35 35
 		$property=$this->getProperty($index);
36
-		if($property instanceof \ReflectionProperty){
36
+		if ($property instanceof \ReflectionProperty) {
37 37
 			$result=$property->getName();
38
-		}elseif(\is_callable($property)){
38
+		}elseif (\is_callable($property)) {
39 39
 			$result=$this->visibleProperties[$index];
40
-		}else{
40
+		} else {
41 41
 			$result=$property;
42 42
 		}
43 43
 		return $result;
44 44
 	}
45 45
 
46
-	public function addSeparatorAfter($fieldNum){
47
-		if(\array_search($fieldNum, $this->separators)===false)
46
+	public function addSeparatorAfter($fieldNum) {
47
+		if (\array_search($fieldNum, $this->separators)===false)
48 48
 			$this->separators[]=$fieldNum;
49 49
 			return $this;
50 50
 	}
Please login to merge, or discard this patch.
Ajax/semantic/widgets/dataform/FormFieldAsTrait.php 1 patch
Spacing   +44 added lines, -44 removed lines patch added patch discarded remove patch
@@ -16,13 +16,13 @@  discard block
 block discarded – undo
16 16
  * @property object $_modelInstance;
17 17
  */
18 18
 
19
-trait FormFieldAsTrait{
19
+trait FormFieldAsTrait {
20 20
 
21 21
 	abstract protected function _getFieldIdentifier($prefix);
22
-	abstract public function setValueFunction($index,$callback);
22
+	abstract public function setValueFunction($index, $callback);
23 23
 
24
-	private function _getLabelField($caption,$icon=NULL){
25
-		$label=new HtmlLabel($this->_getFieldIdentifier("lbl"),$caption,$icon);
24
+	private function _getLabelField($caption, $icon=NULL) {
25
+		$label=new HtmlLabel($this->_getFieldIdentifier("lbl"), $caption, $icon);
26 26
 		return $label;
27 27
 	}
28 28
 
@@ -30,22 +30,22 @@  discard block
 block discarded – undo
30 30
 	 * @param HtmlFormField $element
31 31
 	 * @param array $attributes
32 32
 	 */
33
-	protected function _applyAttributes($element,&$attributes,$index){
33
+	protected function _applyAttributes($element, &$attributes, $index) {
34 34
 		$this->_addRules($element, $attributes);
35
-		if(isset($attributes["callback"])){
35
+		if (isset($attributes["callback"])) {
36 36
 			$callback=$attributes["callback"];
37
-			if(\is_callable($callback)){
38
-				$callback($element,$this->_modelInstance,$index);
37
+			if (\is_callable($callback)) {
38
+				$callback($element, $this->_modelInstance, $index);
39 39
 				unset($attributes["callback"]);
40 40
 			}
41 41
 		}
42 42
 		$element->fromArray($attributes);
43 43
 	}
44 44
 
45
-	protected function _addRules($element,&$attributes){
46
-		if(isset($attributes["rules"])){
45
+	protected function _addRules($element, &$attributes) {
46
+		if (isset($attributes["rules"])) {
47 47
 			$rules=$attributes["rules"];
48
-			if(\is_array($rules)){
48
+			if (\is_array($rules)) {
49 49
 				$element->addRules($rules);
50 50
 			}
51 51
 			else
@@ -54,13 +54,13 @@  discard block
 block discarded – undo
54 54
 		}
55 55
 	}
56 56
 
57
-	protected function _fieldAs($elementCallback,$index,$attributes=NULL,$identifier=null){
58
-		$this->setValueFunction($index,function($value) use ($index,&$attributes,$elementCallback){
57
+	protected function _fieldAs($elementCallback, $index, $attributes=NULL, $identifier=null) {
58
+		$this->setValueFunction($index, function($value) use ($index, &$attributes, $elementCallback){
59 59
 			$caption=$this->_instanceViewer->getCaption($index);
60 60
 			$name=$this->_instanceViewer->getFieldName($index);
61
-			$element=$elementCallback($this->getIdentifier()."-".$name,$name,$value,$caption);
62
-			if(\is_array($attributes)){
63
-				$this->_applyAttributes($element, $attributes,$index);
61
+			$element=$elementCallback($this->getIdentifier()."-".$name, $name, $value, $caption);
62
+			if (\is_array($attributes)) {
63
+				$this->_applyAttributes($element, $attributes, $index);
64 64
 			}
65 65
 			return $element;
66 66
 		});
@@ -68,53 +68,53 @@  discard block
 block discarded – undo
68 68
 	}
69 69
 
70 70
 
71
-	public function fieldAsRadio($index,$attributes=NULL){
72
-		return $this->_fieldAs(function($id,$name,$value,$caption){
73
-			return new HtmlFormRadio($id,$name,$caption,$value);
74
-		}, $index,$attributes);
71
+	public function fieldAsRadio($index, $attributes=NULL) {
72
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
73
+			return new HtmlFormRadio($id, $name, $caption, $value);
74
+		}, $index, $attributes);
75 75
 	}
76 76
 
77
-	public function fieldAsRadios($index,$elements=[],$attributes=NULL){
78
-		return $this->_fieldAs(function($id,$name,$value,$caption,$elements){
79
-			return HtmlFormFields::radios($name,$elements,$caption,$value);
80
-		}, $index,$attributes);
77
+	public function fieldAsRadios($index, $elements=[], $attributes=NULL) {
78
+		return $this->_fieldAs(function($id, $name, $value, $caption, $elements) {
79
+			return HtmlFormFields::radios($name, $elements, $caption, $value);
80
+		}, $index, $attributes);
81 81
 	}
82 82
 
83
-	public function fieldAsTextarea($index,$attributes=NULL){
84
-		return $this->_fieldAs(function($id,$name,$value,$caption){
85
-			$textarea=new HtmlFormTextarea($id,$caption,$value);
83
+	public function fieldAsTextarea($index, $attributes=NULL) {
84
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
85
+			$textarea=new HtmlFormTextarea($id, $caption, $value);
86 86
 			$textarea->setName($name);
87 87
 			return $textarea;
88
-		}, $index,$attributes);
88
+		}, $index, $attributes);
89 89
 	}
90 90
 
91
-	public function fieldAsInput($index,$attributes=NULL){
92
-		return $this->_fieldAs(function($id,$name,$value,$caption){
93
-			$input= new HtmlFormInput($id,$caption,"text",$value);
91
+	public function fieldAsInput($index, $attributes=NULL) {
92
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
93
+			$input=new HtmlFormInput($id, $caption, "text", $value);
94 94
 			$input->setName($name);
95 95
 			return $input;
96
-		}, $index,$attributes);
96
+		}, $index, $attributes);
97 97
 	}
98 98
 
99
-	public function fieldAsCheckbox($index,$attributes=NULL){
100
-		return $this->_fieldAs(function($id,$name,$value,$caption){
101
-			return new HtmlFormCheckbox($id,$caption,$value);
102
-		}, $index,$attributes);
99
+	public function fieldAsCheckbox($index, $attributes=NULL) {
100
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
101
+			return new HtmlFormCheckbox($id, $caption, $value);
102
+		}, $index, $attributes);
103 103
 	}
104 104
 
105
-	public function fieldAsDropDown($index,$elements=[],$multiple=false,$attributes=NULL){
106
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($elements,$multiple){
107
-			$dd=new HtmlFormDropdown($id,$elements,$caption,$value,$multiple);
105
+	public function fieldAsDropDown($index, $elements=[], $multiple=false, $attributes=NULL) {
106
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($elements, $multiple){
107
+			$dd=new HtmlFormDropdown($id, $elements, $caption, $value, $multiple);
108 108
 			$dd->setName($name);
109 109
 			return $dd;
110
-		}, $index,$attributes);
110
+		}, $index, $attributes);
111 111
 	}
112 112
 
113
-	public function fieldAsMessage($index,$attributes=NULL){
114
-		return $this->_fieldAs(function($id,$name,$value,$caption){
115
-			$mess= new HtmlMessage("message-".$id,$value);
113
+	public function fieldAsMessage($index, $attributes=NULL) {
114
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
115
+			$mess=new HtmlMessage("message-".$id, $value);
116 116
 			$mess->addHeader($caption);
117 117
 			return $mess;
118
-		}, $index,$attributes,"message");
118
+		}, $index, $attributes, "message");
119 119
 	}
120 120
 }
121 121
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/widgets/base/InstanceViewer.php 1 patch
Spacing   +72 added lines, -72 removed lines patch added patch discarded remove patch
@@ -16,146 +16,146 @@  discard block
 block discarded – undo
16 16
 
17 17
 	public static $index=0;
18 18
 
19
-	public function __construct($identifier,$instance=NULL,$captions=NULL){
19
+	public function __construct($identifier, $instance=NULL, $captions=NULL) {
20 20
 		$this->widgetIdentifier=$identifier;
21 21
 		$this->values=[];
22 22
 		$this->afterCompile=[];
23
-		if(isset($instance))
23
+		if (isset($instance))
24 24
 			$this->setInstance($instance);
25 25
 		$this->setCaptions($captions);
26 26
 		$this->captionCallback=NULL;
27 27
 	}
28 28
 
29
-	public function getValues(){
29
+	public function getValues() {
30 30
 		$values=[];
31 31
 		$index=0;
32 32
 		$count=$this->count();
33
-		while($index<$count){
33
+		while ($index<$count) {
34 34
 			$values[]=$this->getValue($index++);
35 35
 		}
36 36
 		return $values;
37 37
 	}
38 38
 
39
-	public function getIdentifier(){
39
+	public function getIdentifier() {
40 40
 		$value=self::$index;
41
-		if(isset($this->values["identifier"]))
42
-			$value=$this->values["identifier"](self::$index,$this->instance);
41
+		if (isset($this->values["identifier"]))
42
+			$value=$this->values["identifier"](self::$index, $this->instance);
43 43
 		return $value;
44 44
 	}
45 45
 
46
-	public function getValue($index){
46
+	public function getValue($index) {
47 47
 		$property=$this->properties[$index];
48 48
 		return $this->_getValue($property, $index);
49 49
 	}
50 50
 
51
-	protected function _beforeAddProperty($index,&$field){
51
+	protected function _beforeAddProperty($index, &$field) {
52 52
 
53 53
 	}
54 54
 
55
-	protected function _getDefaultValue($name,$value,$index){
55
+	protected function _getDefaultValue($name, $value, $index) {
56 56
 		return $value;
57 57
 	}
58 58
 
59
-	protected function _getValue($property,$index){
60
-		if($property instanceof \ReflectionProperty){
59
+	protected function _getValue($property, $index) {
60
+		if ($property instanceof \ReflectionProperty) {
61 61
 			$property->setAccessible(true);
62 62
 			$value=$property->getValue($this->instance);
63
-			if(isset($this->values[$index])){
64
-				$value= $this->values[$index]($value,$this->instance,$index);
65
-			}else{
66
-				$value=$this->_getDefaultValue($property->getName(),$value, $index);
63
+			if (isset($this->values[$index])) {
64
+				$value=$this->values[$index]($value, $this->instance, $index);
65
+			} else {
66
+				$value=$this->_getDefaultValue($property->getName(), $value, $index);
67 67
 			}
68
-		}else{
69
-			if(\is_callable($property))
68
+		} else {
69
+			if (\is_callable($property))
70 70
 				$value=$property($this->instance);
71
-			elseif(\is_array($property)){
72
-				$values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property);
71
+			elseif (\is_array($property)) {
72
+				$values=\array_map(function($v) use ($index){return $this->_getValue($v, $index); }, $property);
73 73
 				$value=\implode("", $values);
74
-			}else{
75
-				if(isset($this->values[$index])){
76
-					$value= $this->values[$index]($property,$this->instance,$index);
77
-				}else{
74
+			} else {
75
+				if (isset($this->values[$index])) {
76
+					$value=$this->values[$index]($property, $this->instance, $index);
77
+				} else {
78 78
 					$value=$property;
79 79
 				}
80 80
 			}
81 81
 		}
82
-		if(isset($this->afterCompile[$index])){
83
-			if(\is_callable($this->afterCompile[$index])){
84
-				$this->afterCompile[$index]($value,$this->instance,$index);
82
+		if (isset($this->afterCompile[$index])) {
83
+			if (\is_callable($this->afterCompile[$index])) {
84
+				$this->afterCompile[$index]($value, $this->instance, $index);
85 85
 			}
86 86
 		}
87 87
 		return $value;
88 88
 	}
89 89
 
90
-	public function insertField($index,$field){
91
-		array_splice( $this->visibleProperties, $index, 0, $field );
90
+	public function insertField($index, $field) {
91
+		array_splice($this->visibleProperties, $index, 0, $field);
92 92
 		return $this;
93 93
 	}
94 94
 
95
-	public function insertInField($index,$field){
95
+	public function insertInField($index, $field) {
96 96
 		$vb=$this->visibleProperties;
97
-		if(isset($vb[$index])){
98
-			if(\is_array($vb[$index])){
97
+		if (isset($vb[$index])) {
98
+			if (\is_array($vb[$index])) {
99 99
 				$this->visibleProperties[$index][]=$field;
100
-			}else{
101
-				$this->visibleProperties[$index]=[$vb[$index],$field];
100
+			} else {
101
+				$this->visibleProperties[$index]=[$vb[$index], $field];
102 102
 			}
103
-		}else{
103
+		} else {
104 104
 			return $this->insertField($index, $field);
105 105
 		}
106 106
 		return $this;
107 107
 	}
108 108
 
109
-	public function addField($field){
109
+	public function addField($field) {
110 110
 		$this->visibleProperties[]=$field;
111 111
 		return $this;
112 112
 	}
113 113
 
114
-	public function count(){
114
+	public function count() {
115 115
 		return \sizeof($this->properties);
116 116
 	}
117 117
 
118
-	public function visiblePropertiesCount(){
118
+	public function visiblePropertiesCount() {
119 119
 		return \sizeof($this->visibleProperties);
120 120
 	}
121 121
 
122
-	public function getProperty($index){
122
+	public function getProperty($index) {
123 123
 		return $this->properties[$index];
124 124
 	}
125 125
 
126
-	protected function showableProperty(\ReflectionProperty $rProperty){
127
-		return JString::startswith($rProperty->getName(),"_")===false;
126
+	protected function showableProperty(\ReflectionProperty $rProperty) {
127
+		return JString::startswith($rProperty->getName(), "_")===false;
128 128
 	}
129 129
 
130 130
 	public function setInstance($instance) {
131
-		if(\is_string($instance)){
131
+		if (\is_string($instance)) {
132 132
 			$instance=new $instance();
133 133
 		}
134 134
 		$this->instance=$instance;
135 135
 		$this->properties=[];
136 136
 		$this->reflect=new \ReflectionClass($instance);
137
-		if(\sizeof($this->visibleProperties)===0){
137
+		if (\sizeof($this->visibleProperties)===0) {
138 138
 			$this->properties=$this->getDefaultProperties();
139
-		}else{
140
-			foreach ($this->visibleProperties as $property){
141
-				if(\is_callable($property)){
139
+		} else {
140
+			foreach ($this->visibleProperties as $property) {
141
+				if (\is_callable($property)) {
142 142
 					$this->properties[]=$property;
143
-				}elseif(\is_string($property)){
144
-					try{
143
+				}elseif (\is_string($property)) {
144
+					try {
145 145
 						$this->_beforeAddProperty(\sizeof($this->properties), $property);
146 146
 						$rProperty=$this->reflect->getProperty($property);
147 147
 						$this->properties[]=$rProperty;
148
-					}catch(\Exception $e){
148
+					}catch (\Exception $e) {
149 149
 						$this->_beforeAddProperty(\sizeof($this->properties), $property);
150 150
 						$this->properties[]=$property;
151 151
 					}
152
-				}elseif(\is_int($property)){
152
+				}elseif (\is_int($property)) {
153 153
 					$props=$this->getDefaultProperties();
154
-					if(isset($props[$property]))
154
+					if (isset($props[$property]))
155 155
 						$this->properties[]=$props[$property];
156 156
 					else
157 157
 						$this->properties[]=$property;
158
-				}else{
158
+				} else {
159 159
 					$this->properties[]=$property;
160 160
 				}
161 161
 			}
@@ -163,12 +163,12 @@  discard block
 block discarded – undo
163 163
 		return $this;
164 164
 	}
165 165
 
166
-	protected function getDefaultProperties(){
166
+	protected function getDefaultProperties() {
167 167
 		$result=[];
168 168
 		$properties=$this->reflect->getProperties();
169
-		foreach ($properties as $property){
169
+		foreach ($properties as $property) {
170 170
 			$showable=$this->showableProperty($property);
171
-			if($showable!==false){
171
+			if ($showable!==false) {
172 172
 				$result[]=$property;
173 173
 			}
174 174
 		}
@@ -180,12 +180,12 @@  discard block
 block discarded – undo
180 180
 		return $this;
181 181
 	}
182 182
 
183
-	public function setValueFunction($index,$callback){
183
+	public function setValueFunction($index, $callback) {
184 184
 		$this->values[$index]=$callback;
185 185
 		return $this;
186 186
 	}
187 187
 
188
-	public function setIdentifierFunction($callback){
188
+	public function setIdentifierFunction($callback) {
189 189
 		$this->values["identifier"]=$callback;
190 190
 		return $this;
191 191
 	}
@@ -198,41 +198,41 @@  discard block
 block discarded – undo
198 198
 		return $this->properties;
199 199
 	}
200 200
 
201
-	public function getCaption($index){
202
-		if(isset($this->captions[$index])){
201
+	public function getCaption($index) {
202
+		if (isset($this->captions[$index])) {
203 203
 			return $this->captions[$index];
204 204
 		}
205
-		if($this->properties[$index] instanceof \ReflectionProperty)
205
+		if ($this->properties[$index] instanceof \ReflectionProperty)
206 206
 			return $this->properties[$index]->getName();
207
-		elseif(\is_callable($this->properties[$index]))
207
+		elseif (\is_callable($this->properties[$index]))
208 208
 			return "";
209 209
 		else
210 210
 			return $this->properties[$index];
211 211
 	}
212 212
 
213
-	public function getCaptions(){
214
-		if(isset($this->captions)){
215
-			$captions= $this->captions;
216
-			for($i=\sizeof($captions);$i<$this->count();$i++){
213
+	public function getCaptions() {
214
+		if (isset($this->captions)) {
215
+			$captions=$this->captions;
216
+			for ($i=\sizeof($captions); $i<$this->count(); $i++) {
217 217
 				$captions[]="";
218 218
 			}
219
-		}else{
219
+		} else {
220 220
 			$captions=[];
221 221
 			$index=0;
222 222
 			$count=$this->count();
223
-			while($index<$count){
223
+			while ($index<$count) {
224 224
 				$captions[]=$this->getCaption($index++);
225 225
 			}
226 226
 		}
227
-		if(isset($this->captionCallback) && \is_callable($this->captionCallback)){
227
+		if (isset($this->captionCallback) && \is_callable($this->captionCallback)) {
228 228
 			$callback=$this->captionCallback;
229
-			$callback($captions,$this->instance);
229
+			$callback($captions, $this->instance);
230 230
 		}
231 231
 		return $captions;
232 232
 	}
233 233
 
234
-	public function setCaption($index,$caption){
235
-		if(isset($this->captions)===false)
234
+	public function setCaption($index, $caption) {
235
+		if (isset($this->captions)===false)
236 236
 			$this->captions=[];
237 237
 		$this->captions[$index]=$caption;
238 238
 		return $this;
@@ -250,7 +250,7 @@  discard block
 block discarded – undo
250 250
 	 * @param callable $callback function called after the field compilation
251 251
 	 * @return \Ajax\semantic\widgets\datatable\InstanceViewer
252 252
 	 */
253
-	public function afterCompile($index,$callback){
253
+	public function afterCompile($index, $callback) {
254 254
 		$this->afterCompile[$index]=$callback;
255 255
 		return $this;
256 256
 	}
Please login to merge, or discard this patch.