CustomLayout img-url translation changed so that relative urls are interpreted relati...

svn changeset:4898/svn branch:trunk

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
index 9bb36476381f619948d81d1a9b08d57a619427b8..cf4d52507b1cf041c2ba0712ac2a05a2bc7a4373 100755 (executable)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
@@ -912,8 +912,8 @@ public class ApplicationConnection {
         return toolkitUri;
     }
 
-    public String getTheme() {
-        return view.getTheme();
+    public String getThemeUri() {
+        return configuration.getThemeUri();
     }
 
     /**

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 d59895a89df1771e2cc5a09ad2461f44c9cdd6be..366257fcaa2daba4df4a5ead68a0126b8afb6d6c 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java
@@ -193,14 +193,8 @@ public class ICustomLayout extends ComplexPanel implements Paintable,
         locationToElement.clear();
         scanForLocations(getElement());
 
-        String themeName = client.getTheme();
-        String prefix;
-        if (uriEndsWithSlash()) {
-            prefix = "../ITMILL/themes/";
-        } else {
-            prefix = "ITMILL/themes/";
-        }
-        prefixImgSrcs(getElement(), prefix + themeName + "/layouts/");
+        String themeUri = client.getThemeUri();
+        prefixImgSrcs(getElement(), themeUri + "/layouts/");
 
         publishResizedFunction(DOM.getFirstChild(getElement()));
 
@@ -265,8 +259,10 @@ public class ICustomLayout extends ComplexPanel implements Paintable,
           for (var i = 0; i < divs.length; i++) {
               var div = divs[i];
               var src = div.getAttribute("src");
-              if (src.indexOf(base) == 0) div.setAttribute("src",base + srcPrefix + src.substring(base.length));
-              else if (src.indexOf("http") != 0) div.setAttribute("src",srcPrefix + src);
+              if (src.indexOf("/")==0 || src.match(/\w+:\/\//)) {
+                  continue;
+              }
+              div.setAttribute("src",srcPrefix + src);             
           }                    
       } catch (e) { alert(e + " " + srcPrefix);}
     }-*/;