diff options
| author | Gaute Hope <eg@gaute.vetsj.com> | 2018-09-30 08:41:57 +0200 |
|---|---|---|
| committer | Gaute Hope <eg@gaute.vetsj.com> | 2018-09-30 09:37:08 +0200 |
| commit | 4be9dd02dcdb3925a20088bb8021acc7e50baa25 (patch) | |
| tree | b074b56eae50e1060650b20c5a201579b0fb39f5 /ui | |
| parent | d1a8b20dc2195ecc3b0c1eb0052e31bc2c924ea9 (diff) | |
fix #550: use srcdoc attribute when setting message content in iframe
using the src attribute causes a request that needs to be allowed on the
main GUI thread on new webkit. even when setting the iframe src async it
needs to run on the extension GUI thread in order to be able to
manipulate the DOM tree. thus subsequent calls to the webext, also
necessarily running on the extension GUI thread, blocks .. and the main
GUI blocks while waiting for these to return. this causes a deadlock
while the webext waits for the request to be handled on the main GUI
thread.
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/thread-view.html | 5 | ||||
| -rw-r--r-- | ui/thread-view.scss | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/ui/thread-view.html b/ui/thread-view.html index 202c871..1d9902e 100644 --- a/ui/thread-view.html +++ b/ui/thread-view.html @@ -57,8 +57,9 @@ </div> <div id="body_template" class="body_part"> - <iframe class="body_iframe" sandbox></iframe> -</span> + <iframe id="iframe_template" class="body_iframe" sandbox srcdoc=""></iframe> +</div> + </body> </html> diff --git a/ui/thread-view.scss b/ui/thread-view.scss index 2cddab3..8c49053 100644 --- a/ui/thread-view.scss +++ b/ui/thread-view.scss @@ -938,6 +938,8 @@ body:not(.nohide) .quote_container.controllable.show > .quote { width: auto; padding: 15px; } +#body_template, +#iframe_template, #email_template, #attachment_template, #link_warning_template { |