Merge lp:~methanal-developers/methanal/828626-singleton-modal-overlay into lp:methanal

[Jonathan Jacobs]

[Tristan Seligmann (mithrandi)]

review: Approve

[lp:~methanal-developers/methanal/828626-singleton-modal-overlay]

189. By Jonathan Jacobs on 2011-08-18

Use setModalOverlay in ModalDialog.

=== modified file 'methanal/js/Methanal/Util.js'
--- methanal/js/Methanal/Util.js	2011-07-17 22:17:49 +0000
+++ methanal/js/Methanal/Util.js	2011-08-18 10:56:24 +0000
@@ -1460,3 +1460,24 @@
         node.scrollIntoView(true);
     }
 };
+
+
+
+/**
+ * Set the visibility of the modal overlay.
+ *
+ * If the modal overlay is already in the requested state no action is taken.
+ */
+Methanal.Util.setModalOverlay = function setModalOverlay(visible) {
+    if (visible && Methanal.Util._modalOverlayNode === null) {
+        var T = Methanal.Util.DOMBuilder(document);
+        Methanal.Util._modalOverlayNode = T(
+            'div', {'class': 'modal-dialog-overlay'});
+        document.body.appendChild(Methanal.Util._modalOverlayNode);
+    } else if (!visible && Methanal.Util._modalOverlayNode !== null) {
+        document.body.removeChild(Methanal.Util._modalOverlayNode);
+        Methanal.Util._modalOverlayNode = null;
+    }
+};
+
+Methanal.Util._modalOverlayNode = null;

=== modified file 'methanal/js/Methanal/Widgets.js'
--- methanal/js/Methanal/Widgets.js	2011-08-11 14:20:16 +0000
+++ methanal/js/Methanal/Widgets.js	2011-08-18 10:56:24 +0000
@@ -1393,10 +1393,7 @@
  */
 Nevow.Athena.Widget.subclass(Methanal.Widgets, 'ModalDialog').methods(
     function nodeInserted(self) {
-        var T = Methanal.Util.DOMBuilder(self.node.ownerDocument);
-        self._overlayNode = T('div', {'class': 'modal-dialog-overlay'});
-        self.node.parentNode.appendChild(self._overlayNode);
-
+        Methanal.Util.setModalOverlay(true);
         Methanal.Util.addElementClass(
             self.node.ownerDocument.body, 'printing');
         Methanal.Util.addElementClass(
@@ -1415,7 +1412,7 @@
 
         self.detach();
         self.node.parentNode.removeChild(self.node);
-        self._overlayNode.parentNode.removeChild(self._overlayNode);
+        Methanal.Util.setModalOverlay(false);
     });