submit_js_confirm() fixed to be used on button loadable via ajax.

diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc
index 1e29770487deff359a401b9349dbb170cbc89398..1889962d28b56e30ee65f724de901a523e3a73c0 100644 (file)
--- 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)