ajaxTrait complete refactoring

jcheron · jcheron · commit ab06fe6a9715 · 2017-11-24T02:27:42.000+01:00
diff --git a/Ajax/common/Widget.php b/Ajax/common/Widget.php
@@ -194,6 +194,12 @@ public function insertInField($index,$field){
 		return $this;
 	}
 
+	/**
+	 * Defines the function which displays the field value
+	 * @param $index index or name of the field to display
+	 * @param callable $callback function parameters are : $value : the field value ,$index : the field index, $instance : the active instance of model
+	 * @return Widget
+	 */
 	public function setValueFunction($index,$callback){
 		$index=$this->_getIndex($index);
 		$this->_instanceViewer->setValueFunction($index, $callback);
diff --git a/Ajax/common/html/BaseHtml.php b/Ajax/common/html/BaseHtml.php
@@ -202,6 +202,7 @@ protected function compile_once(JsUtils $js=NULL, &$view=NULL) {
 				$pc=$this->_preCompile;
 				$pc($this);
 			}
+			unset($this->properties["jsCallback"]);
 			$this->_compiled=true;
 		}
 	}
@@ -214,7 +215,10 @@ public function compile(JsUtils $js=NULL, &$view=NULL) {
 				if (\is_array($value)) {
 					$v=PropertyWrapper::wrap($value, $js);
 				} else {
-					$v=$value;
+					if($value instanceof \stdClass)
+						$v=\print_r($value,true);
+					else
+						$v=$value;
 				}
 				$result=str_ireplace("%" . $key . "%", $v, $result);
 			}
diff --git a/Ajax/common/html/BaseWidget.php b/Ajax/common/html/BaseWidget.php
@@ -2,6 +2,8 @@
 
 namespace Ajax\common\html;
 
