From 9b6fac6a6bc82bcd46c12f32b0b9cf887bd22b6b Mon Sep 17 00:00:00 2001
From: Paul Frazee <pfrazee@gmail.com>
Date: Tue, 29 Sep 2015 11:03:32 -0500
Subject: [PATCH] fix subwindow eventhandler releasing on pagenav for PMs

---
 ui/lib/com/pm-form.js   | 3 ++-
 ui/lib/ui/subwindows.js | 5 ++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/lib/com/pm-form.js b/ui/lib/com/pm-form.js
index 1c9d225..f1965a3 100644
--- a/ui/lib/com/pm-form.js
+++ b/ui/lib/com/pm-form.js
@@ -15,7 +15,8 @@ var markdown = require('../markdown')
 var mentionslib = require('../mentions')
 var social = require('../social-graph')
 
-module.exports = function (opts) {
+module.exports = function (opts, h2) {
+  h = h2 || h
 
   var recipients = []
   var placeholder = (opts && opts.placeholder) ? opts.placeholder : ''
diff --git a/ui/lib/ui/subwindows.js b/ui/lib/ui/subwindows.js
index d0548ad..308604f 100644
--- a/ui/lib/ui/subwindows.js
+++ b/ui/lib/ui/subwindows.js
@@ -23,7 +23,7 @@ module.exports.subwindow = function (el, title, opts) {
       h2('a', { href: '#', onclick: oncollapsetoggle }, collapseToggleIcon),
       h2('a.close', { href: '#', onclick: onclose }, com.icon('remove'))
     ),
-    h2('.subwindow-body', el)
+    h2('.subwindow-body', (typeof el == 'function' ? el(h2) : el))
   )
   document.body.appendChild(subwindow)
 
@@ -106,8 +106,7 @@ module.exports.pm = function (opts) {
 
   opts = opts || {}
   opts.onpost = onpost
-  var form = com.pmForm(opts)
-  var sw = makeSubwindow(form, 'Secret Message', { icon: 'lock', help: 'secret-messages' })
+  var sw = makeSubwindow(com.pmForm.bind(null, opts), 'Secret Message', { icon: 'lock', help: 'secret-messages' })
   try { form.querySelector('input').focus() } catch (e) {}
 
   // handlers