diff --git a/dev/Common/Utils.jsx b/dev/Common/Utils.jsx
index dc873a81f..c10bee1ef 100644
--- a/dev/Common/Utils.jsx
+++ b/dev/Common/Utils.jsx
@@ -636,18 +636,19 @@ export function windowPopupKnockout(viewModel, templateID, title, fCallback = nu
{
const
win = window.open(''),
+ doc = win.document,
func = '__OpenerApplyBindingsUid' + fakeMd5() + '__',
template = $('#' + templateID)
;
window[func] = () => {
- if (win && win.document.body && template && template[0])
+ if (win && doc && doc.body && template && template[0])
{
- const body = $(win.document.body);
+ const body = $(doc.body);
$('#rl-content', body).html(template.html());
- $('html', win.document).addClass('external ' + $('html').attr('class'));
+ $('html', doc).addClass('external ' + $('html').attr('class'));
require('Common/Translator').i18nToNodes(body);
@@ -665,22 +666,27 @@ export function windowPopupKnockout(viewModel, templateID, title, fCallback = nu
}
};
- win.document.open();
- win.document.write('' +
-'' +
-'' +
-'' +
-'' +
-'' +
-'' + encodeHtml(title) + '' +
-'');
- win.document.close();
+ doc.open();
+ doc.write(trim(`
+
+
+
+
+
+
+
+ ${encodeHtml(title)}
+
+
+
+`));
+ doc.close();
- const script = win.document.createElement('script');
+ const script = doc.createElement('script');
script.type = 'text/javascript';
- script.innerHTML = `if(window&&window.opener&&window.opener['${func}]'){window.opener['${func}']();window.opener['${func}']=null}`;
+ script.innerHTML = `if(window&&window.opener&&window.opener['${func}']){window.opener['${func}']();window.opener['${func}']=null}`;
- win.document.getElementsByTagName('head')[0].appendChild(script);
+ doc.getElementsByTagName('head')[0].appendChild(script);
}
/**
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/MailMessageView.html b/rainloop/v/0.0.0/app/templates/Views/User/MailMessageView.html
index 55915997a..2ef9fefc3 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/MailMessageView.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/MailMessageView.html
@@ -74,7 +74,7 @@