phpMv / phpMv-UI

Ajax/semantic/html/collections/form/traits/FormTrait.php

Braces +6 added lines, -4 removed lines

@@ -48,8 +48,9 @@ 
 
 	public function setAttached($value=true){
 		$form=$this->getForm();
-		if($value)
-			$form->addToPropertyCtrl("class", "attached", array ("attached" ));
+		if($value) {
+					$form->addToPropertyCtrl("class", "attached", array ("attached" ));
+		}
 		return $form;
 	}
 
@@ -91,8 +92,9 @@ 
 		if(isset($url) && isset($responseElement)){
 			$button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');",true,true);
 			$params=["form"=>$form->getIdentifier(),"responseElement"=>$responseElement,"url"=>$url,"stopPropagation"=>true];
-			if(\is_array($parameters))
-				$params=\array_merge($params,$parameters);
+			if(\is_array($parameters)) {
+							$params=\array_merge($params,$parameters);
+			}
 			$form->addValidationParam("_ajaxSubmit", new AjaxCall("postForm", $params));
 		}
 		return $button;

Spacing +28 added lines, -28 removed lines

@@ -12,28 +12,28 @@ 
  * @author jc
  *
  */
-trait FormTrait{
+trait FormTrait {
 
 	/**
 	 * @return HtmlForm
 	 */
 	abstract protected function getForm();
 
-	protected function addCompoValidation($compo,$field){
+	protected function addCompoValidation($compo, $field) {
 		$validation=$field->getValidation();
-		if(isset($validation)){
+		if (isset($validation)) {
 			$validation->setIdentifier($field->getDataField()->getIdentifier());
 			$compo->addFieldValidation($validation);
 		}
 		return $compo;
 	}
 
-	protected function _runValidationParams(&$compo,JsUtils $js=NULL){
+	protected function _runValidationParams(&$compo, JsUtils $js=NULL) {
 		$form=$this->getForm();
 		$params=$form->getValidationParams();
-		if(isset($params["_ajaxSubmit"]) && $params["_ajaxSubmit"] instanceof AjaxCall){
+		if (isset($params["_ajaxSubmit"]) && $params["_ajaxSubmit"] instanceof AjaxCall) {
 			$compilation=$params["_ajaxSubmit"]->compile($js);
-			$compilation=str_ireplace("\"","%quote%", $compilation);
+			$compilation=str_ireplace("\"", "%quote%", $compilation);
 			$this->onSuccess($compilation);
 			$form->removeValidationParam("_ajaxSubmit");
 		}
@@ -51,14 +51,14 @@ 
 		return $this;
 	}
 
-	public function setAttached($value=true){
+	public function setAttached($value=true) {
 		$form=$this->getForm();
-		if($value)
-			$form->addToPropertyCtrl("class", "attached", array ("attached" ));
+		if ($value)
+			$form->addToPropertyCtrl("class", "attached", array("attached"));
 		return $form;
 	}
 
-	public function addErrorMessage(){
+	public function addErrorMessage() {
 		return $this->getForm()->addContent((new HtmlMessage(""))->setError());
 	}
 
@@ -73,38 +73,38 @@ 
 	 * @param string $responseElement
 	 * @return \Ajax\semantic\html\collections\form\HtmlForm
 	 */
-	public function submitOn($event,$identifier,$url,$responseElement){
+	public function submitOn($event, $identifier, $url, $responseElement) {
 		$form=$this->getForm();
 		$elem=$form->getElementById($identifier, $form->getContent());
-		if(isset($elem)){
-			$this->_buttonAsSubmit($elem, $event,$url,$responseElement);
+		if (isset($elem)) {
+			$this->_buttonAsSubmit($elem, $event, $url, $responseElement);
 		}
 		return $form;
 	}
 
-	public function submitOnClick($identifier,$url,$responseElement){
+	public function submitOnClick($identifier, $url, $responseElement) {
 		return $this->submitOn("click", $identifier, $url, $responseElement);
 	}
 
-	public function addSubmit($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL){
-		$bt=$this->getForm()->addButton($identifier, $value,$cssStyle);
-		return $this->_buttonAsSubmit($bt, "click",$url,$responseElement);
+	public function addSubmit($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL) {
+		$bt=$this->getForm()->addButton($identifier, $value, $cssStyle);
+		return $this->_buttonAsSubmit($bt, "click", $url, $responseElement);
 	}
 
-	protected function _buttonAsSubmit(HtmlButton &$button,$event,$url,$responseElement=NULL,$parameters=NULL){
+	protected function _buttonAsSubmit(HtmlButton&$button, $event, $url, $responseElement=NULL, $parameters=NULL) {
 		$form=$this->getForm();
-		if(isset($url) && isset($responseElement)){
-			$button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');",true,true);
-			$params=["form"=>$form->getIdentifier(),"responseElement"=>$responseElement,"url"=>$url,"stopPropagation"=>true];
-			if(\is_array($parameters))
-				$params=\array_merge($params,$parameters);
+		if (isset($url) && isset($responseElement)) {
+			$button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');", true, true);
+			$params=["form"=>$form->getIdentifier(), "responseElement"=>$responseElement, "url"=>$url, "stopPropagation"=>true];
+			if (\is_array($parameters))
+				$params=\array_merge($params, $parameters);
 			$form->addValidationParam("_ajaxSubmit", new AjaxCall("postForm", $params));
 		}
 		return $button;
 	}
 
-	public function addReset($identifier,$value,$cssStyle=NULL){
-		$bt=$this->getForm()->addButton($identifier, $value,$cssStyle);
+	public function addReset($identifier, $value, $cssStyle=NULL) {
+		$bt=$this->getForm()->addButton($identifier, $value, $cssStyle);
 		$bt->setProperty("type", "reset");
 		return $bt;
 	}
@@ -114,7 +114,7 @@ 
 	 * @param string $jsCode
 	 * @return \Ajax\semantic\html\collections\form\HtmlForm
 	 */
-	public function onValid($jsCode){
+	public function onValid($jsCode) {
 		$form=$this->getForm();
 		$form->addValidationParam("onValid", "%function(){".$jsCode."}%");
 		return $form;
@@ -125,9 +125,9 @@ 
 	 * @param string $jsCode can use event and fields parameters
 	 * @return HtmlForm
 	 */
-	public function onSuccess($jsCode){
+	public function onSuccess($jsCode) {
 		$form=$this->getForm();
-		$form->addValidationParam("onSuccess", $jsCode,"%function(event,fields){","}%");
+		$form->addValidationParam("onSuccess", $jsCode, "%function(event,fields){", "}%");
 		return $form;
 	}
 }
\ No newline at end of file

Ajax/semantic/widgets/datatable/HasCheckboxesTrait.php

Spacing +18 added lines, -18 removed lines

@@ -10,17 +10,17 @@ 
  * @author jc
  * @property string identifier
  */
-trait HasCheckboxesTrait{
+trait HasCheckboxesTrait {
 	protected $_hasCheckboxes;
 	protected $_hasCheckedMessage=false;
 	protected $_checkedMessage;
 	protected $_checkedClass;
 
-	abstract public function addInToolbar($element,$callback=NULL);
+	abstract public function addInToolbar($element, $callback=NULL);
 
-	protected function _runCheckboxes(JsUtils $js){
+	protected function _runCheckboxes(JsUtils $js) {
 		$checkedMessageCall="";
-		if($this->_hasCheckedMessage){
+		if ($this->_hasCheckedMessage) {
 			$msg=$this->getCheckedMessage();
 			$checkedMessageFunction="function updateChecked(){var msg='".$msg[0]."',count=\$('#{$this->identifier} [name=\"selection[]\"]:checked').length,all=\$('#{$this->identifier} [name=\"selection[]\"]').length;
 			if(count==1) msg='".$msg[1]."';
@@ -28,10 +28,10 @@ 
 						\$('#checked-count-".$this->identifier."').contents().filter(function() {return this.nodeType == 3;}).each(function(){this.textContent = msg.replace('{count}',count);});
 							\$('#toolbar-{$this->identifier} .visibleOnChecked').toggle(count>0);}\$('#toolbar-".$this->identifier." .visibleOnChecked').hide();";
 			$checkedMessageCall="updateChecked();";
-			if(isset($this->_checkedClass)){
+			if (isset($this->_checkedClass)) {
 				$checkedMessageCall.="$(this).closest('tr').toggleClass('".$this->_checkedClass."',$(this).prop('checked'));";
 			}
-			$js->exec($checkedMessageFunction,true);
+			$js->exec($checkedMessageFunction, true);
 		}
 		$js->execOn("change", "#".$this->identifier." [name='selection[]']", "
 				var \$parentCheckbox=\$('#ck-main-ck-{$this->identifier}'),\$checkbox=\$('#{$this->identifier} [name=\"selection[]\"]'),allChecked=true,allUnchecked=true;
@@ -39,10 +39,10 @@ 
 				if(allChecked) {\$parentCheckbox.checkbox('set checked');}else if(allUnchecked){\$parentCheckbox.checkbox('set unchecked');}else{\$parentCheckbox.checkbox('set indeterminate');};".$checkedMessageCall);
 	}
 
-	protected function _generateMainCheckbox(&$captions){
-		$ck=new HtmlCheckbox("main-ck-".$this->identifier,"");
+	protected function _generateMainCheckbox(&$captions) {
+		$ck=new HtmlCheckbox("main-ck-".$this->identifier, "");
 		$checkedMessageCall="";
-		if($this->_hasCheckedMessage)
+		if ($this->_hasCheckedMessage)
 			$checkedMessageCall="updateChecked();";
 
 			$ck->setOnChecked($this->_setAllChecked("true").$checkedMessageCall);
@@ -50,9 +50,9 @@ 
 			\array_unshift($captions, $ck);
 	}
 
-	protected function _setAllChecked($checked){
+	protected function _setAllChecked($checked) {
 		$result="$('#".$this->identifier." [name=%quote%selection[]%quote%]').prop('checked',".$checked.");";
-		if(isset($this->_checkedClass)){
+		if (isset($this->_checkedClass)) {
 			$result.="$('#".$this->identifier." tr').toggleClass('".$this->_checkedClass."',".$checked.");";
 		}
 		return $result;
@@ -68,9 +68,9 @@ 
 	}
 
 	protected function getCheckedMessage() {
-		$result= $this->_checkedMessage;
-		if(!isset($result)){
-			$result=[0=>"none selected",1=>"one item selected","other"=>"{count} items selected"];
+		$result=$this->_checkedMessage;
+		if (!isset($result)) {
+			$result=[0=>"none selected", 1=>"one item selected", "other"=>"{count} items selected"];
 		}
 		return $result;
 	}
@@ -90,14 +90,14 @@ 
 	 * @param array $checkedMessage
 	 * @param callable $callback
 	 */
-	public function addCountCheckedInToolbar(array $checkedMessage=null,$callback=null){
-		if(isset($checkedMessage))
+	public function addCountCheckedInToolbar(array $checkedMessage=null, $callback=null) {
+		if (isset($checkedMessage))
 			$this->_checkedMessage=$checkedMessage;
 			$checkedMessage=$this->getCheckedMessage();
 			$this->_hasCheckboxes=true;
 			$this->_hasCheckedMessage=true;
-			$element=new HtmlLabel("checked-count-".$this->identifier,$checkedMessage[0]);
-			$this->addInToolbar($element,$callback);
+			$element=new HtmlLabel("checked-count-".$this->identifier, $checkedMessage[0]);
+			$this->addInToolbar($element, $callback);
 	}
 
 	public function setCheckedClass($_checkedClass) {

Braces +6 added lines, -4 removed lines

@@ -42,8 +42,9 @@ 
 	protected function _generateMainCheckbox(&$captions){
 		$ck=new HtmlCheckbox("main-ck-".$this->identifier,"");
 		$checkedMessageCall="";
-		if($this->_hasCheckedMessage)
-			$checkedMessageCall="updateChecked();";
+		if($this->_hasCheckedMessage) {
+					$checkedMessageCall="updateChecked();";
+		}
 
 			$ck->setOnChecked($this->_setAllChecked("true").$checkedMessageCall);
 			$ck->setOnUnchecked($this->_setAllChecked("false").$checkedMessageCall);
@@ -91,8 +92,9 @@ 
 	 * @param callable $callback
 	 */
 	public function addCountCheckedInToolbar(array $checkedMessage=null,$callback=null){
-		if(isset($checkedMessage))
-			$this->_checkedMessage=$checkedMessage;
+		if(isset($checkedMessage)) {
+					$this->_checkedMessage=$checkedMessage;
+		}
 			$checkedMessage=$this->getCheckedMessage();
 			$this->_hasCheckboxes=true;
 			$this->_hasCheckedMessage=true;

Ajax/semantic/widgets/datatable/DataTable.php

Spacing +67 added lines, -67 removed lines

@@ -21,7 +21,7 @@ 
  *
  */
 class DataTable extends Widget {
-	use TableTrait,DataTableFieldAsTrait,HasCheckboxesTrait;
+	use TableTrait, DataTableFieldAsTrait, HasCheckboxesTrait;
 	protected $_searchField;
 	protected $_urls;
 	protected $_pagination;
@@ -32,33 +32,33 @@ 
 	protected $_targetSelector;
 
 
-	public function __construct($identifier,$model,$modelInstance=NULL) {
-		parent::__construct($identifier, $model,$modelInstance);
-		$this->_init(new InstanceViewer($identifier), "table", new HtmlTable($identifier, 0,0), false);
+	public function __construct($identifier, $model, $modelInstance=NULL) {
+		parent::__construct($identifier, $model, $modelInstance);
+		$this->_init(new InstanceViewer($identifier), "table", new HtmlTable($identifier, 0, 0), false);
 		$this->_urls=[];
 	}
 
-	public function run(JsUtils $js){
-		if($this->_hasCheckboxes && isset($js)){
+	public function run(JsUtils $js) {
+		if ($this->_hasCheckboxes && isset($js)) {
 			$this->_runCheckboxes($js);
 		}
-		if($this->_visibleHover){
-			$js->execOn("mouseover", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'visible');",["preventDefault"=>false,"stopPropagation"=>true]);
-			$js->execOn("mouseout", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'hidden');",["preventDefault"=>false,"stopPropagation"=>true]);
+		if ($this->_visibleHover) {
+			$js->execOn("mouseover", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'visible');", ["preventDefault"=>false, "stopPropagation"=>true]);
+			$js->execOn("mouseout", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'hidden');", ["preventDefault"=>false, "stopPropagation"=>true]);
 		}
-		if(\is_array($this->_deleteBehavior))
-			$this->_generateBehavior("delete",$this->_deleteBehavior, $js);
-		if(\is_array($this->_editBehavior))
-			$this->_generateBehavior("edit",$this->_editBehavior,$js);
+		if (\is_array($this->_deleteBehavior))
+			$this->_generateBehavior("delete", $this->_deleteBehavior, $js);
+		if (\is_array($this->_editBehavior))
+			$this->_generateBehavior("edit", $this->_editBehavior, $js);
 		return parent::run($js);
 	}
 
 
 
-	protected function _generateBehavior($op,$params,JsUtils $js){
-		if(isset($this->_urls[$op])){
-			$params=\array_merge($params,["attr"=>"data-ajax"]);
-			$js->getOnClick("#".$this->identifier." ._".$op, $this->_urls[$op],$this->getTargetSelector(),$params);
+	protected function _generateBehavior($op, $params, JsUtils $js) {
+		if (isset($this->_urls[$op])) {
+			$params=\array_merge($params, ["attr"=>"data-ajax"]);
+			$js->getOnClick("#".$this->identifier." ._".$op, $this->_urls[$op], $this->getTargetSelector(), $params);
 		}
 	}
 
@@ -71,62 +71,62 @@ 
 	}
 
 
-	public function compile(JsUtils $js=NULL,&$view=NULL){
-		if(!$this->_generated){
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
+		if (!$this->_generated) {
 			$this->_instanceViewer->setInstance($this->_model);
 			$captions=$this->_instanceViewer->getCaptions();
 
 			$table=$this->content["table"];
 
-			if($this->_hasCheckboxes){
+			if ($this->_hasCheckboxes) {
 				$this->_generateMainCheckbox($captions);
 			}
 
 			$table->setRowCount(0, \sizeof($captions));
 			$table->setHeaderValues($captions);
-			if(isset($this->_compileParts))
+			if (isset($this->_compileParts))
 				$table->setCompileParts($this->_compileParts);
 
-			if(isset($this->_searchField) && isset($js)){
-				if(isset($this->_urls["refresh"]))
-					$this->_searchField->postOn("change", $this->_urls["refresh"],"{'s':$(this).val()}","#".$this->identifier." tbody",["preventDefault"=>false,"jqueryDone"=>"replaceWith"]);
+			if (isset($this->_searchField) && isset($js)) {
+				if (isset($this->_urls["refresh"]))
+					$this->_searchField->postOn("change", $this->_urls["refresh"], "{'s':$(this).val()}", "#".$this->identifier." tbody", ["preventDefault"=>false, "jqueryDone"=>"replaceWith"]);
 			}
 
 			$this->_generateContent($table);
 
-			if($this->_hasCheckboxes && $table->hasPart("thead")){
+			if ($this->_hasCheckboxes && $table->hasPart("thead")) {
 					$table->getHeader()->getCell(0, 0)->addClass("no-sort");
 			}
 
-			if(isset($this->_pagination) && $this->_pagination->getVisible()){
+			if (isset($this->_pagination) && $this->_pagination->getVisible()) {
 				$this->_generatePagination($table);
 			}
-			if(isset($this->_toolbar)){
+			if (isset($this->_toolbar)) {
 				$this->_setToolbarPosition($table, $captions);
 			}
-			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"table",PositionInTable::AFTERTABLE]);
+			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "table", PositionInTable::AFTERTABLE]);
 			$this->_compileForm();
 			$this->_generated=true;
 		}
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 
 
 
-	protected function _generateContent($table){
+	protected function _generateContent($table) {
 		$objects=$this->_modelInstance;
-		if(isset($this->_pagination)){
+		if (isset($this->_pagination)) {
 			$objects=$this->_pagination->getObjects($this->_modelInstance);
 		}
 		InstanceViewer::setIndex(0);
 		$table->fromDatabaseObjects($objects, function($instance) use($table){
 			$this->_instanceViewer->setInstance($instance);
 			InstanceViewer::$index++;
-			$values= $this->_instanceViewer->getValues();
-			if($this->_hasCheckboxes){
-				$ck=new HtmlCheckbox("ck-".$this->identifier,"");
+			$values=$this->_instanceViewer->getValues();
+			if ($this->_hasCheckboxes) {
+				$ck=new HtmlCheckbox("ck-".$this->identifier, "");
 				$field=$ck->getField();
-				$field->setProperty("value",$this->_instanceViewer->getIdentifier());
+				$field->setProperty("value", $this->_instanceViewer->getIdentifier());
 				$field->setProperty("name", "selection[]");
 				\array_unshift($values, $ck);
 			}
@@ -137,37 +137,37 @@ 
 		});
 	}
 
-	private function _generatePagination($table){
+	private function _generatePagination($table) {
 		$footer=$table->getFooter();
 		$footer->mergeCol();
-		$menu=new HtmlPaginationMenu("pagination-".$this->identifier,$this->_pagination->getPagesNumbers());
+		$menu=new HtmlPaginationMenu("pagination-".$this->identifier, $this->_pagination->getPagesNumbers());
 		$menu->floatRight();
 		$menu->setActiveItem($this->_pagination->getPage()-1);
 		$footer->setValues($menu);
-		if(isset($this->_urls["refresh"]))
-			$menu->postOnClick($this->_urls["refresh"],"{'p':$(this).attr('data-page')}","#".$this->identifier." tbody",["preventDefault"=>false,"jqueryDone"=>"replaceWith"]);
+		if (isset($this->_urls["refresh"]))
+			$menu->postOnClick($this->_urls["refresh"], "{'p':$(this).attr('data-page')}", "#".$this->identifier." tbody", ["preventDefault"=>false, "jqueryDone"=>"replaceWith"]);
 	}
 
-	protected function _getFieldName($index){
+	protected function _getFieldName($index) {
 		return parent::_getFieldName($index)."[]";
 	}
 
-	protected function _getFieldCaption($index){
+	protected function _getFieldCaption($index) {
 		return null;
 	}
 
-	protected function _setToolbarPosition($table,$captions=NULL){
-		switch ($this->_toolbarPosition){
+	protected function _setToolbarPosition($table, $captions=NULL) {
+		switch ($this->_toolbarPosition) {
 			case PositionInTable::BEFORETABLE:
 			case PositionInTable::AFTERTABLE:
-				if(isset($this->_compileParts)===false){
+				if (isset($this->_compileParts)===false) {
 					$this->content[$this->_toolbarPosition]=$this->_toolbar;
 				}
 				break;
 			case PositionInTable::HEADER:
 			case PositionInTable::FOOTER:
 			case PositionInTable::BODY:
-				$this->addToolbarRow($this->_toolbarPosition,$table, $captions);
+				$this->addToolbarRow($this->_toolbarPosition, $table, $captions);
 				break;
 		}
 	}
@@ -179,23 +179,23 @@ 
 	 * @param callable $callback function called after the field compilation
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
 	 */
-	public function afterCompile($index,$callback){
-		$this->_instanceViewer->afterCompile($index,$callback);
+	public function afterCompile($index, $callback) {
+		$this->_instanceViewer->afterCompile($index, $callback);
 		return $this;
 	}
 
-	private function addToolbarRow($part,$table,$captions){
+	private function addToolbarRow($part, $table, $captions) {
 		$hasPart=$table->hasPart($part);
-		if($hasPart){
+		if ($hasPart) {
 			$row=$table->getPart($part)->addRow(\sizeof($captions));
-		}else{
+		} else {
 			$row=$table->getPart($part)->getRow(0);
 		}
 		$row->mergeCol();
 		$row->setValues([$this->_toolbar]);
 	}
 
-	public function getHtmlComponent(){
+	public function getHtmlComponent() {
 		return $this->content["table"];
 	}
 
@@ -209,36 +209,36 @@ 
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
 	 */
 	public function setUrls($urls) {
-		if(\is_array($urls)){
-			$this->_urls["refresh"]=JArray::getValue($urls, "refresh",0);
-			$this->_urls["edit"]=JArray::getValue($urls, "edit",1);
-			$this->_urls["delete"]=JArray::getValue($urls, "delete",2);
-		}else{
-			$this->_urls=["refresh"=>$urls,"edit"=>$urls,"delete"=>$urls];
+		if (\is_array($urls)) {
+			$this->_urls["refresh"]=JArray::getValue($urls, "refresh", 0);
+			$this->_urls["edit"]=JArray::getValue($urls, "edit", 1);
+			$this->_urls["delete"]=JArray::getValue($urls, "delete", 2);
+		} else {
+			$this->_urls=["refresh"=>$urls, "edit"=>$urls, "delete"=>$urls];
 		}
 		return $this;
 	}
 
-	public function paginate($items_per_page=10,$page=1){
-		$this->_pagination=new Pagination($items_per_page,4,$page);
+	public function paginate($items_per_page=10, $page=1) {
+		$this->_pagination=new Pagination($items_per_page, 4, $page);
 	}
 
 
 
-	public function refresh($compileParts=["tbody"]){
+	public function refresh($compileParts=["tbody"]) {
 		$this->_compileParts=$compileParts;
 		return $this;
 	}
 
 
-	public function addSearchInToolbar($position=Direction::RIGHT){
+	public function addSearchInToolbar($position=Direction::RIGHT) {
 		return $this->addInToolbar($this->getSearchField())->setPosition($position);
 	}
 
-	public function getSearchField(){
-		if(isset($this->_searchField)===false){
-			$this->_searchField=new HtmlInput("search-".$this->identifier,"search","","Search...");
-			$this->_searchField->addIcon("search",Direction::RIGHT);
+	public function getSearchField() {
+		if (isset($this->_searchField)===false) {
+			$this->_searchField=new HtmlInput("search-".$this->identifier, "search", "", "Search...");
+			$this->_searchField->addIcon("search", Direction::RIGHT);
 		}
 		return $this->_searchField;
 	}
@@ -254,7 +254,7 @@ 
 		return $this;
 	}
 
-	public function asForm(){
+	public function asForm() {
 		return $this->getForm();
 	}
 
@@ -262,7 +262,7 @@ 
 
 	protected function getTargetSelector() {
 		$result=$this->_targetSelector;
-		if(!isset($result))
+		if (!isset($result))
 			$result="#".$this->identifier;
 		return $result;
 	}

Braces +20 added lines, -14 removed lines

@@ -46,10 +46,12 @@ 
 			$js->execOn("mouseover", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'visible');",["preventDefault"=>false,"stopPropagation"=>true]);
 			$js->execOn("mouseout", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'hidden');",["preventDefault"=>false,"stopPropagation"=>true]);
 		}
-		if(\is_array($this->_deleteBehavior))
-			$this->_generateBehavior("delete",$this->_deleteBehavior, $js);
-		if(\is_array($this->_editBehavior))
-			$this->_generateBehavior("edit",$this->_editBehavior,$js);
+		if(\is_array($this->_deleteBehavior)) {
+					$this->_generateBehavior("delete",$this->_deleteBehavior, $js);
+		}
+		if(\is_array($this->_editBehavior)) {
+					$this->_generateBehavior("edit",$this->_editBehavior,$js);
+		}
 		return parent::run($js);
 	}
 
@@ -84,12 +86,14 @@ 
 
 			$table->setRowCount(0, \sizeof($captions));
 			$table->setHeaderValues($captions);
-			if(isset($this->_compileParts))
-				$table->setCompileParts($this->_compileParts);
+			if(isset($this->_compileParts)) {
+							$table->setCompileParts($this->_compileParts);
+			}
 
 			if(isset($this->_searchField) && isset($js)){
-				if(isset($this->_urls["refresh"]))
-					$this->_searchField->postOn("change", $this->_urls["refresh"],"{'s':$(this).val()}","#".$this->identifier." tbody",["preventDefault"=>false,"jqueryDone"=>"replaceWith"]);
+				if(isset($this->_urls["refresh"])) {
+									$this->_searchField->postOn("change", $this->_urls["refresh"],"{'s':$(this).val()}","#".$this->identifier." tbody",["preventDefault"=>false,"jqueryDone"=>"replaceWith"]);
+				}
 			}
 
 			$this->_generateContent($table);
@@ -144,8 +148,9 @@ 
 		$menu->floatRight();
 		$menu->setActiveItem($this->_pagination->getPage()-1);
 		$footer->setValues($menu);
-		if(isset($this->_urls["refresh"]))
-			$menu->postOnClick($this->_urls["refresh"],"{'p':$(this).attr('data-page')}","#".$this->identifier." tbody",["preventDefault"=>false,"jqueryDone"=>"replaceWith"]);
+		if(isset($this->_urls["refresh"])) {
+					$menu->postOnClick($this->_urls["refresh"],"{'p':$(this).attr('data-page')}","#".$this->identifier." tbody",["preventDefault"=>false,"jqueryDone"=>"replaceWith"]);
+		}
 	}
 
 	protected function _getFieldName($index){
@@ -188,7 +193,7 @@ 
 		$hasPart=$table->hasPart($part);
 		if($hasPart){
 			$row=$table->getPart($part)->addRow(\sizeof($captions));
-		}else{
+		} else{
 			$row=$table->getPart($part)->getRow(0);
 		}
 		$row->mergeCol();
@@ -213,7 +218,7 @@ 
 			$this->_urls["refresh"]=JArray::getValue($urls, "refresh",0);
 			$this->_urls["edit"]=JArray::getValue($urls, "edit",1);
 			$this->_urls["delete"]=JArray::getValue($urls, "delete",2);
-		}else{
+		} else{
 			$this->_urls=["refresh"=>$urls,"edit"=>$urls,"delete"=>$urls];
 		}
 		return $this;
@@ -262,8 +267,9 @@ 
 
 	protected function getTargetSelector() {
 		$result=$this->_targetSelector;
-		if(!isset($result))
-			$result="#".$this->identifier;
+		if(!isset($result)) {
+					$result="#".$this->identifier;
+		}
 		return $result;
 	}
 

Ajax/semantic/widgets/dataelement/DeInstanceViewer.php

Spacing +3 added lines, -3 removed lines

@@ -12,10 +12,10 @@
 		parent::__construct($identifier, $instance, $captions);
 	}
 
-	public function getValue($index){
+	public function getValue($index) {
 		$result=parent::getValue($index);
-		if($result instanceof HtmlFormField){
-			$lbl=new HtmlSemDoubleElement("lbl-".$this->widgetIdentifier."-".$index,"label","",$this->getCaption($index));
+		if ($result instanceof HtmlFormField) {
+			$lbl=new HtmlSemDoubleElement("lbl-".$this->widgetIdentifier."-".$index, "label", "", $this->getCaption($index));
 			$lbl->setProperty("for", $result->getDataField()->getIdentifier());
 			$this->captions[$index]=$lbl;
 		}

Ajax/semantic/widgets/dataelement/DataElement.php

Spacing +15 added lines, -15 removed lines

@@ -18,49 +18,49 @@ 
 class DataElement extends Widget {
 
 	public function __construct($identifier, $modelInstance=NULL) {
-		parent::__construct($identifier, null,$modelInstance);
-		$this->_init(new DeInstanceViewer($identifier), "table", new HtmlTable($identifier, 0,2), false);
+		parent::__construct($identifier, null, $modelInstance);
+		$this->_init(new DeInstanceViewer($identifier), "table", new HtmlTable($identifier, 0, 2), false);
 		$this->content["table"]->setDefinition();
 	}
 
-	public function compile(JsUtils $js=NULL,&$view=NULL){
-		if(!$this->_generated){
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
+		if (!$this->_generated) {
 			$this->_instanceViewer->setInstance($this->_modelInstance);
 
 			$table=$this->content["table"];
 			$this->_generateContent($table);
 
-			if(isset($this->_toolbar)){
+			if (isset($this->_toolbar)) {
 				$this->_setToolbarPosition($table);
 			}
-			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"table",PositionInTable::AFTERTABLE]);
+			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "table", PositionInTable::AFTERTABLE]);
 			$this->_compileForm();
 			$this->_generated=true;
 		}
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 
 	/**
 	 * @param HtmlTable $table
 	 */
-	protected function _generateContent($table){
-		$values= $this->_instanceViewer->getValues();
+	protected function _generateContent($table) {
+		$values=$this->_instanceViewer->getValues();
 		$captions=$this->_instanceViewer->getCaptions();
 		$count=$this->_instanceViewer->count();
-		for($i=0;$i<$count;$i++){
-			$table->addRow([$captions[$i],$values[$i]]);
+		for ($i=0; $i<$count; $i++) {
+			$table->addRow([$captions[$i], $values[$i]]);
 		}
 	}
 
-	protected function _getFieldName($index){
+	protected function _getFieldName($index) {
 		return $this->_instanceViewer->getFieldName($index);
 	}
 
-	protected function _getFieldCaption($index){
+	protected function _getFieldCaption($index) {
 		return null;
 	}
 
-	protected function _getFieldIdentifier($prefix,$name=""){
+	protected function _getFieldIdentifier($prefix, $name="") {
 		return $this->identifier."-{$prefix}-".$name;
 	}
 
@@ -92,7 +92,7 @@ 
 		return $this;
 	}
 
-	public function asForm(){
+	public function asForm() {
 		return $this->getForm();
 	}
 }
\ No newline at end of file

Ajax/common/traits/JqueryAjaxTrait.php

Spacing +46 added lines, -46 removed lines

@@ -17,7 +17,7 @@ 
 	protected $ajaxTransition;
 	protected $ajaxLoader='<span></span><span></span><span></span><span></span><span></span>';
 
-	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 addLoading(&$retour, $responseElement) {
 		$loading_notifier='<div class="ajax-loader">';
 		if ($this->ajaxLoader=='') {
@@ -30,66 +30,66 @@ 
 		$retour.="\t\t$({$responseElement}).prepend('{$loading_notifier}');\n";
 	}
 
-	public function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$jqueryDone="html",$ajaxTransition=null,$immediatly=false) {
-		return $this->_ajax("get", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$jqueryDone,$ajaxTransition,$immediatly);
+	public function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $jqueryDone="html", $ajaxTransition=null, $immediatly=false) {
+		return $this->_ajax("get", $url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition, $immediatly);
 	}
-	public function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$jqueryDone="html",$ajaxTransition=null,$immediatly=false) {
-		return $this->_ajax("post", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$jqueryDone,$ajaxTransition,$immediatly);
+	public function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $jqueryDone="html", $ajaxTransition=null, $immediatly=false) {
+		return $this->_ajax("post", $url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition, $immediatly);
 	}
 
-	protected function _ajax($method,$url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$jqueryDone="html",$ajaxTransition=null,$immediatly=false) {
-		if(JString::isNull($params)){$params="{}";}
+	protected function _ajax($method, $url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $jqueryDone="html", $ajaxTransition=null, $immediatly=false) {
+		if (JString::isNull($params)) {$params="{}"; }
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
 		$retour=$this->_getAjaxUrl($url, $attr);
 		$responseElement=$this->_getResponseElement($responseElement);
 		$retour.="var self=this;\n";
-		if($hasLoader===true){
+		if ($hasLoader===true) {
 			$this->addLoading($retour, $responseElement);
 		}
 		$retour.="$.".$method."(url,".$params.").done(function( data ) {\n";
-		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback)."});\n";
+		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback)."});\n";
 		if ($immediatly)
 			$this->jquery_code_for_compile[]=$retour;
 		return $retour;
 	}
 
-	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 _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 (JString::isNotNull($attr)) {
 			if ($attr==="value")
 				$retour.="url=url+'".$slash."'+$(this).val();\n";
 			elseif ($attr==="html")
 			$retour.="url=url+'".$slash."'+$(this).html();\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 ($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";
 		}
@@ -97,7 +97,7 @@ 
 		return $retour;
 	}
 
-	protected function _getResponseElement($responseElement){
+	protected function _getResponseElement($responseElement) {
 		if ($responseElement!=="") {
 			$responseElement=Javascript::prep_value($responseElement);
 		}
@@ -107,7 +107,7 @@ 
 	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->jsUtils->getUrl($url);
 		}
 		return $url;
@@ -121,7 +121,7 @@ 
 	 * @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) {
+	public function _json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document", $immediatly=false) {
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
 		$retour=$this->_getAjaxUrl($url, $attr);
 		$retour.="$.{$method}(url,".$params.").done(function( data ) {\n";
@@ -142,7 +142,7 @@ 
 	 * @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()) {
+	public function _jsonOn($event, $element, $url, $parameters=array()) {
 		$preventDefault=true;
 		$stopPropagation=true;
 		$jsCallback=null;
@@ -152,7 +152,7 @@ 
 		$params="{}";
 		$immediatly=true;
 		extract($parameters);
-		return $this->_add_event($element, $this->_json($url,$method, $params,$jsCallback, $attr,$context), $event, $preventDefault, $stopPropagation,$immediatly);
+		return $this->_add_event($element, $this->_json($url, $method, $params, $jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 
 	/**
@@ -164,19 +164,19 @@ 
 	 * @param string $context jquery DOM element, array container.
 	 * @param boolean $immediatly
 	 */
-	public function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context=null,$immediatly=false) {
+	public function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context=null, $immediatly=false) {
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
 		$retour=$this->_getAjaxUrl($url, $attr);
-		if($context===null){
+		if ($context===null) {
 			$appendTo="\t\tnewElm.appendTo($('".$maskSelector."').parent());\n";
-			$newElm = "$('#'+newId)";
-		}else{
+			$newElm="$('#'+newId)";
+		} else {
 			$appendTo="\t\tnewElm.appendTo(".$context.");\n";
-			$newElm = $context.".find('#'+newId)";
+			$newElm=$context.".find('#'+newId)";
 		}
 		$retour.="var self = $(this);\n$.{$method}(url,".$params.").done(function( data ) {\n";
 		$retour.="\tdata=$.parseJSON(data);$.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";
-		$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";
 		$retour.="\t".$jsCallback."\n"."});\n";
@@ -191,30 +191,30 @@ 
 	 * @param string $url the request address
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get", "context"=>null)
 	 */
-	public function _jsonArrayOn($event,$element, $maskSelector,$url,$parameters=array()) {
+	public function _jsonArrayOn($event, $element, $maskSelector, $url, $parameters=array()) {
 		$preventDefault=true;
 		$stopPropagation=true;
 		$jsCallback=null;
 		$attr="id";
 		$method="get";
-		$context = null;
+		$context=null;
 		$params="{}";
 		$immediatly=true;
 		extract($parameters);
-		return $this->_add_event($element, $this->_jsonArray($maskSelector,$url,$method, $params,$jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation,$immediatly);
+		return $this->_add_event($element, $this->_jsonArray($maskSelector, $url, $method, $params, $jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 
-	public function _postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true,$jqueryDone="html",$ajaxTransition=null,$immediatly=false) {
+	public function _postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true, $jqueryDone="html", $ajaxTransition=null, $immediatly=false) {
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
 		$retour=$this->_getAjaxUrl($url, $attr);
 		$retour.="\nvar params=$('#".$form."').serialize();\n";
 		$responseElement=$this->_getResponseElement($responseElement);
 		$retour.="var self=this;\n";
-		if($hasLoader===true){
+		if ($hasLoader===true) {
 			$this->addLoading($retour, $responseElement);
 		}
 		$retour.="$.post(url,params).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) {
@@ -237,7 +237,7 @@ 
 	 * @param string $responseElement
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxTransition"=>null,"jqueryDone"=>"html")
 	 */
-	public function _getOn($event,$element, $url, $params="{}", $responseElement="", $parameters=array()) {
+	public function _getOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
 		$preventDefault=true;
 		$stopPropagation=true;
 		$jsCallback=null;
@@ -247,7 +247,7 @@ 
 		$jqueryDone="html";
 		$ajaxTransition=null;
 		extract($parameters);
-		return $this->_add_event($element, $this->_get($url, $params, $responseElement, $jsCallback, $attr,$hasLoader,$jqueryDone,$ajaxTransition), $event, $preventDefault, $stopPropagation,$immediatly);
+		return $this->_add_event($element, $this->_get($url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 
 	/**
@@ -260,7 +260,7 @@ 
 	 * @param string $responseElement
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxTransition"=>null)
 	 */
-	public function _postOn($event,$element, $url, $params="{}", $responseElement="", $parameters=array()) {
+	public function _postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
 		$preventDefault=true;
 		$stopPropagation=true;
 		$jsCallback=null;
@@ -270,7 +270,7 @@ 
 		$jqueryDone="html";
 		$ajaxTransition=null;
 		extract($parameters);
-		return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr,$hasLoader,$jqueryDone,$ajaxTransition), $event, $preventDefault, $stopPropagation,$immediatly);
+		return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 
 	/**
@@ -283,7 +283,7 @@ 
 	 * @param string $responseElement
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxTransition"=>null,"immediatly"=>true)
 	 */
-	public function _postFormOn($event,$element, $url, $form, $responseElement="", $parameters=array()) {
+	public function _postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) {
 		$preventDefault=true;
 		$stopPropagation=true;
 		$validation=false;
@@ -294,6 +294,6 @@ 
 		$jqueryDone="html";
 		$ajaxTransition=null;
 		extract($parameters);
-		return $this->_add_event($element, $this->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr,$hasLoader,$jqueryDone,$ajaxTransition), $event, $preventDefault, $stopPropagation,$immediatly);
+		return $this->_add_event($element, $this->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 }
\ No newline at end of file

Braces +32 added lines, -24 removed lines

@@ -48,8 +48,9 @@ 
 		}
 		$retour.="$.".$method."(url,".$params.").done(function( data ) {\n";
 		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback)."});\n";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 		return $retour;
 	}
 
@@ -67,15 +68,17 @@ 
 		$url=$this->_correctAjaxUrl($url);
 		$retour="url='".$url."';";
 		$slash="/";
-		if(JString::endswith($url, "/")===true)
-			$slash="";
+		if(JString::endswith($url, "/")===true) {
+					$slash="";
+		}
 		if(JString::isNotNull($attr)){
-			if ($attr==="value")
-				$retour.="url=url+'".$slash."'+$(this).val();\n";
-			elseif ($attr==="html")
-			$retour.="url=url+'".$slash."'+$(this).html();\n";
-			elseif($attr!=null && $attr!=="")
-					$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
+			if ($attr==="value") {
+							$retour.="url=url+'".$slash."'+$(this).val();\n";
+			} elseif ($attr==="html") {
+						$retour.="url=url+'".$slash."'+$(this).html();\n";
+			} elseif($attr!=null && $attr!=="") {
+								$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
+			}
 		}
 		return $retour;
 	}
@@ -85,13 +88,14 @@ 
 		if ($responseElement!=="") {
 			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";
-			else
-				$retour="\t$({$responseElement}).{$jqueryDone}( data );\n";
+			if(\is_callable($call)) {
+							$retour="\t".$call($responseElement,$jqueryDone).";\n";
+			} else {
+							$retour="\t$({$responseElement}).{$jqueryDone}( data );\n";
+			}
 		}
 		$retour.="\t".$jsCallback."\n";
 		return $retour;
@@ -105,8 +109,9 @@ 
 	}
 
 	protected function _correctAjaxUrl($url) {
-		if ($url!=="/" && JString::endsWith($url, "/")===true)
-			$url=substr($url, 0, strlen($url)-1);
+		if ($url!=="/" && JString::endsWith($url, "/")===true) {
+					$url=substr($url, 0, strlen($url)-1);
+		}
 		if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
 			$url=$this->jsUtils->getUrl($url);
 		}
@@ -130,8 +135,9 @@ 
 				$retour.="\t".$jsCallback."\n".
 						"\t$(document).trigger('jsonReady',[data]);\n".
 						"});\n";
-				if ($immediatly)
-					$this->jquery_code_for_compile[]=$retour;
+				if ($immediatly) {
+									$this->jquery_code_for_compile[]=$retour;
+				}
 					return $retour;
 	}
 
@@ -170,7 +176,7 @@ 
 		if($context===null){
 			$appendTo="\t\tnewElm.appendTo($('".$maskSelector."').parent());\n";
 			$newElm = "$('#'+newId)";
-		}else{
+		} else{
 			$appendTo="\t\tnewElm.appendTo(".$context.");\n";
 			$newElm = $context.".find('#'+newId)";
 		}
@@ -180,8 +186,9 @@ 
 		$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";
 		$retour.="\t".$jsCallback."\n"."});\n";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 			return $retour;
 	}
 	/**
@@ -222,8 +229,9 @@ 
 			}});\n";
 			$retour.="$('#".$form."').submit();\n";
 		}
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 			return $retour;
 	}
 

Ajax/service/JString.php

Spacing +15 added lines, -15 removed lines

@@ -2,51 +2,51 @@
 namespace Ajax\service;
 class JString {
 
-	public static function contains($hay,$needle){
-		return strpos($hay, $needle) !== false;
+	public static function contains($hay, $needle) {
+		return strpos($hay, $needle)!==false;
 	}
 	public static function startswith($hay, $needle) {
-		return substr($hay, 0, strlen($needle)) === $needle;
+		return substr($hay, 0, strlen($needle))===$needle;
 	}
 
 	public static function endswith($hay, $needle) {
-		return substr($hay, -strlen($needle)) === $needle;
+		return substr($hay, -strlen($needle))===$needle;
 	}
 
-	public static function isNull($s){
+	public static function isNull($s) {
 		return (!isset($s) || NULL===$s || ""===$s);
 	}
-	public static function isNotNull($s){
+	public static function isNotNull($s) {
 		return (isset($s) && NULL!==$s && ""!==$s);
 	}
 
-	public static function isBoolean($value){
+	public static function isBoolean($value) {
 		return \is_bool($value) || $value==1 || $value==0;
 	}
 
-	public static function isBooleanTrue($value){
+	public static function isBooleanTrue($value) {
 		return $value==1 || $value;
 	}
 
-	public static function isBooleanFalse($value){
+	public static function isBooleanFalse($value) {
 		return $value==0 || !$value;
 	}
 
-	public static function camelCaseToSeparated($input,$separator=" "){
+	public static function camelCaseToSeparated($input, $separator=" ") {
 		return strtolower(preg_replace('/(?<!^)[A-Z]/', $separator.'$0', $input));
 	}
 
-	public static function replaceAtFirst($subject,$from, $to){
-		$from = '/\A'.preg_quote($from, '/').'/';
+	public static function replaceAtFirst($subject, $from, $to) {
+		$from='/\A'.preg_quote($from, '/').'/';
 		return \preg_replace($from, $to, $subject, 1);
 	}
 
-	public static function replaceAtLast($subject,$from, $to){
-		$from = '/'.preg_quote($from, '/').'\z/';
+	public static function replaceAtLast($subject, $from, $to) {
+		$from='/'.preg_quote($from, '/').'\z/';
 		return \preg_replace($from, $to, $subject, 1);
 	}
 
-	public static function replaceAtFirstAndLast($subject,$fromFirst,$toFirst,$fromLast,$toLast){
+	public static function replaceAtFirstAndLast($subject, $fromFirst, $toFirst, $fromLast, $toLast) {
 		$s=self::replaceAtFirst($subject, $fromFirst, $toFirst);
 		return self::replaceAtLast($s, $fromLast, $toLast);
 	}

Ajax/semantic/widgets/business/BusinessForm.php

Spacing +13 added lines, -13 removed lines

@@ -16,17 +16,17 @@ 
 	 *
 	 * @see \Ajax\semantic\widgets\dataform\DataForm::__construct()
 	 */
-	public function __construct($identifier,$modelInstance=null,$fieldsOrder,$fieldsDefinition,$fields=[],$captions=[],$separators=[]) {
-		if(!isset($modelInstance)){
+	public function __construct($identifier, $modelInstance=null, $fieldsOrder, $fieldsDefinition, $fields=[], $captions=[], $separators=[]) {
+		if (!isset($modelInstance)) {
 			$modelInstance=$this->getDefaultModelInstance();
 		}
-		parent::__construct($identifier,$modelInstance);
-		$this->_initForm($fieldsOrder, $fieldsDefinition,$fields,$captions,$separators);
+		parent::__construct($identifier, $modelInstance);
+		$this->_initForm($fieldsOrder, $fieldsDefinition, $fields, $captions, $separators);
 	}
 
 	abstract protected function getDefaultModelInstance();
 
-	protected function _initForm($fieldsOrder,$fieldsDefinition,$fields=[],$captions=[],$separators=[]){
+	protected function _initForm($fieldsOrder, $fieldsDefinition, $fields=[], $captions=[], $separators=[]) {
 		$this->_fieldsOrder=$fieldsOrder;
 		$this->setFields($fields);
 		$this->setSeparators($separators);
@@ -34,26 +34,26 @@ 
 		$this->setCaptions($captions);
 	}
 
-	protected function _getIndex($fieldName){
+	protected function _getIndex($fieldName) {
 		$index=$fieldName;
-		if(\is_string($fieldName)){
+		if (\is_string($fieldName)) {
 			$index=\array_search($fieldName, $this->_fieldsOrder);
 		}
 		return $index;
 	}
-	protected function _fieldAs($elementCallback,&$index,$attributes=NULL,$prefix=null){
+	protected function _fieldAs($elementCallback, &$index, $attributes=NULL, $prefix=null) {
 		$index=$this->_getIndex($index);
-		return parent::_fieldAs($elementCallback, $index,$attributes,$prefix);
+		return parent::_fieldAs($elementCallback, $index, $attributes, $prefix);
 	}
 
 
-	public function removeField($fieldName){
+	public function removeField($fieldName) {
 		parent::removeField($fieldName);
-		\array_splice($this->_fieldsOrder,$this->_getIndex($fieldName),1);
+		\array_splice($this->_fieldsOrder, $this->_getIndex($fieldName), 1);
 		return $this;
 	}
 
-	public function compile(JsUtils $js=NULL,&$view=NULL){
-		return parent::compile($js,$view);
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
+		return parent::compile($js, $view);
 	}
 }
\ No newline at end of file

Ajax/semantic/widgets/dataform/FormInstanceViewer.php

Braces +6 added lines, -4 removed lines

@@ -47,15 +47,17 @@
 
 
 	public function addSeparatorAfter($fieldNum){
-		if(\array_search($fieldNum, $this->separators)===false)
-			$this->separators[]=$fieldNum;
+		if(\array_search($fieldNum, $this->separators)===false) {
+					$this->separators[]=$fieldNum;
+		}
 		return $this;
 	}
 
 	public function addHeaderDividerBefore($fieldNum,$header){
 		$this->headers[$fieldNum]=$header;
-		if($fieldNum>0)
-			$this->addSeparatorAfter($fieldNum-1);
+		if($fieldNum>0) {
+					$this->addSeparatorAfter($fieldNum-1);
+		}
 		return $this;
 	}
 

Spacing +23 added lines, -23 removed lines

@@ -11,58 +11,58 @@ 
 	protected $headers;
 	protected $wrappers;
 
-	public function __construct($identifier,$instance=NULL, $captions=NULL) {
-		parent::__construct($identifier,$instance=NULL, $captions=NULL);
+	public function __construct($identifier, $instance=NULL, $captions=NULL) {
+		parent::__construct($identifier, $instance=NULL, $captions=NULL);
 		$this->separators=[-1];
 		$this->headers=[];
 		$this->wrappers=[];
-		$this->defaultValueFunction=function($name,$value,$index){
+		$this->defaultValueFunction=function($name, $value, $index) {
 			$caption=$this->getCaption($index);
-			$input=new HtmlFormInput($this->widgetIdentifier."-".$name,$caption,"text",$value);
+			$input=new HtmlFormInput($this->widgetIdentifier."-".$name, $caption, "text", $value);
 			$input->setName($name);
 			return $input;
 		};
 	}
 
-	protected function _beforeAddProperty($index,&$field){
-		if(JString::endswith($field, "\n")===true){
+	protected function _beforeAddProperty($index, &$field) {
+		if (JString::endswith($field, "\n")===true) {
 			$this->addSeparatorAfter($index);
 		}
-		if($index>1 && JString::startswith($field, "\n")===true){
+		if ($index>1 && JString::startswith($field, "\n")===true) {
 			$this->addSeparatorAfter($index-1);
 		}
 		$field=\str_replace("\n", "", $field);
-		if(($header=$this->hasHeader($field))!==false){
+		if (($header=$this->hasHeader($field))!==false) {
 			$this->addHeaderDividerBefore($index, $header);
 		}
 	}
 
-	protected function hasHeader(&$field){
-		$matches=[];$result=false;
-		if(\preg_match('/\{(.*?)\}/s', $field, $matches)===1){
+	protected function hasHeader(&$field) {
+		$matches=[]; $result=false;
+		if (\preg_match('/\{(.*?)\}/s', $field, $matches)===1) {
 			$result=$matches[1];
-			$field=\str_replace("{".$result."}","", $field);
+			$field=\str_replace("{".$result."}", "", $field);
 		}
 		return $result;
 	}
 
 
 
-	public function addSeparatorAfter($fieldNum){
-		if(\array_search($fieldNum, $this->separators)===false)
+	public function addSeparatorAfter($fieldNum) {
+		if (\array_search($fieldNum, $this->separators)===false)
 			$this->separators[]=$fieldNum;
 		return $this;
 	}
 
-	public function addHeaderDividerBefore($fieldNum,$header){
+	public function addHeaderDividerBefore($fieldNum, $header) {
 		$this->headers[$fieldNum]=$header;
-		if($fieldNum>0)
+		if ($fieldNum>0)
 			$this->addSeparatorAfter($fieldNum-1);
 		return $this;
 	}
 
-	public function addWrapper($fieldNum,$contentBefore,$contentAfter=null){
-		$this->wrappers[$fieldNum]=[$contentBefore,$contentAfter];
+	public function addWrapper($fieldNum, $contentBefore, $contentAfter=null) {
+		$this->wrappers[$fieldNum]=[$contentBefore, $contentAfter];
 			return $this;
 	}
 
@@ -70,15 +70,15 @@ 
 		return $this->separators;
 	}
 
-	public function removeSeparator($index){
-		\array_splice($this->separators,$index,1);
+	public function removeSeparator($index) {
+		\array_splice($this->separators, $index, 1);
 	}
 
-	public function removeField($index){
+	public function removeField($index) {
 		parent::removeField($index);
 		$pos=\array_search($index, $this->separators);
-		if($pos!==false){
-			for($i=$pos+1;$i<\sizeof($this->separators);$i++){
+		if ($pos!==false) {
+			for ($i=$pos+1; $i<\sizeof($this->separators); $i++) {
 				$this->separators[$i]--;
 			}
 			\array_splice($this->separators, $pos, 1);