Completed
Push — master ( 462f88...b88904 )
by Jean-Christophe
03:19
created
Ajax/semantic/html/base/traits/AttachedTrait.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,6 +16,6 @@
 block discarded – undo
16 16
 		if (isset($toElement)) {
17 17
 			$toElement->setAttached(true);
18 18
 		}
19
-		return $this->addToPropertyCtrl("class", $side . " attached", Side::getConstantValues("attached"));
19
+		return $this->addToPropertyCtrl("class", $side." attached", Side::getConstantValues("attached"));
20 20
 	}
21 21
 }
22 22
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/service/Javascript.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -6,8 +6,8 @@
 block discarded – undo
6 6
 	public static $preventDefault="\nif(event && event.preventDefault) event.preventDefault();\n";
7 7
 	public static $stopPropagation="\nif(event && event.stopPropagation) event.stopPropagation();\n";
8 8
 
9
-	public static function containsCode($expression){
10
-		return strrpos($expression, 'this')!==false||strrpos($expression, 'event')!==false||strrpos($expression, 'self')!==false;
9
+	public static function containsCode($expression) {
10
+		return strrpos($expression, 'this')!==false || strrpos($expression, 'event')!==false || strrpos($expression, 'self')!==false;
11 11
 	}
12 12
 
13 13
 	/**
Please login to merge, or discard this patch.
Ajax/common/html/HtmlSingleElement.php 1 patch
Spacing   +3 added lines, -3 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);
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 	}
22 22
 
23 23
 	public function addClass($classNames) {
24
-		if(\is_array($classNames)){
24
+		if (\is_array($classNames)) {
25 25
 			$classNames=implode(" ", $classNames);
26 26
 		}
27 27
 		$this->addToProperty("class", $classNames);
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 	 */
53 53
 	public function fromArray($array) {
54 54
 		$array=parent::fromArray($array);
55
-		foreach ( $array as $key => $value ) {
55
+		foreach ($array as $key => $value) {
56 56
 			$this->setProperty($key, $value);
57 57
 		}
58 58
 		return $array;
Please login to merge, or discard this patch.
Ajax/semantic/html/content/InternalPopup.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -14,64 +14,64 @@
 block discarded – undo
14 14
 	protected $params;
15 15
 	protected $semElement;
16 16
 
17
-	public function __construct($semElement,$title="",$content="",$variation=NULL,$params=array()){
17
+	public function __construct($semElement, $title="", $content="", $variation=NULL, $params=array()) {
18 18
 		$this->semElement=$semElement;
19 19
 		$this->title=$title;
20 20
 		$this->content=$content;
21
-		$this->setAttributes($variation,$params);
21
+		$this->setAttributes($variation, $params);
22 22
 	}
23 23
 
24 24
 	public function setHtml($html) {
25
-		$this->html= $html;
25
+		$this->html=$html;
26 26
 		return $this;
27 27
 	}
28 28
 
29
-	public function setAttributes($variation=NULL,$params=array()){
29
+	public function setAttributes($variation=NULL, $params=array()) {
30 30
 		$this->variation=$variation;
31 31
 		$this->params=$params;
32 32
 	}
33 33
 
34
-	public function onShow($jsCode){
34
+	public function onShow($jsCode) {
35 35
 		$this->params["onShow"]=$jsCode;
36 36
 	}
37 37
 
38
-	public function compile(JsUtils $js=NULL){
39
-		if(JString::isNotNull($this->title)){
38
+	public function compile(JsUtils $js=NULL) {
39
+		if (JString::isNotNull($this->title)) {
40 40
 			$this->semElement->addToProperty("data-title", $this->title);
41 41
 		}
42
-		if(JString::isNotNull($this->content)){
42
+		if (JString::isNotNull($this->content)) {
43 43
 			$this->semElement->addToProperty("data-content", $this->content);
44 44
 		}
45 45
 		$this->_compileHtml($js);
46
-		if(JString::isNotNull($this->variation)){
46
+		if (JString::isNotNull($this->variation)) {
47 47
 			$this->semElement->addToProperty("data-variation", $this->variation);
48 48
 		}
49 49
 	}
50 50
 
51
-	private function _compileHtml(JsUtils $js=NULL){
52
-		if(JString::isNotNull($this->html)){
51
+	private function _compileHtml(JsUtils $js=NULL) {
52
+		if (JString::isNotNull($this->html)) {
53 53
 			$html=$this->html;
54
-			if(\is_array($html)){
54
+			if (\is_array($html)) {
55 55
 				\array_walk($html, function(&$item) use($js){
56
-					if($item instanceof HtmlSemDoubleElement){
56
+					if ($item instanceof HtmlSemDoubleElement) {
57 57
 						$comp=$item->compile($js);
58
-						if(isset($js)){
58
+						if (isset($js)) {
59 59
 							$bs=$item->run($js);
60
-							if(isset($bs))
60
+							if (isset($bs))
61 61
 								$this->params['onShow']=$bs->getScript();
62 62
 						}
63 63
 						$item=$comp;
64 64
 					}
65 65
 				});
66
-				$html=\implode("",$html);
66
+				$html=\implode("", $html);
67 67
 			}
68 68
 			$html=\str_replace("\"", "'", $html);
69 69
 			$this->semElement->addToProperty("data-html", $html);
70 70
 		}
71 71
 	}
72 72
 
73
-	public function run(JsUtils $js){
74
-		$js->semantic()->popup("#".$this->semElement->getIdentifier(),$this->params);
73
+	public function run(JsUtils $js) {
74
+		$js->semantic()->popup("#".$this->semElement->getIdentifier(), $this->params);
75 75
 	}
76 76
 
77 77
 }
78 78
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/bootstrap/html/HtmlButtongroups.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 	 * @return HtmlButtongroups default : ""
40 40
 	 */
41 41
 	public function setSize($size) {
42
-		foreach ( $this->elements as $element ) {
42
+		foreach ($this->elements as $element) {
43 43
 			$element->setSize($size);
44 44
 		}
45 45
 		if (is_int($size)) {
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 	}
50 50
 
51 51
 	public function setStyle($value) {
52
-		foreach ( $this->elements as $element )
52
+		foreach ($this->elements as $element)
53 53
 			$element->setStyle($value);
54 54
 	}
55 55
 
@@ -69,29 +69,29 @@  discard block
 block discarded – undo
69 69
 	public function addElement($element) {
70 70
 		$result=$element;
71 71
 		$iid=sizeof($this->elements)+1;
72
-		if (($element instanceof HtmlDropdown)||($element instanceof HtmlSplitbutton)) {
72
+		if (($element instanceof HtmlDropdown) || ($element instanceof HtmlSplitbutton)) {
73 73
 			$this->addExistingDropDown($element);
74 74
 		} elseif (\is_array($element)) {
75
-			$result=$this->_addArrayElement($element,$iid);
75
+			$result=$this->_addArrayElement($element, $iid);
76 76
 		} elseif (is_string($element)) {
77
-			$result=new HtmlButton($this->identifier."-button-".$iid,$element);
77
+			$result=new HtmlButton($this->identifier."-button-".$iid, $element);
78 78
 		}
79
-		if($result instanceof HtmlButton)
79
+		if ($result instanceof HtmlButton)
80 80
 			$this->elements[]=$result;
81 81
 		return $result;
82 82
 	}
83 83
 
84
-	private function _addArrayElement(array $element,$iid){
84
+	private function _addArrayElement(array $element, $iid) {
85 85
 		if (array_key_exists("glyph", $element))
86 86
 			$bt=new HtmlGlyphButton($this->identifier."-button-".$iid);
87 87
 		elseif (array_key_exists("btnCaption", $element)) {
88 88
 			if (array_key_exists("split", $element))
89 89
 				$bt=new HtmlSplitbutton($this->identifier."-dropdown-".$iid);
90
-			else{
90
+			else {
91 91
 				$bt=new HtmlDropdown($this->identifier."-dropdown-".$iid);
92 92
 				$this->dropdownAsButton($bt);
93 93
 			}
94
-		} else{
94
+		} else {
95 95
 			$bt=new HtmlButton($this->identifier."-button-".$iid);
96 96
 			$bt->fromArray($element);
97 97
 		}
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 	}
100 100
 
101 101
 	public function addElements($elements) {
102
-		foreach ( $elements as $element ) {
102
+		foreach ($elements as $element) {
103 103
 			$this->addElement($element);
104 104
 		}
105 105
 		return $this;
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 		} else
120 120
 			$value="btn-group-".$value;
121 121
 		if (strstr($value, "justified")) {
122
-			foreach ( $this->elements as $element ) {
122
+			foreach ($this->elements as $element) {
123 123
 				$element->wrap('<div class="btn-group" role="group">', '</div>');
124 124
 			}
125 125
 		}
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
 	 * @see \Ajax\bootstrap\html\base\BaseHtml::on()
151 151
 	 */
152 152
 	public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) {
153
-		foreach ( $this->elements as $element ) {
153
+		foreach ($this->elements as $element) {
154 154
 			$element->on($event, $jsCode, $stopPropagation, $preventDefault);
155 155
 		}
156 156
 		return $this;
Please login to merge, or discard this patch.
Ajax/service/JQueryAjaxEffect.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,15 +1,15 @@
 block discarded – undo
1 1
 <?php
2 2
 namespace Ajax\service;
3 3
 class JQueryAjaxEffect {
4
-	public static function none($responseElement,$jqueryDone="html"){
4
+	public static function none($responseElement, $jqueryDone="html") {
5 5
 		return "\t$({$responseElement}).{$jqueryDone}( data );\n";
6 6
 	}
7 7
 
8
-	public static function fade($responseElement,$jqueryDone="html"){
8
+	public static function fade($responseElement, $jqueryDone="html") {
9 9
 		return "\t$({$responseElement}).hide().{$jqueryDone}( data ).fadeIn();\n";
10 10
 	}
11 11
 
12
-	public static function slide($responseElement,$jqueryDone="html"){
12
+	public static function slide($responseElement, $jqueryDone="html") {
13 13
 		return "\t$({$responseElement}).hide().{$jqueryDone}( data ).slideDown();\n";
14 14
 	}
15 15
 }
16 16
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/service/AjaxTransition.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -3,26 +3,26 @@
 block discarded – undo
3 3
 use Ajax\semantic\html\base\constants\Transition;
4 4
 
5 5
 class AjaxTransition {
6
-	public static function none($responseElement,$jqueryDone="html"){
6
+	public static function none($responseElement, $jqueryDone="html") {
7 7
 		return "$({$responseElement}).{$jqueryDone}( data )";
8 8
 	}
9 9
 
10
-	public static function jqFade($responseElement,$jqueryDone="html"){
10
+	public static function jqFade($responseElement, $jqueryDone="html") {
11 11
 		return "$({$responseElement}).hide().{$jqueryDone}( data ).fadeIn()";
12 12
 	}
13 13
 
14
-	public static function jqSlide($responseElement,$jqueryDone="html"){
14
+	public static function jqSlide($responseElement, $jqueryDone="html") {
15 15
 		return "$({$responseElement}).hide().{$jqueryDone}( data ).slideDown()";
16 16
 	}
17 17
 
18
-	public static function random($responseElement,$jqueryDone="html"){
18
+	public static function random($responseElement, $jqueryDone="html") {
19 19
 		$transitions=Transition::getConstantValues();
20
-		$transition=$transitions[\rand(0,\sizeof($transitions)-1)];
21
-		return self::__callStatic($transition, [$responseElement,$jqueryDone]);
20
+		$transition=$transitions[\rand(0, \sizeof($transitions)-1)];
21
+		return self::__callStatic($transition, [$responseElement, $jqueryDone]);
22 22
 	}
23 23
 
24
-	public static function __callStatic($name, $arguments){
25
-		if(\sizeof($arguments)==2){
24
+	public static function __callStatic($name, $arguments) {
25
+		if (\sizeof($arguments)==2) {
26 26
 			$responseElement=$arguments[0];
27 27
 			$jqueryDone=$arguments[1];
28 28
 			$name=JString::camelCaseToSeparated($name);
Please login to merge, or discard this patch.
Ajax/semantic/html/base/constants/Transition.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -3,12 +3,12 @@
 block discarded – undo
3 3
 use Ajax\common\BaseEnum;
4 4
 abstract class Transition extends BaseEnum {
5 5
 	const SCALE="scale",
6
-	FADE="fade",FADE_UP="fadeUp",FADE_DOWN="fadeDown",FADE_LEFT="fadeLeft",FADE_RIGHT="fadeRight",
7
-	HORIZONTAL_FLIP="horizontalFlip",VERTICAL_FLIP="verticalFlip",
6
+	FADE="fade", FADE_UP="fadeUp", FADE_DOWN="fadeDown", FADE_LEFT="fadeLeft", FADE_RIGHT="fadeRight",
7
+	HORIZONTAL_FLIP="horizontalFlip", VERTICAL_FLIP="verticalFlip",
8 8
 	DROP="drop",
9
-	FLY_LEFT="flyLeft",FLY_RIGHT="flyRight",FLY_UP="flyUp",FLY_DOWN="flyDown",
10
-	SWING_LEFT="swingLeft",SWING_RIGHT="swingRight",SWING_UP="swingUp",SWING_DOWN="swingDown",
11
-	BROWSE="browse",BROWSE_RIGHT="browseRight",
12
-	SLIDE_LEFT="slideLeft",SLIDE_RIGHT="slideRight",SLIDE_UP="slideUp",SLIDE_DOWN="slideDown",
13
-	JIGGLE="jiggle",FLASH="flash",SHAKE="shake",PULSE="pulse",TADA="tada",BOUNCE="bounce";
9
+	FLY_LEFT="flyLeft", FLY_RIGHT="flyRight", FLY_UP="flyUp", FLY_DOWN="flyDown",
10
+	SWING_LEFT="swingLeft", SWING_RIGHT="swingRight", SWING_UP="swingUp", SWING_DOWN="swingDown",
11
+	BROWSE="browse", BROWSE_RIGHT="browseRight",
12
+	SLIDE_LEFT="slideLeft", SLIDE_RIGHT="slideRight", SLIDE_UP="slideUp", SLIDE_DOWN="slideDown",
13
+	JIGGLE="jiggle", FLASH="flash", SHAKE="shake", PULSE="pulse", TADA="tada", BOUNCE="bounce";
14 14
 }
15 15
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/php/ci/JsUtils.php 1 patch
Spacing   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -1,39 +1,39 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 namespace Ajax\php\ci;
3 3
 
4
-class JsUtils extends \Ajax\JsUtils{
4
+class JsUtils extends \Ajax\JsUtils {
5 5
 	protected $ci;
6
-	protected $_my_controller_paths= array();
7
-	protected $_my_controllers= array();
6
+	protected $_my_controller_paths=array();
7
+	protected $_my_controllers=array();
8 8
 
9
-	public function __construct($params=array(),$injected=NULL){
10
-		parent::__construct($params,$injected);
11
-		$this->_my_controller_paths = array(APPPATH);
9
+	public function __construct($params=array(), $injected=NULL) {
10
+		parent::__construct($params, $injected);
11
+		$this->_my_controller_paths=array(APPPATH);
12 12
 	}
13
-	public function getUrl($url){
13
+	public function getUrl($url) {
14 14
 		return site_url($url);
15 15
 	}
16 16
 
17
-	public function getCi(){
18
-		if(isset($this->ci)===false){
19
-			$this->ci =& get_instance();
17
+	public function getCi() {
18
+		if (isset($this->ci)===false) {
19
+			$this->ci=& get_instance();
20 20
 			$this->ci->load->helper('url');
21 21
 		}
22 22
 		return $this->ci;
23 23
 	}
24 24
 
25
-	public function addViewElement($identifier,$content,&$view){
26
-		if(\array_key_exists("q", $view)===false){
25
+	public function addViewElement($identifier, $content, &$view) {
26
+		if (\array_key_exists("q", $view)===false) {
27 27
 			$view["q"]=array();
28 28
 		}
29 29
 		$view["q"][$identifier]=$content;
30 30
 	}
31 31
 
32
-	public function createScriptVariable(&$view,$view_var, $output){
32
+	public function createScriptVariable(&$view, $view_var, $output) {
33 33
 		$view[$view_var]=$output;
34 34
 	}
35 35
 
36
-	public function forward($initialControllerInstance,$controllerName,$actionName,$params=NULL){
36
+	public function forward($initialControllerInstance, $controllerName, $actionName, $params=NULL) {
37 37
 		$ci=$this->getCi();
38 38
 		$controllerName=strtolower($controllerName);
39 39
 		$this->controller($controllerName);
@@ -44,64 +44,64 @@  discard block
 block discarded – undo
44 44
 		return $result;
45 45
 	}
46 46
 
47
-	public function renderContent($initialControllerInstance,$viewName, $params=NULL) {
47
+	public function renderContent($initialControllerInstance, $viewName, $params=NULL) {
48 48
 		return $initialControllerInstance->load->view($viewName, $params, true);
49 49
 	}
50 50
 
51
-	public function fromDispatcher($dispatcher){
51
+	public function fromDispatcher($dispatcher) {
52 52
 		return array_values($dispatcher->uri->segment_array());
53 53
 	}
54 54
 
55
-	public function controller($controller, $name = '', $db_conn = FALSE){
56
-		if (\is_array($controller)){
57
-			foreach ($controller as $babe){
55
+	public function controller($controller, $name='', $db_conn=FALSE) {
56
+		if (\is_array($controller)) {
57
+			foreach ($controller as $babe) {
58 58
 				$this->controller($babe);
59 59
 			}
60 60
 			return;
61 61
 		}
62
-		if ($controller == ''){
62
+		if ($controller=='') {
63 63
 			return;
64 64
 		}
65
-		$path = '';
65
+		$path='';
66 66
 		// Is the controller in a sub-folder? If so, parse out the filename and path.
67
-		if (($last_slash = strrpos($controller, '/')) !== FALSE){
67
+		if (($last_slash=strrpos($controller, '/'))!==FALSE) {
68 68
 			// The path is in front of the last slash
69
-			$path = substr($controller, 0, $last_slash + 1);
69
+			$path=substr($controller, 0, $last_slash+1);
70 70
 			// And the controller name behind it
71
-			$controller = substr($controller, $last_slash + 1);
71
+			$controller=substr($controller, $last_slash+1);
72 72
 		}
73 73
 
74
-		if ($name == ''){
75
-			$name = $controller;
74
+		if ($name=='') {
75
+			$name=$controller;
76 76
 		}
77 77
 
78
-		if (in_array($name, $this->_my_controllers, TRUE)){
78
+		if (in_array($name, $this->_my_controllers, TRUE)) {
79 79
 			return;
80 80
 		}
81 81
 
82
-		$CI =$this->getCi();
83
-		if (isset($CI->$name)){
82
+		$CI=$this->getCi();
83
+		if (isset($CI->$name)) {
84 84
 			show_error('The controller name you are loading is the name of a resource that is already being used: '.$name);
85 85
 		}
86
-		$controller = strtolower($controller);
87
-		foreach ($this->_my_controller_paths as $mod_path){
88
-			if ( ! file_exists($mod_path.'controllers/'.$path.$controller.'.php')){
86
+		$controller=strtolower($controller);
87
+		foreach ($this->_my_controller_paths as $mod_path) {
88
+			if (!file_exists($mod_path.'controllers/'.$path.$controller.'.php')) {
89 89
 				continue;
90 90
 			}
91
-			if ($db_conn !== FALSE && ! class_exists('CI_DB')){
92
-				if ($db_conn === TRUE){
93
-					$db_conn = '';
91
+			if ($db_conn!==FALSE && !class_exists('CI_DB')) {
92
+				if ($db_conn===TRUE) {
93
+					$db_conn='';
94 94
 				}
95 95
 				$CI->load->database($db_conn, FALSE, TRUE);
96 96
 			}
97
-			if ( ! class_exists('CI_Controller')){
97
+			if (!class_exists('CI_Controller')) {
98 98
 				load_class('Controller', 'core');
99 99
 			}
100 100
 			require_once($mod_path.'controllers/'.$path.$controller.'.php');
101
-			$controller = ucfirst($controller);
102
-			$CI->$name = new $controller();
101
+			$controller=ucfirst($controller);
102
+			$CI->$name=new $controller();
103 103
 
104
-			$this->_my_controllers[] = $name;
104
+			$this->_my_controllers[]=$name;
105 105
 			return;
106 106
 		}
107 107
 		show_error('Unable to locate the controller you have specified: '.$controller);
Please login to merge, or discard this patch.