From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Tue, 9 Mar 2010 12:51:44 +0000 (+0000)
Subject: fixes #4279
X-Git-Tag: 6.7.0.beta1~1974
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8c1b559e9bc662722bb442e8662468b95c80bf6a;p=vaadin-framework.git

fixes #4279

svn changeset:11707/svn branch:6.3
---

diff --git a/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml b/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml
index 2962ebbfd4..fde9d0d024 100644
--- a/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml
+++ b/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml
@@ -23,6 +23,12 @@
 		<when-property-is name="user.agent" value="ie6"/>
 	</replace-with>
 
+	<!-- Safari needs a different implementation due to GWT bug. See #4279 (vaadin trac) -->
+	<replace-with class="com.vaadin.terminal.gwt.client.ui.richtextarea.CustomWebkitRichTextArea">
+		<when-type-is class="com.google.gwt.user.client.ui.impl.RichTextAreaImpl" />
+		<when-property-is name="user.agent" value="safari" />
+	</replace-with>
+
 	<generate-with class="com.vaadin.terminal.gwt.widgetsetutils.WidgetMapGenerator">
 		<when-type-is class="com.vaadin.terminal.gwt.client.WidgetMap"/>
 	</generate-with>
diff --git a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/CustomWebkitRichTextArea.java b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/CustomWebkitRichTextArea.java
new file mode 100644
index 0000000000..646616a95f
--- /dev/null
+++ b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/CustomWebkitRichTextArea.java
@@ -0,0 +1,35 @@
+/**
+ * 
+ */
+package com.vaadin.terminal.gwt.client.ui.richtextarea;
+
+import com.google.gwt.user.client.Command;
+import com.google.gwt.user.client.DeferredCommand;
+import com.google.gwt.user.client.Element;
+import com.google.gwt.user.client.ui.impl.RichTextAreaImplSafari;
+
+/**
+ * TODO remove me when GWT RichTextArea is fixed. See #4279 (vaadin trac)
+ * 
+ */
+class CustomWebkitRichTextArea extends RichTextAreaImplSafari {
+    public CustomWebkitRichTextArea() {
+        DeferredCommand.addCommand(new Command() {
+            public void execute() {
+                hookBlur(getElement());
+            }
+        });
+    }
+
+    private native void hookBlur(Element iframe)
+    /*-{
+
+        iframe.contentDocument.documentElement.onblur = function(evt) {
+          if (iframe.__listener) {
+            iframe.__listener.@com.google.gwt.user.client.ui.Widget::onBrowserEvent(Lcom/google/gwt/user/client/Event;)(evt);
+          }
+        };
+        
+        
+    }-*/;
+}
\ No newline at end of file