From 05c3c650e2b78dc17256b5237c8a9f14eb13a554 Mon Sep 17 00:00:00 2001
From: John Alhroos <john.ahlroos@itmill.com>
Date: Wed, 10 Feb 2010 11:07:01 +0000
Subject: [PATCH] Merged changes from 6.2 branch.

svn changeset:11245/svn branch:6.3
---
 .../themes/base/datefield/datefield.css       |  3 ++
 WebContent/VAADIN/themes/base/styles.css      |  3 ++
 .../terminal/gwt/client/ui/VEmbedded.java     | 11 ++++--
 .../terminal/gwt/client/ui/VNativeButton.java | 36 ++++++++++++-------
 4 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/WebContent/VAADIN/themes/base/datefield/datefield.css b/WebContent/VAADIN/themes/base/datefield/datefield.css
index 720a80716f..fd2730bf24 100644
--- a/WebContent/VAADIN/themes/base/datefield/datefield.css
+++ b/WebContent/VAADIN/themes/base/datefield/datefield.css
@@ -51,6 +51,9 @@
 .v-datefield-time .v-label {
 	display: inline;
 }
+.v-datefield-popup {
+	background: #fff;
+}
 /* Disabled by default
 .v-datefield-error .v-textfield,
 .v-datefield-error .v-datefield-calendarpanel {
diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css
index 28d412536e..af82ec079d 100644
--- a/WebContent/VAADIN/themes/base/styles.css
+++ b/WebContent/VAADIN/themes/base/styles.css
@@ -528,6 +528,9 @@ div.v-app-loading {
 .v-datefield-time .v-label {
 	display: inline;
 }
+.v-datefield-popup {
+	background: #fff;
+}
 /* Disabled by default
 .v-datefield-error .v-textfield,
 .v-datefield-error .v-datefield-calendarpanel {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java b/src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java
index 7d69e5682a..ffd09dab2c 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java
@@ -140,6 +140,7 @@ public class VEmbedded extends HTML implements Paintable {
                     parameters.put("movie", getSrc(uidl, client));
                 }
 
+                // Add the parameters to the Object
                 for (String name : parameters.keySet()) {
                     html += "<param name=\"" + escapeAttribute(name)
                             + "\" value=\""
@@ -147,9 +148,15 @@ public class VEmbedded extends HTML implements Paintable {
                 }
 
                 html += "<embed src=\"" + getSrc(uidl, client) + "\" width=\""
-                        + width + "\" height=\"" + height + "\"></embed>";
+                        + width + "\" height=\"" + height + "\" ";
 
-                html += "</object>";
+                // Add the parameters to the Embed
+                for (String name : parameters.keySet()) {
+                    html += escapeAttribute(name) + "=\""
+                    + escapeAttribute(parameters.get(name)) + "\" ";
+                }
+
+                html += "></embed></object>";
                 setHTML(html);
             } else if (mime.equals("image/svg+xml")) {
                 String data;
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VNativeButton.java b/src/com/vaadin/terminal/gwt/client/ui/VNativeButton.java
index e544e1f9ce..ef7e183698 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VNativeButton.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VNativeButton.java
@@ -19,7 +19,7 @@ import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.Util;
 import com.vaadin.terminal.gwt.client.VTooltip;
 
-public class VNativeButton extends Button implements Paintable {
+public class VNativeButton extends Button implements Paintable, ClickHandler {
 
     public static final String CLASSNAME = "v-nativebutton";
 
@@ -48,18 +48,8 @@ public class VNativeButton extends Button implements Paintable {
         getElement().appendChild(captionElement);
         captionElement.setClassName(getStyleName() + "-caption");
 
-        addClickHandler(new ClickHandler() {
-            public void onClick(ClickEvent event) {
-                if (id == null || client == null) {
-                    return;
-                }
-                if (BrowserInfo.get().isSafari()) {
-                    VNativeButton.this.setFocus(true);
-                }
-                client.updateVariable(id, "state", true, true);
-                clickPending = false;
-            }
-        });
+        addClickHandler(this);
+
         sinkEvents(VTooltip.TOOLTIP_EVENTS);
         sinkEvents(Event.ONMOUSEDOWN);
         sinkEvents(Event.ONMOUSEUP);
@@ -179,4 +169,24 @@ public class VNativeButton extends Button implements Paintable {
         }
     }
 
+    /*
+     * (non-Javadoc)
+     * 
+     * @see
+     * com.google.gwt.event.dom.client.ClickHandler#onClick(com.google.gwt.event
+     * .dom.client.ClickEvent)
+     */
+    public void onClick(ClickEvent event) {
+        if (id == null || client == null) {
+            return;
+        }
+
+        if (BrowserInfo.get().isSafari()) {
+            VNativeButton.this.setFocus(true);
+        }
+
+        client.updateVariable(id, "state", true, true);
+        clickPending = false;
+    }
+
 }
-- 
2.39.5