Completed
Push — master ( 541276...03d1b2 )
by Jean-Christophe
03:16
created
Ajax/common/html/HtmlSingleElement.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 	}
14 14
 
15 15
 	public function setClass($classNames) {
16
-		if(is_array($classNames)){
16
+		if (is_array($classNames)) {
17 17
 			$classNames=implode(" ", $classNames);
18 18
 		}
19 19
 		$this->setProperty("class", $classNames);
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 	 */
41 41
 	public function fromArray($array) {
42 42
 		$array=parent::fromArray($array);
43
-		foreach ( $array as $key => $value ) {
43
+		foreach ($array as $key => $value) {
44 44
 			$this->setProperty($key, $value);
45 45
 		}
46 46
 		return $array;
Please login to merge, or discard this patch.
Ajax/common/html/html5/HtmlOption.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
 class HtmlOption extends HtmlDoubleElement {
11 11
 	protected $value;
12 12
 	protected $selected;
13
-	public function __construct($identifier,$caption,$value="") {
13
+	public function __construct($identifier, $caption, $value="") {
14 14
 		parent::__construct($identifier, "option");
15 15
 		$this->_template='<option id="%identifier%" value="%value%" %selected% %properties%>%content%</option>';
16 16
 		$this->content=$caption;
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
 		$this->selected="";
19 19
 	}
20 20
 	
21
-	public function select(){
21
+	public function select() {
22 22
 		$this->selected="selected";
23 23
 		return $this;
24 24
 	}
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 		return $this->value;
28 28
 	}
29 29
 	public function setValue($value) {
30
-		$this->value = $value;
30
+		$this->value=$value;
31 31
 		return $this;
32 32
 	}
33 33
 	
Please login to merge, or discard this patch.
Ajax/common/html/html5/HtmlSelect.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
 	private $default;
17 17
 	private $options;
18 18
 
19
-	public function __construct($identifier, $caption,$default=NULL) {
19
+	public function __construct($identifier, $caption, $default=NULL) {
20 20
 		parent::__construct($identifier, "select");
21 21
 		$this->setProperty("name", $identifier);
22 22
 		$this->setProperty("class", "form-control");
@@ -25,21 +25,21 @@  discard block
 block discarded – undo
25 25
 		$this->options=array();
26 26
 	}
27 27
 
28
-	public function addOption($element,$value="",$selected=false){
29
-		if($element instanceof HtmlOption){
28
+	public function addOption($element, $value="", $selected=false) {
29
+		if ($element instanceof HtmlOption) {
30 30
 			$option=$element;
31
-		}else{
32
-			$option=new HtmlOption($this->identifier."-".count($this->options), $element,$value);
31
+		}else {
32
+			$option=new HtmlOption($this->identifier."-".count($this->options), $element, $value);
33 33
 		}
34
-		if($selected || $option->getValue()==$this->getProperty("value")){
34
+		if ($selected || $option->getValue()==$this->getProperty("value")) {
35 35
 			$option->select();
36 36
 		}
37 37
 		$this->options[]=$option;
38 38
 	}
39 39
 
40 40
 	public function setValue($value) {
41
-		foreach ( $this->options as $option ) {
42
-			if (strcasecmp($option->getValue(),$value)===0) {
41
+		foreach ($this->options as $option) {
42
+			if (strcasecmp($option->getValue(), $value)===0) {
43 43
 				$option->setProperty("selected", "");
44 44
 			}
45 45
 		}
@@ -52,23 +52,23 @@  discard block
 block discarded – undo
52 52
 	 */
53 53
 	public function compile(JsUtils $js=NULL, View $view=NULL) {
54 54
 		$this->content=array();
55
-		if(isset($this->default)){
55
+		if (isset($this->default)) {
56 56
 			$default=new HtmlOption("", $this->default);
57 57
 			$this->content[]=$default;
58 58
 		}
59
-		foreach ($this->options as $option){
59
+		foreach ($this->options as $option) {
60 60
 			$this->content[]=$option;
61 61
 		}
62 62
 		return parent::compile($js, $view);
63 63
 	}
64 64
 
65
-	public function fromArray($array){
66
-		if(JArray::isAssociative($array)){
67
-			foreach ($array as $k=>$v){
65
+	public function fromArray($array) {
66
+		if (JArray::isAssociative($array)) {
67
+			foreach ($array as $k=>$v) {
68 68
 				$this->addOption($v, $k);
69 69
 			}
70
-		}else{
71
-			foreach ($array as $v){
70
+		}else {
71
+			foreach ($array as $v) {
72 72
 				$this->addOption($v, $v);
73 73
 			}
74 74
 		}
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 		$this->addOption($function($object));
102 102
 	}
103 103
 
104
-	public function setSize($size){
104
+	public function setSize($size) {
105 105
 		return $this->setProperty("size", $size);
106 106
 	}
107 107
 }
Please login to merge, or discard this patch.
Ajax/JsUtils.php 1 patch
Spacing   +59 added lines, -59 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 
51 51
 	protected function _setDi($di) {
52 52
 		$this->_di=$di;
53
-		if ($this->js!=null&&$di!=null)
53
+		if ($this->js!=null && $di!=null)
54 54
 			$this->js->setDi($di);
55 55
 	}
56 56
 
@@ -145,18 +145,18 @@  discard block
 block discarded – undo
145 145
 	}
146 146
 
147 147
 	public function __construct($params=array()) {
148
-		$defaults=array (
148
+		$defaults=array(
149 149
 				'driver' => 'Jquery',
150 150
 				'debug' => true
151 151
 		);
152
-		foreach ( $defaults as $key => $val ) {
153
-			if (isset($params[$key])&&$params[$key]!=="") {
152
+		foreach ($defaults as $key => $val) {
153
+			if (isset($params[$key]) && $params[$key]!=="") {
154 154
 				$defaults[$key]=$params[$key];
155 155
 			}
156 156
 		}
157 157
 		extract($defaults);
158 158
 		$this->js=new Jquery($defaults);
159
-		$this->cdns=array ();
159
+		$this->cdns=array();
160 160
 	}
161 161
 
162 162
 	public function addToCompile($jsScript) {
@@ -408,7 +408,7 @@  discard block
 block discarded – undo
408 408
 	 * @return string
409 409
 	 */
410 410
 	public function addClass($element='this', $class='', $immediatly=false) {
411
-		return $this->js->_genericCallValue('addClass',$element, $class, $immediatly);
411
+		return $this->js->_genericCallValue('addClass', $element, $class, $immediatly);
412 412
 	}
413 413
 
414 414
 	/**
@@ -418,8 +418,8 @@  discard block
 block discarded – undo
418 418
 	 * @param boolean $immediatly defers the execution if set to false
419 419
 	 * @return string
420 420
 	 */
421
-	public function after($to, $element, $immediatly=false){
422
-		return $this->js->_genericCallElement('after',$to, $element, $immediatly);
421
+	public function after($to, $element, $immediatly=false) {
422
+		return $this->js->_genericCallElement('after', $to, $element, $immediatly);
423 423
 	}
424 424
 
425 425
 	/**
@@ -429,8 +429,8 @@  discard block
 block discarded – undo
429 429
 	 * @param boolean $immediatly defers the execution if set to false
430 430
 	 * @return string
431 431
 	 */
432
-	public function before($to, $element, $immediatly=false){
433
-		return $this->js->_genericCallElement('before',$to, $element, $immediatly);
432
+	public function before($to, $element, $immediatly=false) {
433
+		return $this->js->_genericCallElement('before', $to, $element, $immediatly);
434 434
 	}
435 435
 
436 436
 	/**
@@ -450,8 +450,8 @@  discard block
 block discarded – undo
450 450
 	 * @param string $value
451 451
 	 * @param boolean $immediatly defers the execution if set to false
452 452
 	 */
453
-	public function val($element='this',$value='',$immediatly=false){
454
-		return $this->js->_genericCallValue('val',$element,$value,$immediatly);
453
+	public function val($element='this', $value='', $immediatly=false) {
454
+		return $this->js->_genericCallValue('val', $element, $value, $immediatly);
455 455
 	}
456 456
 
457 457
 	/**
@@ -461,7 +461,7 @@  discard block
 block discarded – undo
461 461
 	 * @param boolean $immediatly defers the execution if set to false
462 462
 	 */
463 463
 	public function html($element='this', $value='', $immediatly=false) {
464
-		return $this->js->_genericCallValue('html',$element, $value, $immediatly);
464
+		return $this->js->_genericCallValue('html', $element, $value, $immediatly);
465 465
 	}
466 466
 	// --------------------------------------------------------------------
467 467
 	/**
@@ -486,7 +486,7 @@  discard block
 block discarded – undo
486 486
 	 * @return string
487 487
 	 */
488 488
 	public function append($to, $element, $immediatly=false) {
489
-		return $this->js->_genericCallElement('append',$to, $element, $immediatly);
489
+		return $this->js->_genericCallElement('append', $to, $element, $immediatly);
490 490
 	}
491 491
 
492 492
 	/**
@@ -497,7 +497,7 @@  discard block
 block discarded – undo
497 497
 	 * @return string
498 498
 	 */
499 499
 	public function prepend($to, $element, $immediatly=false) {
500
-		return $this->js->_genericCallElement('prepend',$to, $element, $immediatly);
500
+		return $this->js->_genericCallElement('prepend', $to, $element, $immediatly);
501 501
 	}
502 502
 	// --------------------------------------------------------------------
503 503
 	/**
@@ -548,7 +548,7 @@  discard block
 block discarded – undo
548 548
 	 * @return string
549 549
 	 */
550 550
 	public function removeClass($element='this', $class='', $immediatly=false) {
551
-		return $this->js->_genericCall('removeClass',$element, $class, $immediatly);
551
+		return $this->js->_genericCall('removeClass', $element, $class, $immediatly);
552 552
 	}
553 553
 	// --------------------------------------------------------------------
554 554
 	/**
@@ -609,7 +609,7 @@  discard block
 block discarded – undo
609 609
 	 * @return string
610 610
 	 */
611 611
 	public function toggleClass($element='this', $class='', $immediatly=false) {
612
-		return $this->js->_genericCallValue('toggleClass',$element, $class, $immediatly);
612
+		return $this->js->_genericCallValue('toggleClass', $element, $class, $immediatly);
613 613
 	}
614 614
 
615 615
 	/**
@@ -656,11 +656,11 @@  discard block
 block discarded – undo
656 656
 	 */
657 657
 	public function compile($view=NULL, $view_var='script_foot', $script_tags=TRUE) {
658 658
 		$bs=$this->_bootstrap;
659
-		if (isset($bs)&&isset($view)) {
659
+		if (isset($bs) && isset($view)) {
660 660
 			$bs->compileHtml($this, $view);
661 661
 		}
662 662
 		$sem=$this->_semantic;
663
-		if (isset($sem)&&isset($view)) {
663
+		if (isset($sem) && isset($view)) {
664 664
 			$sem->compileHtml($this, $view);
665 665
 		}
666 666
 		return $this->js->_compile($view, $view_var, $script_tags);
@@ -740,27 +740,27 @@  discard block
 block discarded – undo
740 740
 				$json_result=$result->result_array();
741 741
 			} elseif (is_array($result)) {
742 742
 				$json_result=$result;
743
-			} else {
743
+			}else {
744 744
 				return $this->_prep_args($result);
745 745
 			}
746
-		} else {
746
+		}else {
747 747
 			return 'null';
748 748
 		}
749 749
 		return $this->_create_json($json_result, $match_array_type);
750 750
 	}
751 751
 
752 752
 	private function _create_json($json_result, $match_array_type) {
753
-		$json=array ();
753
+		$json=array();
754 754
 		$_is_assoc=TRUE;
755
-		if (!is_array($json_result)&&empty($json_result)) {
755
+		if (!is_array($json_result) && empty($json_result)) {
756 756
 			show_error("Generate JSON Failed - Illegal key, value pair.");
757 757
 		} elseif ($match_array_type) {
758 758
 			$_is_assoc=$this->_is_associative_array($json_result);
759 759
 		}
760
-		foreach ( $json_result as $k => $v ) {
760
+		foreach ($json_result as $k => $v) {
761 761
 			if ($_is_assoc) {
762 762
 				$json[]=$this->_prep_args($k, TRUE).':'.$this->generate_json($v, $match_array_type);
763
-			} else {
763
+			}else {
764 764
 				$json[]=$this->generate_json($v, $match_array_type);
765 765
 			}
766 766
 		}
@@ -775,7 +775,7 @@  discard block
 block discarded – undo
775 775
 	 * @return type
776 776
 	 */
777 777
 	public function _is_associative_array($arr) {
778
-		foreach ( array_keys($arr) as $key => $val ) {
778
+		foreach (array_keys($arr) as $key => $val) {
779 779
 			if ($key!==$val) {
780 780
 				return TRUE;
781 781
 			}
@@ -794,11 +794,11 @@  discard block
 block discarded – undo
794 794
 			return 'null';
795 795
 		} elseif (is_bool($result)) {
796 796
 			return ($result===TRUE) ? 'true' : 'false';
797
-		} elseif (is_string($result)||$is_key) {
798
-			return '"'.str_replace(array (
799
-					'\\',"\t","\n","\r",'"','/'
800
-			), array (
801
-					'\\\\','\\t','\\n',"\\r",'\"','\/'
797
+		} elseif (is_string($result) || $is_key) {
798
+			return '"'.str_replace(array(
799
+					'\\', "\t", "\n", "\r", '"', '/'
800
+			), array(
801
+					'\\\\', '\\t', '\\n', "\\r", '\"', '\/'
802 802
 			), $result).'"';
803 803
 		} elseif (is_scalar($result)) {
804 804
 			return $result;
@@ -813,8 +813,8 @@  discard block
 block discarded – undo
813 813
 	 * @param string $jsCallback javascript code to execute after the request
814 814
 	 * @param boolean $hasLoader true for showing ajax loader. default : true
815 815
 	 */
816
-	public function get($url, $responseElement="", $params="{}", $jsCallback=NULL,$hasLoader=true) {
817
-		return $this->js->_get($url, $params, $responseElement, $jsCallback, NULL, $hasLoader,true);
816
+	public function get($url, $responseElement="", $params="{}", $jsCallback=NULL, $hasLoader=true) {
817
+		return $this->js->_get($url, $params, $responseElement, $jsCallback, NULL, $hasLoader, true);
818 818
 	}
819 819
 
820 820
 	/**
@@ -825,8 +825,8 @@  discard block
 block discarded – undo
825 825
 	 * @param string $jsCallback javascript code to execute after the request
826 826
 	 * @param boolean $immediatly
827 827
 	 */
828
-	public function json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document",$immediatly=false) {
829
-		return $this->js->_json($url, $method, $params, $jsCallback, $attr, $context,$immediatly);
828
+	public function json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document", $immediatly=false) {
829
+		return $this->js->_json($url, $method, $params, $jsCallback, $attr, $context, $immediatly);
830 830
 	}
831 831
 
832 832
 	/**
@@ -836,8 +836,8 @@  discard block
 block discarded – undo
836 836
 	 * @param string $url the request address
837 837
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true)
838 838
 	 */
839
-	public function jsonOn($event,$element, $url,$parameters=array()) {
840
-		return $this->js->_jsonOn($event, $element, $url,$parameters);
839
+	public function jsonOn($event, $element, $url, $parameters=array()) {
840
+		return $this->js->_jsonOn($event, $element, $url, $parameters);
841 841
 	}
842 842
 
843 843
 	/**
@@ -881,8 +881,8 @@  discard block
 block discarded – undo
881 881
 	 * @param string $url the request url
882 882
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true)
883 883
 	 */
884
-	public function jsonArrayOn($event,$element,$maskSelector, $url,$parameters=array()) {
885
-		return $this->js->_jsonArrayOn($event,$element,$maskSelector, $url, $parameters);
884
+	public function jsonArrayOn($event, $element, $maskSelector, $url, $parameters=array()) {
885
+		return $this->js->_jsonArrayOn($event, $element, $maskSelector, $url, $parameters);
886 886
 	}
887 887
 
888 888
 	/**
@@ -894,7 +894,7 @@  discard block
 block discarded – undo
894 894
 	 * @param string $jsCallback javascript code to execute after the request
895 895
 	 * @param string $attr the html attribute added to the request
896 896
 	 */
897
-	public function getDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL,$attr="id") {
897
+	public function getDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id") {
898 898
 		return $this->js->_get($url, $params, $responseElement, $jsCallback, $attr, false);
899 899
 	}
900 900
 
@@ -932,8 +932,8 @@  discard block
 block discarded – undo
932 932
 	 * @param string $jsCallback javascript code to execute after the request
933 933
 	 * @param boolean $hasLoader true for showing ajax loader. default : true
934 934
 	 */
935
-	public function post($url, $responseElement="", $params="{}", $jsCallback=NULL,$hasLoader=true) {
936
-		return $this->js->_post($url, $params, $responseElement, $jsCallback, NULL, $hasLoader,true);
935
+	public function post($url, $responseElement="", $params="{}", $jsCallback=NULL, $hasLoader=true) {
936
+		return $this->js->_post($url, $params, $responseElement, $jsCallback, NULL, $hasLoader, true);
937 937
 	}
938 938
 
939 939
 	/**
@@ -946,8 +946,8 @@  discard block
 block discarded – undo
946 946
 	 * @param string $jsCallback javascript code to execute after the request
947 947
 	 * @param boolean $hasLoader true for showing ajax loader. default : true
948 948
 	 */
949
-	public function postDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id",$hasLoader=true) {
950
-		return $this->js->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader,false);
949
+	public function postDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id", $hasLoader=true) {
950
+		return $this->js->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader, false);
951 951
 	}
952 952
 
953 953
 	/**
@@ -961,7 +961,7 @@  discard block
 block discarded – undo
961 961
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true)
962 962
 	 */
963 963
 	public function postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
964
-		return $this->js->_postOn($event, $element,  $url, $params, $responseElement, $parameters);
964
+		return $this->js->_postOn($event, $element, $url, $params, $responseElement, $parameters);
965 965
 	}
966 966
 
967 967
 	/**
@@ -985,8 +985,8 @@  discard block
 block discarded – undo
985 985
 	 * @param string $jsCallback javascript code to execute after the request
986 986
 	 * @param boolean $hasLoader true for showing ajax loader. default : true
987 987
 	 */
988
-	public function postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL,$hasLoader=true) {
989
-		return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, NULL, $hasLoader,true);
988
+	public function postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $hasLoader=true) {
989
+		return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, NULL, $hasLoader, true);
990 990
 	}
991 991
 
992 992
 	/**
@@ -999,8 +999,8 @@  discard block
 block discarded – undo
999 999
 	 * @param string $attr the html attribute added to the request
1000 1000
 	 * @param boolean $hasLoader true for showing ajax loader. default : true
1001 1001
 	 */
1002
-	public function postFormDeferred($url, $form, $responseElement, $validation=false, $jsCallback=NULL,$attr="id",$hasLoader=true) {
1003
-		return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader,false);
1002
+	public function postFormDeferred($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true) {
1003
+		return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader, false);
1004 1004
 	}
1005 1005
 
1006 1006
 	/**
@@ -1014,7 +1014,7 @@  discard block
 block discarded – undo
1014 1014
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true)
1015 1015
 	 */
1016 1016
 	public function postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) {
1017
-		return $this->js->_postFormOn($event,$element, $url, $form, $responseElement, $parameters);
1017
+		return $this->js->_postFormOn($event, $element, $url, $form, $responseElement, $parameters);
1018 1018
 	}
1019 1019
 
1020 1020
 	/**
@@ -1069,7 +1069,7 @@  discard block
 block discarded – undo
1069 1069
 		$preventDefault=false;
1070 1070
 		$immediatly=true;
1071 1071
 		extract($parameters);
1072
-		return $this->js->_doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param, $preventDefault, $stopPropagation, $jsCallback,$immediatly);
1072
+		return $this->js->_doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param, $preventDefault, $stopPropagation, $jsCallback, $immediatly);
1073 1073
 	}
1074 1074
 
1075 1075
 	/**
@@ -1096,7 +1096,7 @@  discard block
 block discarded – undo
1096 1096
 		$preventDefault=false;
1097 1097
 		$immediatly=true;
1098 1098
 		extract($parameters);
1099
-		$script=$this->js->_execOn($element, $event, $js, $preventDefault, $stopPropagation,$immediatly);
1099
+		$script=$this->js->_execOn($element, $event, $js, $preventDefault, $stopPropagation, $immediatly);
1100 1100
 		return $script;
1101 1101
 	}
1102 1102
 
@@ -1106,7 +1106,7 @@  discard block
 block discarded – undo
1106 1106
 
1107 1107
 	public function setCDNs($cdns) {
1108 1108
 		if (is_array($cdns)===false) {
1109
-			$cdns=array (
1109
+			$cdns=array(
1110 1110
 					$cdns
1111 1111
 			);
1112 1112
 		}
@@ -1117,9 +1117,9 @@  discard block
 block discarded – undo
1117 1117
 		$hasJQuery=false;
1118 1118
 		$hasJQueryUI=false;
1119 1119
 		$hasBootstrap=false;
1120
-		$result=array ();
1121
-		foreach ( $this->cdns as $cdn ) {
1122
-			switch(get_class($cdn)) {
1120
+		$result=array();
1121
+		foreach ($this->cdns as $cdn) {
1122
+			switch (get_class($cdn)) {
1123 1123
 				case "Ajax\lib\CDNJQuery":
1124 1124
 					$hasJQuery=true;
1125 1125
 					$result[0]=$cdn;
@@ -1137,10 +1137,10 @@  discard block
 block discarded – undo
1137 1137
 		if ($hasJQuery===false) {
1138 1138
 			$result[0]=new CDNJQuery("x");
1139 1139
 		}
1140
-		if ($hasJQueryUI===false&&isset($this->_ui)) {
1140
+		if ($hasJQueryUI===false && isset($this->_ui)) {
1141 1141
 			$result[1]=new CDNGuiGen("x", $template);
1142 1142
 		}
1143
-		if ($hasBootstrap===false&&isset($this->_bootstrap)) {
1143
+		if ($hasBootstrap===false && isset($this->_bootstrap)) {
1144 1144
 			$result[2]=new CDNBootstrap("x");
1145 1145
 		}
1146 1146
 		ksort($result);
@@ -1154,7 +1154,7 @@  discard block
 block discarded – undo
1154 1154
 			$this->_setDi($di);
1155 1155
 		}
1156 1156
 	}
1157
-} else {
1157
+}else {
1158 1158
 	class JsUtils extends _JsUtils {
1159 1159
 
1160 1160
 		public function setDi(DiInterface $di) {
Please login to merge, or discard this patch.
Ajax/semantic/html/base/Color.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -5,8 +5,8 @@
 block discarded – undo
5 5
 use Ajax\common\BaseEnum;
6 6
 
7 7
 class Color extends BaseEnum {
8
-	const RED="red",ORANGE="orange",YELLOW="yellow",
9
-	OLIVE="olive",GREEN="green",TEAL="teal",
10
-	BLUE="blue",VIOLET="violet",PURPLE="purple",
11
-	PINK="pink",BROWN="brown",GREY="grey",BLACK="black";
8
+	const RED="red", ORANGE="orange", YELLOW="yellow",
9
+	OLIVE="olive", GREEN="green", TEAL="teal",
10
+	BLUE="blue", VIOLET="violet", PURPLE="purple",
11
+	PINK="pink", BROWN="brown", GREY="grey", BLACK="black";
12 12
 }
13 13
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/html/base/IconSize.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,5 +2,5 @@
 block discarded – undo
2 2
 namespace Ajax\semantic\html\base;
3 3
 	use Ajax\common\BaseEnum;
4 4
 abstract class IconSize extends BaseEnum {
5
-	const MINI="mini", TINY="tiny", SMALL="small", NORMAL="",LARGE="large", BIG="big", HUGE="huge", MASSIVE="massive";
5
+	const MINI="mini", TINY="tiny", SMALL="small", NORMAL="", LARGE="large", BIG="big", HUGE="huge", MASSIVE="massive";
6 6
 }
7 7
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/bootstrap/html/HtmlBreadcrumbs.php 1 patch
Spacing   +38 added lines, -38 removed lines patch added patch discarded remove patch
@@ -41,15 +41,15 @@  discard block
 block discarded – undo
41 41
 	 * @param boolean $autoActive sets the last element's class to <b>active</b> if true
42 42
 	 * @param function $hrefFunction the function who generates the href elements. default : function($e){return $e->getContent()}
43 43
 	 */
44
-	public function __construct($identifier,$elements=array(),$autoActive=true,$startIndex=0,$hrefFunction=NULL){
45
-		parent::__construct($identifier,"ol");
44
+	public function __construct($identifier, $elements=array(), $autoActive=true, $startIndex=0, $hrefFunction=NULL) {
45
+		parent::__construct($identifier, "ol");
46 46
 		$this->startIndex=$startIndex;
47 47
 		$this->setProperty("class", "breadcrumb");
48 48
 		$this->content=array();
49 49
 		$this->autoActive=$autoActive;
50 50
 		$this->absolutePaths;
51
-		$this->_hrefFunction=function ($e){return $e->getContent();};
52
-		if(isset($hrefFunction)){
51
+		$this->_hrefFunction=function($e) {return $e->getContent(); };
52
+		if (isset($hrefFunction)) {
53 53
 			$this->_hrefFunction=$hrefFunction;
54 54
 		}
55 55
 		$this->addElements($elements);
@@ -60,43 +60,43 @@  discard block
 block discarded – undo
60 60
 	 * @param string $href
61 61
 	 * @return \Ajax\bootstrap\html\HtmlLink
62 62
 	 */
63
-	public function addElement($element,$href="",$glyph=NULL){
63
+	public function addElement($element, $href="", $glyph=NULL) {
64 64
 		$size=sizeof($this->content);
65
-		if(is_array($element)){
65
+		if (is_array($element)) {
66 66
 			$elm=new HtmlLink("lnk-".$this->identifier."-".$size);
67 67
 			$elm->fromArray($element);
68
-		}else if($element instanceof HtmlLink){
68
+		}else if ($element instanceof HtmlLink) {
69 69
 			$elm=$element;
70
-		}else{
71
-			$elm=new HtmlLink("lnk-".$this->identifier."-".$size,$href,$element);
72
-			if(isset($glyph)){
70
+		}else {
71
+			$elm=new HtmlLink("lnk-".$this->identifier."-".$size, $href, $element);
72
+			if (isset($glyph)) {
73 73
 				$elm->wrapContentWithGlyph($glyph);
74 74
 			}
75 75
 		}
76
-		$elm->wrap("<li>","</li>");
76
+		$elm->wrap("<li>", "</li>");
77 77
 		$this->content[]=$elm;
78 78
 		$elm->setProperty($this->attr, $this->getHref($size));
79 79
 		return $elm;
80 80
 	}
81 81
 
82
-	public function setActive($index=null){
83
-		if(!isset($index)){
82
+	public function setActive($index=null) {
83
+		if (!isset($index)) {
84 84
 			$index=sizeof($this->content)-1;
85 85
 		}
86
-		$li=new HtmlBsDoubleElement("","li");
86
+		$li=new HtmlBsDoubleElement("", "li");
87 87
 		$li->setClass("active");
88 88
 		$li->setContent($this->content[$index]->getContent());
89 89
 		$this->content[$index]=$li;
90 90
 	}
91 91
 
92
-	public function addElements($elements){
93
-		foreach ( $elements as $element ) {
92
+	public function addElements($elements) {
93
+		foreach ($elements as $element) {
94 94
 			$this->addElement($element);
95 95
 		}
96 96
 		return $this;
97 97
 	}
98 98
 
99
-	public function fromArray($array){
99
+	public function fromArray($array) {
100 100
 		$array=parent::fromArray($array);
101 101
 		$this->addElements($array);
102 102
 		return $array;
@@ -108,14 +108,14 @@  discard block
 block discarded – undo
108 108
 	 * @param string $separator
109 109
 	 * @return string
110 110
 	 */
111
-	public function getHref($index=null,$separator="/"){
112
-		if(!isset($index)){
111
+	public function getHref($index=null, $separator="/") {
112
+		if (!isset($index)) {
113 113
 			$index=sizeof($this->content);
114 114
 		}
115
-		if($this->absolutePaths===true){
115
+		if ($this->absolutePaths===true) {
116 116
 			return $this->_hrefFunction($this->content[$index]);
117
-		}else{
118
-			return $this->root.implode($separator, array_slice(array_map(function($e){return $this->_hrefFunction($e);}, $this->content),$this->startIndex,$index+1));
117
+		}else {
118
+			return $this->root.implode($separator, array_slice(array_map(function($e) {return $this->_hrefFunction($e); }, $this->content), $this->startIndex, $index+1));
119 119
 		}
120 120
 	}
121 121
 
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
 	 * @see \Ajax\bootstrap\html\BaseHtml::compile()
125 125
 	 */
126 126
 	public function compile(JsUtils $js=NULL, View $view=NULL) {
127
-		if($this->autoActive){
127
+		if ($this->autoActive) {
128 128
 			$this->setActive();
129 129
 		}
130 130
 		return parent::compile($js, $view);
@@ -142,19 +142,19 @@  discard block
 block discarded – undo
142 142
 	 * @see \Ajax\bootstrap\html\base\BaseHtml::on()
143 143
 	 */
144 144
 	public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) {
145
-		foreach ($this->content as $element){
146
-			$element->on($event,$jsCode,$stopPropagation,$preventDefault);
145
+		foreach ($this->content as $element) {
146
+			$element->on($event, $jsCode, $stopPropagation, $preventDefault);
147 147
 		}
148 148
 		return $this;
149 149
 	}
150 150
 
151 151
 	public function setAutoActive($autoActive) {
152
-		$this->autoActive = $autoActive;
152
+		$this->autoActive=$autoActive;
153 153
 		return $this;
154 154
 	}
155 155
 
156 156
 	public function _ajaxOn($operation, $event, $url, $responseElement="", $parameters=array()) {
157
-		foreach ($this->content as $element){
157
+		foreach ($this->content as $element) {
158 158
 			$element->_ajaxOn($operation, $event, $url, $responseElement, $parameters);
159 159
 		}
160 160
 		return $this;
@@ -167,18 +167,18 @@  discard block
 block discarded – undo
167 167
 	 * @param string $attr the html attribute used to build the elements url
168 168
 	 * @return HtmlBreadcrumbs
169 169
 	 */
170
-	public function autoGetOnClick($targetSelector){
171
-		return $this->getOnClick($this->root, $targetSelector,array("attr"=>$this->attr));
170
+	public function autoGetOnClick($targetSelector) {
171
+		return $this->getOnClick($this->root, $targetSelector, array("attr"=>$this->attr));
172 172
 	}
173 173
 
174
-	public function contentAsString(){
175
-		if($this->autoActive){
174
+	public function contentAsString() {
175
+		if ($this->autoActive) {
176 176
 			$this->setActive();
177 177
 		}
178 178
 		return parent::contentAsString();
179 179
 	}
180 180
 
181
-	public function getElement($index){
181
+	public function getElement($index) {
182 182
 		return $this->content[$index];
183 183
 	}
184 184
 
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
187 187
 	 * @param mixed $glyph
188 188
 	 * @param int $index
189 189
 	 */
190
-	public function addGlyph($glyph,$index=0){
190
+	public function addGlyph($glyph, $index=0) {
191 191
 		$elm=$this->getElement($index);
192 192
 		return $elm->wrapContentWithGlyph($glyph);
193 193
 	}
@@ -197,14 +197,14 @@  discard block
 block discarded – undo
197 197
 	 * @param Dispatcher $dispatcher the request dispatcher
198 198
 	 * @return \Ajax\bootstrap\html\HtmlBreadcrumbs
199 199
 	 */
200
-	public function fromDispatcher($dispatcher){
200
+	public function fromDispatcher($dispatcher) {
201 201
 		$params=$dispatcher->getParams();
202 202
 		$action=$dispatcher->getActionName();
203 203
 		$items=array($dispatcher->getControllerName());
204
-		if(\sizeof($params)>0 || \strtolower($action)!="index" ){
204
+		if (\sizeof($params)>0 || \strtolower($action)!="index") {
205 205
 			$items[]=$action;
206
-			foreach ($params as $p){
207
-				if(\is_object($p)===false)
206
+			foreach ($params as $p) {
207
+				if (\is_object($p)===false)
208 208
 				$items[]=$p;
209 209
 			}
210 210
 		}
@@ -218,7 +218,7 @@  discard block
 block discarded – undo
218 218
 	 * @return \Ajax\bootstrap\html\HtmlBreadcrumbs
219 219
 	 */
220 220
 	public function setHrefFunction($_hrefFunction) {
221
-		$this->_hrefFunction = $_hrefFunction;
221
+		$this->_hrefFunction=$_hrefFunction;
222 222
 		return $this;
223 223
 	}
224 224
 
Please login to merge, or discard this patch.
Ajax/common/html/html5/HtmlImg.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@
 block discarded – undo
7 7
 
8 8
 class HtmlImg extends HtmlSingleElement {
9 9
 
10
-	public function __construct($identifier,$src="",$alt="") {
10
+	public function __construct($identifier, $src="", $alt="") {
11 11
 		parent::__construct($identifier, "img");
12 12
 		$this->setSrc($src);
13 13
 		$this->setAlt($alt);
Please login to merge, or discard this patch.
Ajax/semantic/html/elements/HtmlIcon.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
 	protected $attributes;
18 18
 	protected $color;
19 19
 
20
-	public function __construct($identifier,$icon) {
20
+	public function __construct($identifier, $icon) {
21 21
 		parent::__construct($identifier, "i");
22 22
 		$this->icon=$icon;
23 23
 		$this->_template='<i class="%icon% icon %size% %attributes% %color%"></i>';
@@ -42,11 +42,11 @@  discard block
 block discarded – undo
42 42
 	 * @see \Ajax\common\html\HtmlSingleElement::setSize()
43 43
 	 */
44 44
 	public function setSize($size) {
45
-		$this->setMemberCtrl($this->size, $size,Size::getConstants());
45
+		$this->setMemberCtrl($this->size, $size, Size::getConstants());
46 46
 		return $this;
47 47
 	}
48 48
 
49
-	public function setDisabled(){
49
+	public function setDisabled() {
50 50
 		return $this->addToMember($this->attributes, "disabled");
51 51
 	}
52 52
 
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 	 *  Icon used as a simple loader
55 55
 	 * @return \Ajax\semantic\html\HtmlIcon
56 56
 	 */
57
-	public function asLoader(){
57
+	public function asLoader() {
58 58
 		return $this->addToMember($this->attributes, "loading");
59 59
 	}
60 60
 
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 	 * An icon can be fitted, without any space to the left or right of it.
63 63
 	 * @return \Ajax\semantic\html\HtmlIcon
64 64
 	 */
65
-	public function setFitted(){
65
+	public function setFitted() {
66 66
 		return $this->addToMember($this->attributes, "fitted");
67 67
 	}
68 68
 
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 	 * @param string $sens horizontally or vertically
71 71
 	 * @return \Ajax\semantic\html\HtmlIcon
72 72
 	 */
73
-	public function setFlipped($sens="horizontally"){
73
+	public function setFlipped($sens="horizontally") {
74 74
 		return $this->addToMember($this->attributes, "flipped ".$sens);
75 75
 	}
76 76
 
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 	 * @param string $sens clockwise or counterclockwise
79 79
 	 * @return \Ajax\semantic\html\HtmlIcon
80 80
 	 */
81
-	public function setRotated($sens="clockwise"){
81
+	public function setRotated($sens="clockwise") {
82 82
 		return $this->addToMember($this->attributes, "rotated ".$sens);
83 83
 	}
84 84
 
@@ -86,13 +86,13 @@  discard block
 block discarded – undo
86 86
 	 * icon formatted as a link
87 87
 	 * @return \Ajax\semantic\html\HtmlIcon
88 88
 	 */
89
-	public function asLink(){
89
+	public function asLink() {
90 90
 		return $this->addToMember($this->attributes, "link");
91 91
 	}
92 92
 
93
-	public function setCircular($inverted=false){
93
+	public function setCircular($inverted=false) {
94 94
 		$invertedStr="";
95
-		if($inverted!==false)
95
+		if ($inverted!==false)
96 96
 			$invertedStr=" inverted";
97 97
 		return $this->addToMember($this->attributes, "circular".$invertedStr);
98 98
 	}
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
 	/**
101 101
 	 * @return \Ajax\semantic\html\HtmlIcon
102 102
 	 */
103
-	public function setInverted(){
103
+	public function setInverted() {
104 104
 		return $this->addToMember($this->attributes, "inverted");
105 105
 	}
106 106
 
@@ -108,9 +108,9 @@  discard block
 block discarded – undo
108 108
 	 * @param string $inverted
109 109
 	 * @return \Ajax\semantic\html\HtmlIcon
110 110
 	 */
111
-	public function setBordered($inverted=false){
111
+	public function setBordered($inverted=false) {
112 112
 		$invertedStr="";
113
-		if($inverted!==false)
113
+		if ($inverted!==false)
114 114
 			$invertedStr=" inverted";
115 115
 			return $this->addToMember($this->attributes, "bordered".$invertedStr);
116 116
 	}
@@ -119,14 +119,14 @@  discard block
 block discarded – undo
119 119
 	 * @param string $color
120 120
 	 * @return \Ajax\semantic\html\HtmlIcon
121 121
 	 */
122
-	public function setColor($color){
122
+	public function setColor($color) {
123 123
 		return $this->setMemberCtrl($this->color, $color, Color::getConstants());
124 124
 	}
125 125
 
126 126
 	/**
127 127
 	 * @return \Ajax\semantic\html\HtmlIcon
128 128
 	 */
129
-	public function toCorner(){
129
+	public function toCorner() {
130 130
 		return $this->addToMember($this->attributes, "corner");
131 131
 	}
132 132
 }
133 133
\ No newline at end of file
Please login to merge, or discard this patch.