CustomLayout no longer expects a space before "src=". fixes #2654

svn changeset:6908/svn branch:trunk

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 0b218e796f5295b96c1cc1a71d5a56f73e710ef0..0e4f0aaa2c0b1613d96291d18359e702e3756831 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java
@@ -223,12 +223,12 @@ public class ICustomLayout extends ComplexPanel implements Paintable,
         // prefix all relative image elements to point to theme dir with a
         // regexp search
         template = template.replaceAll(
-                "<((?:img)|(?:IMG)) ([^>]*)src=\"((?![a-z]+:)[^/][^\"]+)\"",
+                "<((?:img)|(?:IMG))\\s([^>]*)src=\"((?![a-z]+:)[^/][^\"]+)\"",
                 "<$1 $2src=\"" + relImgPrefix + "$3\"");
         // also support src attributes without quotes
         template = template
                 .replaceAll(
-                        "<((?:img)|(?:IMG)) ([^>]*)src=[^\"]((?![a-z]+:)[^/][^ />]+)[ />]",
+                        "<((?:img)|(?:IMG))\\s([^>]*)src=[^\"]((?![a-z]+:)[^/][^ />]+)[ />]",
                         "<$1 $2src=\"" + relImgPrefix + "$3\"");
         // also prefix relative style="...url(...)..."
         template = template