Anonymous avatar Anonymous committed 165041d

Related to WW-1322 I found more missing includeParams attributes
o added missing includeParams='none' to all css/js <@ww:url... /> occurances
Issue Number: WW-1322

git-svn-id: http://svn.opensymphony.com/svn/webwork/trunk@2649 573baa09-0c28-0410-bef9-dab3c582ae83

Comments (0)

Files changed (10)

src/java/template/ajax/form-close.ftl

 --><#t/>
 <#if parameters.hasTooltip?default(false)><#t/>
 	<#lt/><!-- javascript that is needed for tooltips --> 
-	<#lt/><script language="JavaScript" type="text/javascript" src="<@ww.url value='/webwork/tooltip/wz_tooltip.js' encode='false' />"></script>
+	<#lt/><script language="JavaScript" type="text/javascript" src="<@ww.url value='/webwork/tooltip/wz_tooltip.js' encode='false' includeParams='none'/>"></script>
 </#if><#t/>
 
 </table>

src/java/template/ajax/head.ftl

     };
 </script>
 <script language="JavaScript" type="text/javascript"
-        src="<@ww.url includeParams='none' value='/webwork/dojo/dojo.js' encode='false'/>"></script>
+        src="<@ww.url includeParams='none' value='/webwork/dojo/dojo.js' encode='false' includeParams='none'/>"></script>
 <script language="JavaScript" type="text/javascript"
-        src="<@ww.url includeParams='none' value='/webwork/ajax/dojoRequire.js' encode='false'/>"></script>
+        src="<@ww.url includeParams='none' value='/webwork/ajax/dojoRequire.js' encode='false' includeParams='none'/>"></script>
 <script language="JavaScript" type="text/javascript"
-        src="<@ww.url includeParams='none' value='/webwork/CommonFunctions.js' encode='false'/>"></script>
+        src="<@ww.url includeParams='none' value='/webwork/CommonFunctions.js' encode='false' includeParams='none'/>"></script>

src/java/template/ajax/tree.ftl

  </script>
 <div dojoType="Tree"   
 	<#if parameters.blankIconSrc?exists>
-	gridIconSrcT="<@ww.url value='${parameters.blankIconSrc}' encode="false" />"
+	gridIconSrcT="<@ww.url value='${parameters.blankIconSrc}' encode="false" includeParams='none'/>"
 	</#if>
 	<#if parameters.gridIconSrcL?exists>
-	gridIconSrcL="<@ww.url value='${parameters.gridIconSrcL}' encode="false" />"
+	gridIconSrcL="<@ww.url value='${parameters.gridIconSrcL}' encode="false" includeParams='none'/>"
 	</#if>
 	<#if parameters.gridIconSrcV?exists>
-	gridIconSrcV="<@ww.url value='${parameters.gridIconSrcV}' encode="false" />"
+	gridIconSrcV="<@ww.url value='${parameters.gridIconSrcV}' encode="false" includeParams='none'/>"
 	</#if>
 	<#if parameters.gridIconSrcP?exists>
-	gridIconSrcP="<@ww.url value='${parameters.gridIconSrcP}' encode="false" />"
+	gridIconSrcP="<@ww.url value='${parameters.gridIconSrcP}' encode="false" includeParams='none'/>"
 	</#if>
 	<#if parameters.gridIconSrcC?exists>
-	gridIconSrcC="<@ww.url value='${parameters.gridIconSrcC}' encode="false" />"
+	gridIconSrcC="<@ww.url value='${parameters.gridIconSrcC}' encode="false" includeParams='none'/>"
 	</#if>
 	<#if parameters.gridIconSrcX?exists>
-	gridIconSrcX="<@ww.url value='${parameters.gridIconSrcX}' encode="false" />"
+	gridIconSrcX="<@ww.url value='${parameters.gridIconSrcX}' encode="false" includeParams='none'/>"
 	</#if>
 	<#if parameters.gridIconSrcY?exists>
-	gridIconSrcY="<@ww.url value='${parameters.gridIconSrcY}' encode="false" />"
+	gridIconSrcY="<@ww.url value='${parameters.gridIconSrcY}' encode="false" includeParams='none'/>"
 	</#if>
 	<#if parameters.gridIconSrcZ?exists>
-	gridIconSrcZ="<@ww.url value='${parameters.gridIconSrcZ}' encode="false" />"
+	gridIconSrcZ="<@ww.url value='${parameters.gridIconSrcZ}' encode="false" includeParams='none'/>"
 	</#if>
 	<#if parameters.expandIconSrcPlus?exists>
-	expandIconSrcPlus="<@ww.url value='${parameters.expandIconSrcPlus}' />"
+	expandIconSrcPlus="<@ww.url value='${parameters.expandIconSrcPlus}' includeParams='none'/>"
 	</#if>
 	<#if parameters.expandIconSrcMinus?exists>
-	expandIconSrcMinus="<@ww.url value='${parameters.expandIconSrcMinus?html}' />"
+	expandIconSrcMinus="<@ww.url value='${parameters.expandIconSrcMinus?html}'includeParams='none' />"
 	</#if>
 	<#if parameters.iconWidth?exists>
 	iconWidth="<@ww.url value='${parameters.iconWidth?html}' encode="false" />"
 	toggleDuration=${parameters.toggleDuration?c}
 	</#if>
 	<#if parameters.templateCssPath?exists>
