diff options
| author | Build Agent <build@vaadin.com> | 2014-02-13 13:17:58 +0200 |
|---|---|---|
| committer | Build Agent <build@vaadin.com> | 2014-02-13 13:17:58 +0200 |
| commit | 3f07fb247e87deb19bef0f07004161c60443c829 (patch) | |
| tree | cb1c82b171514a75d637e9a1190a20a4b945f6e7 /client | |
| parent | 6f5b334247e024143b82c1c9e0c84b41d9bd2abb (diff) | |
| parent | ef208a686c9b32a66d317ceaf571a1b0387625bb (diff) | |
| download | vaadin-framework-3f07fb247e87deb19bef0f07004161c60443c829.tar.gz vaadin-framework-3f07fb247e87deb19bef0f07004161c60443c829.zip | |
Merge changes from origin/7.1
98aff2b Fix caption lost issue related to focus changing (#12967)
af96612 Test using Tomcat 7 behind Apache proxy (#13302)
ad49fe3 Test using Wildfly 8 (currently CR1) (#13167)
6d8b9e5 Servlet test for push with default parameters (#13299)
d88e409 Added proper escaping to OptionGroup item icon URLs (#13310)
e680b8f Changed getAbsoluteUrl to use the correct escaping method (#13311)
fe6ea57 Release notes updated to describe #13310 #13311
ef208a6 Javadoc formatting fixup
Change-Id: I9cedc16c69b25cc89dd4e4a6812d29019e6e0e0a
Diffstat (limited to 'client')
| -rw-r--r-- | client/src/com/vaadin/client/Util.java | 3 | ||||
| -rw-r--r-- | client/src/com/vaadin/client/ui/VOptionGroup.java | 5 | ||||
| -rw-r--r-- | client/src/com/vaadin/client/ui/orderedlayout/Slot.java | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/client/src/com/vaadin/client/Util.java b/client/src/com/vaadin/client/Util.java index edbb40e86c..7cf8338171 100644 --- a/client/src/com/vaadin/client/Util.java +++ b/client/src/com/vaadin/client/Util.java @@ -1344,7 +1344,8 @@ public class Util { divElement.getStyle().setDisplay(Display.NONE); RootPanel.getBodyElement().appendChild(divElement); - divElement.setInnerHTML("<a href='" + escapeHTML(url) + "' ></a>"); + divElement.setInnerHTML("<a href='" + escapeAttribute(url) + + "' ></a>"); AnchorElement a = divElement.getChild(0).cast(); String href = a.getHref(); diff --git a/client/src/com/vaadin/client/ui/VOptionGroup.java b/client/src/com/vaadin/client/ui/VOptionGroup.java index fee1c313f5..fe4ef214cb 100644 --- a/client/src/com/vaadin/client/ui/VOptionGroup.java +++ b/client/src/com/vaadin/client/ui/VOptionGroup.java @@ -142,8 +142,9 @@ public class VOptionGroup extends VOptionGroupBase implements FocusHandler, String icon = opUidl.getStringAttribute("icon"); if (icon != null && icon.length() != 0) { String iconUrl = client.translateVaadinUri(icon); - itemHtml = "<img src=\"" + iconUrl + "\" class=\"" - + Icon.CLASSNAME + "\" alt=\"\" />" + itemHtml; + itemHtml = "<img src=\"" + Util.escapeAttribute(iconUrl) + + "\" class=\"" + Icon.CLASSNAME + "\" alt=\"\" />" + + itemHtml; } String key = opUidl.getStringAttribute("key"); diff --git a/client/src/com/vaadin/client/ui/orderedlayout/Slot.java b/client/src/com/vaadin/client/ui/orderedlayout/Slot.java index 37a97f3399..efa19895a8 100644 --- a/client/src/com/vaadin/client/ui/orderedlayout/Slot.java +++ b/client/src/com/vaadin/client/ui/orderedlayout/Slot.java @@ -474,7 +474,8 @@ public final class Slot extends SimplePanel { // Made changes to DOM. Focus can be lost if it was in the // widget. - focusLost = widget.getElement().isOrHasChild(focusedElement); + focusLost = (focusedElement == null ? false : widget + .getElement().isOrHasChild(focusedElement)); } } else if (caption != null) { orphan(widget); @@ -485,7 +486,8 @@ public final class Slot extends SimplePanel { captionWrap = null; // Made changes to DOM. Focus can be lost if it was in the widget. - focusLost = widget.getElement().isOrHasChild(focusedElement); + focusLost = (focusedElement == null ? false : widget.getElement() + .isOrHasChild(focusedElement)); } // Caption text |