Completed
Push — master ( b3a3fe...f04c22 )
by Jean-Christophe
04:06
created
Ajax/common/traits/JqueryActionsTrait.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
3 3
 namespace Ajax\common\traits;
4 4
 
5 5
 trait JqueryActionsTrait {
6
-	public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
6
+	public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true);
7 7
 	public abstract function _prep_element($element);
8 8
 	public abstract function _prep_value($value);
9 9
 
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 		if (isset($value)) {
20 20
 			$value=$this->_prep_value($value);
21 21
 			$str="$({$element}).attr(\"$attributeName\",{$value});";
22
-		} else
22
+		}else
23 23
 			$str="$({$element}).attr(\"$attributeName\");";
24 24
 			if ($immediatly)
25 25
 				$this->jquery_code_for_compile[]=$str;
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
 	 * @param boolean $immediatly defers the execution if set to false
34 34
 	 * @return string
35 35
 	 */
36
-	public function after($element='this', $value='', $immediatly=false){
36
+	public function after($element='this', $value='', $immediatly=false) {
37 37
 		$element=$this->_prep_element($element);
38 38
 		$value=$this->_prep_value($value);
39 39
 		$str="$({$element}).after({$value});";
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 
59 59
 		$animations="\t\t\t";
60 60
 		if (is_array($params)) {
61
-			foreach ( $params as $param => $value ) {
61
+			foreach ($params as $param => $value) {
62 62
 				$animations.=$param.': \''.$value.'\', ';
63 63
 			}
64 64
 		}
@@ -351,8 +351,8 @@  discard block
 block discarded – undo
351 351
 	 * @param boolean $immediatly
352 352
 	 * @return string
353 353
 	 */
354
-	public function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $preventDefault=false, $stopPropagation=false, $jsCallback="",$immediatly=true) {
355
-		return $this->_add_event($element, $this->_doJQuery($elementToModify, $jqueryCall, $param, $jsCallback), $event, $preventDefault, $stopPropagation,$immediatly);
354
+	public function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $preventDefault=false, $stopPropagation=false, $jsCallback="", $immediatly=true) {
355
+		return $this->_add_event($element, $this->_doJQuery($elementToModify, $jqueryCall, $param, $jsCallback), $event, $preventDefault, $stopPropagation, $immediatly);
356 356
 	}
357 357
 
358 358
 	/**
@@ -378,8 +378,8 @@  discard block
 block discarded – undo
378 378
 	 * @param boolean $immediatly
379 379
 	 * @return String
380 380
 	 */
381
-	public function _execOn($element, $event, $js, $preventDefault=false, $stopPropagation=false,$immediatly=true) {
382
-		return $this->_add_event($element, $this->_exec($js), $event, $preventDefault, $stopPropagation,$immediatly);
381
+	public function _execOn($element, $event, $js, $preventDefault=false, $stopPropagation=false, $immediatly=true) {
382
+		return $this->_add_event($element, $this->_exec($js), $event, $preventDefault, $stopPropagation, $immediatly);
383 383
 	}
384 384
 
385 385
 	/**
@@ -388,8 +388,8 @@  discard block
 block discarded – undo
388 388
 	 * @return string
389 389
 	 */
390 390
 	private function _validate_speed($speed) {
391
-		if (in_array($speed, array (
392
-				'slow','normal','fast'
391
+		if (in_array($speed, array(
392
+				'slow', 'normal', 'fast'
393 393
 		))) {
394 394
 			$speed='"'.$speed.'"';
395 395
 		} elseif (preg_match("/[^0-9]/", $speed)) {
Please login to merge, or discard this patch.
Ajax/semantic/html/base/traits/IconTrait.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -8,18 +8,18 @@  discard block
 block discarded – undo
8 8
 	private $_hasIcon=false;
9 9
 
10 10
 	protected abstract function addToPropertyCtrl($name, $value, $typeCtrl);
11
-	public abstract function addContent($content,$before=false);
11
+	public abstract function addContent($content, $before=false);
12 12
 
13
-	public function addIcon($icon,$direction=Direction::LEFT){
14
-		if($this->_hasIcon===false){
13
+	public function addIcon($icon, $direction=Direction::LEFT) {
14
+		if ($this->_hasIcon===false) {
15 15
 			$iconO=$icon;
16
-			if(\is_string($icon)){
16
+			if (\is_string($icon)) {
17 17
 				$iconO=new HtmlIcon("icon-".$this->identifier, $icon);
18 18
 			}
19 19
 			$this->addToPropertyCtrl("class", $direction." icon", Direction::getConstantValues("icon"));
20
-			$this->addContent($iconO,false);
20
+			$this->addContent($iconO, false);
21 21
 			$this->_hasIcon=true;
22
-		}else{
22
+		}else {
23 23
 			$iconO=$this->getIcon();
24 24
 			$iconO->setIcon($icon);
25 25
 			$this->addToPropertyCtrl("class", $direction." icon", Direction::getConstantValues("icon"));
@@ -27,10 +27,10 @@  discard block
 block discarded – undo
27 27
 		return $iconO;
28 28
 	}
29 29
 
30
-	public function getIcon(){
31
-		if(\is_array($this->content)){
32
-			foreach ($this->content as $item){
33
-				if($item instanceof HtmlIcon)
30
+	public function getIcon() {
31
+		if (\is_array($this->content)) {
32
+			foreach ($this->content as $item) {
33
+				if ($item instanceof HtmlIcon)
34 34
 					return $item;
35 35
 			}
36 36
 		}
Please login to merge, or discard this patch.
Ajax/semantic/components/Popup.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 		return $this->setParam("onShow", "%function(){".$jsCode."}%");
31 31
 	}
32 32
 
33
-	public function setExclusive($value){
33
+	public function setExclusive($value) {
34 34
 		return $this->setParam("exclusive", $value);
35 35
 	}
36 36
 
@@ -39,15 +39,15 @@  discard block
 block discarded – undo
39 39
 	 * @param string $popup the css selector of the popup
40 40
 	 * @return \Ajax\semantic\components\Popup
41 41
 	 */
42
-	public function setPopup($popup){
42
+	public function setPopup($popup) {
43 43
 		return $this->setParam("popup", $popup);
44 44
 	}
45 45
 
46
-	public function setInline($value){
46
+	public function setInline($value) {
47 47
 		return $this->setParam("inline", $value);
48 48
 	}
49 49
 
50
-	public function setPosition($value){
50
+	public function setPosition($value) {
51 51
 		return $this->setParam("position", $value);
52 52
 	}
53 53
 	//TODO other events implementation
Please login to merge, or discard this patch.
Ajax/semantic/html/modules/HtmlSticky.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -8,13 +8,13 @@  discard block
 block discarded – undo
8 8
 class HtmlSticky extends HtmlSemDoubleElement {
9 9
 	private $_params=array();
10 10
 
11
-	public function __construct($identifier,$context=NULL,$content=NULL) {
11
+	public function __construct($identifier, $context=NULL, $content=NULL) {
12 12
 		parent::__construct($identifier, "div", "ui sticky", $content);
13
-		if(isset($content))
13
+		if (isset($content))
14 14
 			$this->setContext($context);
15 15
 	}
16 16
 
17
-	public function setContext($context){
17
+	public function setContext($context) {
18 18
 		$this->_params["context"]=$context;
19 19
 		return $this;
20 20
 	}
@@ -23,8 +23,8 @@  discard block
 block discarded – undo
23 23
 	 * {@inheritDoc}
24 24
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::run()
25 25
 	 */
26
-	public function run(JsUtils $js){
26
+	public function run(JsUtils $js) {
27 27
 		parent::run($js);
28
-		return $js->semantic()->sticky("#".$this->identifier,$this->_params);
28
+		return $js->semantic()->sticky("#".$this->identifier, $this->_params);
29 29
 	}
30 30
 }
31 31
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/HtmlFormInput.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -8,13 +8,13 @@
 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 setReadonly(){
17
+	public function setReadonly() {
18 18
 		$this->getField()->setProperty("readonly", "");
19 19
 	}
20 20
 }
21 21
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/html/modules/HtmlPopup.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
 class HtmlPopup extends HtmlSemDoubleElement {
13 13
 	private $_params;
14 14
 	private $_container;
15
-	public function __construct(BaseHtml $container,$identifier, $content="") {
15
+	public function __construct(BaseHtml $container, $identifier, $content="") {
16 16
 		parent::__construct($identifier, "div");
17 17
 		$this->_container=$container;
18 18
 		$this->setClass("ui popup");
@@ -20,21 +20,21 @@  discard block
 block discarded – undo
20 20
 		$this->_params=array("on"=>"hover");
21 21
 	}
22 22
 
23
-	public function addList($items=array(),$header=NULL){
24
-		if(!$this->content instanceof HtmlGrid){
25
-			$this->content=new HtmlGrid("Grid-".$this->identifier,0);
23
+	public function addList($items=array(), $header=NULL) {
24
+		if (!$this->content instanceof HtmlGrid) {
25
+			$this->content=new HtmlGrid("Grid-".$this->identifier, 0);
26 26
 		}
27 27
 		$grid=$this->content;
28 28
 
29 29
 		$colCount=$grid->colCount();
30 30
 		$grid->setColsCount(++$colCount);
31 31
 
32
-		$list=new HtmlList("",$items);
32
+		$list=new HtmlList("", $items);
33 33
 		$list->asLink();
34
-		if(isset($header)){
35
-			$list->addHeader(4,$header);
34
+		if (isset($header)) {
35
+			$list->addHeader(4, $header);
36 36
 		}
37
-		$grid->getCell(0,$colCount-1)->setContent($list);
37
+		$grid->getCell(0, $colCount-1)->setContent($list);
38 38
 		$grid->setDivided()->setRelaxed(true);
39 39
 		return $list;
40 40
 	}
@@ -42,14 +42,14 @@  discard block
 block discarded – undo
42 42
 	/**
43 43
 	 * A popup can have no maximum width and continue to flow to fit its content
44 44
 	 */
45
-	public function setFlowing(){
45
+	public function setFlowing() {
46 46
 		return $this->addToProperty("class", "flowing");
47 47
 	}
48 48
 
49 49
 	/**
50 50
 	 * A popup can provide more basic formatting
51 51
 	 */
52
-	public function setBasic(){
52
+	public function setBasic() {
53 53
 		return $this->addToProperty("class", "basic");
54 54
 	}
55 55
 
@@ -57,22 +57,22 @@  discard block
 block discarded – undo
57 57
 	 * {@inheritDoc}
58 58
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::run()
59 59
 	 */
60
-	public function run(JsUtils $js){
60
+	public function run(JsUtils $js) {
61 61
 		$this->_params["popup"]="#".$this->identifier;
62
-		$js->semantic()->popup("#".$this->_container->getIdentifier(),$this->_params);
62
+		$js->semantic()->popup("#".$this->_container->getIdentifier(), $this->_params);
63 63
 	}
64 64
 
65
-	public function setOn($event="click"){
65
+	public function setOn($event="click") {
66 66
 		$this->_params["on"]=$event;
67 67
 		return $this;
68 68
 	}
69 69
 
70
-	public function setInline($value=true){
70
+	public function setInline($value=true) {
71 71
 		$this->_params["inline"]=$value;
72 72
 		return $this;
73 73
 	}
74 74
 
75
-	public function setPosition($position){
75
+	public function setPosition($position) {
76 76
 		$this->_params["position"]=$position;
77 77
 		return $this;
78 78
 	}
Please login to merge, or discard this patch.
Ajax/semantic/html/elements/HtmlReveal.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -10,64 +10,64 @@
 block discarded – undo
10 10
 
11 11
 class HtmlReveal extends HtmlSemDoubleElement {
12 12
 
13
-	public function __construct($identifier, $visibleContent,$hiddenContent,$type=RevealType::FADE,$attributeType=NULL) {
13
+	public function __construct($identifier, $visibleContent, $hiddenContent, $type=RevealType::FADE, $attributeType=NULL) {
14 14
 		parent::__construct($identifier, "div", "ui reveal");
15 15
 		$this->setElement(0, $visibleContent);
16 16
 		$this->setElement(1, $hiddenContent);
17
-		$this->setType($type,$attributeType);
17
+		$this->setType($type, $attributeType);
18 18
 	}
19 19
 
20
-	private function setElement($index,$content){
21
-		if(!$content instanceof HtmlSingleElement){
22
-			$content=new HtmlLabel("",$content);
20
+	private function setElement($index, $content) {
21
+		if (!$content instanceof HtmlSingleElement) {
22
+			$content=new HtmlLabel("", $content);
23 23
 		}
24
-		if($content instanceof HtmlSemDoubleElement){
25
-			$content=new HtmlSemDoubleElement($this->identifier."-".$index,"div","",$content);
26
-		}elseif ($content instanceof HtmlImg){
24
+		if ($content instanceof HtmlSemDoubleElement) {
25
+			$content=new HtmlSemDoubleElement($this->identifier."-".$index, "div", "", $content);
26
+		}elseif ($content instanceof HtmlImg) {
27 27
 			$this->addToPropertyCtrl("class", "image", array("image"));
28 28
 		}
29
-		$content->addToProperty("class",(($index===0)?"visible":"hidden")." content");
29
+		$content->addToProperty("class", (($index===0) ? "visible" : "hidden")." content");
30 30
 		$this->content[$index]=$content;
31 31
 		return $this;
32 32
 	}
33 33
 
34
-	public function setVisibleContent($visibleContent){
34
+	public function setVisibleContent($visibleContent) {
35 35
 		return $this->setElement(0, $visibleContent);
36 36
 	}
37 37
 
38
-	public function setHiddenContent($hiddenContent){
38
+	public function setHiddenContent($hiddenContent) {
39 39
 		return $this->setElement(1, $hiddenContent);
40 40
 	}
41 41
 
42
-	public function getVisibleContent(){
42
+	public function getVisibleContent() {
43 43
 		return $this->content[0];
44 44
 	}
45 45
 
46
-	public function getHiddenContent(){
46
+	public function getHiddenContent() {
47 47
 		return $this->content[1];
48 48
 	}
49 49
 
50
-	public function setType($type,$attribute=NULL){
50
+	public function setType($type, $attribute=NULL) {
51 51
 		$this->addToPropertyCtrl("class", $type, RevealType::getConstants());
52
-		if(isset($attribute)){
52
+		if (isset($attribute)) {
53 53
 			$this->addToPropertyCtrl("class", $attribute, Direction::getConstants());
54 54
 		}
55 55
 		return $this;
56 56
 	}
57 57
 
58
-	public function setFade($attribute=NULL){
59
-		return $this->setType(RevealType::FADE,$attribute);
58
+	public function setFade($attribute=NULL) {
59
+		return $this->setType(RevealType::FADE, $attribute);
60 60
 	}
61 61
 
62
-	public function setMove($attribute=NULL){
63
-		return $this->setType(RevealType::MOVE,$attribute);
62
+	public function setMove($attribute=NULL) {
63
+		return $this->setType(RevealType::MOVE, $attribute);
64 64
 	}
65 65
 
66
-	public function setRotate($attribute=NULL){
67
-		return $this->setType(RevealType::ROTATE,$attribute);
66
+	public function setRotate($attribute=NULL) {
67
+		return $this->setType(RevealType::ROTATE, $attribute);
68 68
 	}
69 69
 
70
-	public function setCircular(){
70
+	public function setCircular() {
71 71
 		return $this->addToProperty("class", "circular");
72 72
 	}
73 73
 
Please login to merge, or discard this patch.
Ajax/semantic/html/elements/HtmlStep.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -9,11 +9,11 @@  discard block
 block discarded – undo
9 9
 use Ajax\common\html\HtmlDoubleElement;
10 10
 use Ajax\semantic\html\base\constants\Side;
11 11
 
12
-class HtmlStep extends HtmlSemCollection{
12
+class HtmlStep extends HtmlSemCollection {
13 13
 	protected $_activeStep;
14 14
 
15
-	public function __construct( $identifier,$steps=array()){
16
-		parent::__construct( $identifier,"div", "ui steps");
15
+	public function __construct($identifier, $steps=array()) {
16
+		parent::__construct($identifier, "div", "ui steps");
17 17
 		$this->addItems($steps);
18 18
 	}
19 19
 
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
 	 * @see \Ajax\common\html\html5\HtmlCollection::createItem()
24 24
 	 */
25 25
 	protected function createItem($value) {
26
-		$itemO=new HtmlStepItem("item-".\sizeof($this->content),$value);
26
+		$itemO=new HtmlStepItem("item-".\sizeof($this->content), $value);
27 27
 		return $itemO;
28 28
 	}
29 29
 
@@ -31,50 +31,50 @@  discard block
 block discarded – undo
31 31
 	 * @param string|array $step
32 32
 	 * @return HtmlStepItem
33 33
 	 */
34
-	public function addStep($step){
34
+	public function addStep($step) {
35 35
 		return $this->addItem($step);
36 36
 	}
37 37
 
38
-	public function setOrdered(){
38
+	public function setOrdered() {
39 39
 		return $this->addToProperty("class", "ordered");
40 40
 	}
41 41
 
42
-	public function isOrdered(){
42
+	public function isOrdered() {
43 43
 		return $this->propertyContains("class", "ordered");
44 44
 	}
45 45
 
46
-	public function setVertical(){
46
+	public function setVertical() {
47 47
 		return $this->addToProperty("class", "vertical");
48 48
 	}
49 49
 
50
-	protected function defineActiveStep(){
50
+	protected function defineActiveStep() {
51 51
 		$activestep=$this->_activeStep;
52 52
 		$count=$this->count();
53
-		if($this->isOrdered()){
54
-			for($i=0;$i<$count;$i++){
53
+		if ($this->isOrdered()) {
54
+			for ($i=0; $i<$count; $i++) {
55 55
 				$step=$this->content[$i];
56 56
 				$step->removeStatus();
57
-				if($i<$activestep)
57
+				if ($i<$activestep)
58 58
 					$step->setCompleted();
59 59
 				elseif ($i===$activestep)
60 60
 					$step->setActive();
61 61
 				else
62 62
 					$step->setDisabled();
63 63
 			}
64
-		}else{
65
-			foreach ($this->content as $step){
64
+		}else {
65
+			foreach ($this->content as $step) {
66 66
 				$step->removeStatus();
67 67
 			}
68
-			if($activestep<$count)
68
+			if ($activestep<$count)
69 69
 				$this->content[$activestep]->setActive();
70 70
 		}
71 71
 		return $this;
72 72
 	}
73 73
 
74 74
 	public function compile(JsUtils $js=NULL, View $view=NULL) {
75
-		if(isset($this->_activeStep)===true && \is_numeric($this->_activeStep))
75
+		if (isset($this->_activeStep)===true && \is_numeric($this->_activeStep))
76 76
 			$this->defineActiveStep();
77
-		return parent::compile($js,$view);
77
+		return parent::compile($js, $view);
78 78
 	}
79 79
 
80 80
 	public function setActiveStep($_activeStep) {
@@ -82,15 +82,15 @@  discard block
 block discarded – undo
82 82
 		return $this;
83 83
 	}
84 84
 
85
-	public function setAttached($side="",HtmlDoubleElement $toElement=NULL){
86
-		if(isset($toElement)){
87
-			$toElement->addToPropertyCtrl("class", "attached",array("attached"));
85
+	public function setAttached($side="", HtmlDoubleElement $toElement=NULL) {
86
+		if (isset($toElement)) {
87
+			$toElement->addToPropertyCtrl("class", "attached", array("attached"));
88 88
 		}
89
-		return $this->addToPropertyCtrl("class", $side." attached",Side::getConstantValues("attached"));
89
+		return $this->addToPropertyCtrl("class", $side." attached", Side::getConstantValues("attached"));
90 90
 	}
91 91
 
92
-	public function asLink(){
93
-		foreach ($this->content as $step){
92
+	public function asLink() {
93
+		foreach ($this->content as $step) {
94 94
 			$step->asLink();
95 95
 		}
96 96
 		return $this;
Please login to merge, or discard this patch.
Ajax/semantic/html/base/constants/StepStatus.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,5 +5,5 @@
 block discarded – undo
5 5
 use Ajax\common\BaseEnum;
6 6
 
7 7
 abstract class StepStatus extends BaseEnum {
8
-	const ACTIVE="active",COMPLETED="completed",DISABLED="disabled",NONE="";
8
+	const ACTIVE="active", COMPLETED="completed", DISABLED="disabled", NONE="";
9 9
 }
10 10
\ No newline at end of file
Please login to merge, or discard this patch.