Updated the Alert and Confirm classes to leverage the alert() and confirm() methods in Utils.js from the javaxt-webcontrols library.

Author: pborissow

ui/javascript/widgets/Alert.js

@@ -1,68 +1,10 @@
-if(!javaxt) var javaxt={};
-if(!javaxt.express) javaxt.express={};
-javaxt.express.Alert = null;
 
   //**************************************************************************
   //** alert
   //**************************************************************************
-  /** Overrides the native javascript alert() method by creating a
-   *  javaxt.express.Alert window.
+  /** Overrides the native javascript alert() method by creating a custom
+   *  Alert window.
    */
     var alert = function(msg){
-
-        if (msg==null) msg = "";
-
-
-      //Special case for ajax request
-        if (!(typeof(msg) === 'string' || msg instanceof String)){
-            if (typeof msg.responseText !== 'undefined'){
-                msg = (msg.responseText.length>0 ? msg.responseText : msg.statusText);
-                if (!msg) msg = "Unknown Server Error";
-            }
-        }
-
-        var win = javaxt.express.Alert;
-
-        if (!win){
-
-            var body = document.getElementsByTagName("body")[0];
-
-
-            var outerDiv = document.createElement('div');
-            outerDiv.style.width = "100%";
-            outerDiv.style.height = "100%";
-            outerDiv.style.position = "relative";
-            outerDiv.style.cursor = "inherit";
-            var innerDiv = document.createElement('div');
-            innerDiv.style.width = "100%";
-            innerDiv.style.height = "100%";
-            innerDiv.style.position = "absolute";
-            innerDiv.style.overflowX = 'hidden';
-            innerDiv.style.cursor = "inherit";
-            outerDiv.appendChild(innerDiv);
-
-
-            win = javaxt.express.Alert = new javaxt.dhtml.Window(body, {
-                width: 450,
-                height: 200,
-                valign: "top",
-                modal: true,
-                title: "Alert",
-                body: outerDiv,
-                style: {
-                    panel: "window",
-                    header: "window-header alert-header",
-                    title: "window-title",
-                    buttonBar: "window-header-button-bar",
-                    button: "window-header-button",
-                    body: "window-body alert-body"
-                }
-            });
-            win.div = innerDiv;
-        }
-
-
-        win.div.innerHTML = msg;
-        win.show();
-
+        javaxt.dhtml.utils.alert(msg);
     };

ui/javascript/widgets/Confirm.js

@@ -1,6 +1,3 @@
-if(!javaxt) var javaxt={};
-if(!javaxt.express) javaxt.express={};
-javaxt.express.Confirm = null;
 
   //**************************************************************************
   //** confirm
@@ -9,83 +6,6 @@ javaxt.express.Confirm = null;
    *  javaxt.express.Confirm window.
    */
     var confirm = function(msg, config){
-
-        if (!(typeof(msg) === 'string' || msg instanceof String)){
-            config = msg;
-        }
-
-
-        javaxt.dhtml.utils.merge(config, {
-            title: "Confirm",
-            text: msg
-        });
-
-
-        var win = javaxt.express.Confirm;
-        if (!win){
-            var body = document.getElementsByTagName("body")[0];
-
-            var buttonDiv = document.createElement("div");
-            buttonDiv.className = "button-div";
-
-            var createButton = function(label, result){
-                var input = document.createElement("input");
-                input.type = "button";
-                input.className = "form-button";
-                input.onclick = function(){
-                    win.result = this.result;
-                    win.close();
-                };
-                input.setLabel = function(label){
-                    if (label) this.name = this.value = label;
-                };
-                input.setValue = function(b){
-                    if (b===true || b===false) this.result = b;
-                };
-                input.update = function(config){
-                    if (config){
-                        this.setLabel(config.label);
-                        this.setValue(config.value);
-                    }
-                };
-                input.setLabel(label);
-                input.setValue(result);
-                buttonDiv.appendChild(input);
-                return input;
-            };
-
-
-            win = javaxt.express.Confirm = new javaxt.dhtml.Window(body, {
-                width: 450,
-                height: 150,
-                valign: "top",
-                modal: true,
-                footer: buttonDiv,
-                style: {
-                    panel: "window",
-                    header: "window-header",
-                    title: "window-title",
-                    buttonBar: "window-header-button-bar",
-                    button: "window-header-button",
-                    body: "window-body confirm-body"
-                }
-            });
-
-
-            win.leftButton = createButton("OK", true);
-            win.rightButton = createButton("Cancel", false);
-        }
-
-
-        win.setTitle(config.title);
-        win.setContent(config.text.replace("\n","<p></p>"));
-        win.leftButton.update(config.leftButton);
-        win.rightButton.update(config.rightButton);
-        win.result = false;
-        win.onClose = function(){
-            var callback = config.callback;
-            if (callback) callback.apply(win, [win.result]);
-        };
-        win.show();
+        javaxt.dhtml.utils.confirm(msg, config);
         return false;
     };