Commit 03b7214

committed

add actions in toast

update ajax url regex

1 parent 97a77be commit 03b7214Copy full SHA for 03b7214

File tree

+16

-2

lines changed

+16

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ protected function _getAjaxUrl($url, $attr) {`
`140`	`140`	`$retour .= "url=url+'" . $slash . "'+" . \substr($attr, 3) . ";\n";`
`141`	`141`	`} elseif ($attr !== null && $attr !== "") {`
`142`	`142`	`$retour .= "let elmUrl=$(this).attr('" . $attr . "')\|\|'';";`
`143`		`- $retour .= "url=(!/^((http\|https\|ftp):\/\/)/.test(elmUrl))?url+'" . $slash . "'+elmUrl:elmUrl;\n";`
	`143`	`+ $retour .= "url=!(new RegExp('^((http\|https\|ftp):\/\/)')).test(elmUrl)?url+'" . $slash . "'+elmUrl:elmUrl;\n";`
`144`	`144`	`}`
`145`	`145`	`}`
`146`	`146`	`return $retour;`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public function setParamParts($paramParts) {`
`45`	`45`
`46`	`46`	`public function addComponentEvent($event,$jsCode){`
`47`	`47`	`$jsCode=\str_ireplace("\"","%quote%", $jsCode);`
`48`		`- return $this->setParam($event, "%function(){".$jsCode."}%");`
	`48`	`+ return $this->setParam($event, "%function(module){".$jsCode."}%");`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`public function setJs(JsUtils $js){`

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,20 @@ public function setTitle($title){`
`47`	`47`	`$this->params['title']=$title;`
`48`	`48`	`return $this;`
`49`	`49`	`}`
	`50`	`+`
	`51`	`+ public function setActions(array $actions){`
	`52`	`+ foreach ($actions as &$action){`
	`53`	`+ if(isset($action['click'])){`
	`54`	`+ $js=\str_ireplace("\"","%quote%", $action['click']);`
	`55`	`+ $action['click']="%function(){".$js."}%";`
	`56`	`+ }`
	`57`	`+ }`
	`58`	`+ $this->params['actions']=$actions;`
	`59`	`+ if(count($actions)>0) {`
	`60`	`+ $this->params['displayTime'] = 0;`
	`61`	`+ }`
	`62`	`+ return $this;`
	`63`	`+ }`
`50`	`64`
`51`	`65`	`public function setMessage($message){`
`52`	`66`	`$this->params['message']=$message;`

Comments

(0)