diff options
| author | John Ahlroos <john@vaadin.com> | 2012-09-07 10:09:02 +0300 |
|---|---|---|
| committer | John Ahlroos <john@vaadin.com> | 2012-09-07 10:23:35 +0300 |
| commit | 074b1095ee302af67626055820853ed1b8a4ea86 (patch) | |
| tree | a6a6c72465748cb97fc83f5a84f37e151b7618de /server/src/com/vaadin/ui | |
| parent | 4222b99bf020c8d7a3d49f4105507be4308cddd2 (diff) | |
| download | vaadin-framework-074b1095ee302af67626055820853ed1b8a4ea86.tar.gz vaadin-framework-074b1095ee302af67626055820853ed1b8a4ea86.zip | |
Now using HTML5 content mode. Also deprecated the XHTML content modes.
Diffstat (limited to 'server/src/com/vaadin/ui')
| -rw-r--r-- | server/src/com/vaadin/ui/Label.java | 5 | ||||
| -rw-r--r-- | server/src/com/vaadin/ui/LoginForm.java | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/server/src/com/vaadin/ui/Label.java b/server/src/com/vaadin/ui/Label.java index 86cbdb3253..b3a6f43e64 100644 --- 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 2e372e8512..69778c4c07 100644 --- 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 |