Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Email Previewing was not showing in Firefox

This commit is contained in:
Robin Ward 2017-03-27 14:41:26 -04:00
parent 20400cb33f
commit 1d478a97db
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/admin/controllers/admin-email-preview-digest.js.es6
View File

@ -8,10 +8,6 @@ export default Ember.Controller.extend({
showSendEmailForm: Em.computed.notEmpty('model.html_content'), showSendEmailForm: Em.computed.notEmpty('model.html_content'),
htmlEmpty: Em.computed.empty('model.html_content'), htmlEmpty: Em.computed.empty('model.html_content'),
iframeSrc: function() {
return ('data:text/html;charset=utf-8,' + encodeURI(this.get('model.html_content')));
}.property('model.html_content'),
actions: { actions: {
refresh() { refresh() {
const model = this.get('model'); const model = this.get('model');

2
app/assets/javascripts/admin/templates/email-preview-digest.hbs
View File

@ -43,7 +43,7 @@
{{#if htmlEmpty}} {{#if htmlEmpty}}
<p>{{i18n 'admin.email.no_result'}}</p> <p>{{i18n 'admin.email.no_result'}}</p>
{{else}} {{else}}
<iframe src="{{iframeSrc}}" /> <iframe srcdoc={{model.html_content}} />
{{/if}} {{/if}}
{{else}} {{else}}
<pre>{{{model.text_content}}}</pre> <pre>{{{model.text_content}}}</pre>