phpMv / phpMv-UI

Ajax/semantic/html/content/HtmlStepItem.php

Spacing +14 added lines, -14 removed lines

@@ -8,46 +8,46 @@
 class HtmlStepItem extends HtmlAbsractItem {
 
 	public function __construct($identifier, $content) {
-		parent::__construct($identifier,"step",$content);
+		parent::__construct($identifier, "step", $content);
 	}
-	protected function initContent($content){
-		if(\is_array($content)){
+	protected function initContent($content) {
+		if (\is_array($content)) {
 			$icon=JArray::getValue($content, "icon", 0);
 			$title=JArray::getValue($content, "title", 1);
 			$desc=JArray::getValue($content, "description", 2);
 			$status=JArray::getValue($content, "status", 3);
-			if(isset($icon)){
+			if (isset($icon)) {
 				$this->setIcon($icon);
 			}
-			if(isset($status)){
+			if (isset($status)) {
 				$this->setStatus($status);
 			}
-			if(isset($title)){
-				$this->setTitle($title,$desc);
+			if (isset($title)) {
+				$this->setTitle($title, $desc);
 			}
-		}else{
+		} else {
 			$this->setContent($content);
 		}
 	}
 
-	public function setActive($value=true){
-		if($value)
+	public function setActive($value=true) {
+		if ($value)
 			$this->setStatus(StepStatus::ACTIVE);
 		else
 			$this->setStatus(StepStatus::NONE);
 		return $this;
 	}
 
-	public function setCompleted(){
-		$this->removePropertyValues("class", [StepStatus::COMPLETED,StepStatus::DISABLED]);
+	public function setCompleted() {
+		$this->removePropertyValues("class", [StepStatus::COMPLETED, StepStatus::DISABLED]);
 		return $this->setStatus(StepStatus::COMPLETED);
 	}
 
-	public function setStatus($status){
+	public function setStatus($status) {
 		return $this->addToPropertyCtrl("class", $status, StepStatus::getConstants());
 	}
 
-	public function removeStatus(){
+	public function removeStatus() {
 		$this->removePropertyValues("class", StepStatus::getConstants());
 	}
 }

Ajax/common/html/HtmlSingleElement.php

Spacing +4 added lines, -4 removed lines

@@ -13,7 +13,7 @@ 
 	}
 
 	public function setClass($classNames) {
-		if(\is_array($classNames)){
+		if (\is_array($classNames)) {
 			$classNames=implode(" ", $classNames);
 		}
 		$this->setProperty("class", $classNames);
@@ -21,7 +21,7 @@ 
 	}
 
 	public function addClass($classNames) {
-		if(\is_array($classNames)){
+		if (\is_array($classNames)) {
 			$classNames=implode(" ", $classNames);
 		}
 		$this->addToProperty("class", $classNames);
@@ -38,7 +38,7 @@ 
 		return $this;
 	}
 	
-	public function setStyle($value){
+	public function setStyle($value) {
 		$this->setProperty("style", $value);
 		return $this;
 	}
@@ -57,7 +57,7 @@ 
 	 */
 	public function fromArray($array) {
 		$array=parent::fromArray($array);
-		foreach ( $array as $key => $value ) {
+		foreach ($array as $key => $value) {
 			$this->setProperty($key, $value);
 		}
 		return $array;

Ajax/semantic/html/content/HtmlAbsractItem.php

Spacing +27 added lines, -27 removed lines

@@ -11,7 +11,7 @@ 
 
 abstract class HtmlAbsractItem extends HtmlSemDoubleElement {
 
-	public function __construct($identifier, $baseClass,$content=NULL) {
+	public function __construct($identifier, $baseClass, $content=NULL) {
 		parent::__construct($identifier, "div", $baseClass);
 		$this->content=array();
 		$this->initContent($content);
@@ -19,73 +19,73 @@ 
 
 	abstract protected function initContent($content);
 
-	public function setIcon($icon){
+	public function setIcon($icon) {
 		$this->content["icon"]=new HtmlIcon("icon-".$this->identifier, $icon);
 	}
 
-	public function removeIcon(){
-		if(isset($this->content["icon"]))
+	public function removeIcon() {
+		if (isset($this->content["icon"]))
 			unset($this->content["icon"]);
 		return $this;
 	}
 
-	public function setImage($image){
+	public function setImage($image) {
 		$image=new HtmlImg("icon-".$this->identifier, $image);
 		$image->asAvatar();
 		$this->content["image"]=$image;
 	}
 
-	private function _getContent($key="content",$baseClass="content"){
-		if(\array_key_exists($key, $this->content)===false){
-			$this->content[$key]=new HtmlSemDoubleElement($key."-".$this->identifier,"div",$baseClass);
+	private function _getContent($key="content", $baseClass="content") {
+		if (\array_key_exists($key, $this->content)===false) {
+			$this->content[$key]=new HtmlSemDoubleElement($key."-".$this->identifier, "div", $baseClass);
 		}
 		return $this->content[$key];
 	}
 	
-	private function _getRightContent(){
-		return $this->_getContent("right-content","right floated content");
+	private function _getRightContent() {
+		return $this->_getContent("right-content", "right floated content");
 	}
 	
-	public function addContent($content,$before=false){
-		$this->_getContent("content")->addContent($content,$before);
+	public function addContent($content, $before=false) {
+		$this->_getContent("content")->addContent($content, $before);
 		return $this;
 	}
 	
-	public function addRightContent($content,$before=false){
-		$this->_getRightContent()->addContent($content,$before);
+	public function addRightContent($content, $before=false) {
+		$this->_getRightContent()->addContent($content, $before);
 		return $this;
 	}
 
-	public function setTitle($title,$description=NULL,$baseClass="title"){
-		$title=new HtmlSemDoubleElement("","div",$baseClass,$title);
+	public function setTitle($title, $description=NULL, $baseClass="title") {
+		$title=new HtmlSemDoubleElement("", "div", $baseClass, $title);
 		$content=$this->_getContent();
 		$content->addContent($title);
-		if(isset($description)){
-			$description=new HtmlSemDoubleElement("","div","description",$description);
+		if (isset($description)) {
+			$description=new HtmlSemDoubleElement("", "div", "description", $description);
 			$content->addContent($description);
 		}
 		return $this;
 	}
 
-	public function getPart($partName="header"){
-		$content=\array_merge($this->_getContent()->getContent(),array(@$this->content["icon"],@$this->content["image"]));
+	public function getPart($partName="header") {
+		$content=\array_merge($this->_getContent()->getContent(), array(@$this->content["icon"], @$this->content["image"]));
 		return $this->getElementByPropertyValue("class", $partName, $content);
 	}
 
-	public function setActive($value=true){
-		if($value){
+	public function setActive($value=true) {
+		if ($value) {
 			$this->setTagName("div");
 			$this->removeProperty("href");
 			$this->addToPropertyCtrl("class", "active", array("active"));
-		}else{
+		} else {
 			$this->removePropertyValue("class", "active");
 		}
 		return $this;
 	}
 
-	public function asLink($href=NULL,$part=NULL){
+	public function asLink($href=NULL, $part=NULL) {
 		$this->setTagName("a");
-		if(isset($href))
+		if (isset($href))
 			$this->setProperty("href", $href);
 		return $this;
 	}
@@ -97,8 +97,8 @@ 
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile()
 	 */
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		if(\is_array($this->content) && JArray::isAssociative($this->content))
-			$this->content=JArray::sortAssociative($this->content, [ "right-content","icon","image","content" ]);
+		if (\is_array($this->content) && JArray::isAssociative($this->content))
+			$this->content=JArray::sortAssociative($this->content, ["right-content", "icon", "image", "content"]);
 		return parent::compile($js, $view);
 	}
 }

Ajax/php/ubiquity/JsUtils.php

Spacing +14 added lines, -14 removed lines

@@ -5,34 +5,34 @@ 
 use Ubiquity\controllers\Startup;
 use Ubiquity\utils\http\URequest;
 
-class JsUtils extends \Ajax\JsUtils{
+class JsUtils extends \Ajax\JsUtils {
 
-	public function getUrl($url){
+	public function getUrl($url) {
 		return URequest::getUrl($url);
 	}
 
-	public function addViewElement($identifier,$content,&$view){
+	public function addViewElement($identifier, $content, &$view) {
 		$controls=$view->getVar("q");
-		if (isset($controls) === false) {
-			$controls=array ();
+		if (isset($controls)===false) {
+			$controls=array();
 		}
 		$controls[$identifier]=$content;
 		$view->setVar("q", $controls);
 	}
 
-	public function createScriptVariable(&$view,$view_var, $output){
-		$view->setVar($view_var,$output);
+	public function createScriptVariable(&$view, $view_var, $output) {
+		$view->setVar($view_var, $output);
 	}
 
-	public function forward($initialController,$controller,$action,$params=array()){
-		return $initialController->forward($controller,$action,$params,true,true,true);
+	public function forward($initialController, $controller, $action, $params=array()) {
+		return $initialController->forward($controller, $action, $params, true, true, true);
 	}
 
-	public function renderContent($initialControllerInstance,$viewName, $params=NULL) {
-		return $initialControllerInstance->loadView($viewName,$params,true);
+	public function renderContent($initialControllerInstance, $viewName, $params=NULL) {
+		return $initialControllerInstance->loadView($viewName, $params, true);
 	}
 
-	public function fromDispatcher($dispatcher){
+	public function fromDispatcher($dispatcher) {
 		return Startup::$urlParts;
 	}
 	
@@ -43,8 +43,8 @@ 
 	 * If an associative array is passed, the view retrieves variables from the table's key names
 	 * @param boolean $asString If true, the view is not displayed but returned as a string (usable in a variable)
 	 */
-	public function renderView($viewName,$parameters=[],$asString=false){
-		if(isset($this->injected)){
+	public function renderView($viewName, $parameters=[], $asString=false) {
+		if (isset($this->injected)) {
 			$view=$this->injected->getView();
 			$this->compile($view);
 			if (isset($parameters))

Ajax/common/html/HtmlCollection.php

Spacing +52 added lines, -52 removed lines

@@ -14,44 +14,44 @@ 
  */
 abstract class HtmlCollection extends HtmlDoubleElement {
 
-	public function __construct($identifier,$tagName="div"){
-		parent::__construct($identifier,$tagName);
+	public function __construct($identifier, $tagName="div") {
+		parent::__construct($identifier, $tagName);
 		$this->content=array();
 	}
 
-	public function addItems($items){
-		if(JArray::isAssociative($items)){
-			foreach ($items as $k=>$v){
-				$this->addItem([$k,$v]);
+	public function addItems($items) {
+		if (JArray::isAssociative($items)) {
+			foreach ($items as $k=>$v) {
+				$this->addItem([$k, $v]);
 			}
-		}else{
-			foreach ($items as $item){
+		} else {
+			foreach ($items as $item) {
 				$this->addItem($item);
 			}
 		}
 		return $this;
 	}
 
-	public function setItems($items){
+	public function setItems($items) {
 		$this->content=$items;
 		return $this;
 	}
 
-	public function getItems(){
+	public function getItems() {
 		return $this->content;
 	}
 
-	protected function getItemToAdd($item){
+	protected function getItemToAdd($item) {
 		$itemO=$item;
-		if($this->createCondition($item)===true){
+		if ($this->createCondition($item)===true) {
 			$itemO=$this->createItem($item);
 		}
 		return $itemO;
 	}
 
-	protected function setItemIdentifier($item,$classname,$index){
-		if($item instanceof BaseWidget){
-			if(JString::isNull($item->getIdentifier())){
+	protected function setItemIdentifier($item, $classname, $index) {
+		if ($item instanceof BaseWidget) {
+			if (JString::isNull($item->getIdentifier())) {
 				$item->setIdentifier($classname."-".$this->identifier."-".$index);
 			}
 		}
@@ -62,15 +62,15 @@ 
 	 * @param HtmlDoubleElement|string|array $item
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addItem($item){
+	public function addItem($item) {
 		$itemO=$this->getItemToAdd($item);
 		$this->addContent($itemO);
 		return $itemO;
 	}
 
-	public function insertItem($item,$position=0){
+	public function insertItem($item, $position=0) {
 		$itemO=$this->getItemToAdd($item);
-		\array_splice( $this->content, $position, 0, array($itemO));
+		\array_splice($this->content, $position, 0, array($itemO));
 		return $itemO;
 	}
 
@@ -93,11 +93,11 @@ 
 		return $this;
 	}
 
-	public function removeItem($index){
+	public function removeItem($index) {
 		return array_splice($this->content, $index, 1);
 	}
 
-	public function count(){
+	public function count() {
 		return \sizeof($this->content);
 	}
 
@@ -108,8 +108,8 @@ 
 		return $this->addItem($function($object));
 	}
 
-	public function apply($callBack){
-		foreach ($this->content as $item){
+	public function apply($callBack) {
+		foreach ($this->content as $item) {
 			$callBack($item);
 		}
 		return $this;
@@ -129,23 +129,23 @@ 
 	 */
 	abstract protected function createItem($value);
 
-	protected function createCondition($value){
+	protected function createCondition($value) {
 		return \is_object($value)===false;
 	}
 
-	protected function contentAs($tagName){
-		foreach ($this->content as $item){
+	protected function contentAs($tagName) {
+		foreach ($this->content as $item) {
 			$item->setTagName($tagName);
 		}
 		return $this;
 	}
 
-	public function setProperties($properties){
+	public function setProperties($properties) {
 		$i=0;
-		foreach ($properties as $k=>$v){
+		foreach ($properties as $k=>$v) {
 			$c=$this->content[$i++];
-			if(isset($c))
-				$c->setProperty($k,$v);
+			if (isset($c))
+				$c->setProperty($k, $v);
 			else
 				return $this;
 		}
@@ -158,17 +158,17 @@ 
 	 * @param array $values
 	 * @return HtmlCollection
 	 */
-	public function setPropertyValues($property,$values){
+	public function setPropertyValues($property, $values) {
 		$i=0;
-		if(\is_array($values)===false){
-			$values=\array_fill(0, $this->count(),$values);
+		if (\is_array($values)===false) {
+			$values=\array_fill(0, $this->count(), $values);
 		}
-		foreach ($values as $value){
+		foreach ($values as $value) {
 			$c=$this->content[$i++];
-			if(isset($c)){
-				$c->setProperty($property,$value);
+			if (isset($c)) {
+				$c->setProperty($property, $value);
 			}
-			else{
+			else {
 				return $this;
 			}
 		}
@@ -181,17 +181,17 @@ 
 	 * @param array $values
 	 * @return HtmlCollection
 	 */
-	public function addPropertyValues($property,$values){
+	public function addPropertyValues($property, $values) {
 		$i=0;
-		if(\is_array($values)===false){
-			$values=\array_fill(0, $this->count(),$values);
+		if (\is_array($values)===false) {
+			$values=\array_fill(0, $this->count(), $values);
 		}
-		foreach ($values as $value){
+		foreach ($values as $value) {
 			$c=$this->content[$i++];
-			if(isset($c)){
-				$c->addToProperty($property,$value);
+			if (isset($c)) {
+				$c->addToProperty($property, $value);
 			}
-			else{
+			else {
 				return $this;
 			}
 		}
@@ -201,13 +201,13 @@ 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
 		$index=0;
 		$classname=\strtolower(JReflection::shortClassName($this));
-		foreach ($this->content as $item){
-			$this->setItemIdentifier($item,$classname,$index++);
+		foreach ($this->content as $item) {
+			$this->setItemIdentifier($item, $classname, $index++);
 		}
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 
-	public function getItemById($identifier){
+	public function getItemById($identifier) {
 		return $this->getElementById($identifier, $this->content);
 	}
 
@@ -216,13 +216,13 @@ 
 	 * @param string $target
 	 * @return HtmlCollection
 	 */
-	public function asLinks($hrefs=[],$target=NUll) {
-		foreach ( $this->content as $index=>$item ) {
-			if($item instanceof HtmlDoubleElement){
+	public function asLinks($hrefs=[], $target=NUll) {
+		foreach ($this->content as $index=>$item) {
+			if ($item instanceof HtmlDoubleElement) {
 				$href="";
-				if(isset($hrefs[$index]))
+				if (isset($hrefs[$index]))
 					$href=$hrefs[$index];
-				$item->asLink($href,$target);
+				$item->asLink($href, $target);
 			}
 		}
 		return $this;

Ajax/service/Javascript.php

Spacing +7 added lines, -7 removed lines

@@ -6,16 +6,16 @@ 
 	public static $preventDefault="\nif(event && event.preventDefault) event.preventDefault();\n";
 	public static $stopPropagation="\nif(event && event.stopPropagation) event.stopPropagation();\n";
 
-	public static function draggable($attr="id"){
+	public static function draggable($attr="id") {
 		return 'var dt=event.dataTransfer || event.originalEvent.dataTransfer;dt.setData("text/plain",JSON.stringify({id:$(event.target).attr("id"),data:$(event.target).attr("'.$attr.'")}));';
 	}
 	
-	public static function dropZone($jqueryDone,$jsCallback=""){
+	public static function dropZone($jqueryDone, $jsCallback="") {
 		return 'var dt=event.dataTransfer || event.originalEvent.dataTransfer;var _data=JSON.parse(dt.getData("text/plain"));$(event.target).'.$jqueryDone.'($("#"+_data.id));var data=_data.data;'.$jsCallback;
 	}
 	
-	public static function containsCode($expression){
-		return strrpos($expression, 'this')!==false||strrpos($expression, 'event')!==false||strrpos($expression, 'self')!==false;
+	public static function containsCode($expression) {
+		return strrpos($expression, 'this')!==false || strrpos($expression, 'event')!==false || strrpos($expression, 'self')!==false;
 	}
 
 	/**
@@ -46,14 +46,14 @@ 
 			$value=implode(",", $value);
 		}
 		if (self::containsCode($value)===false) {
-			$value=\str_replace(["\\","\""], ["\\\\","\\\""], $value);
+			$value=\str_replace(["\\", "\""], ["\\\\", "\\\""], $value);
 			$value='"'.$value.'"';
 		}
 		return $value;
 	}
 
-	public static function prep_jquery_selector($value){
-		if(JString::startswith($value, '$(')===false){
+	public static function prep_jquery_selector($value) {
+		if (JString::startswith($value, '$(')===false) {
 			return '$('.$value.')';
 		}
 		return $value;

Ajax/semantic/html/elements/HtmlList.php

Spacing +33 added lines, -33 removed lines

@@ -21,17 +21,17 @@ 
 
 	protected function createItem($value) {
 		$count=$this->count();
-		$item=new HtmlListItem("item-" . $this->identifier . "-" . $count, $value);
+		$item=new HtmlListItem("item-".$this->identifier."-".$count, $value);
 		return $item;
 	}
 
 	public function addHeader($niveau, $content) {
-		$header=new HtmlHeader("header-" . $this->identifier, $niveau, $content, "page");
+		$header=new HtmlHeader("header-".$this->identifier, $niveau, $content, "page");
 		$this->wrap($header);
 		return $header;
 	}
 
-	public function getItemPart($index,$partName="header"){
+	public function getItemPart($index, $partName="header") {
 		return $this->getItem($index)->getPart($partName);
 	}
 
@@ -39,9 +39,9 @@ 
 		return $this->contentAs($tagName);
 	}
 
-	public function asLinks($hrefs=[],$target=NUll) {
-		$this->addToPropertyCtrl("class", "link", array ("link" ));
-		return parent::asLinks($hrefs,$target);
+	public function asLinks($hrefs=[], $target=NUll) {
+		$this->addToPropertyCtrl("class", "link", array("link"));
+		return parent::asLinks($hrefs, $target);
 	}
 
 	public function addList($items=array()) {
@@ -50,9 +50,9 @@ 
 		return $this->addItem($list);
 	}
 
-	protected function getItemToAdd($item){
+	protected function getItemToAdd($item) {
 		$itemO=parent::getItemToAdd($item);
-		if($itemO instanceof AbstractCheckbox)
+		if ($itemO instanceof AbstractCheckbox)
 			$itemO->addClass("item");
 		return $itemO;
 	}
@@ -70,9 +70,9 @@ 
 	}
 
 	public function run(JsUtils $js) {
-		if ($this->_hasCheckedList === true) {
-			$jsCode=include dirname(__FILE__) . '/../../components/jsTemplates/tplCheckedList.php';
-			$jsCode=\str_replace("%identifier%", "#" . $this->identifier, $jsCode);
+		if ($this->_hasCheckedList===true) {
+			$jsCode=include dirname(__FILE__).'/../../components/jsTemplates/tplCheckedList.php';
+			$jsCode=\str_replace("%identifier%", "#".$this->identifier, $jsCode);
 			$jsCode=\str_replace("%fireOnInit%", $this->_fireOnInit, $jsCode);
 			$jsCode=\str_replace("%onChange%", $this->_ckItemChange, $jsCode);
 			$this->executeOnRun($jsCode);
@@ -80,7 +80,7 @@ 
 		return parent::run($js);
 	}
 	
-	public function onCkItemChange($jsCode){
+	public function onCkItemChange($jsCode) {
 		$this->_ckItemChange=$jsCode;
 	}
 
@@ -88,7 +88,7 @@ 
 	 * @param boolean $fireOnInit
 	 */
 	public function setFireOnInit($fireOnInit) {
-		$this->_fireOnInit = $fireOnInit;
+		$this->_fireOnInit=$fireOnInit;
 	}
 
 	public function setRelaxed() {
@@ -115,42 +115,42 @@ 
 	 * @param string $notAllChecked
 	 * @return HtmlList
 	 */
-	public function addCheckedList($items=array(), $masterItem=NULL, $values=array(),$notAllChecked=false,$name=null) {
+	public function addCheckedList($items=array(), $masterItem=NULL, $values=array(), $notAllChecked=false, $name=null) {
 		$count=$this->count();
-		$identifier=$this->identifier . "-" . $count;
+		$identifier=$this->identifier."-".$count;
 		if (isset($masterItem)) {
-			if(\is_array($masterItem)){
-				$masterO=new HtmlFormCheckbox("master-" . $identifier, @$masterItem[0],@$masterItem[1]);
-				if(isset($name))
+			if (\is_array($masterItem)) {
+				$masterO=new HtmlFormCheckbox("master-".$identifier, @$masterItem[0], @$masterItem[1]);
+				if (isset($name))
 					$masterO->setName($name);
-				if(isset($masterItem[1])){
-					if(\array_search($masterItem[1], $values)!==false){
+				if (isset($masterItem[1])) {
+					if (\array_search($masterItem[1], $values)!==false) {
 						$masterO->getDataField()->setProperty("checked", "");
 					}
 				}
-			}else{
-				$masterO=new HtmlFormCheckbox("master-" . $identifier, $masterItem);
+			} else {
+				$masterO=new HtmlFormCheckbox("master-".$identifier, $masterItem);
 			}
-			if($notAllChecked){
+			if ($notAllChecked) {
 				$masterO->getDataField()->addClass("_notAllChecked");
 			}
 			$masterO->getHtmlCk()->addToProperty("class", "master");
 			$masterO->setClass("item");
 			$this->addItem($masterO);
 		}
-		$fields=array ();
+		$fields=array();
 		$i=0;
-		foreach ( $items as $val => $caption ) {
-			$itemO=new HtmlFormCheckbox($identifier . "-" . $i++, $caption, $val, "child");
-			if (\array_search($val, $values) !== false) {
+		foreach ($items as $val => $caption) {
+			$itemO=new HtmlFormCheckbox($identifier."-".$i++, $caption, $val, "child");
+			if (\array_search($val, $values)!==false) {
 				$itemO->getDataField()->setProperty("checked", "");
 			}
-			if(isset($name))
+			if (isset($name))
 				$itemO->setName($name);
 			$itemO->setClass("item");
 			$fields[]=$itemO;
 		}
-		if (isset($masterO) === true) {
+		if (isset($masterO)===true) {
 			$list=new HtmlList("", $fields);
 			$list->setClass("list");
 			$masterO->addContent($list);
@@ -161,12 +161,12 @@ 
 		return $this;
 	}
 
-	public function setIcons($icons){
-		if(!\is_array($icons)){
+	public function setIcons($icons) {
+		if (!\is_array($icons)) {
 			$icons=\array_fill(0, \sizeof($this->content), $icons);
 		}
-		$max=\min(\sizeof($icons),\sizeof($this->content));
-		for($i=0;$i<$max;$i++){
+		$max=\min(\sizeof($icons), \sizeof($this->content));
+		for ($i=0; $i<$max; $i++) {
 			$this->content[$i]->addIcon($icons[$i]);
 		}
 		return $this;

Ajax/common/traits/JsUtilsAjaxTrait.php

Spacing +97 added lines, -97 removed lines

@@ -16,9 +16,9 @@ 
 	protected $ajaxLoader="<div class=\"ui active centered inline text loader\">Loading</div>";
 
 	abstract public function getUrl($url);
-	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
+	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true);
 
-	protected function _ajax($method,$url,$responseElement="",$parameters=[]) {
+	protected function _ajax($method, $url, $responseElement="", $parameters=[]) {
 		$jsCallback=null;
 		$attr="id";
 		$hasLoader=true;
@@ -36,80 +36,80 @@ 
 		$retour=$this->_getAjaxUrl($url, $attr);
 		$responseElement=$this->_getResponseElement($responseElement);
 		$retour.="var self=this;\n";
-		if($hasLoader===true && JString::isNotNull($responseElement)){
-			$this->addLoading($retour, $responseElement,$ajaxLoader);
+		if ($hasLoader===true && JString::isNotNull($responseElement)) {
+			$this->addLoading($retour, $responseElement, $ajaxLoader);
 		}
-		$ajaxParameters=["url"=>"url","method"=>"'".\strtoupper($method)."'"];
-		if(!$async){
+		$ajaxParameters=["url"=>"url", "method"=>"'".\strtoupper($method)."'"];
+		if (!$async) {
 			$ajaxParameters["async"]="false";
 		}
-		if(isset($params)){
+		if (isset($params)) {
 			$ajaxParameters["data"]=self::_correctParams($params);
 		}
-		if(isset($headers)){
+		if (isset($headers)) {
 			$ajaxParameters["headers"]=$headers;
 		}
 		$this->createAjaxParameters($ajaxParameters, $parameters);
 		$retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data, textStatus, jqXHR ) {\n";
-		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback)."});\n";
-		$retour=$this->_addJsCondition($jsCondition,$retour);
+		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback)."});\n";
+		$retour=$this->_addJsCondition($jsCondition, $retour);
 		if ($immediatly)
 			$this->jquery_code_for_compile[]=$retour;
 		return $retour;
 	}
 
-	protected function createAjaxParameters(&$original,$parameters){
-		$validParameters=["dataType"=>"'%value%'","beforeSend"=>"function(jqXHR,settings){%value%}","complete"=>"function(jqXHR){%value%}"];
-		foreach ($validParameters as $param=>$mask){
-			if(isset($parameters[$param])){
+	protected function createAjaxParameters(&$original, $parameters) {
+		$validParameters=["dataType"=>"'%value%'", "beforeSend"=>"function(jqXHR,settings){%value%}", "complete"=>"function(jqXHR){%value%}"];
+		foreach ($validParameters as $param=>$mask) {
+			if (isset($parameters[$param])) {
 				$original[$param]=\str_replace("%value%", $parameters[$param], $mask);
 			}
 		}
 	}
 
-	protected function implodeAjaxParameters($ajaxParameters){
-		$s = ''; foreach ($ajaxParameters as $k=>$v) { if ($s !== '') { $s .= ','; } $s .= "'{$k}':{$v}"; }
+	protected function implodeAjaxParameters($ajaxParameters) {
+		$s=''; foreach ($ajaxParameters as $k=>$v) { if ($s!=='') { $s.=','; } $s.="'{$k}':{$v}"; }
 		return $s;
 	}
 
-	protected function _addJsCondition($jsCondition,$jsSource){
-		if(isset($jsCondition)){
+	protected function _addJsCondition($jsCondition, $jsSource) {
+		if (isset($jsCondition)) {
 			return "if(".$jsCondition."){\n".$jsSource."\n}";
 		}
 		return $jsSource;
 	}
 
 
-	protected function _getAjaxUrl($url,$attr){
+	protected function _getAjaxUrl($url, $attr) {
 		$url=$this->_correctAjaxUrl($url);
 		$retour="url='".$url."';";
 		$slash="/";
-		if(JString::endswith($url, "/")===true){
+		if (JString::endswith($url, "/")===true) {
 			$slash="";
 		}
-		if(JString::isNotNull($attr)){
-			if ($attr==="value"){
+		if (JString::isNotNull($attr)) {
+			if ($attr==="value") {
 				$retour.="url=url+'".$slash."'+$(this).val();\n";
-			}elseif ($attr==="html"){
+			}elseif ($attr==="html") {
 				$retour.="url=url+'".$slash."'+$(this).html();\n";
-			}elseif(\substr($attr, 0,3)==="js:"){
+			}elseif (\substr($attr, 0, 3)==="js:") {
 				$retour.="url=url+'".$slash."'+".\substr($attr, 3).";\n";
-			}elseif($attr!==null && $attr!=="")
+			}elseif ($attr!==null && $attr!=="")
 				$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
 		}
 		return $retour;
 	}
 
-	protected function _getOnAjaxDone($responseElement,$jqueryDone,$ajaxTransition,$jsCallback){
-		$retour="";$call=null;
+	protected function _getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback) {
+		$retour=""; $call=null;
 		if (JString::isNotNull($responseElement)) {
-			if(isset($ajaxTransition)){
+			if (isset($ajaxTransition)) {
 				$call=$this->setAjaxDataCall($ajaxTransition);
-			}elseif(isset($this->ajaxTransition)){
+			}elseif (isset($this->ajaxTransition)) {
 				$call=$this->ajaxTransition;
 			}
-			if(\is_callable($call))
-				$retour="\t".$call($responseElement,$jqueryDone).";\n";
+			if (\is_callable($call))
+				$retour="\t".$call($responseElement, $jqueryDone).";\n";
 			else
 				$retour="\t{$responseElement}.{$jqueryDone}( data );\n";
 		}
@@ -117,7 +117,7 @@ 
 		return $retour;
 	}
 
-	protected function _getResponseElement($responseElement){
+	protected function _getResponseElement($responseElement) {
 		if (JString::isNotNull($responseElement)) {
 			$responseElement=Javascript::prep_value($responseElement);
 			$responseElement=Javascript::prep_jquery_selector($responseElement);
@@ -128,33 +128,33 @@ 
 	protected function _correctAjaxUrl($url) {
 		if ($url!=="/" && JString::endsWith($url, "/")===true)
 			$url=substr($url, 0, strlen($url)-1);
-			if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
+			if (strncmp($url, 'http://', 7)!=0 && strncmp($url, 'https://', 8)!=0) {
 				$url=$this->getUrl($url);
 			}
 			return $url;
 	}
 
-	public static function _correctParams($params){
-		if(JString::isNull($params)){
+	public static function _correctParams($params) {
+		if (JString::isNull($params)) {
 			return "";
 		}
-		if(\preg_match("@^\{.*?\}$@", $params)){
+		if (\preg_match("@^\{.*?\}$@", $params)) {
 			return '$.param('.$params.')';
 		}
 		return $params;
 	}
 
-	public static function _implodeParams($parameters){
+	public static function _implodeParams($parameters) {
 		$allParameters=[];
-		foreach ($parameters as $params){
-			if(isset($params))
+		foreach ($parameters as $params) {
+			if (isset($params))
 				$allParameters[]=self::_correctParams($params);
 		}
 		return \implode("+'&'+", $allParameters);
 	}
 
-	protected function addLoading(&$retour, $responseElement,$ajaxLoader=null) {
-		if(!isset($ajaxLoader)){
+	protected function addLoading(&$retour, $responseElement, $ajaxLoader=null) {
+		if (!isset($ajaxLoader)) {
 			$ajaxLoader=$this->ajaxLoader;
 		}
 		$loading_notifier='<div class="ajax-loader">'.$ajaxLoader.'</div>';
@@ -162,19 +162,19 @@ 
 		$retour.="\t\t{$responseElement}.prepend('{$loading_notifier}');\n";
 	}
 
-	protected function setAjaxDataCall($params){
+	protected function setAjaxDataCall($params) {
 		$result=null;
-		if(!\is_callable($params)){
-			$result=function ($responseElement,$jqueryDone="html") use($params){
-				return AjaxTransition::{$params}($responseElement,$jqueryDone);
+		if (!\is_callable($params)) {
+			$result=function($responseElement, $jqueryDone="html") use($params){
+				return AjaxTransition::{$params}($responseElement, $jqueryDone);
 			};
 		}
 		return $result;
 	}
 
-	protected function setDefaultParameters(&$parameters,$default){
-		foreach ($default as $k=>$v){
-			if(!isset($parameters[$k]))
+	protected function setDefaultParameters(&$parameters, $default) {
+		foreach ($default as $k=>$v) {
+			if (!isset($parameters[$k]))
 				$parameters[$k]=$v;
 		}
 	}
@@ -188,8 +188,8 @@ 
 	 * @param string $url The url of the request
 	 * @param string $responseElement selector of the HTML element displaying the answer
 	 */
-	private function _get($url, $responseElement="",$parameters=[]) {
-		return $this->_ajax("get", $url,$responseElement,$parameters);
+	private function _get($url, $responseElement="", $parameters=[]) {
+		return $this->_ajax("get", $url, $responseElement, $parameters);
 	}
 
 	/**
@@ -198,9 +198,9 @@ 
 	 * @param string $responseElement selector of the HTML element displaying the answer
 	 * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null)
 	 */
-	public function get($url, $responseElement="",$parameters=[]) {
+	public function get($url, $responseElement="", $parameters=[]) {
 		$parameters["immediatly"]=true;
-		return $this->_get($url,$responseElement,$parameters);
+		return $this->_get($url, $responseElement, $parameters);
 	}
 
 	/**
@@ -210,9 +210,9 @@ 
 	 * @param string $responseElement selector of the HTML element displaying the answer
 	 * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null)
 	 */
-	public function ajax($method,$url, $responseElement="", $parameters=[]) {
+	public function ajax($method, $url, $responseElement="", $parameters=[]) {
 		$parameters["immediatly"]=true;
-		return $this->_ajax($method,$url,$responseElement,$parameters);
+		return $this->_ajax($method, $url, $responseElement, $parameters);
 	}
 
 	/**
@@ -222,9 +222,9 @@ 
 	 * @param string $responseElement selector of the HTML element displaying the answer
 	 * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null)
 	 */
-	public function ajaxDeferred($method,$url, $responseElement="", $parameters=[]) {
+	public function ajaxDeferred($method, $url, $responseElement="", $parameters=[]) {
 		$parameters["immediatly"]=false;
-		return $this->_ajax($method,$url,$responseElement,$parameters);
+		return $this->_ajax($method, $url, $responseElement, $parameters);
 	}
 
 	/**
@@ -233,15 +233,15 @@ 
 	 * @param string $method Method used
 	 * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>"document","jsCondition"=>NULL,"headers"=>null,"immediatly"=>false)
 	 */
-	private function _json($url, $method="get",$parameters=[]) {
-		$parameters=\array_merge($parameters,["hasLoader"=>false]);
+	private function _json($url, $method="get", $parameters=[]) {
+		$parameters=\array_merge($parameters, ["hasLoader"=>false]);
 		$jsCallback=isset($parameters['jsCallback']) ? $parameters['jsCallback'] : "";
 		$context=isset($parameters['context']) ? $parameters['context'] : "document";
 		$retour="\tdata=($.isPlainObject(data))?data:JSON.parse(data);\t".$jsCallback.";\n\tfor(var key in data){"
 				."if($('#'+key,".$context.").length){ if($('#'+key,".$context.").is('[value]')) { $('#'+key,".$context.").val(data[key]);} else { $('#'+key,".$context.").html(data[key]); }}};\n";
 				$retour.="\t$(document).trigger('jsonReady',[data]);\n";
 		$parameters["jsCallback"]=$retour;
-		return $this->_ajax($method, $url,null,$parameters);
+		return $this->_ajax($method, $url, null, $parameters);
 	}
 
 	/**
@@ -251,7 +251,7 @@ 
 	 * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>"document","jsCondition"=>NULL,"headers"=>null,"immediatly"=>false)
 	 */
 	public function json($url, $method="get", $parameters=[]) {
-		return $this->_json($url,$method,$parameters);
+		return $this->_json($url, $method, $parameters);
 	}
 
 	/**
@@ -262,9 +262,9 @@ 
 	 * @param string $method default get
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true)
 	 */
-	public function jsonOn($event,$element, $url,$method="get",$parameters=array()) {
-		$this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]);
-		return $this->_add_event($element, $this->jsonDeferred($url,$method, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]);
+	public function jsonOn($event, $element, $url, $method="get", $parameters=array()) {
+		$this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]);
+		return $this->_add_event($element, $this->jsonDeferred($url, $method, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]);
 	}
 
 	/**
@@ -275,7 +275,7 @@ 
 	 */
 	public function jsonDeferred($url, $method="get", $parameters=[]) {
 		$parameters["immediatly"]=false;
-		return $this->_json($url,$method,$parameters);
+		return $this->_json($url, $method, $parameters);
 	}
 
 	/**
@@ -286,26 +286,26 @@ 
 	 * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"rowClass"=>"_json")
 	 */
 	private function _jsonArray($maskSelector, $url, $method="get", $parameters=[]) {
-		$parameters=\array_merge($parameters,["hasLoader"=>false]);
+		$parameters=\array_merge($parameters, ["hasLoader"=>false]);
 		$rowClass=isset($parameters['rowClass']) ? $parameters['rowClass'] : "_json";
 		$jsCallback=isset($parameters['jsCallback']) ? $parameters['jsCallback'] : "";
 		$context=isset($parameters['context']) ? $parameters['context'] : null;
-		if($context===null){
+		if ($context===null) {
 			$parent="$('".$maskSelector."').parent()";
-			$newElm = "$('#'+newId)";
-		}else{
+			$newElm="$('#'+newId)";
+		} else {
 			$parent=$context;
-			$newElm = $context.".find('#'+newId)";
+			$newElm=$context.".find('#'+newId)";
 		}
 		$appendTo="\t\tnewElm.appendTo(".$parent.");\n";
 		$retour=$parent.".find('.{$rowClass}').remove();";
 		$retour.="\tdata=($.isPlainObject(data))?data:JSON.parse(data);\t".$jsCallback.";\n$.each(data, function(index, value) {\n"."\tvar created=false;var maskElm=$('".$maskSelector."').first();maskElm.hide();"."\tvar newId=(maskElm.attr('id') || 'mask')+'-'+index;"."\tvar newElm=".$newElm.";\n"."\tif(!newElm.length){\n"."\t\tnewElm=maskElm.clone();
 		newElm.attr('id',newId);\n;newElm.addClass('{$rowClass}').removeClass('_jsonArrayModel');\nnewElm.find('[id]').each(function(){ var newId=$(this).attr('id')+'-'+index;$(this).attr('id',newId).removeClass('_jsonArrayChecked');});\n";
-		$retour.= $appendTo;
+		$retour.=$appendTo;
 		$retour.="\t}\n"."\tfor(var key in value){\n"."\t\t\tvar html = $('<div />').append($(newElm).clone()).html();\n"."\t\t\tif(html.indexOf('__'+key+'__')>-1){\n"."\t\t\t\tcontent=$(html.split('__'+key+'__').join(value[key]));\n"."\t\t\t\t$(newElm).replaceWith(content);newElm=content;\n"."\t\t\t}\n"."\t\tvar sel='[data-id=\"'+key+'\"]';if($(sel,newElm).length){\n"."\t\t\tvar selElm=$(sel,newElm);\n"."\t\t\t if(selElm.is('[value]')) { selElm.attr('value',value[key]);selElm.val(value[key]);} else { selElm.html(value[key]); }\n"."\t\t}\n"."}\n"."\t$(newElm).show(true);"."\n"."\t$(newElm).removeClass('hide');"."});\n";
 		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
 		$parameters["jsCallback"]=$retour;
-		return $this->_ajax($method, $url,null,$parameters);
+		return $this->_ajax($method, $url, null, $parameters);
 	}
 
 	/**
@@ -316,7 +316,7 @@ 
 	 * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"rowClass"=>"_json")
 	 */
 	public function jsonArray($maskSelector, $url, $method="get", $parameters=[]) {
-		return $this->_jsonArray($maskSelector, $url,$method,$parameters);
+		return $this->_jsonArray($maskSelector, $url, $method, $parameters);
 	}
 
 	/**
@@ -339,9 +339,9 @@ 
 	 * @param string $method Method used, default : get
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","rowClass"=>"_json","immediatly"=>true)
 	 */
-	public function jsonArrayOn($event,$element,$maskSelector, $url,$method="get",$parameters=array()) {
-		$this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]);
-		return $this->_add_event($element, $this->jsonArrayDeferred($maskSelector,$url,$method, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]);
+	public function jsonArrayOn($event, $element, $maskSelector, $url, $method="get", $parameters=array()) {
+		$this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]);
+		return $this->_add_event($element, $this->jsonArrayDeferred($maskSelector, $url, $method, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]);
 	}
 
 	/**
@@ -353,7 +353,7 @@ 
 	 */
 	public function getDeferred($url, $responseElement="", $parameters=[]) {
 		$parameters["immediatly"]=false;
-		return $this->_get($url, $responseElement,$parameters);
+		return $this->_get($url, $responseElement, $parameters);
 	}
 
 	/**
@@ -366,8 +366,8 @@ 
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>null,"headers"=>null)
 	 */
 	public function getOn($event, $element, $url, $responseElement="", $parameters=array()) {
-		$this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]);
-		return $this->_add_event($element, $this->getDeferred($url,$responseElement,$parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]);
+		$this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]);
+		return $this->_add_event($element, $this->getDeferred($url, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]);
 	}
 
 	/**
@@ -380,8 +380,8 @@ 
 	 * @param array $parameters default : array("method"=>"get","preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null)
 	 */
 	public function ajaxOn($event, $element, $url, $responseElement="", $parameters=array()) {
-		$this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true,"method"=>"get"]);
-		return $this->_add_event($element, $this->ajaxDeferred($parameters["method"],$url,$responseElement,$parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]);
+		$this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true, "method"=>"get"]);
+		return $this->_add_event($element, $this->ajaxDeferred($parameters["method"], $url, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]);
 	}
 
 	/**
@@ -408,9 +408,9 @@ 
 		return $this->getOn("click", $element, $url, $responseElement, $parameters);
 	}
 
-	private function _post($url, $params="{}",$responseElement="", $parameters=[]) {
+	private function _post($url, $params="{}", $responseElement="", $parameters=[]) {
 		$parameters["params"]=$params;
-		return $this->_ajax("POST", $url,$responseElement,$parameters);
+		return $this->_ajax("POST", $url, $responseElement, $parameters);
 	}
 
 	/**
@@ -420,8 +420,8 @@ 
 	 * @param string $params JSON parameters
 	 * @param array $parameters default : array("jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null)
 	 */
-	public function post($url, $params="{}",$responseElement="", $parameters=[]) {
-		return $this->_post($url, $params,$responseElement, $parameters);
+	public function post($url, $params="{}", $responseElement="", $parameters=[]) {
+		return $this->_post($url, $params, $responseElement, $parameters);
 	}
 
 	/**
@@ -432,7 +432,7 @@ 
 	 * @param string $responseElement selector of the HTML element displaying the answer
 	 * @param array $parameters default : array("jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null)
 	 */
-	public function postDeferred($url, $params="{}",$responseElement="", $parameters=[]) {
+	public function postDeferred($url, $params="{}", $responseElement="", $parameters=[]) {
 		$parameters["immediatly"]=false;
 		return $this->_post($url, $params, $responseElement, $parameters);
 	}
@@ -448,8 +448,8 @@ 
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null)
 	 */
 	public function postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
-		$this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]);
-		return $this->_add_event($element, $this->postDeferred($url, $params, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]);
+		$this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]);
+		return $this->_add_event($element, $this->postDeferred($url, $params, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]);
 	}
 
 	/**
@@ -466,27 +466,27 @@ 
 	}
 
 	private function _postForm($url, $form, $responseElement, $parameters=[]) {
-		$params="{}";$validation=false;$jsCallback=NULL;$attr="id";$hasLoader=true;$ajaxLoader=null;$jqueryDone="html";$ajaxTransition=null;$immediatly=false;$jsCondition=NULL;$headers=NULL;$async=true;
+		$params="{}"; $validation=false; $jsCallback=NULL; $attr="id"; $hasLoader=true; $ajaxLoader=null; $jqueryDone="html"; $ajaxTransition=null; $immediatly=false; $jsCondition=NULL; $headers=NULL; $async=true;
 		\extract($parameters);
-		$async=($async)?"true":"false";
+		$async=($async) ? "true" : "false";
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
 		$retour=$this->_getAjaxUrl($url, $attr);
 		$retour.="\nvar params=$('#".$form."').serialize();\n";
-		if(isset($params)){
+		if (isset($params)) {
 			$retour.="params+='&'+".self::_correctParams($params).";\n";
 		}
 		$responseElement=$this->_getResponseElement($responseElement);
 		$retour.="var self=this;\n";
-		if($hasLoader===true){
-			$this->addLoading($retour, $responseElement,$ajaxLoader);
+		if ($hasLoader===true) {
+			$this->addLoading($retour, $responseElement, $ajaxLoader);
 		}
-		$ajaxParameters=["url"=>"url","method"=>"'POST'","data"=>"params","async"=>$async];
-		if(isset($headers)){
+		$ajaxParameters=["url"=>"url", "method"=>"'POST'", "data"=>"params", "async"=>$async];
+		if (isset($headers)) {
 			$ajaxParameters["headers"]=$headers;
 		}
 		$this->createAjaxParameters($ajaxParameters, $parameters);
 		$retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data ) {\n";
-		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback)."});\n";
+		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback)."});\n";
 
 		if ($validation) {
 			$retour="$('#".$form."').validate({submitHandler: function(form) {
@@ -536,8 +536,8 @@ 
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>null,"headers"=>null)
 	 */
 	public function postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) {
-		$this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]);
-		return $this->_add_event($element, $this->postFormDeferred($url, $form, $responseElement,$parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]);
+		$this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]);
+		return $this->_add_event($element, $this->postFormDeferred($url, $form, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]);
 	}
 
 	/**

Ajax/Bootstrap.php

Spacing +11 added lines, -11 removed lines

@@ -172,8 +172,8 @@ 
 	 * @param string $tagName container tagName
 	 * @return HtmlListgroup
 	 */
-	public function htmlListgroup($identifier,$items=array(),$tagName="ul"){
-		$listGroup=new HtmlListgroup($identifier,$tagName);
+	public function htmlListgroup($identifier, $items=array(), $tagName="ul") {
+		$listGroup=new HtmlListgroup($identifier, $tagName);
 		$listGroup->addItems($items);
 		return $this->addHtmlComponent($listGroup);
 	}
@@ -198,8 +198,8 @@ 
 	 * @param string $onClick
 	 * @return HtmlSplitbutton
 	 */
-	public function htmlSplitbutton($identifier,$value="", $items=array(), $cssStyle="btn-default", $onClick=NULL) {
-		return $this->addHtmlComponent(new HtmlSplitbutton($identifier, $value, $items, $cssStyle,$onClick));
+	public function htmlSplitbutton($identifier, $value="", $items=array(), $cssStyle="btn-default", $onClick=NULL) {
+		return $this->addHtmlComponent(new HtmlSplitbutton($identifier, $value, $items, $cssStyle, $onClick));
 	}
 
 	/**
@@ -207,7 +207,7 @@ 
 	 * @param string $identifier
 	 * @return HtmlInputgroup
 	 */
-	public function htmlInputgroup($identifier){
+	public function htmlInputgroup($identifier) {
 		return $this->addHtmlComponent(new HtmlInputgroup($identifier));
 	}
 
@@ -219,8 +219,8 @@ 
 	 * @param callable $hrefFunction the function who generates the href elements. default : function($e){return $e->getContent()}
 	 * @return HtmlBreadcrumbs
 	 */
-	public function htmlBreadcrumbs($identifier,$elements=array(),$autoActive=true,$startIndex=0,$hrefFunction=NULL){
-		return $this->addHtmlComponent(new HtmlBreadcrumbs($identifier,$elements,$autoActive,$startIndex,$hrefFunction));
+	public function htmlBreadcrumbs($identifier, $elements=array(), $autoActive=true, $startIndex=0, $hrefFunction=NULL) {
+		return $this->addHtmlComponent(new HtmlBreadcrumbs($identifier, $elements, $autoActive, $startIndex, $hrefFunction));
 	}
 
 	/**
@@ -232,8 +232,8 @@ 
 	 * @param int $active The active page
 	 * @return HtmlPagination
 	 */
-	public function htmlPagination($identifier,$from=1,$to=1,$active=NULL,$countVisible=NULL){
-		return $this->addHtmlComponent(new HtmlPagination($identifier,$from,$to,$active,$countVisible));
+	public function htmlPagination($identifier, $from=1, $to=1, $active=NULL, $countVisible=NULL) {
+		return $this->addHtmlComponent(new HtmlPagination($identifier, $from, $to, $active, $countVisible));
 	}
 
 	/**
@@ -244,7 +244,7 @@ 
 	 * @param int $numCols
 	 * @return HtmlGridSystem
 	 */
-	public function htmlGridSystem($identifier,$numRows=1,$numCols=NULL){
-		return $this->addHtmlComponent(new HtmlGridSystem($identifier,$numRows,$numCols));
+	public function htmlGridSystem($identifier, $numRows=1, $numCols=NULL) {
+		return $this->addHtmlComponent(new HtmlGridSystem($identifier, $numRows, $numCols));
 	}
 }