From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Sat, 30 Oct 2010 13:33:40 +0000 (+0000)
Subject: submit_js_confirm() fixed to be used on button loadable via ajax.
X-Git-Tag: v2.4.2~19^2~526
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=aad1fb7fcaf1f0e9c97f82150092ccf1e936a1a3;p=fa-stable.git

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 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)