From 3f075f787eab220c55c38b3ba418810c86c8b9e4 Mon Sep 17 00:00:00 2001 From: Rainer Hermanns Date: Wed, 13 Sep 2006 10:49:45 +0000 Subject: [PATCH] readonly attribute on ww:textfield does not behave as a boolean o backport from WW 2.2.3 o problem also fixed in other templates Issue Number: WW-1436 git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@442936 13f79535-47bb-0310-9956-ffa450edef68 --- core/src/main/resources/template/ajax/head.ftl | 4 ++-- core/src/main/resources/template/simple/head.ftl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/resources/template/ajax/head.ftl b/core/src/main/resources/template/ajax/head.ftl index 4eb0ed8d4..bd85e3b49 100644 --- a/core/src/main/resources/template/ajax/head.ftl +++ b/core/src/main/resources/template/ajax/head.ftl @@ -1,6 +1,6 @@ <#--include "/${parameters.templateDir}/xhtml/head.ftl" /--> <#include "/${parameters.templateDir}/${themeProperties.parent}/head.ftl" /> + src="<@s.url value='/struts/ajax/dojoRequire.js' includeParams='none' encode='false' />"> + src="<@s.url value='/struts/CommonFunctions.js' includeParams='none' encode='false'/>"> diff --git a/core/src/main/resources/template/simple/head.ftl b/core/src/main/resources/template/simple/head.ftl index 59ed379c9..91c05dcb8 100644 --- a/core/src/main/resources/template/simple/head.ftl +++ b/core/src/main/resources/template/simple/head.ftl @@ -2,7 +2,7 @@ // Dojo configuration djConfig = { baseRelativePath: "<@s.url includeParams='none' value='/struts/dojo' includeParams="none" encode='false'/>", - isDebug: ${parameters.debug}, + isDebug: ${parameters.debug?default(false)}, bindEncoding: "${parameters.encoding}", debugAtAllCosts: true // not needed, but allows the Venkman debugger to work with the includes };