From: Joonas Lehtinen Date: Mon, 18 Jun 2007 15:54:57 +0000 (+0000) Subject: Now customlayout loading __seems__ to work with ff, ie6, ie7, safari... X-Git-Tag: 6.7.0.beta1~6225 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=117a469589c0ca8b902d18c53412cbd170eb882b;p=vaadin-framework.git Now customlayout loading __seems__ to work with ff, ie6, ie7, safari... svn changeset:1763/svn branch:trunk --- diff --git a/WebContent/theme/demo/layout/featurebrowser-mainlayout.html b/WebContent/theme/demo/layout/featurebrowser-mainlayout.html index d39d9cd3e6..ac0623983c 100644 --- a/WebContent/theme/demo/layout/featurebrowser-mainlayout.html +++ b/WebContent/theme/demo/layout/featurebrowser-mainlayout.html @@ -4,7 +4,7 @@ -
+
puu
@@ -65,7 +65,7 @@
+ style="overflow: hidden; position: absolute; width: 137px; height: 17px;" />
",scriptStart); - scripts += html.substring(scriptStart+1,j) + ";"; + int j = lc.indexOf("", scriptStart); + scripts += html.substring(scriptStart + 1, j) + ";"; nextPosToCheck = endOfPrevScript = j + "".length(); scriptStart = lc.indexOf("",startOfBody)+1; - int endOfBody = lc.indexOf("",startOfBody); + startOfBody = lc.indexOf(">", startOfBody) + 1; + int endOfBody = lc.indexOf("", startOfBody); if (endOfBody > startOfBody) - res = html.substring(startOfBody,endOfBody); - else + res = html.substring(startOfBody, endOfBody); + else res = html.substring(startOfBody); - } - + } + return res; }