phpMv / phpMv-UI

Ajax/service/JQueryAjaxEffect.php

Spacing +3 added lines, -3 removed lines

@@ -1,15 +1,15 @@
 <?php
 namespace Ajax\service;
 class JQueryAjaxEffect {
-	public static function none($responseElement,$jqueryDone="html"){
+	public static function none($responseElement, $jqueryDone="html") {
 		return "\t$({$responseElement}).{$jqueryDone}( data );\n";
 	}
 
-	public static function fade($responseElement,$jqueryDone="html"){
+	public static function fade($responseElement, $jqueryDone="html") {
 		return "\t$({$responseElement}).hide().{$jqueryDone}( data ).fadeIn();\n";
 	}
 
-	public static function slide($responseElement,$jqueryDone="html"){
+	public static function slide($responseElement, $jqueryDone="html") {
 		return "\t$({$responseElement}).hide().{$jqueryDone}( data ).slideDown();\n";
 	}
 }
\ No newline at end of file

Ajax/service/AjaxCall.php

Spacing +4 added lines, -4 removed lines

@@ -33,15 +33,15 @@
 		if ($stopPropagation===true) {
 			$result.=Javascript::$stopPropagation;
 		}
-		switch($this->method) {
+		switch ($this->method) {
 			case "get":
-				$result.=$js->getDeferred($url, $responseElement, $params, $callback, $attr,$jqueryDone,$ajaxTransition);
+				$result.=$js->getDeferred($url, $responseElement, $params, $callback, $attr, $jqueryDone, $ajaxTransition);
 				break;
 			case "post":
-				$result.=$js->postDeferred($url, $responseElement, $params, $callback, $attr,$hasLoader,$jqueryDone,$ajaxTransition);
+				$result.=$js->postDeferred($url, $responseElement, $params, $callback, $attr, $hasLoader, $jqueryDone, $ajaxTransition);
 				break;
 			case "postForm":
-				$result.=$js->postFormDeferred($url, $form, $responseElement, $validation, $callback, $attr,$hasLoader,$jqueryDone,$ajaxTransition);
+				$result.=$js->postFormDeferred($url, $form, $responseElement, $validation, $callback, $attr, $hasLoader, $jqueryDone, $ajaxTransition);
 				break;
 		}
 		return $result;

Ajax/Jquery.php

Spacing +25 added lines, -25 removed lines

@@ -15,16 +15,16 @@ 
  * @license Apache 2 http://www.apache.org/licenses/
  **/
 class Jquery {
-	use JqueryEventsTrait,JqueryAjaxTrait,JqueryActionsTrait;
+	use JqueryEventsTrait, JqueryAjaxTrait, JqueryActionsTrait;
 	protected $_ui;
 	protected $_bootstrap;
 	protected $_semantic;
-	protected $jquery_code_for_compile=array ();
+	protected $jquery_code_for_compile=array();
 	protected $jsUtils;
 	protected $params;
 
-	protected $jquery_events=array (
-			"bind","blur","change","click","dblclick","delegate","die","error","focus","focusin","focusout","hover","keydown","keypress","keyup","live","load","mousedown","mousseenter","mouseleave","mousemove","mouseout","mouseover","mouseup","off","on","one","ready","resize","scroll","select","submit","toggle","trigger","triggerHandler","undind","undelegate","unload"
+	protected $jquery_events=array(
+			"bind", "blur", "change", "click", "dblclick", "delegate", "die", "error", "focus", "focusin", "focusout", "hover", "keydown", "keypress", "keyup", "live", "load", "mousedown", "mousseenter", "mouseleave", "mousemove", "mouseout", "mouseover", "mouseup", "off", "on", "one", "ready", "resize", "scroll", "select", "submit", "toggle", "trigger", "triggerHandler", "undind", "undelegate", "unload"
 	);
 
 	public function ui($ui=NULL) {
@@ -48,13 +48,13 @@ 
 		return $this->_semantic;
 	}
 
-	public function __construct($params,$jsUtils) {
+	public function __construct($params, $jsUtils) {
 		$this->params=array();
-		foreach ( $params as $key => $val ) {
+		foreach ($params as $key => $val) {
 				$this->params[$key]=$params[$key];
 		}
 		$this->jsUtils=$jsUtils;
-		if(isset($params["ajaxTransition"]))
+		if (isset($params["ajaxTransition"]))
 			$this->ajaxTransition=$this->setAjaxDataCall($params["ajaxTransition"]);
 	}
 
@@ -116,12 +116,12 @@ 
 	 */
 	public function _output($array_js='') {
 		if (!is_array($array_js)) {
-			$array_js=array (
+			$array_js=array(
 					$array_js
 			);
 		}
 
-		foreach ( $array_js as $js ) {
+		foreach ($array_js as $js) {
 			$this->jquery_code_for_compile[]="\t$js\n";
 		}
 	}
@@ -133,7 +133,7 @@ 
 	 * @param string $param
 	 * @param boolean $immediatly delayed if false
 	 */
-	public function _genericCallValue($jQueryCall,$element='this', $param="", $immediatly=false) {
+	public function _genericCallValue($jQueryCall, $element='this', $param="", $immediatly=false) {
 		$element=Javascript::prep_element($element);
 		if (isset($param)) {
 			$param=Javascript::prep_value($param);
@@ -152,7 +152,7 @@ 
 	 * @param boolean $immediatly delayed if false
 	 * @return string
 	 */
-	public function _genericCallElement($jQueryCall,$to='this', $element, $immediatly=false) {
+	public function _genericCallElement($jQueryCall, $to='this', $element, $immediatly=false) {
 		$to=Javascript::prep_element($to);
 		$element=Javascript::prep_element($element);
 		$str="$({$to}).{$jQueryCall}({$element});";
@@ -170,8 +170,8 @@ 
 	 */
 	public function sortable($element, $options=array()) {
 		if (count($options)>0) {
-			$sort_options=array ();
-			foreach ( $options as $k => $v ) {
+			$sort_options=array();
+			foreach ($options as $k => $v) {
 				$sort_options[]="\n\t\t".$k.': '.$v."";
 			}
 			$sort_options=implode(",", $sort_options);
@@ -203,7 +203,7 @@ 
 	 * @param boolean $stopPropagation Prevents the event from bubbling up the DOM tree, preventing any parent handlers from being notified of the event.
 	 * @return string
 	 */
-	public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true) {
+	public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true) {
 		if (\is_array($js)) {
 			$js=implode("\n\t\t", $js);
 		}
@@ -217,7 +217,7 @@ 
 			$event="\n\t$(".Javascript::prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n";
 		else
 			$event="\n\t$(".Javascript::prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n";
-		if($immediatly)
+		if ($immediatly)
 			$this->jquery_code_for_compile[]=$event;
 		return $event;
 	}
@@ -243,29 +243,29 @@ 
 		$script='$(document).ready(function() {'."\n";
 		$script.=implode('', $this->jquery_code_for_compile);
 		$script.='})';
-		if($this->params["defer"]){
+		if ($this->params["defer"]) {
 			$script=$this->defer($script);
 		}
 		$script.=";";
 		$this->jquery_code_for_compile=array();
-		if($this->params["debug"]===false){
+		if ($this->params["debug"]===false) {
 			$script=$this->minify($script);
 		}
 		$output=($script_tags===FALSE) ? $script : $this->inline($script);
 
-		if ($view!==NULL){
-			$this->jsUtils->createScriptVariable($view,$view_var, $output);
+		if ($view!==NULL) {
+			$this->jsUtils->createScriptVariable($view, $view_var, $output);
 		}
 		return $output;
 	}
 
-	private function defer($script){
+	private function defer($script) {
 		$result="window.defer=function (method) {if (window.jQuery) method(); else setTimeout(function() { defer(method) }, 50);};";
 		$result.="window.defer(function(){".$script."})";
 		return $result;
 	}
 
-	private function _compileLibrary($library){
+	private function _compileLibrary($library) {
 		if ($library!=NULL) {
 			if ($library->isAutoCompile()) {
 				$library->compile(true);
@@ -283,7 +283,7 @@ 
 	 * @return void
 	 */
 	public function _clear_compile() {
-		$this->jquery_code_for_compile=array ();
+		$this->jquery_code_for_compile=array();
 	}
 
 	/**
@@ -292,18 +292,18 @@ 
 	 */
 	public function _document_ready($js) {
 		if (!is_array($js)) {
-			$js=array (
+			$js=array(
 					$js
 			);
 		}
 
-		foreach ( $js as $script ) {
+		foreach ($js as $script) {
 			$this->jquery_code_for_compile[]=$script;
 		}
 	}
 
 	private function minify($input) {
-	if(trim($input) === "") return $input;
+	if (trim($input)==="") return $input;
 	return preg_replace(
 			array(
 					// Remove comment(s)

Ajax/common/traits/JsUtilsAjaxTrait.php

Spacing +21 added lines, -21 removed lines

@@ -25,8 +25,8 @@ 
 	 * @param string $jqueryDone the jquery function call on ajax data. default:html
 	 * @param string|callable $ajaxTransition
 	 */
-	public function get($url, $responseElement="", $params="{}", $jsCallback=NULL,$hasLoader=true,$jqueryDone="html",$ajaxTransition=null) {
-		return $this->js->_get($url, $params, $responseElement, $jsCallback, NULL, $hasLoader,$jqueryDone,$ajaxTransition,true);
+	public function get($url, $responseElement="", $params="{}", $jsCallback=NULL, $hasLoader=true, $jqueryDone="html", $ajaxTransition=null) {
+		return $this->js->_get($url, $params, $responseElement, $jsCallback, NULL, $hasLoader, $jqueryDone, $ajaxTransition, true);
 	}
 
 	/**
@@ -37,8 +37,8 @@ 
 	 * @param string $jsCallback javascript code to execute after the request
 	 * @param boolean $immediatly
 	 */
-	public function json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document",$immediatly=false) {
-		return $this->js->_json($url, $method, $params, $jsCallback, $attr, $context,$immediatly);
+	public function json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document", $immediatly=false) {
+		return $this->js->_json($url, $method, $params, $jsCallback, $attr, $context, $immediatly);
 	}
 
 	/**
@@ -48,8 +48,8 @@ 
 	 * @param string $url the request address
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true)
 	 */
-	public function jsonOn($event,$element, $url,$parameters=array()) {
-		return $this->js->_jsonOn($event, $element, $url,$parameters);
+	public function jsonOn($event, $element, $url, $parameters=array()) {
+		return $this->js->_jsonOn($event, $element, $url, $parameters);
 	}
 
 	/**
@@ -71,7 +71,7 @@ 
 	 * @param string $jsCallback javascript code to execute after the request
 	 */
 	public function jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL) {
-		return $this->js->_jsonArray($maskSelector, $url, $method, $params, $jsCallback, NULL,true);
+		return $this->js->_jsonArray($maskSelector, $url, $method, $params, $jsCallback, NULL, true);
 	}
 
 	/**
@@ -93,8 +93,8 @@ 
 	 * @param string $url the request url
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true)
 	 */
-	public function jsonArrayOn($event,$element,$maskSelector, $url,$parameters=array()) {
-		return $this->js->_jsonArrayOn($event,$element,$maskSelector, $url, $parameters);
+	public function jsonArrayOn($event, $element, $maskSelector, $url, $parameters=array()) {
+		return $this->js->_jsonArrayOn($event, $element, $maskSelector, $url, $parameters);
 	}
 
 	/**
@@ -108,8 +108,8 @@ 
 	 * @param string $jqueryDone the jquery function call on ajax data. default:html
 	 * @param string|callable $ajaxTransition
 	 */
-	public function getDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL,$attr="id",$jqueryDone="html",$ajaxTransition=null) {
-		return $this->js->_get($url, $params, $responseElement, $jsCallback, $attr, false,$jqueryDone,$ajaxTransition);
+	public function getDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id", $jqueryDone="html", $ajaxTransition=null) {
+		return $this->js->_get($url, $params, $responseElement, $jsCallback, $attr, false, $jqueryDone, $ajaxTransition);
 	}
 
 	/**
@@ -148,8 +148,8 @@ 
 	 * @param string $jqueryDone the jquery function call on ajax data. default:html
 	 * @param string|callable $ajaxTransition
 	 */
-	public function post($url, $responseElement="", $params="{}", $jsCallback=NULL,$hasLoader=true,$jqueryDone="html",$ajaxTransition=null) {
-		return $this->js->_post($url, $params, $responseElement, $jsCallback, NULL, $hasLoader,$jqueryDone,$ajaxTransition,true);
+	public function post($url, $responseElement="", $params="{}", $jsCallback=NULL, $hasLoader=true, $jqueryDone="html", $ajaxTransition=null) {
+		return $this->js->_post($url, $params, $responseElement, $jsCallback, NULL, $hasLoader, $jqueryDone, $ajaxTransition, true);
 	}
 
 	/**
@@ -164,8 +164,8 @@ 
 	 * @param string $jqueryDone the jquery function call on ajax data. default:html
 	 * @param string|callable $ajaxTransition
 	 */
-	public function postDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id",$hasLoader=true,$jqueryDone="html",$ajaxTransition=null) {
-		return $this->js->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader,$jqueryDone,$ajaxTransition,false);
+	public function postDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id", $hasLoader=true, $jqueryDone="html", $ajaxTransition=null) {
+		return $this->js->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition, false);
 	}
 
 	/**
@@ -179,7 +179,7 @@ 
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null)
 	 */
 	public function postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
-		return $this->js->_postOn($event, $element,  $url, $params, $responseElement, $parameters);
+		return $this->js->_postOn($event, $element, $url, $params, $responseElement, $parameters);
 	}
 
 	/**
@@ -205,8 +205,8 @@ 
 	 * @param string $jqueryDone the jquery function call on ajax data. default:html
 	 * @param string|callable $ajaxTransition
 	 */
-	public function postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL,$hasLoader=true,$jqueryDone="html",$ajaxTransition=null) {
-		return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, NULL, $hasLoader,$jqueryDone,$ajaxTransition,true);
+	public function postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $hasLoader=true, $jqueryDone="html", $ajaxTransition=null) {
+		return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, NULL, $hasLoader, $jqueryDone, $ajaxTransition, true);
 	}
 
 	/**
@@ -221,8 +221,8 @@ 
 	 * @param string $jqueryDone the jquery function call on ajax data. default:html
 	 * @param string|callable $ajaxTransition
 	 */
-	public function postFormDeferred($url, $form, $responseElement, $validation=false, $jsCallback=NULL,$attr="id",$hasLoader=true,$jqueryDone="html",$ajaxTransition=null) {
-		return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader,$jqueryDone,$ajaxTransition,false);
+	public function postFormDeferred($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true, $jqueryDone="html", $ajaxTransition=null) {
+		return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition, false);
 	}
 
 	/**
@@ -236,7 +236,7 @@ 
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null)
 	 */
 	public function postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) {
-		return $this->js->_postFormOn($event,$element, $url, $form, $responseElement, $parameters);
+		return $this->js->_postFormOn($event, $element, $url, $form, $responseElement, $parameters);
 	}
 
 	/**

Ajax/service/AjaxTransition.php

Spacing +8 added lines, -8 removed lines

@@ -3,26 +3,26 @@
 use Ajax\semantic\html\base\constants\Transition;
 
 class AjaxTransition {
-	public static function none($responseElement,$jqueryDone="html"){
+	public static function none($responseElement, $jqueryDone="html") {
 		return "$({$responseElement}).{$jqueryDone}( data )";
 	}
 
-	public static function jqFade($responseElement,$jqueryDone="html"){
+	public static function jqFade($responseElement, $jqueryDone="html") {
 		return "$({$responseElement}).hide().{$jqueryDone}( data ).fadeIn()";
 	}
 
-	public static function jqSlide($responseElement,$jqueryDone="html"){
+	public static function jqSlide($responseElement, $jqueryDone="html") {
 		return "$({$responseElement}).hide().{$jqueryDone}( data ).slideDown()";
 	}
 
-	public static function random($responseElement,$jqueryDone="html"){
+	public static function random($responseElement, $jqueryDone="html") {
 		$transitions=Transition::getConstantValues();
-		$transition=$transitions[\rand(0,\sizeof($transitions)-1)];
-		return self::__callStatic($transition, [$responseElement,$jqueryDone]);
+		$transition=$transitions[\rand(0, \sizeof($transitions)-1)];
+		return self::__callStatic($transition, [$responseElement, $jqueryDone]);
 	}
 
-	public static function __callStatic($name, $arguments){
-		if(\sizeof($arguments)==2){
+	public static function __callStatic($name, $arguments) {
+		if (\sizeof($arguments)==2) {
 			$responseElement=$arguments[0];
 			$jqueryDone=$arguments[1];
 			$name=JString::camelCaseToSeparated($name);

Ajax/semantic/html/base/constants/Transition.php

Spacing +7 added lines, -7 removed lines

@@ -3,12 +3,12 @@
 use Ajax\common\BaseEnum;
 abstract class Transition extends BaseEnum {
 	const SCALE="scale",
-	FADE="fade",FADE_UP="fadeUp",FADE_DOWN="fadeDown",FADE_LEFT="fadeLeft",FADE_RIGHT="fadeRight",
-	HORIZONTAL_FLIP="horizontalFlip",VERTICAL_FLIP="verticalFlip",
+	FADE="fade", FADE_UP="fadeUp", FADE_DOWN="fadeDown", FADE_LEFT="fadeLeft", FADE_RIGHT="fadeRight",
+	HORIZONTAL_FLIP="horizontalFlip", VERTICAL_FLIP="verticalFlip",
 	DROP="drop",
-	FLY_LEFT="flyLeft",FLY_RIGHT="flyRight",FLY_UP="flyUp",FLY_DOWN="flyDown",
-	SWING_LEFT="swingLeft",SWING_RIGHT="swingRight",SWING_UP="swingUp",SWING_DOWN="swingDown",
-	BROWSE="browse",BROWSE_RIGHT="browseRight",
-	SLIDE_LEFT="slideLeft",SLIDE_RIGHT="slideRight",SLIDE_UP="slideUp",SLIDE_DOWN="slideDown",
-	JIGGLE="jiggle",FLASH="flash",SHAKE="shake",PULSE="pulse",TADA="tada",BOUNCE="bounce";
+	FLY_LEFT="flyLeft", FLY_RIGHT="flyRight", FLY_UP="flyUp", FLY_DOWN="flyDown",
+	SWING_LEFT="swingLeft", SWING_RIGHT="swingRight", SWING_UP="swingUp", SWING_DOWN="swingDown",
+	BROWSE="browse", BROWSE_RIGHT="browseRight",
+	SLIDE_LEFT="slideLeft", SLIDE_RIGHT="slideRight", SLIDE_UP="slideUp", SLIDE_DOWN="slideDown",
+	JIGGLE="jiggle", FLASH="flash", SHAKE="shake", PULSE="pulse", TADA="tada", BOUNCE="bounce";
 }
\ No newline at end of file

Ajax/service/JReflection.php

Spacing +2 added lines, -2 removed lines

@@ -3,8 +3,8 @@
 namespace Ajax\service;
 
 class JReflection {
-	public static function shortClassName($object){
-		$classNameWithNamespace = get_class($object);
+	public static function shortClassName($object) {
+		$classNameWithNamespace=get_class($object);
 		return substr($classNameWithNamespace, strrpos($classNameWithNamespace, '\\')+1);
 	}
 }
\ No newline at end of file

Ajax/php/ci/JsUtils.php

Spacing +39 added lines, -39 removed lines

@@ -1,39 +1,39 @@ 
 <?php
 namespace Ajax\php\ci;
 
-class JsUtils extends \Ajax\JsUtils{
+class JsUtils extends \Ajax\JsUtils {
 	protected $ci;
-	protected $_my_controller_paths= array();
-	protected $_my_controllers= array();
+	protected $_my_controller_paths=array();
+	protected $_my_controllers=array();
 
-	public function __construct($params=array(),$injected=NULL){
-		parent::__construct($params,$injected);
-		$this->_my_controller_paths = array(APPPATH);
+	public function __construct($params=array(), $injected=NULL) {
+		parent::__construct($params, $injected);
+		$this->_my_controller_paths=array(APPPATH);
 	}
-	public function getUrl($url){
+	public function getUrl($url) {
 		return site_url($url);
 	}
 
-	public function getCi(){
-		if(isset($this->ci)===false){
-			$this->ci =& get_instance();
+	public function getCi() {
+		if (isset($this->ci)===false) {
+			$this->ci=& get_instance();
 			$this->ci->load->helper('url');
 		}
 		return $this->ci;
 	}
 
-	public function addViewElement($identifier,$content,&$view){
-		if(\array_key_exists("q", $view)===false){
+	public function addViewElement($identifier, $content, &$view) {
+		if (\array_key_exists("q", $view)===false) {
 			$view["q"]=array();
 		}
 		$view["q"][$identifier]=$content;
 	}
 
-	public function createScriptVariable(&$view,$view_var, $output){
+	public function createScriptVariable(&$view, $view_var, $output) {
 		$view[$view_var]=$output;
 	}
 
-	public function forward($initialControllerInstance,$controllerName,$actionName,$params=NULL){
+	public function forward($initialControllerInstance, $controllerName, $actionName, $params=NULL) {
 		$ci=$this->getCi();
 		$controllerName=strtolower($controllerName);
 		$this->controller($controllerName);
@@ -44,64 +44,64 @@ 
 		return $result;
 	}
 
-	public function renderContent($initialControllerInstance,$viewName, $params=NULL) {
+	public function renderContent($initialControllerInstance, $viewName, $params=NULL) {
 		return $initialControllerInstance->load->view($viewName, $params, true);
 	}
 
-	public function fromDispatcher($dispatcher){
+	public function fromDispatcher($dispatcher) {
 		return array_values($dispatcher->uri->segment_array());
 	}
 
-	public function controller($controller, $name = '', $db_conn = FALSE){
-		if (\is_array($controller)){
-			foreach ($controller as $babe){
+	public function controller($controller, $name='', $db_conn=FALSE) {
+		if (\is_array($controller)) {
+			foreach ($controller as $babe) {
 				$this->controller($babe);
 			}
 			return;
 		}
-		if ($controller == ''){
+		if ($controller=='') {
 			return;
 		}
-		$path = '';
+		$path='';
 		// Is the controller in a sub-folder? If so, parse out the filename and path.
-		if (($last_slash = strrpos($controller, '/')) !== FALSE){
+		if (($last_slash=strrpos($controller, '/'))!==FALSE) {
 			// The path is in front of the last slash
-			$path = substr($controller, 0, $last_slash + 1);
+			$path=substr($controller, 0, $last_slash+1);
 			// And the controller name behind it
-			$controller = substr($controller, $last_slash + 1);
+			$controller=substr($controller, $last_slash+1);
 		}
 
-		if ($name == ''){
-			$name = $controller;
+		if ($name=='') {
+			$name=$controller;
 		}
 
-		if (in_array($name, $this->_my_controllers, TRUE)){
+		if (in_array($name, $this->_my_controllers, TRUE)) {
 			return;
 		}
 
-		$CI =$this->getCi();
-		if (isset($CI->$name)){
+		$CI=$this->getCi();
+		if (isset($CI->$name)) {
 			show_error('The controller name you are loading is the name of a resource that is already being used: '.$name);
 		}
-		$controller = strtolower($controller);
-		foreach ($this->_my_controller_paths as $mod_path){
-			if ( ! file_exists($mod_path.'controllers/'.$path.$controller.'.php')){
+		$controller=strtolower($controller);
+		foreach ($this->_my_controller_paths as $mod_path) {
+			if (!file_exists($mod_path.'controllers/'.$path.$controller.'.php')) {
 				continue;
 			}
-			if ($db_conn !== FALSE && ! class_exists('CI_DB')){
-				if ($db_conn === TRUE){
-					$db_conn = '';
+			if ($db_conn!==FALSE && !class_exists('CI_DB')) {
+				if ($db_conn===TRUE) {
+					$db_conn='';
 				}
 				$CI->load->database($db_conn, FALSE, TRUE);
 			}
-			if ( ! class_exists('CI_Controller')){
+			if (!class_exists('CI_Controller')) {
 				load_class('Controller', 'core');
 			}
 			require_once($mod_path.'controllers/'.$path.$controller.'.php');
-			$controller = ucfirst($controller);
-			$CI->$name = new $controller();
+			$controller=ucfirst($controller);
+			$CI->$name=new $controller();
 
-			$this->_my_controllers[] = $name;
+			$this->_my_controllers[]=$name;
 			return;
 		}
 		show_error('Unable to locate the controller you have specified: '.$controller);

Ajax/semantic/widgets/datatable/DataTableFieldAsTrait.php

Spacing +51 added lines, -51 removed lines

@@ -12,19 +12,19 @@ 
  * @property boolean $_visibleHover
  * @property InstanceViewer $_instanceViewer
  */
-trait DataTableFieldAsTrait{
+trait DataTableFieldAsTrait {
 	abstract public function addField($field);
-	abstract public function insertField($index,$field);
-	abstract public function insertInField($index,$field);
-	abstract public function fieldAs($index,$type,$attributes=NULL);
+	abstract public function insertField($index, $field);
+	abstract public function insertInField($index, $field);
+	abstract public function fieldAs($index, $type, $attributes=NULL);
 	/**
 	 * @param string $caption
 	 * @param callable $callback
 	 * @param boolean $visibleHover
 	 * @return callable
 	 */
-	private function getFieldButtonCallable($caption,$visibleHover=true,$callback=null){
-		return $this->getCallable("getFieldButton",[$caption,$visibleHover],$callback);
+	private function getFieldButtonCallable($caption, $visibleHover=true, $callback=null) {
+		return $this->getCallable("getFieldButton", [$caption, $visibleHover], $callback);
 	}
 
 	/**
@@ -33,19 +33,19 @@ 
 	 * @param callable $callback
 	 * @return callable
 	 */
-	private function getCallable($thisCallback,$parameters,$callback=null){
-		$result=function($instance) use($thisCallback,$parameters,$callback){
-			$object=call_user_func_array(array($this,$thisCallback), $parameters);
-			if(isset($callback)){
-				if(\is_callable($callback)){
-					$callback($object,$instance);
+	private function getCallable($thisCallback, $parameters, $callback=null) {
+		$result=function($instance) use($thisCallback, $parameters, $callback){
+			$object=call_user_func_array(array($this, $thisCallback), $parameters);
+			if (isset($callback)) {
+				if (\is_callable($callback)) {
+					$callback($object, $instance);
 				}
 			}
-			if($object instanceof HtmlSemDoubleElement){
-				$object->setProperty("data-ajax",$this->_instanceViewer->getIdentifier());
-				if($object->propertyContains("class","visibleover")){
+			if ($object instanceof HtmlSemDoubleElement) {
+				$object->setProperty("data-ajax", $this->_instanceViewer->getIdentifier());
+				if ($object->propertyContains("class", "visibleover")) {
 					$this->_visibleHover=true;
-					$object->setProperty("style","visibility:hidden;");
+					$object->setProperty("style", "visibility:hidden;");
 				}
 			}
 			return $object;
@@ -57,9 +57,9 @@ 
 	 * @param string $caption
 	 * @return HtmlButton
 	 */
-	private function getFieldButton($caption,$visibleHover=true){
-		$bt= new HtmlButton("",$caption);
-		if($visibleHover)
+	private function getFieldButton($caption, $visibleHover=true) {
+		$bt=new HtmlButton("", $caption);
+		if ($visibleHover)
 			$this->_visibleOver($bt);
 			return $bt;
 	}
@@ -73,19 +73,19 @@ 
 	 * @param array $attributes associative array (<b>ajax</b> key is for ajax post)
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
 	 */
-	public function fieldAsSubmit($index,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle,$index,$attributes){
-			$button=new HtmlButton($id,$value,$cssStyle);
-			$button->postOnClick($url,"$(event.target).closest('tr').find(':input').serialize()",$responseElement,$attributes["ajax"]);
-			if(!isset($attributes["visibleHover"]) || $attributes["visibleHover"])
+	public function fieldAsSubmit($index, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($url, $responseElement, $cssStyle, $index, $attributes){
+			$button=new HtmlButton($id, $value, $cssStyle);
+			$button->postOnClick($url, "$(event.target).closest('tr').find(':input').serialize()", $responseElement, $attributes["ajax"]);
+			if (!isset($attributes["visibleHover"]) || $attributes["visibleHover"])
 				$this->_visibleOver($button);
 				return $button;
-		}, $index,$attributes);
+		}, $index, $attributes);
 	}
 
-	protected function _visibleOver($element){
+	protected function _visibleOver($element) {
 		$this->_visibleHover=true;
-		return $element->addToProperty("class", "visibleover")->setProperty("style","visibility:hidden;");
+		return $element->addToProperty("class", "visibleover")->setProperty("style", "visibility:hidden;");
 	}
 
 	/**
@@ -95,8 +95,8 @@ 
 	 * @param boolean $visibleHover
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
 	 */
-	public function addFieldButton($caption,$visibleHover=true,$callback=null){
-		$this->addField($this->getCallable("getFieldButton",[$caption,$visibleHover],$callback));
+	public function addFieldButton($caption, $visibleHover=true, $callback=null) {
+		$this->addField($this->getCallable("getFieldButton", [$caption, $visibleHover], $callback));
 		return $this;
 	}
 
@@ -107,8 +107,8 @@ 
 	 * @param callable $callback
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
 	 */
-	public function insertFieldButton($index,$caption,$visibleHover=true,$callback=null){
-		$this->insertField($index, $this->getFieldButtonCallable($caption,$visibleHover,$callback));
+	public function insertFieldButton($index, $caption, $visibleHover=true, $callback=null) {
+		$this->insertField($index, $this->getFieldButtonCallable($caption, $visibleHover, $callback));
 		return $this;
 	}
 
@@ -119,25 +119,25 @@ 
 	 * @param callable $callback
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
 	 */
-	public function insertInFieldButton($index,$caption,$visibleHover=true,$callback=null){
-		$this->insertInField($index, $this->getFieldButtonCallable($caption,$visibleHover,$callback));
+	public function insertInFieldButton($index, $caption, $visibleHover=true, $callback=null) {
+		$this->insertInField($index, $this->getFieldButtonCallable($caption, $visibleHover, $callback));
 		return $this;
 	}
 
-	private function addDefaultButton($icon,$class=null,$visibleHover=true,$callback=null){
-		$this->addField($this->getCallable("getDefaultButton",[$icon,$class,$visibleHover],$callback));
+	private function addDefaultButton($icon, $class=null, $visibleHover=true, $callback=null) {
+		$this->addField($this->getCallable("getDefaultButton", [$icon, $class, $visibleHover], $callback));
 		return $this;
 	}
 
-	private function insertDefaultButtonIn($index,$icon,$class=null,$visibleHover=true,$callback=null){
-		$this->insertInField($index,$this->getCallable("getDefaultButton",[$icon,$class,$visibleHover],$callback));
+	private function insertDefaultButtonIn($index, $icon, $class=null, $visibleHover=true, $callback=null) {
+		$this->insertInField($index, $this->getCallable("getDefaultButton", [$icon, $class, $visibleHover], $callback));
 		return $this;
 	}
 
-	private function getDefaultButton($icon,$class=null,$visibleHover=true){
-		$bt=$this->getFieldButton("",$visibleHover);
+	private function getDefaultButton($icon, $class=null, $visibleHover=true) {
+		$bt=$this->getFieldButton("", $visibleHover);
 		$bt->asIcon($icon);
-		if(isset($class))
+		if (isset($class))
 			$bt->addClass($class);
 		return $bt;
 	}
@@ -148,30 +148,30 @@ 
 	 * @param callable $callback
 	 * @return DataTable
 	 */
-	public function addDeleteButton($visibleHover=true,$deleteBehavior=[],$callback=null){
+	public function addDeleteButton($visibleHover=true, $deleteBehavior=[], $callback=null) {
 		$this->_deleteBehavior=$deleteBehavior;
-		return $this->addDefaultButton("remove","_delete red basic",$visibleHover,$callback);
+		return $this->addDefaultButton("remove", "_delete red basic", $visibleHover, $callback);
 	}
 
-	public function addEditButton($visibleHover=true,$editBehavior=[],$callback=null){
+	public function addEditButton($visibleHover=true, $editBehavior=[], $callback=null) {
 		$this->_editBehavior=$editBehavior;
-		return $this->addDefaultButton("edit","_edit basic",$visibleHover,$callback);
+		return $this->addDefaultButton("edit", "_edit basic", $visibleHover, $callback);
 	}
 
-	public function addEditDeleteButtons($visibleHover=true,$behavior=[],$callbackEdit=null,$callbackDelete=null){
-		$this->addEditButton($visibleHover,$behavior,$callbackEdit);
+	public function addEditDeleteButtons($visibleHover=true, $behavior=[], $callbackEdit=null, $callbackDelete=null) {
+		$this->addEditButton($visibleHover, $behavior, $callbackEdit);
 		$index=$this->_instanceViewer->visiblePropertiesCount()-1;
-		$this->insertDeleteButtonIn($index,$visibleHover,$behavior,$callbackDelete);
+		$this->insertDeleteButtonIn($index, $visibleHover, $behavior, $callbackDelete);
 		return $this;
 	}
 
-	public function insertDeleteButtonIn($index,$visibleHover=true,$deleteBehavior=[],$callback=null){
+	public function insertDeleteButtonIn($index, $visibleHover=true, $deleteBehavior=[], $callback=null) {
 		$this->_deleteBehavior=$deleteBehavior;
-		return $this->insertDefaultButtonIn($index,"remove","_delete red basic",$visibleHover,$callback);
+		return $this->insertDefaultButtonIn($index, "remove", "_delete red basic", $visibleHover, $callback);
 	}
 
-	public function insertEditButtonIn($index,$visibleHover=true,$editBehavior=[],$callback=null){
+	public function insertEditButtonIn($index, $visibleHover=true, $editBehavior=[], $callback=null) {
 		$this->_editBehavior=$editBehavior;
-		return $this->insertDefaultButtonIn($index,"edit","_edit basic",$visibleHover,$callback);
+		return $this->insertDefaultButtonIn($index, "edit", "_edit basic", $visibleHover, $callback);
 	}
 }
\ No newline at end of file