From 977e89e030e56fcfe41fd9fbff0c3dae8b83f3ba Mon Sep 17 00:00:00 2001
From: Jos Groot Lipman <jos.grootlipman@aareon.nl>
Date: Mon, 21 Nov 2016 12:52:03 +0000
Subject: [PATCH] FSN#36132 Alerts en confirm via jQuery dialoog

svn path=/Website/trunk/; revision=31592
---
 APPL/Localscripts/FcltMgr.js  | 81 ++++++++++++++++++++++++++---------
 APPL/SCF/scaffolding_edit.inc |  4 +-
 APPL/SCF/scaffolding_show.inc |  4 +-
 APPL/Shared/header.inc        |  5 +--
 4 files changed, 68 insertions(+), 26 deletions(-)

diff --git a/APPL/Localscripts/FcltMgr.js b/APPL/Localscripts/FcltMgr.js
index 8368718ed6..628a16d311 100644
--- a/APPL/Localscripts/FcltMgr.js
+++ b/APPL/Localscripts/FcltMgr.js
@@ -1091,8 +1091,39 @@ var FcltMgr =
             try { document.documentElement.focus(); }
             catch(e) {/* soms met IE8 op 'remembered' tabbladen */}
         },
-        // TODO: Uitbreiden tot een meer luxe interface die mensen niet onbedoeld kunnen
-        //       disablen
+        mydialog: function (tekst, params, fncallback)
+        {
+            var buttons = // Ok is er altijd
+                    [
+                        {
+                            text: params.oktekst || L("lcl_ok"),
+                            click: function ()
+                            {
+                                if (params.fncallback)
+                                    params.fncallback();
+                                $(this).dialog("close");
+                            }
+                        }
+                    ];
+            if (params.buttons)
+            {
+                buttons = buttons.concat(params.buttons);
+            }
+            $('<div></div>').appendTo('body')
+                .html('<div>' + tekst + '</div>')
+                .dialog({
+                    modal: true,
+                    title: params.title,
+                    zIndex: 10000,
+                    autoOpen: true,
+                    width: 'auto',
+                    resizable: false,
+                    buttons: buttons,
+                    close: function (event, ui) {
+                        $(this).remove();
+                    }
+                });
+        },
         confirm: function (tekst, params, fncallback)
         {
             if (typeof params == "function")
@@ -1105,34 +1136,42 @@ var FcltMgr =
                 fncallback();
                 return;
             }
-            if (confirm(tekst))
+            if (!$.fn.dialog) // fallback als jQuery-ui niet is geladen
             {
-                fncallback();
+                if (confirm(tekst))
+                {
+                    fncallback();
+                }
+                else
+                {
+                    if (params.fncancel)
+                        params.fncancel();
+                }
+                return;
             }
-            else
-            {
-                if (params.fncancel)
-                    params.fncancel();
-            }
-
-            /*
-            jConfirm(tekst, "Titel", function (r) {
-                    if (r)
-                    {
-                        fncallback();
-                    }
-                    else
+            params.fncallback = fncallback;
+            params.buttons = [
+                {
+                    text: params.canceltekst || L("lcl_cancel"),
+                    click: function ()
                     {
                         if (params.fncancel)
                             params.fncancel();
+                        $(this).dialog("close");
                     }
-                });
-            */
+                }];
 
+            this.mydialog (tekst, params, fncallback);
         },
-        alert: function (tekst)
+        alert: function (tekst, params)
         {
-            alert(tekst);
+            params = params || {};
+            if (!$.fn.dialog) // fallback als jQuery-ui niet is geladen
+            {
+                alert(tekst);
+                return;
+            }
+            this.mydialog (tekst, params);
         }
     }
 
diff --git a/APPL/SCF/scaffolding_edit.inc b/APPL/SCF/scaffolding_edit.inc
index c2c197c6bc..c5984c78b1 100644
--- a/APPL/SCF/scaffolding_edit.inc
+++ b/APPL/SCF/scaffolding_edit.inc
@@ -182,7 +182,9 @@ function scaffolding_edit(model, scf_params)
             FcltMgr.confirm('<%=safe.jsstring(L("lcl_scf_confirm_delete").format(model.record_title, xxx_data.name || xxx_data.id))%>',
                 { fncancel: function() {
                     iface.button.enable("btn_scf_delete")
-                } },
+                  },
+                  oktekst: L("lcl_delete")
+                },
                 function() {
                     var data = {
                         key: "<%=key%>"
diff --git a/APPL/SCF/scaffolding_show.inc b/APPL/SCF/scaffolding_show.inc
index 92a6d9bcfd..0f1cbe0015 100644
--- a/APPL/SCF/scaffolding_show.inc
+++ b/APPL/SCF/scaffolding_show.inc
@@ -63,7 +63,9 @@ function scaffolding_show(model, scf_params)
 
             function xxx_delete()
             {
-              FcltMgr.confirm('<%=safe.jsstring(L("lcl_scf_confirm_delete").format(model.record_title, xxx_data.name || xxx_data.id))%>', function() {
+              FcltMgr.confirm('<%=safe.jsstring(L("lcl_scf_confirm_delete").format(model.record_title, xxx_data.name || xxx_data.id))%>',
+                { oktekst: L("lcl_delete") },
+                function() {
                   var data = {
                       key: "<%=key%>"
                   };
diff --git a/APPL/Shared/header.inc b/APPL/Shared/header.inc
index d87a9b60bc..974757abcd 100644
--- a/APPL/Shared/header.inc
+++ b/APPL/Shared/header.inc
@@ -81,10 +81,9 @@ FCLTHeader =
                           switch (params.plugins[i])
                           {
                               case "jQuery":
-                                  FCLTHeader.Requires({js: ["jQuery.js", "FcltJquery.js", "jquery.alerts.js"]});
+                                  FCLTHeader.Requires({js: ["jQuery.js", "FcltJquery.js"]});
                                   FCLTHeader.Requires({js: ["jquery.toast.min.js"],
-                                                       css: [rooturl + "/appl/localscripts/jquery.toast.min.css",
-                                                             rooturl + "/appl/localscripts/jquery.alerts.css"]});
+                                                       css: [rooturl + "/appl/localscripts/jquery.toast.min.css"]});
                                   break;
                               case "suggest":
                                   FCLTHeader.Requires({js: [rooturl + "/appl/shared/suggest/suggest.js"],