-	templateCssPath="<@ww.url value='${parameters.templateCssPath}' encode="false" />"
+	templateCssPath="<@ww.url value='${parameters.templateCssPath}' encode="false" includeParams='none'/>"
 	</#if>
 	<#if parameters.showGrid?exists>
 	showGrid="${parameters.showGrid?default(true)?string}"

src/java/template/css_xhtml/head.ftl

-<link rel="stylesheet" href="<@ww.url value='/webwork/css_xhtml/styles.css' encode='false' />" type="text/css"/>
+<link rel="stylesheet" href="<@ww.url value='/webwork/css_xhtml/styles.css' encode='false' includeParams='none'/>" type="text/css"/>
 <#include "/${parameters.templateDir}/simple/head.ftl" />

src/java/template/simple/form-close.ftl

 --><#t/>
 <#if parameters.hasTooltip?default(false)><#t/>
 	<#lt/><!-- javascript that is needed for tooltips -->
-	<#lt/><script language="JavaScript" type="text/javascript" src="<@ww.url value='/webwork/tooltip/wz_tooltip.js' encode='false' />"></script>
+	<#lt/><script language="JavaScript" type="text/javascript" src="<@ww.url value='/webwork/tooltip/wz_tooltip.js' encode='false' includeParams='none' />"></script>
 </#if><#t/>

src/java/template/simple/optiontransferselect.ftl

 <#if !stack.findValue("#optiontransferselect_js_included")?exists><#t/>
-	<script language="javascript" src="<@ww.url value="/webwork/optiontransferselect/optiontransferselect.js" encode='false' />"></script>
+	<script language="javascript" src="<@ww.url value="/webwork/optiontransferselect/optiontransferselect.js" encode='false' includeParams='none' />"></script>
 	<#assign temporaryVariable = stack.setValue("#optiontransferselect_js_included", "true") /><#t/>
 </#if><#t/>
 <table border="0">

src/java/template/simple/richtexteditor.ftl

 <#if !stack.findValue('#richtexteditor_js_included')?exists><#t/>
-	<script type="text/javascript" src="<@ww.url value='/webwork/richtexteditor/fckeditor.js' encode='false' />"></script>
+	<script type="text/javascript" src="<@ww.url value='/webwork/richtexteditor/fckeditor.js' encode='false' includeParams='none' />"></script>
 	<#assign tmpVariable = stack.setValue('#richtexteditor_js_included', 'true') /><#t/>
 </#if><#t/>
 <script>

src/java/template/simple/updownselect.ftl

 <#if !stack.findValue("#optiontransferselect_js_included")?exists><#t/>
-	<script language="javascript" src="<@ww.url value="/webwork/optiontransferselect/optiontransferselect.js" encode='false' />"></script>
+	<script language="javascript" src="<@ww.url value="/webwork/optiontransferselect/optiontransferselect.js" encode='false' includeParams='none' />"></script>
 	<#assign temporaryVariable = stack.setValue("#optiontransferselect_js_included", "true") /><#t/>
 </#if><#t/>
 <table>

src/java/template/xhtml/checkbox.ftl

 </#if>
 :<#t/>
 <#if parameters.tooltip?exists>
-    <img src='<@ww.url value="/webwork/tooltip/tooltip.gif" />' alt="${parameters.tooltip}" title="${parameters.tooltip}" onmouseover="return escape('${parameters.tooltip?js_string}');" />
+    <img src='<@ww.url value="/webwork/tooltip/tooltip.gif" includeParams='none' />' alt="${parameters.tooltip}" title="${parameters.tooltip}" onmouseover="return escape('${parameters.tooltip?js_string}');" />
 </#if>
 </label><#t/>
 </#if>
 </#if>
 :<#t/>
 <#if parameters.tooltip?exists>
-    <img src='<@ww.url value="/webwork/tooltip/tooltip.gif" />' alt="${parameters.tooltip}" title="${parameters.tooltip}" onmouseover="return escape('${parameters.tooltip?js_string}');" />
+    <img src='<@ww.url value="/webwork/tooltip/tooltip.gif"  includeParams='none'/>' alt="${parameters.tooltip}" title="${parameters.tooltip}" onmouseover="return escape('${parameters.tooltip?js_string}');" />
 </#if>
 </label><#t/>
 </#if>
         <span class="required">*</span><#t/>
     </#if>
     <#if parameters.tooltip?exists>
-        <img src='<@ww.url value="/webwork/tooltip/tooltip.gif" />' alt="${parameters.tooltip}" title="${parameters.tooltip}" onmouseover="return escape('${parameters.tooltip?js_string}');" />
+        <img src='<@ww.url value="/webwork/tooltip/tooltip.gif"  includeParams='none'/>' alt="${parameters.tooltip}" title="${parameters.tooltip}" onmouseover="return escape('${parameters.tooltip?js_string}');" />
     </#if>
 </#if>
     </td>

src/java/template/xhtml/head.ftl

-<link rel="stylesheet" href="<@ww.url value='/webwork/xhtml/styles.css' encode='false' />" type="text/css"/>
+<link rel="stylesheet" href="<@ww.url value='/webwork/xhtml/styles.css' encode='false' includeParams='none'/>" type="text/css"/>
 <#include "/${parameters.templateDir}/simple/head.ftl" />
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.