Re: svn commit: r1150271 - /ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl

Posted by Scott Gray-2 on Jul 25, 2011; 8:19am
URL: http://ofbiz.116.s1.nabble.com/Re-svn-commit-r1150271-ofbiz-trunk-specialpurpose-ecommerce-webapp-ecommerce-includes-headerHead-ftl-tp3691910.html

Hi Hans,

This seems a little messy, what are you trying to achieve that the transform cannot?

Thanks
Scott

On 24/07/2011, at 3:37 PM, [hidden email] wrote:

> Author: hansbak
> Date: Sun Jul 24 03:37:20 2011
> New Revision: 1150271
>
> URL: http://svn.apache.org/viewvc?rev=1150271&view=rev
> Log:
> only add contenturl prefix to javascript includes which do not start with http
>
> Modified:
>    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl
>
> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl?rev=1150271&r1=1150270&r2=1150271&view=diff
> ==============================================================================
> --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl (original)
> +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl Sun Jul 24 03:37:20 2011
> @@ -35,7 +35,11 @@ under the License.
>     <#list layoutSettings.javaScripts as javaScript>
>       <#if javaScriptsSet.contains(javaScript)>
>         <#assign nothing = javaScriptsSet.remove(javaScript)/>
> -        <script type="text/javascript" src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>"></script>
> +        <#if javaScript?starts_with("http")>
> +            <script type="text/javascript" src="${StringUtil.wrapString(javaScript)}"></script>
> +        <#else>
> +            <script type="text/javascript" src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>"></script>
> +        </#if>
>       </#if>
>     </#list>
>   </#if>
>
>