add actions in toast

update ajax url regex
phpMv · Apr 23, 2022 · 03b7214 · 03b7214
1 parent 97a77be
commit 03b7214
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/Ajax/common/traits/JsUtilsAjaxTrait.php b/Ajax/common/traits/JsUtilsAjaxTrait.php
@@ -140,7 +140,7 @@ protected function _getAjaxUrl($url, $attr) {
 				$retour .= "url=url+'" . $slash . "'+" . \substr($attr, 3) . ";\n";
 			} elseif ($attr !== null && $attr !== "") {
 				$retour .= "let elmUrl=$(this).attr('" . $attr . "')||'';";
-				$retour .= "url=(!/^((http|https|ftp):\/\/)/.test(elmUrl))?url+'" . $slash . "'+elmUrl:elmUrl;\n";
+				$retour .= "url=!(new RegExp('^((http|https|ftp):\/\/)')).test(elmUrl)?url+'" . $slash . "'+elmUrl:elmUrl;\n";
 			}
 		}
 		return $retour;

diff --git a/Ajax/semantic/components/SimpleSemExtComponent.php b/Ajax/semantic/components/SimpleSemExtComponent.php
@@ -45,7 +45,7 @@ public function setParamParts($paramParts) {
 
 	public function addComponentEvent($event,$jsCode){
 		$jsCode=\str_ireplace("\"","%quote%", $jsCode);
-		return $this->setParam($event, "%function(){".$jsCode."}%");
+		return $this->setParam($event, "%function(module){".$jsCode."}%");
 	}
 
 	public function setJs(JsUtils $js){

diff --git a/Ajax/semantic/components/Toast.php b/Ajax/semantic/components/Toast.php
@@ -47,6 +47,20 @@ public function setTitle($title){
 		$this->params['title']=$title;
 		return $this;
 	}
+
+	public function setActions(array $actions){
+		foreach ($actions as &$action){
+			if(isset($action['click'])){
+				$js=\str_ireplace("\"","%quote%", $action['click']);
+				$action['click']="%function(){".$js."}%";
+			}
+		}
+		$this->params['actions']=$actions;
+		if(count($actions)>0) {
+			$this->params['displayTime'] = 0;
+		}
+		return $this;
+	}
 
 	public function setMessage($message){
 		$this->params['message']=$message;