+use Ajax\service\JString;
+
 /**
  * BaseWidget for Twitter Bootstrap, jQuery UI or Semantic rich components
  * @author jc
@@ -23,11 +25,11 @@ public function getIdentifier() {
 	}
 
 	public function setIdentifier($identifier) {
-		$this->identifier=$identifier;
+		$this->identifier=$this->cleanIdentifier($identifier);
 		return $this;
 	}
 
 	protected function cleanIdentifier($id) {
-		return preg_replace('/[^a-zA-Z0-9\-.]/s', '', $id);
+		return JString::cleanIdentifier($id);
 	}
 }
diff --git a/Ajax/common/traits/JsUtilsAjaxTrait.php b/Ajax/common/traits/JsUtilsAjaxTrait.php
diff --git a/Ajax/semantic/html/base/HtmlSemDoubleElement.php b/Ajax/semantic/html/base/HtmlSemDoubleElement.php
@@ -167,8 +167,8 @@ public function run(JsUtils $js) {
 		return $this->_bsComponent;
 	}
 
-	public function addList($elements,$ordered=false){
-		$list=new HtmlList("list-".$this->identifier,$elements);
+	public function addList($items,$ordered=false){
+		$list=new HtmlList("list-".$this->identifier,$items);
 		$list->setOrdered($ordered);
 		$list->setClass("ui list");
 		$this->addContent($list);
diff --git a/Ajax/semantic/html/base/constants/icons/webContent.php b/Ajax/semantic/html/base/constants/icons/webContent.php
@@ -4,6 +4,6 @@
 
 use Ajax\common\BaseEnum;
 
-abstract class WebContent extends BaseEnum {
+abstract class webContent extends BaseEnum {
 	const ALARM="alarm", ALARM_SLASH="alarm slash", ALARM_OUTLINE="alarm outline", ALARM_SLASH_OUTLINE="alarm slash outline", AT="at", BROWSER="browser", BUG="bug", CALENDAR_OUTLINE="calendar outline", CALENDAR="calendar", CLOUD="cloud", CODE="code", COMMENT="comment", COMMENTS="comments", COMMENT_OUTLINE="comment outline", COMMENTS_OUTLINE="comments outline", COPYRIGHT="copyright", DASHBOARD="dashboard", DROPDOWN="dropdown", EXTERNAL_SQUARE="external square", EXTERNAL="external", EYEDROPPER="eyedropper", FEED="feed", FIND="find", HEARTBEAT="heartbeat", HISTORY="history", HOME="home", IDEA="idea", INBOX="inbox", LAB="lab", MAIL="mail", MAIL_OUTLINE="mail outline", MAIL_SQUARE="mail square", MAP="map", OPTIONS="options", PAINT_BRUSH="paint brush", PAYMENT="payment", PHONE="phone", PHONE_SQUARE="phone square", PRIVACY="privacy", PROTECT="protect", SEARCH="search", SETTING="setting", SETTINGS="settings", SHOP="shop", SIDEBAR="sidebar", SIGNAL="signal", SITEMAP="sitemap", TAG="tag", TAGS="tags", TASKS="tasks", TERMINAL="terminal", TEXT_TELEPHONE="text telephone", TICKET="ticket", TROPHY="trophy", WIFI="wifi";
 }
diff --git a/Ajax/semantic/html/collections/form/HtmlFormFields.php b/Ajax/semantic/html/collections/form/HtmlFormFields.php
@@ -124,10 +124,10 @@ public static function checkeds($name, $items=array(), $label=NULL, $values=arra
 			}
 			$fields[]=$itemO;
 		}
-		$checkeds=new HtmlFormFields("fields-".$name, $fields);
+		$radios=new HtmlFormFields("fields-".$name, $fields);
 		if (isset($label))
-			$checkeds->setLabel($label)->setProperty("for", $name);
-		return $checkeds;
+			$radios->setLabel($label)->setProperty("for", $name);
+		return $radios;
 	}
 
 	public function setEqualWidth($_equalWidth) {
diff --git a/Ajax/semantic/html/elements/HtmlButtonGroups.php b/Ajax/semantic/html/elements/HtmlButtonGroups.php
@@ -26,11 +26,6 @@ protected function createItem($value){
 		return new HtmlButton("", $value);
 	}
 
-	/**
-	 * @param array $items
-	 * @param boolean $asCombo
-	 * @return HtmlDropdown
-	 */
 	public function addDropdown($items,$asCombo=false){
 		$dd= new HtmlDropdown("dd-".$this->identifier,null,$items);
 		$dd->asButton();
diff --git a/Ajax/semantic/html/modules/HtmlModal.php b/Ajax/semantic/html/modules/HtmlModal.php
@@ -57,7 +57,7 @@ public function setActions($actions) {
 	public function addAction($action){
 		if(!$action instanceof BaseHtml){
 			$class="";
-			if(\array_search($action, ["Okay","Yes"])!==false){
+			if(\array_search($action, ["Okay","Yes","Validate"])!==false){
 				$class="approve";
 			}
 			if(\array_search($action, ["Close","Cancel","No"])!==false){
diff --git a/Ajax/semantic/widgets/base/FieldAsTrait.php b/Ajax/semantic/widgets/base/FieldAsTrait.php
@@ -46,7 +46,7 @@ protected function _applyAttributes(BaseHtml $element,&$attributes,$index){
 			$callback=$attributes["jsCallback"];
 			if(\is_callable($callback)){
 				$callback($element,$this->_modelInstance,$index);
-				unset($attributes["jsCallback"]);
+				//unset($attributes["jsCallback"]);
 			}
 		}
 		unset($attributes["rules"]);
diff --git a/Ajax/semantic/widgets/base/InstanceViewer.php b/Ajax/semantic/widgets/base/InstanceViewer.php
@@ -99,7 +99,9 @@ protected function _getValue($property,$index){
 		if($property instanceof \ReflectionProperty){
 			$value=$this->_getPropertyValue($property, $index);
 			$propertyName=$property->getName();
-		}elseif(\is_array($property)){
+		}elseif(\is_callable($property))
+			$value=$property($this->instance);
+		elseif(\is_array($property)){
 			$values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property);
 			$value=\implode("", $values);
 		}elseif(\is_string($property)){
@@ -109,8 +111,6 @@ protected function _getValue($property,$index){
 			}elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){
 				$value=JReflection::callMethod($this->instance, $getter, []);
 			}
-		}elseif(\is_callable($property)){
-			$value=$property($this->instance);
 		}
 		return $this->_postGetValue($index, $propertyName, $value);
 	}
diff --git a/Ajax/semantic/widgets/datatable/DataTable.php b/Ajax/semantic/widgets/datatable/DataTable.php
@@ -172,19 +172,21 @@ protected function _generateRow($instance,&$table,$checkedClass=null){
 		InstanceViewer::$index++;
 		$values= $this->_instanceViewer->getValues();
 		$id=$this->_instanceViewer->getIdentifier();
+		$dataAjax=$id;
+		$id=$this->cleanIdentifier($id);
 		if($this->_hasCheckboxes){
 			$ck=new HtmlCheckbox("ck-".$this->identifier."-".$id,"");
 			$ck->setOnChange("event.stopPropagation();");
 			$field=$ck->getField();
-			$field->setProperty("value",$id);
+			$field->setProperty("value",$dataAjax);
 			$field->setProperty("name", "selection[]");
 			if(isset($checkedClass))
 				$field->setClass($checkedClass);
 			\array_unshift($values, $ck);
 		}
 		$result=$table->newRow();
 		$result->setIdentifier($this->identifier."-tr-".$id);
-		$result->setProperty("data-ajax",$id);
+		$result->setProperty("data-ajax",$dataAjax);
 		$result->setValues($values);
 		$result->addToProperty("class",$this->_rowClass);
 		return $result;
diff --git a/Ajax/semantic/widgets/datatable/DataTableFieldAsTrait.php b/Ajax/semantic/widgets/datatable/DataTableFieldAsTrait.php
@@ -61,7 +61,7 @@ private function getCallable($thisCallback,$parameters,$callback=null){
 	 * @return HtmlButton
 	 */
 	private function getFieldButton($caption,$visibleHover=true){
-		$bt= new HtmlButton("",$caption);
+		$bt= new HtmlButton($this->cleanIdentifier($caption),$caption);
 		if($visibleHover)
 			$this->_visibleOver($bt);
 		return $bt;
diff --git a/Ajax/service/AjaxCall.php b/Ajax/service/AjaxCall.php
@@ -18,26 +18,22 @@ public function compile(JsUtils $js=null) {
 			return;
 		$params="{}";
 		$jsCallback=NULL;
-		$attr="id";
-		$validation=false;
 		$stopPropagation=true;
 		$preventDefault=true;
-		$jqueryDone="html";
-		$ajaxTransition=null;
-		$hasLoader=true;
 		$method="get";
 		$rowClass="_json";
+		$this->parameters["immediatly"]=false;
 		extract($this->parameters);
 		$result=$this->_eventPreparing($preventDefault, $stopPropagation);
 		switch($this->method) {
 			case "get":
-				$result.=$js->getDeferred($url, $responseElement, $params, $jsCallback, $attr,$jqueryDone,$ajaxTransition);
+				$result.=$js->getDeferred($url, $responseElement, $this->parameters);
 				break;
 			case "post":
-				$result.=$js->postDeferred($url, $responseElement, $params, $jsCallback, $attr,$hasLoader,$jqueryDone,$ajaxTransition);
+				$result.=$js->postDeferred($url, $params,$responseElement, $this->parameters);
 				break;
 			case "postForm":
-				$result.=$js->postFormDeferred($url, $form, $responseElement, $params,$validation, $jsCallback, $attr,$hasLoader,$jqueryDone,$ajaxTransition);
+				$result.=$js->postFormDeferred($url, $form, $responseElement, $this->parameters);
 				break;
 			case "json":
 				$result.=$js->jsonDeferred($url,$method,$params,$jsCallback);
diff --git a/Ajax/service/JString.php b/Ajax/service/JString.php
@@ -62,4 +62,8 @@ public static function getValueBetween(&$str,$before="{{",$after="}}"){
 		}
 		return $result;
 	}
+
+	public static function cleanIdentifier($id) {
+		return preg_replace('/[^a-zA-Z0-9\-]/s', '', $id);
+	}
 }
diff --git a/Ajax/ui/components/DialogButton.php b/Ajax/ui/components/DialogButton.php
@@ -42,7 +42,16 @@ public static function cancelButton($caption="Annuler") {
 		return new DialogButton($caption, "$( this ).dialog( 'close' );");
 	}
 
-	public static function submitButton(JsUtils $js, $url, $form, $responseElement, $caption="Okay") {
-		return new DialogButton($caption, $js->postForm($url, $form, $responseElement) . ";$( this ).dialog( 'close' );");
+	/**
+	 * @param JsUtils $js
+	 * @param string $url
+	 * @param string $form
+	 * @param unknown $responseElement
+	 * @param string $caption
+	 * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null)
+	 * @return DialogButton
+	 */
+	public static function submitButton(JsUtils $js, $url, $form, $responseElement, $caption="Okay",$parameters=[]) {
+		return new DialogButton($caption, $js->postFormDeferred($url, $form, $responseElement,$parameters) . ";$( this ).dialog( 'close' );");
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -202,6 +202,7 @@ protected function compile_once(JsUtils $js=NULL, &$view=NULL) {`
`202`	`202`	`$pc=$this->_preCompile;`
`203`	`203`	`$pc($this);`
`204`	`204`	`}`
	`205`	`+ unset($this->properties["jsCallback"]);`
`205`	`206`	`$this->_compiled=true;`
`206`	`207`	`}`
`207`	`208`	`}`
`@@ -214,7 +215,10 @@ public function compile(JsUtils $js=NULL, &$view=NULL) {`
`214`	`215`	`if (\is_array($value)) {`
`215`	`216`	`$v=PropertyWrapper::wrap($value, $js);`
`216`	`217`	`} else {`
`217`		`- $v=$value;`
	`218`	`+ if($value instanceof \stdClass)`
	`219`	`+ $v=\print_r($value,true);`
	`220`	`+ else`
	`221`	`+ $v=$value;`
`218`	`222`	`}`
`219`	`223`	`$result=str_ireplace("%" . $key . "%", $v, $result);`
`220`	`224`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,8 @@`
`2`	`2`
`3`	`3`	`namespace Ajax\common\html;`
`4`	`4`
	`5`	`+use Ajax\service\JString;`
	`6`	`+`
`5`	`7`	`/**`
`6`	`8`	`* BaseWidget for Twitter Bootstrap, jQuery UI or Semantic rich components`
`7`	`9`	`* @author jc`
`@@ -23,11 +25,11 @@ public function getIdentifier() {`
`23`	`25`	`}`
`24`	`26`
`25`	`27`	`public function setIdentifier($identifier) {`
`26`		`- $this->identifier=$identifier;`
	`28`	`+ $this->identifier=$this->cleanIdentifier($identifier);`
`27`	`29`	`return $this;`
`28`	`30`	`}`
`29`	`31`
`30`	`32`	`protected function cleanIdentifier($id) {`
`31`		`- return preg_replace('/[^a-zA-Z0-9\-.]/s', '', $id);`
	`33`	`+ return JString::cleanIdentifier($id);`
`32`	`34`	`}`
`33`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@`
`4`	`4`
`5`	`5`	`use Ajax\common\BaseEnum;`
`6`	`6`
`7`		`-abstract class WebContent extends BaseEnum {`
	`7`	`+abstract class webContent extends BaseEnum {`
`8`	`8`	const ALARM="alarm", ALARM_SLASH="alarm slash", ALARM_OUTLINE="alarm outline", ALARM_SLASH_OUTLINE="alarm slash outline", AT="at", BROWSER="browser", BUG="bug", CALENDAR_OUTLINE="calendar outline", CALENDAR="calendar", CLOUD="cloud", CODE="code", COMMENT="comment", COMMENTS="comments", COMMENT_OUTLINE="comment outline", COMMENTS_OUTLINE="comments outline", COPYRIGHT="copyright", DASHBOARD="dashboard", DROPDOWN="dropdown", EXTERNAL_SQUARE="external square", EXTERNAL="external", EYEDROPPER="eyedropper", FEED="feed", FIND="find", HEARTBEAT="heartbeat", HISTORY="history", HOME="home", IDEA="idea", INBOX="inbox", LAB="lab", MAIL="mail", MAIL_OUTLINE="mail outline", MAIL_SQUARE="mail square", MAP="map", OPTIONS="options", PAINT_BRUSH="paint brush", PAYMENT="payment", PHONE="phone", PHONE_SQUARE="phone square", PRIVACY="privacy", PROTECT="protect", SEARCH="search", SETTING="setting", SETTINGS="settings", SHOP="shop", SIDEBAR="sidebar", SIGNAL="signal", SITEMAP="sitemap", TAG="tag", TAGS="tags", TASKS="tasks", TERMINAL="terminal", TEXT_TELEPHONE="text telephone", TICKET="ticket", TROPHY="trophy", WIFI="wifi";
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -124,10 +124,10 @@ public static function checkeds($name, $items=array(), $label=NULL, $values=arra`
`124`	`124`	`}`
`125`	`125`	`$fields[]=$itemO;`
`126`	`126`	`}`
`127`		`- $checkeds=new HtmlFormFields("fields-".$name, $fields);`
	`127`	`+ $radios=new HtmlFormFields("fields-".$name, $fields);`
`128`	`128`	`if (isset($label))`
`129`		`- $checkeds->setLabel($label)->setProperty("for", $name);`
`130`		`- return $checkeds;`
	`129`	`+ $radios->setLabel($label)->setProperty("for", $name);`
	`130`	`+ return $radios;`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`public function setEqualWidth($_equalWidth) {`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public function setActions($actions) {`
`57`	`57`	`public function addAction($action){`
`58`	`58`	`if(!$action instanceof BaseHtml){`
`59`	`59`	`$class="";`
`60`		`- if(\array_search($action, ["Okay","Yes"])!==false){`
	`60`	`+ if(\array_search($action, ["Okay","Yes","Validate"])!==false){`
`61`	`61`	`$class="approve";`
`62`	`62`	`}`
`63`	`63`	`if(\array_search($action, ["Close","Cancel","No"])!==false){`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ protected function _applyAttributes(BaseHtml $element,&$attributes,$index){`
`46`	`46`	`$callback=$attributes["jsCallback"];`
`47`	`47`	`if(\is_callable($callback)){`
`48`	`48`	`$callback($element,$this->_modelInstance,$index);`
`49`		`- unset($attributes["jsCallback"]);`
	`49`	`+ //unset($attributes["jsCallback"]);`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`	`unset($attributes["rules"]);`