summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAutomerge <automerge@vaadin.com>2012-03-19 15:28:39 +0000
committerAutomerge <automerge@vaadin.com>2012-03-19 15:28:39 +0000
commit3e12c50b99b463938c8538e30856e943dac59a81 (patch)
tree7095c739044e0afc19eaf2e2d5dad237d3bcb863
parent8da6b1a0c3293c7de05ebc3d451a2f2e272a13b8 (diff)
downloadvaadin-framework-3e12c50b99b463938c8538e30856e943dac59a81.tar.gz
vaadin-framework-3e12c50b99b463938c8538e30856e943dac59a81.zip
[merge from 6.7] #7855 - Screen goes blank when detaching an Embedded component displaying a PDF
svn changeset:23264/svn branch:6.8
-rw-r--r--src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java b/src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java
index 17a95388b9..2c3115c5ed 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java
@@ -395,8 +395,14 @@ public class VEmbedded extends HTML implements Paintable {
// Force browser to fire unload event when component is detached
// from the view (IE doesn't do this automatically)
if (browserElement != null) {
- DOM.setElementAttribute(browserElement, "src",
- "javascript:false");
+ /*
+ * src was previously set to javascript:false, but this was not
+ * enough to overcome a bug when detaching an iframe with a pdf
+ * loaded in IE9. about:blank seems to cause the adobe reader
+ * plugin to unload properly before the iframe is removed. See
+ * #7855
+ */
+ DOM.setElementAttribute(browserElement, "src", "about:blank");
}
}
super.onDetach();