Merge lp:~methanal-developers/methanal/1081191-modaldialog-close-notification-2 into lp:methanal

[Jonathan Jacobs]

[lp:~methanal-developers/methanal/1081191-modaldialog-close-notification-2]

198. By Jonathan Jacobs on 2012-11-21

Remove old Deferred.

[Tristan Seligmann (mithrandi)]

review: Approve

=== modified file 'methanal/js/Methanal/Widgets.js'
--- methanal/js/Methanal/Widgets.js	2012-11-20 16:12:15 +0000
+++ methanal/js/Methanal/Widgets.js	2012-11-21 06:21:17 +0000
@@ -1403,9 +1403,6 @@
 
 /**
  * Modal dialog widget.
- *
- * @ivar onClose: L{Deferred} that is fired with a L{Boolean}, indicating if
- *     the dialog was cancelled, when the dialog is closed.
  */
 Nevow.Athena.Widget.subclass(Methanal.Widgets, 'ModalDialog').methods(
     function nodeInserted(self) {
@@ -1414,7 +1411,22 @@
             self.node.ownerDocument.body, 'printing');
         Methanal.Util.addElementClass(
             self.node, 'print-target');
-        self.onClose = Divmod.Defer.Deferred();
+        self._notifyOnClose = [];
+    },
+
+
+    /**
+     * Get a L{Deferred} that is fired when this dialog is closed.
+     *
+     * The L{Deferred} is fired with a boolean indicating whether the dialog
+     * was cancelled.
+     *
+     * @rtype: L{Deferred}
+     */
+    function notifyOnClose(self) {
+        var d = Divmod.Defer.Deferred();
+        self._notifyOnClose.push(d);
+        return d;
     },
 
 
@@ -1438,7 +1450,9 @@
         self.detach();
         self.node.parentNode.removeChild(self.node);
         Methanal.Util.setModalOverlay(false);
-        self.onClose.callback(!!cancelled);
+        for (var i = 0; i < self._notifyOnClose.length; ++i) {
+            self._notifyOnClose[i].callback(!!cancelled);
+        }
     });