Now using HTML5 content mode. Also deprecated the XHTML content modes.

diff --git a/client/src/com/vaadin/client/ui/label/LabelConnector.java b/client/src/com/vaadin/client/ui/label/LabelConnector.java
index 33ec07b9f212326ea5af2460f8b466547df78a22..b52809c90eb4568b212e49345323014e0fd229d4 100644 (file)
--- a/client/src/com/vaadin/client/ui/label/LabelConnector.java
+++ b/client/src/com/vaadin/client/ui/label/LabelConnector.java
@@ -58,6 +58,7 @@ public class LabelConnector extends AbstractComponentConnector {
             break;
 
         case XHTML:
+        case HTML:
         case RAW:
             sinkOnloads = true;
         case XML:

diff --git a/server/src/com/vaadin/server/AbstractErrorMessage.java b/server/src/com/vaadin/server/AbstractErrorMessage.java
index 4e30dff06f0c78f8aee7f6dcf7923e611e26623b..3ab0e73c8a18aef61118371a462af45a84fd2c90 100644 (file)
--- a/server/src/com/vaadin/server/AbstractErrorMessage.java
+++ b/server/src/com/vaadin/server/AbstractErrorMessage.java
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright 2011 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -43,9 +43,19 @@ public abstract class AbstractErrorMessage implements ErrorMessage {
          * Content mode, where the error contains preformatted text.
          */
         PREFORMATTED,
+
+        /**
+         * Content mode, where the error contains XHTML.
+         * 
+         */
+        HTML,
+
         /**
          * Content mode, where the error contains XHTML.
+         * 
+         * @deprecated Use {@link ContentMode.HTML}
          */
+        @Deprecated
         XHTML;
     }
 
@@ -116,6 +126,7 @@ public abstract class AbstractErrorMessage implements ErrorMessage {
                     + "</pre>";
             break;
         case XHTML:
+        case HTML:
             result = getMessage();
             break;
         }
@@ -151,7 +162,7 @@ public abstract class AbstractErrorMessage implements ErrorMessage {
         } else if (t instanceof Validator.InvalidValueException) {
             UserError error = new UserError(
                     ((Validator.InvalidValueException) t).getHtmlMessage(),
-                    ContentMode.XHTML, ErrorLevel.ERROR);
+                    ContentMode.HTML, ErrorLevel.ERROR);
             for (Validator.InvalidValueException nestedException : ((Validator.InvalidValueException) t)
                     .getCauses()) {
                 error.addCause(getErrorMessageForException(nestedException));

diff --git a/server/src/com/vaadin/server/BootstrapHandler.java b/server/src/com/vaadin/server/BootstrapHandler.java
index 491830fb8192531bfa5df5ec2e3601f3ab1394a4..1301978fd44f30ca9c0d45587ee1c3ea3d6939b0 100644 (file)
--- a/server/src/com/vaadin/server/BootstrapHandler.java
+++ b/server/src/com/vaadin/server/BootstrapHandler.java
@@ -200,10 +200,9 @@ public abstract class BootstrapHandler implements RequestHandler {
 
         Document document = response.getDocument();
 
-        DocumentType doctype = new DocumentType("html",
-                "-//W3C//DTD XHTML 1.0 Transitional//EN",
-                "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd",
+        DocumentType doctype = new DocumentType("html", "", "",
                 document.baseUri());
+
         document.child(0).before(doctype);
         document.body().parent().attr("xmlns", "http://www.w3.org/1999/xhtml");
 
@@ -303,7 +302,7 @@ public abstract class BootstrapHandler implements RequestHandler {
          *      .v-app-loading
          *      .v-app-<simpleName for app class>
          *- Additionally added from javascript:
-         *      .v-theme-<themeName, remove non-alphanum> 
+         *      .v-theme-<themeName, remove non-alphanum>
          */
 
         String appClass = "v-app-"

diff --git a/server/src/com/vaadin/server/SystemError.java b/server/src/com/vaadin/server/SystemError.java
index aa9ffcaf52aa8e72100b8cfe77d3c607a2c51ce5..14fc0831a4748d16eb179e2a3ddd62ed0918fc5e 100644 (file)
--- a/server/src/com/vaadin/server/SystemError.java
+++ b/server/src/com/vaadin/server/SystemError.java
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright 2011 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -40,7 +40,7 @@ public class SystemError extends AbstractErrorMessage {
     public SystemError(String message) {
         super(message);
         setErrorLevel(ErrorLevel.SYSTEMERROR);
-        setMode(ContentMode.XHTML);
+        setMode(ContentMode.HTML);
         setMessage(getHtmlMessage());
     }
 

diff --git a/server/src/com/vaadin/server/UserError.java b/server/src/com/vaadin/server/UserError.java
index 756f2e70e00a4fe2f776ec1a95622108d810effa..c59eb382ee895ee4c4db56fd6ed4a878609baf83 100644 (file)
--- a/server/src/com/vaadin/server/UserError.java
+++ b/server/src/com/vaadin/server/UserError.java
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright 2011 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -39,7 +39,7 @@ public class UserError extends AbstractErrorMessage {
     public static final ContentMode CONTENT_PREFORMATTED = ContentMode.PREFORMATTED;
 
     /**
-     * @deprecated from 7.0, use {@link ContentMode#XHTML} instead    
+     * @deprecated from 7.0, use {@link ContentMode#HTML} instead    
      */
     @Deprecated
     public static final ContentMode CONTENT_XHTML = ContentMode.XHTML;

diff --git a/server/src/com/vaadin/ui/Label.java b/server/src/com/vaadin/ui/Label.java
index 86cbdb3253d064b3e45bde023493d8fba7ce652a..b3a6f43e6431546dd214f47a42423f7334688e1a 100644 (file)
--- a/server/src/com/vaadin/ui/Label.java
+++ b/server/src/com/vaadin/ui/Label.java
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright 2011 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -414,7 +414,8 @@ public class Label extends AbstractComponent implements Property<String>,
         }
 
         if (getContentMode() == ContentMode.XHTML
-                || getContentMode() == ContentMode.XML) {
+                || getContentMode() == ContentMode.XML
+                || getContentMode() == ContentMode.HTML) {
             return stripTags(stringValue);
         } else {
             return stringValue;

diff --git a/server/src/com/vaadin/ui/LoginForm.java b/server/src/com/vaadin/ui/LoginForm.java
index 2e372e851244e2646642e080e99f7a8d7b1c9fc2..69778c4c07bbc69a63992e5f8544e0cafd4f472b 100644 (file)
--- a/server/src/com/vaadin/ui/LoginForm.java
+++ b/server/src/com/vaadin/ui/LoginForm.java
@@ -135,10 +135,7 @@ public class LoginForm extends CustomComponent {
         String appUri = getSession().getURL().toString();
 
         try {
-            return ("<!DOCTYPE html PUBLIC \"-//W3C//DTD "
-                    + "XHTML 1.0 Transitional//EN\" "
-                    + "\"http://www.w3.org/TR/xhtml1/"
-                    + "DTD/xhtml1-transitional.dtd\">\n" + "<html>"
+            return ("<!DOCTYPE html>\n" + "<html>"
                     + "<head><script type='text/javascript'>"
                     + "var setTarget = function() {" + "var uri = '"
                     + appUri

diff --git a/shared/src/com/vaadin/shared/ui/label/ContentMode.java b/shared/src/com/vaadin/shared/ui/label/ContentMode.java
index 1927b6c01be71ff2c5f1ebf3f2c658fc1bec2533..3e6e5b8e45cd1966404fb2ae269ae4c3a32fba1c 100644 (file)
--- a/shared/src/com/vaadin/shared/ui/label/ContentMode.java
+++ b/shared/src/com/vaadin/shared/ui/label/ContentMode.java
@@ -15,6 +15,7 @@
  */
 package com.vaadin.shared.ui.label;
 
+
 /**
  * Content modes defining how the client should interpret a Label's value.
  * 
@@ -33,9 +34,16 @@ public enum ContentMode {
     PREFORMATTED,
 
     /**
-     * Content mode, where the label contains XHTML. Care should be taken to
-     * ensure
+     * Content mode, where the label contains HTML.
+     */
+    HTML,
+
+    /**
+     * Content mode, where the label contains XHTML.
+     * 
+     * @deprecated Use {@link ContentMode.HTML}
      */
+    @Deprecated
     XHTML,
 
     /**