From c552f44e215783d4d8fb7f46a4c11198c227958d Mon Sep 17 00:00:00 2001 From: Marc Englund Date: Thu, 19 Feb 2009 14:07:11 +0000 Subject: [PATCH] CustomLayout now prefixes inline styles with url(). Fixes #2653 svn changeset:6907/svn branch:trunk --- .../toolkit/terminal/gwt/client/ui/ICustomLayout.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java index 452621dbc1..0b218e796f 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java @@ -225,11 +225,16 @@ public class ICustomLayout extends ComplexPanel implements Paintable, template = template.replaceAll( "<((?:img)|(?:IMG)) ([^>]*)src=\"((?![a-z]+:)[^/][^\"]+)\"", "<$1 $2src=\"" + relImgPrefix + "$3\""); - // also support src attributes without quotas + // also support src attributes without quotes template = template .replaceAll( "<((?:img)|(?:IMG)) ([^>]*)src=[^\"]((?![a-z]+:)[^/][^ />]+)[ />]", "<$1 $2src=\"" + relImgPrefix + "$3\""); + // also prefix relative style="...url(...)..." + template = template + .replaceAll( + "(<[^>]+style=\"[^\"]*url\\()((?![a-z]+:)[^/][^\"]+)(\\)[^>]*>)", + "$1 " + relImgPrefix + "$2 $3"); getElement().setInnerHTML(template); -- 2.39.5