Allow HordeDialog to output information only (no cancel button needed)

Also, fix loading graphic. Needed for Request #12965
horde · Mar 23, 2014 · ddf5542 · ddf5542
1 parent 8fab45a
commit ddf5542
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 13 deletions.
diff --git a/framework/Core/js/dialog.js b/framework/Core/js/dialog.js
@@ -17,6 +17,8 @@
  *     hidden: {},
  *     // Default value for the INPUT element
  *     input_val: '',
+ *     // Don't display as a form (no cancel either)
+ *     noform: false
  *     // Don't insert the default INPUT element
  *     noinput: false,
  *     // OK text.
@@ -60,7 +62,9 @@ var HordeDialog = {
             id: data.form_id || 'RB_confirm'
         }, data.form_opts || {});
 
-        var n = new Element('FORM', data.form_opts);
+        var n = data.noform
+            ? new Element('DIV')
+            : new Element('FORM', data.form_opts);
         if (data.header) {
             n.insert(new Element('H2').insert(data.header));
         }
@@ -70,13 +74,14 @@ var HordeDialog = {
 
         delete RedBox.onDisplay;
 
-        n.addClassName('RB_confirm');
         if (data.form) {
             n.insert(data.form);
-        } else if (!data.noinput) {
+        } else if (!data.noinput && !data.noform) {
             n.insert(new Element('INPUT', { id: 'dialog_input', name: 'dialog_input', type: data.password ? 'password' : 'text', size: 15 }).setValue(data.input_val));
         }
 
+        n.addClassName('RB_confirm');
+
         if (data.hidden) {
             $H(data.hidden).each(function(pair) {
                 n.insert(new Element('INPUT', {
@@ -93,20 +98,27 @@ var HordeDialog = {
                 value: data.ok_text || this.ok_text
             })
         );
-        n.insert(
-            new Element('INPUT', {
-                className: 'horde-cancel',
-                type: 'button',
-                value: data.cancel_text || this.cancel_text
-            })
-        );
+
+        if (!data.noform) {
+            n.insert(
+                new Element('INPUT', {
+                    className: 'horde-cancel',
+                    type: 'button',
+                    value: data.cancel_text || this.cancel_text
+                })
+            );
+        }
 
         n.observe('click', function(e) {
             var elt = e.element();
             if (elt.hasClassName('horde-cancel')) {
                 this.close();
             } else if (elt.hasClassName('horde-default')) {
-                RedBox.getWindowContents().fire('HordeDialog:onClick', e);
+                if (data.noform) {
+                    this.close();
+                } else {
+                    RedBox.getWindowContents().fire('HordeDialog:onClick', e);
+                }
             }
         }.bindAsEventListener(this));
         n.observe('keydown', function(e) {

diff --git a/framework/Core/js/redbox.js b/framework/Core/js/redbox.js
@@ -62,12 +62,13 @@ var RedBox = {
 
     loading: function()
     {
-        var rl = $('RB_loading');
-
         this.showOverlay();
+
+        var rl = $('RB_loading');
         if (rl) {
             rl.show();
         }
+
         this.setWindowPosition();
     },