From aad1fb7fcaf1f0e9c97f82150092ccf1e936a1a3 Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Sat, 30 Oct 2010 13:33:40 +0000 Subject: [PATCH] submit_js_confirm() fixed to be used on button loadable via ajax. --- includes/ui/ui_input.inc | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc index 1e297704..1889962d 100644 --- a/includes/ui/ui_input.inc +++ b/includes/ui/ui_input.inc @@ -247,11 +247,16 @@ function submit_return($name, $value, $title=false) } } -function submit_js_confirm($name, $msg) { - add_js_source( - "_validate.$name=function(){ return confirm('" - . strtr($msg, array("\n"=>'\\n')) . "');};"); -}; +function submit_js_confirm($name, $msg, $set = true) { + global $Ajax; + $js = "_validate.$name=".($set ? "function(){ return confirm('" + . strtr($msg, array("\n"=>'\\n')) . "');};" + : 'null;'); + if (in_ajax()) { + $Ajax->addScript(true, $js); + } else + add_js_source($js); +} //----------------------------------------------------------------------------------- function set_icon($icon, $title=false) -- 2.30.2