Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-06 23:27:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary <#rt> tags on FreeMarker templates where nonces were introduced for script and link tags

Browse Source
This commit is contained in:
Santiago
2020-09-11 12:04:52 +02:00
parent 32bc34d797
commit 4b8d7a15be
16 changed files with 18 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/resources/org/apache/struts2/interceptor/debugging/console.ftl
+1 -3
View File
@@ -21,9 +21,7 @@
<!DOCTYPE html>
<html>
<head>
<script type="text/javascript" <#rt/>
<#include "/${parameters.templateDir}/simple/nonce.ftl" />
>
<script type="text/javascript" <#include "/${parameters.templateDir}/simple/nonce.ftl" /> >
var baseUrl = "<@s.url value="/struts" includeParams="none"/>";
window.open(baseUrl+"/webconsole.html", 'OGNL Console','width=500,height=450,status=no,toolbar=no,menubar=no');
</script>
core/src/main/resources/template/css_xhtml/head.ftl
+1 -3
View File
@@ -18,7 +18,5 @@
* under the License.
*/
-->
<link
<#include "/${parameters.templateDir}/simple/nonce.ftl" />
rel="stylesheet" href="<@s.url value='/struts/css_xhtml/styles.css' includeParams='none' encode='false' />" type="text/css" />
<link <#include "/${parameters.templateDir}/simple/nonce.ftl" /> rel="stylesheet" href="<@s.url value='/struts/css_xhtml/styles.css' includeParams='none' encode='false' />" type="text/css" />
<#include "/${parameters.templateDir}/simple/head.ftl" />
core/src/main/resources/template/simple/combobox.ftl
+1 -3
View File
@@ -18,9 +18,7 @@
* under the License.
*/
-->
<script type="text/javascript" <#rt/>
<#include "/${parameters.templateDir}/simple/nonce.ftl" />
>
<script type="text/javascript" <#include "/${parameters.templateDir}/simple/nonce.ftl" /> >
function autoPopulate_${parameters.escapedId}(targetElement) {
<#if parameters.headerKey?? && parameters.headerValue??>
if (targetElement.options[targetElement.selectedIndex].value == '${parameters.headerKey}') {
core/src/main/resources/template/simple/debug.ftl
+1 -3
View File
@@ -18,9 +18,7 @@
* under the License.
*/
-->
<script type="text/javascript" <#rt/>
<#include "/${parameters.templateDir}/simple/nonce.ftl" />
>
<script type="text/javascript" <#include "/${parameters.templateDir}/simple/nonce.ftl" /> >
<!--
function toggleDebug(debugId) {
var debugDiv = document.getElementById(debugId);
core/src/main/resources/template/simple/doubleselect.ftl
+1 -3
View File
@@ -70,9 +70,7 @@
</#if>
/>
</#if>
<script type="text/javascript" <#rt/>
<#include "/${parameters.templateDir}/simple/nonce.ftl" />
>
<script type="text/javascript" <#include "/${parameters.templateDir}/simple/nonce.ftl" /> >
<#assign itemCount = startCount/>
var ${parameters.id}Group = new Array(${parameters.listSize} + ${startCount});
for (var i = 0; i < (${parameters.listSize} + ${startCount}); i++) {
core/src/main/resources/template/simple/form-close-tooltips.ftl
+2 -6
View File
@@ -24,11 +24,7 @@
--><#t/>
<#if (parameters.hasTooltip!false)><#t/>
<#lt/><!-- javascript that is needed for tooltips -->
<#lt/><script type="text/javascript" src='<@s.url value="/struts/domTT.js" includeParams="none" encode="false" />'<#rt/>
<#include "/${parameters.templateDir}/simple/nonce.ftl" />
></script>
<#lt/><link rel="stylesheet" type="text/css" href="<@s.url value="/struts/domTT.css" includeParams="none" encode="false" />" <#rt/>
<#include "/${parameters.templateDir}/simple/nonce.ftl" />
/>
<#lt/><script type="text/javascript" src='<@s.url value="/struts/domTT.js" includeParams="none" encode="false" />' <#include "/${parameters.templateDir}/simple/nonce.ftl" /> > </script>
<#lt/><link rel="stylesheet" type="text/css" href="<@s.url value="/struts/domTT.css" includeParams="none" encode="false" />" <#include "/${parameters.templateDir}/simple/nonce.ftl" /> />
</#if><#t/>
core/src/main/resources/template/simple/form-close.ftl
+2 -4
View File
@@ -21,9 +21,7 @@
</form>
<#if (parameters.customOnsubmitEnabled??)>
<script type="text/javascript" <#rt/>
<#include "/${parameters.templateDir}/simple/nonce.ftl" />
>
<script type="text/javascript" <#include "/${parameters.templateDir}/simple/nonce.ftl" /> >
<#--
Enable auto-select of optiontransferselect tag's entries upon containing form's
submission.
@@ -101,4 +99,4 @@
</script>
</#if>
<#include "/${parameters.templateDir}/${parameters.expandTheme}/form-close-tooltips.ftl" />
<#include "/${parameters.templateDir}/${parameters.expandTheme}/form-close-tooltips.ftl" />
core/src/main/resources/template/simple/head.ftl
+1 -3
View File
@@ -18,6 +18,4 @@
* under the License.
*/
-->
<script src="${base}/struts/utils.js" type="text/javascript" <#rt/>
<#include "/${parameters.templateDir}/simple/nonce.ftl" />
></script>
<script src="${base}/struts/utils.js" type="text/javascript" <#include "/${parameters.templateDir}/simple/nonce.ftl" /> ></script>
core/src/main/resources/template/simple/inputtransferselect.ftl
+1 -3
View File
@@ -19,9 +19,7 @@
*/
-->
<#if !stack.findValue("#inputtransferselect_js_included")??><#t/>
<script type="text/javascript" src="<@s.url value="/struts/inputtransferselect.js" encode='false' includeParams='none'/>" <#rt/>
<#include "/${parameters.templateDir}/simple/nonce.ftl" />
></script>
<script type="text/javascript" src="<@s.url value="/struts/inputtransferselect.js" encode='false' includeParams='none'/>" <#include "/${parameters.templateDir}/simple/nonce.ftl" /> ></script>
<#assign temporaryVariable = stack.setValue("#inputtransferselect_js_included", "true") /><#t/>
</#if><#t/>
<table>
core/src/main/resources/template/simple/link.ftl
+1 -2
View File
@@ -20,8 +20,7 @@
-->
<#include "/${parameters.templateDir}/${parameters.expandTheme}/common-attributes.ftl" />
<#include "/${parameters.templateDir}/${parameters.expandTheme}/dynamic-attributes.ftl" />
<link <#rt/>
<#include "/${parameters.templateDir}/simple/nonce.ftl" />
<link <#include "/${parameters.templateDir}/simple/nonce.ftl" />
<#if parameters.href?has_content>
href="${parameters.href}"<#rt/>
</#if>
core/src/main/resources/template/simple/optiontransferselect.ftl
+1 -3
View File
@@ -19,9 +19,7 @@
*/
-->
<#if !stack.findValue("#optiontransferselect_js_included")??><#t/>
<script type="text/javascript" src="<@s.url value="/struts/optiontransferselect.js" encode='false' includeParams='none'/>"<#rt/>
<#include "/${parameters.templateDir}/simple/nonce.ftl" />
></script>
<script type="text/javascript" src="<@s.url value="/struts/optiontransferselect.js" encode='false' includeParams='none'/>" <#include "/${parameters.templateDir}/simple/nonce.ftl" /> ></script>
<#assign temporaryVariable = stack.setValue("#optiontransferselect_js_included", "true") /><#t/>
</#if><#t/>
<table>
core/src/main/resources/template/simple/updownselect.ftl
+1 -3
View File
@@ -19,9 +19,7 @@
*/
-->
<#if !stack.findValue("#optiontransferselect_js_included")??><#t/>
<script type="text/javascript" src="<@s.url value="/struts/optiontransferselect.js" encode='false' includeParams='none'/>" <#rt/>
<#include "/${parameters.templateDir}/simple/nonce.ftl" />
></script>
<script type="text/javascript" src="<@s.url value="/struts/optiontransferselect.js" encode='false' includeParams='none'/>" <#include "/${parameters.templateDir}/simple/nonce.ftl" /> ></script>
<#assign temporaryVariable = stack.setValue("#optiontransferselect_js_included", "true") /><#t/>
</#if><#t/>
<table>
core/src/main/resources/template/xhtml/form-close-validate.ftl
+1 -3
View File
@@ -32,9 +32,7 @@ Only the following validators are supported:
END SNIPPET: supported-validators
-->
<#if ((parameters.validate!false == true) && (parameters.performValidation!false == true))>
<script type="text/javascript"<#rt/>
<#include "/${parameters.templateDir}/simple/nonce.ftl" />
>
<script type="text/javascript" <#include "/${parameters.templateDir}/simple/nonce.ftl" /> >
function validateForm_${parameters.id?replace('[^a-zA-Z0-9_]', '_', 'r')}() {
<#--
In case of multiselect fields return only the first value.
core/src/main/resources/template/xhtml/form-close.ftl
+1 -3
View File
@@ -22,9 +22,7 @@
<#include "/${parameters.templateDir}/simple/form-close.ftl" />
<#include "/${parameters.templateDir}/${parameters.expandTheme}/form-close-validate.ftl" />
<#if parameters.focusElement??>
<script type="text/javascript" <#rt/>
<#include "/${parameters.templateDir}/simple/nonce.ftl" />
>
<script type="text/javascript" <#include "/${parameters.templateDir}/simple/nonce.ftl" /> >
StrutsUtils.addOnLoad(function() {
var element = document.getElementById("${parameters.focusElement}");
if(element) {
core/src/main/resources/template/xhtml/form-validate.ftl
+1 -3
View File
@@ -19,9 +19,7 @@
*/
-->
<#if parameters.validate!false == true>
<script type="text/javascript" src="${base}/struts/xhtml/validation.js" <#rt/>
<#include "/${parameters.templateDir}/simple/nonce.ftl" />
></script>
<script type="text/javascript" src="${base}/struts/xhtml/validation.js" <#include "/${parameters.templateDir}/simple/nonce.ftl" /> ></script>
<#if parameters.onsubmit??>
${tag.addParameter('onsubmit', "${parameters.onsubmit}; return validateForm_${parameters.id?replace('[^a-zA-Z0-9_]', '_', 'r')}();")}
<#else>
core/src/main/resources/template/xhtml/head.ftl
+1 -3
View File
@@ -18,7 +18,5 @@
* under the License.
*/
-->
<link rel="stylesheet" href="<@s.url value='/struts/xhtml/styles.css' includeParams='none' encode='false'/>" type="text/css"
<#include "/${parameters.templateDir}/simple/nonce.ftl" />
/>
<link rel="stylesheet" href="<@s.url value='/struts/xhtml/styles.css' includeParams='none' encode='false'/>" type="text/css" <#include "/${parameters.templateDir}/simple/nonce.ftl" /> />
<#include "/${parameters.templateDir}/simple/head.ftl" />