aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJonatan Kronqvist <jonatan.kronqvist@itmill.com>2011-09-12 13:02:12 +0000
committerJonatan Kronqvist <jonatan.kronqvist@itmill.com>2011-09-12 13:02:12 +0000
commit6ecda9a8859a43572e21b6e66c487a716bc4d186 (patch)
tree654522e4738ccbb519e75c350eae1a25af88899e /src
parente7ab8fc25add2a165598ae1b3403c5a0a9c878ca (diff)
downloadvaadin-framework-6ecda9a8859a43572e21b6e66c487a716bc4d186.tar.gz
vaadin-framework-6ecda9a8859a43572e21b6e66c487a716bc4d186.zip
More fixes based on review of #6909
svn changeset:20967/svn branch:6.7
Diffstat (limited to 'src')
-rw-r--r--src/com/vaadin/terminal/gwt/client/ui/VAudio.java3
-rw-r--r--src/com/vaadin/ui/Audio.java5
-rw-r--r--src/com/vaadin/ui/Video.java5
3 files changed, 13 insertions, 0 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VAudio.java b/src/com/vaadin/terminal/gwt/client/ui/VAudio.java
index 73162ea76d..8aadf1bb90 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VAudio.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VAudio.java
@@ -25,6 +25,9 @@ public class VAudio extends VMediaBase {
@Override
public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
+ if (client.updateComponent(this, uidl, true)) {
+ return;
+ }
super.updateFromUIDL(uidl, client);
Style style = audio.getStyle();
diff --git a/src/com/vaadin/ui/Audio.java b/src/com/vaadin/ui/Audio.java
index 8698ec52d2..322b0a720f 100644
--- a/src/com/vaadin/ui/Audio.java
+++ b/src/com/vaadin/ui/Audio.java
@@ -20,6 +20,11 @@ import com.vaadin.terminal.gwt.client.ui.VAudio;
* "https://developer.mozilla.org/En/Using_audio_and_video_in_Firefox#Using_Flash"
* >Mozilla Developer Network</a>.
*
+ * Multiple sources can be specified. Which of the sources is used is selected
+ * by the browser depending on which file formats it supports. See <a
+ * href="http://en.wikipedia.org/wiki/HTML5_video#Table">wikipedia</a> for a
+ * table of formats supported by different browsers.
+ *
* @author Vaadin Ltd
* @since 6.7.0
*/
diff --git a/src/com/vaadin/ui/Video.java b/src/com/vaadin/ui/Video.java
index be17ae67ed..26d79a438f 100644
--- a/src/com/vaadin/ui/Video.java
+++ b/src/com/vaadin/ui/Video.java
@@ -22,6 +22,11 @@ import com.vaadin.terminal.gwt.client.ui.VVideo;
* "https://developer.mozilla.org/En/Using_audio_and_video_in_Firefox#Using_Flash"
* >Mozilla Developer Network</a>.
*
+ * Multiple sources can be specified. Which of the sources is used is selected
+ * by the browser depending on which file formats it supports. See <a
+ * href="http://en.wikipedia.org/wiki/HTML5_video#Table">wikipedia</a> for a
+ * table of formats supported by different browsers.
+ *
* @author Vaadin Ltd
* @since 6.7.0
*/