Thanks David,
I saw you have used such a solution for other cases. I should have thought
about that
Jacques
From: <[email protected]>
Author: jonesde
Date: Mon Feb 9 02:34:23 2009
New Revision: 742234
URL: http://svn.apache.org/viewvc?rev=742234&view=rev
Log:
Fixed issue with general html encoding of String objects in FTL files being applied to dynamic JavaScript from groovy files by
leaving them as StringBuffers, ie just removing the toString calls
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/InlineProductDetail.groovy
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy
ofbiz/trunk/specialpurpose/webpos/webapp/webpos/includes/Header.ftl
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/InlineProductDetail.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/InlineProductDetail.groovy?rev=742234&r1=742233&r2=742234&view=diff
==============================================================================
---
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/InlineProductDetail.groovy
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/InlineProductDetail.groovy Mon Feb 9 02:34:23
2009
@@ -303,7 +303,7 @@
jsBuf.append(variantPriceJS.toString());
jsBuf.append("</script>");
- context.virtualJavaScript = jsBuf.toString();
+ context.virtualJavaScript = jsBuf;
}
}
}
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy?rev=742234&r1=742233&r2=742234&view=diff
==============================================================================
---
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy
(original)
+++
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy
Mon Feb 9 02:34:23 2009
@@ -375,7 +375,7 @@
jsBuf.append(variantPriceJS.toString());
jsBuf.append("</script>");
- context.virtualJavaScript = jsBuf.toString();
+ context.virtualJavaScript = jsBuf;
}
}
}
Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/includes/Header.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/includes/Header.ftl?rev=742234&r1=742233&r2=742234&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/includes/Header.ftl
(original)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/includes/Header.ftl Mon Feb
9 02:34:23 2009
@@ -37,7 +37,6 @@
<link rel="stylesheet" href="<@ofbizContentUrl>${styleSheet}</@ofbizContentUrl>"
type="text/css"/>
</#list>
</#if>
- ${layoutSettings?if_exists.extraHead?if_exists}
<#-- Append CSS for catalog -->
<#if catalogStyleSheet?exists>
