From 94dd7a5267f89d857d46e7abe29a291167cf892b Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Sun, 17 Dec 2023 16:40:22 +0100 Subject: [PATCH 1/3] WW-5362 Removes type attribute out of tag --- .../main/webapp/WEB-INF/decorators/main.jsp | 2 +- .../WEB-INF/validation/ajaxFormSubmit.jsp | 2 +- assembly/src/main/resources/template.vm | 8 ++++---- .../src/main/resources/osgi/admin/shell.ftl | 12 +++++------ .../main/resources/osgi/admin/viewBundle.ftl | 14 ++++++------- .../main/resources/osgi/admin/viewBundles.ftl | 10 +++++----- .../struts2/interceptor/debugging/browser.ftl | 20 +++++++++---------- .../struts2/interceptor/debugging/console.ftl | 2 +- .../template/css_xhtml/form-validate.ftl | 2 +- .../resources/template/simple/combobox.ftl | 2 +- .../template/simple/doubleselect.ftl | 2 +- .../template/simple/form-close-tooltips.ftl | 2 +- .../resources/template/simple/form-close.ftl | 2 +- .../main/resources/template/simple/head.ftl | 2 +- .../template/simple/inputtransferselect.ftl | 2 +- .../template/simple/optiontransferselect.ftl | 2 +- .../template/simple/updownselect.ftl | 2 +- .../template/xhtml/form-close-validate.ftl | 2 +- .../resources/template/xhtml/form-close.ftl | 2 +- .../template/xhtml/form-validate.ftl | 2 +- .../confluence/ww-template-autoexport.html | 2 +- .../struts2/views/jsp/ui/ComboBox-1.txt | 2 +- .../struts2/views/jsp/ui/ComboBox-2.txt | 2 +- .../struts2/views/jsp/ui/ComboBox-3.txt | 2 +- .../struts2/views/jsp/ui/ComboBox-4.txt | 2 +- .../struts2/views/jsp/ui/DoubleSelect-1.txt | 2 +- .../struts2/views/jsp/ui/DoubleSelect-2.txt | 2 +- .../struts2/views/jsp/ui/DoubleSelect-3.txt | 2 +- .../struts2/views/jsp/ui/DoubleSelect-4.txt | 2 +- .../struts2/views/jsp/ui/DoubleSelect-5.txt | 2 +- .../struts2/views/jsp/ui/DoubleSelect-6.txt | 2 +- .../struts2/views/jsp/ui/Formtag-11.txt | 6 +++--- .../struts2/views/jsp/ui/Formtag-12.txt | 2 +- .../apache/struts2/views/jsp/ui/Formtag-2.txt | 8 ++++---- .../struts2/views/jsp/ui/Formtag-22.txt | 8 ++++---- .../struts2/views/jsp/ui/Formtag-24.txt | 8 ++++---- .../apache/struts2/views/jsp/ui/Formtag-6.txt | 6 +++--- .../struts2/views/jsp/ui/HeadTagTest-1.txt | 2 +- .../views/jsp/ui/inputtransferselect-1.txt | 2 +- .../views/jsp/ui/inputtransferselect-2.txt | 2 +- .../views/jsp/ui/optiontransferselect-1.txt | 16 +++++++-------- .../views/jsp/ui/optiontransferselect-2.txt | 10 +++++----- .../views/jsp/ui/optiontransferselect-3.txt | 10 +++++----- .../views/jsp/ui/optiontransferselect-4.txt | 12 +++++------ .../views/jsp/ui/optiontransferselect-5.txt | 12 +++++------ .../views/jsp/ui/optiontransferselect-6.txt | 10 +++++----- .../views/jsp/ui/optiontransferselect-7.txt | 10 +++++----- .../views/jsp/ui/optiontransferselect-8.txt | 2 +- .../apache/struts2/views/jsp/ui/tooltip-1.txt | 2 +- .../apache/struts2/views/jsp/ui/tooltip-2.txt | 2 +- .../apache/struts2/views/jsp/ui/tooltip-3.txt | 2 +- .../views/jsp/ui/updownselecttag-1.txt | 2 +- .../views/jsp/ui/updownselecttag-10.txt | 10 +++++----- .../views/jsp/ui/updownselecttag-11.txt | 2 +- .../views/jsp/ui/updownselecttag-2.txt | 2 +- .../views/jsp/ui/updownselecttag-3.txt | 2 +- .../views/jsp/ui/updownselecttag-4.txt | 2 +- .../views/jsp/ui/updownselecttag-5.txt | 2 +- .../views/jsp/ui/updownselecttag-6.txt | 2 +- .../views/jsp/ui/updownselecttag-7.txt | 2 +- .../views/jsp/ui/updownselecttag-8.txt | 2 +- .../views/jsp/ui/updownselecttag-9.txt | 2 +- 62 files changed, 139 insertions(+), 139 deletions(-) diff --git a/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp b/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp index 77f387ace1..8483741a1b 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp @@ -72,7 +72,7 @@ - + $(function () { var alerts = $('ul.alert').wrap('
'); alerts.prepend('×'); diff --git a/apps/showcase/src/main/webapp/WEB-INF/validation/ajaxFormSubmit.jsp b/apps/showcase/src/main/webapp/WEB-INF/validation/ajaxFormSubmit.jsp index 3064aa2511..cf8fddaeb5 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/validation/ajaxFormSubmit.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/validation/ajaxFormSubmit.jsp @@ -72,7 +72,7 @@
- + /******************************************************************** * JS just used on this page. * Usually this would be placed in a JS file diff --git a/assembly/src/main/resources/template.vm b/assembly/src/main/resources/template.vm index e254e59a00..9a533598b3 100644 --- a/assembly/src/main/resources/template.vm +++ b/assembly/src/main/resources/template.vm @@ -1,6 +1,6 @@ #set ($stylebase = "https://struts.apache.org/css") - @@ -43,12 +43,12 @@ under the License. #end - #end - - - + <@s.script src="${base}${parameters.staticContentPath}/js/shell.js" /> + <@s.script src="${base}${parameters.staticContentPath}/js/jquery-1.12.4.min.js" /> + <@s.script src="${base}${parameters.staticContentPath}/js/jquery-ui-1.12.1.min.js" />
diff --git a/bundles/admin/src/main/resources/osgi/admin/viewBundle.ftl b/bundles/admin/src/main/resources/osgi/admin/viewBundle.ftl index 97f22a3d6a..886662268f 100644 --- a/bundles/admin/src/main/resources/osgi/admin/viewBundle.ftl +++ b/bundles/admin/src/main/resources/osgi/admin/viewBundle.ftl @@ -22,17 +22,17 @@ ${bundle.symbolicName!} - " /> - " /> + <@s.link rel="stylesheet" type="text/css" href="${base}${parameters.staticContentPath}/css/main.css" /> + <@s.link rel="stylesheet" type="text/css" href="${base}${parameters.staticContentPath}/css/redmond/jquery-ui-1.12.1.redmond.css" /> - - + <@s.script src="${base}${parameters.staticContentPath}/js/jquery-1.12.4.min.js"/> + <@s.script src="${base}${parameters.staticContentPath}/js/jquery-ui-1.12.1.min.js" /> - + @@ -72,7 +72,7 @@ OSGi Shell -
+ <@s.actionerror /> diff --git a/bundles/admin/src/main/resources/osgi/admin/viewBundles.ftl b/bundles/admin/src/main/resources/osgi/admin/viewBundles.ftl index f20fed85a3..77d60d33b1 100644 --- a/bundles/admin/src/main/resources/osgi/admin/viewBundles.ftl +++ b/bundles/admin/src/main/resources/osgi/admin/viewBundles.ftl @@ -22,11 +22,11 @@ OSGi Bundles - " /> - " /> + <@s.link rel="stylesheet" type="text/css" href="${base}${parameters.staticContentPath}/css/main.css" /> + <@s.link rel="stylesheet" type="text/css" href="${base}${parameters.staticContentPath}/css/redmond/jquery-ui-1.12.1.redmond.css" /> - - + <@s.script src="${base}${parameters.staticContentPath}/js/jquery-1.12.4.min.js" /> + <@s.script src="${base}${parameters.staticContentPath}/js/jquery-ui-1.12.1.min.js" /> @@ -42,7 +42,7 @@ OSGi Shell - + <@s.actionerror /> diff --git a/core/src/main/resources/org/apache/struts2/interceptor/debugging/browser.ftl b/core/src/main/resources/org/apache/struts2/interceptor/debugging/browser.ftl index f1dcbbf6b9..3f0dbb339f 100644 --- a/core/src/main/resources/org/apache/struts2/interceptor/debugging/browser.ftl +++ b/core/src/main/resources/org/apache/struts2/interceptor/debugging/browser.ftl @@ -20,39 +20,39 @@ --> - + - + ${debugHtml?no_esc} diff --git a/core/src/main/resources/org/apache/struts2/interceptor/debugging/console.ftl b/core/src/main/resources/org/apache/struts2/interceptor/debugging/console.ftl index 4aaccaa010..520a8add1e 100644 --- a/core/src/main/resources/org/apache/struts2/interceptor/debugging/console.ftl +++ b/core/src/main/resources/org/apache/struts2/interceptor/debugging/console.ftl @@ -21,7 +21,7 @@ - <@s.script type="text/javascript"> + <@s.script> var baseUrl = "<@s.url value="/static" includeParams="none"/>"; window.open(baseUrl+"/webconsole.html", 'OGNL Console','width=500,height=450,status=no,toolbar=no,menubar=no'); diff --git a/core/src/main/resources/template/css_xhtml/form-validate.ftl b/core/src/main/resources/template/css_xhtml/form-validate.ftl index da7b24080a..8d46b594db 100644 --- a/core/src/main/resources/template/css_xhtml/form-validate.ftl +++ b/core/src/main/resources/template/css_xhtml/form-validate.ftl @@ -19,7 +19,7 @@ */ --> <#if parameters.validate!false == true> - +<@s.script src="${base}${parameters.staticContentPath}/css_xhtml/validation.js"/> <#if parameters.onsubmit??> ${tag.addParameter('onsubmit', "${parameters.onsubmit}; return validateForm_${parameters.escapedId}();")} <#else> diff --git a/core/src/main/resources/template/simple/combobox.ftl b/core/src/main/resources/template/simple/combobox.ftl index 1cef117548..733e33c5f2 100644 --- a/core/src/main/resources/template/simple/combobox.ftl +++ b/core/src/main/resources/template/simple/combobox.ftl @@ -18,7 +18,7 @@ * under the License. */ --> -<@s.script type="text/javascript"> +<@s.script> function autoPopulate_${parameters.escapedId}(targetElement) { <#if parameters.headerKey?? && parameters.headerValue??> if (targetElement.options[targetElement.selectedIndex].value == '${parameters.headerKey?js_string}') { diff --git a/core/src/main/resources/template/simple/doubleselect.ftl b/core/src/main/resources/template/simple/doubleselect.ftl index 2a87e30f56..a0c5cf82d4 100644 --- a/core/src/main/resources/template/simple/doubleselect.ftl +++ b/core/src/main/resources/template/simple/doubleselect.ftl @@ -114,7 +114,7 @@ /><#rt/> -<@s.script type="text/javascript"> +<@s.script> <#assign itemCount = startCount/> var ${parameters.escapedId}Group = new Array(${parameters.listSize?number?c} + ${startCount}); for (var i = 0; i < (${parameters.listSize?number?c} + ${startCount}); i++) { diff --git a/core/src/main/resources/template/simple/form-close-tooltips.ftl b/core/src/main/resources/template/simple/form-close-tooltips.ftl index 1a418b9854..6007081c4e 100644 --- a/core/src/main/resources/template/simple/form-close-tooltips.ftl +++ b/core/src/main/resources/template/simple/form-close-tooltips.ftl @@ -24,6 +24,6 @@ --><#t/> <#if (parameters.hasTooltip!false)><#t/> <#lt/> - <#lt/><@s.script type="text/javascript" src="${base}${parameters.staticContentPath}/domTT.js" /> + <#lt/><@s.script src="${base}${parameters.staticContentPath}/domTT.js" /> <#lt/><@s.link rel="stylesheet" type="text/css" href="${base}${parameters.staticContentPath}/domTT.css" /> <#t/> diff --git a/core/src/main/resources/template/simple/form-close.ftl b/core/src/main/resources/template/simple/form-close.ftl index ce2b912594..f8bb047d63 100644 --- a/core/src/main/resources/template/simple/form-close.ftl +++ b/core/src/main/resources/template/simple/form-close.ftl @@ -21,7 +21,7 @@ <#if (parameters.customOnsubmitEnabled??)> -<@s.script type="text/javascript"> +<@s.script> <#-- Enable auto-select of optiontransferselect tag's entries upon containing form's submission. diff --git a/core/src/main/resources/template/simple/head.ftl b/core/src/main/resources/template/simple/head.ftl index 82fe8db202..623ec70f2c 100644 --- a/core/src/main/resources/template/simple/head.ftl +++ b/core/src/main/resources/template/simple/head.ftl @@ -18,4 +18,4 @@ * under the License. */ --> -<@s.script src="${base}${parameters.staticContentPath}/utils.js" type="text/javascript" /> +<@s.script src="${base}${parameters.staticContentPath}/utils.js" /> diff --git a/core/src/main/resources/template/simple/inputtransferselect.ftl b/core/src/main/resources/template/simple/inputtransferselect.ftl index 9b28a02ce7..117390ea74 100644 --- a/core/src/main/resources/template/simple/inputtransferselect.ftl +++ b/core/src/main/resources/template/simple/inputtransferselect.ftl @@ -19,7 +19,7 @@ */ --> <#if !stack.findValue("#inputtransferselect_js_included")??><#t/> - <@s.script type="text/javascript" src="${base}${parameters.staticContentPath}/inputtransferselect.js"/> + <@s.script src="${base}${parameters.staticContentPath}/inputtransferselect.js"/> <#assign temporaryVariable = stack.setValue("#inputtransferselect_js_included", "true") /><#t/> <#t/> diff --git a/core/src/main/resources/template/simple/optiontransferselect.ftl b/core/src/main/resources/template/simple/optiontransferselect.ftl index adf7704997..408196e0df 100644 --- a/core/src/main/resources/template/simple/optiontransferselect.ftl +++ b/core/src/main/resources/template/simple/optiontransferselect.ftl @@ -19,7 +19,7 @@ */ --> <#if !stack.findValue("#optiontransferselect_js_included")??><#t/> - <@s.script type="text/javascript" src="${base}${parameters.staticContentPath}/optiontransferselect.js" /> + <@s.script src="${base}${parameters.staticContentPath}/optiontransferselect.js" /> <#assign temporaryVariable = stack.setValue("#optiontransferselect_js_included", "true") /><#t/> <#t/>
diff --git a/core/src/main/resources/template/simple/updownselect.ftl b/core/src/main/resources/template/simple/updownselect.ftl index 7491f9a081..a67194f63c 100644 --- a/core/src/main/resources/template/simple/updownselect.ftl +++ b/core/src/main/resources/template/simple/updownselect.ftl @@ -19,7 +19,7 @@ */ --> <#if !stack.findValue("#optiontransferselect_js_included")??><#t/> - <@s.script type="text/javascript" src="${base}${parameters.staticContentPath}/optiontransferselect.js" /><#t/> + <@s.script src="${base}${parameters.staticContentPath}/optiontransferselect.js" /><#t/> <#assign temporaryVariable = stack.setValue("#optiontransferselect_js_included", "true") /><#t/> <#t/>
diff --git a/core/src/main/resources/template/xhtml/form-close-validate.ftl b/core/src/main/resources/template/xhtml/form-close-validate.ftl index dfc338cbc9..dce718e6c2 100644 --- a/core/src/main/resources/template/xhtml/form-close-validate.ftl +++ b/core/src/main/resources/template/xhtml/form-close-validate.ftl @@ -32,7 +32,7 @@ Only the following validators are supported: END SNIPPET: supported-validators --> <#if ((parameters.validate!false == true) && (parameters.performValidation!false == true))> -<@s.script type="text/javascript"> +<@s.script> function validateForm_${parameters.escapedId}() { <#-- In case of multiselect fields return only the first value. diff --git a/core/src/main/resources/template/xhtml/form-close.ftl b/core/src/main/resources/template/xhtml/form-close.ftl index 300de7a040..1d17228b71 100644 --- a/core/src/main/resources/template/xhtml/form-close.ftl +++ b/core/src/main/resources/template/xhtml/form-close.ftl @@ -22,7 +22,7 @@ <#include "/${parameters.templateDir}/simple/form-close.ftl" /> <#include "/${parameters.templateDir}/${parameters.expandTheme}/form-close-validate.ftl" /> <#if parameters.focusElement??> -<@s.script type="text/javascript"> +<@s.script> StrutsUtils.addOnLoad(function() { var element = document.getElementById("${parameters.focusElement?js_string}"); if(element) { diff --git a/core/src/main/resources/template/xhtml/form-validate.ftl b/core/src/main/resources/template/xhtml/form-validate.ftl index 028c5d9ec7..ffd8116102 100644 --- a/core/src/main/resources/template/xhtml/form-validate.ftl +++ b/core/src/main/resources/template/xhtml/form-validate.ftl @@ -19,7 +19,7 @@ */ --> <#if parameters.validate!false == true> - <@s.script type="text/javascript" src="${base}${parameters.staticContentPath}/xhtml/validation.js" /> + <@s.script src="${base}${parameters.staticContentPath}/xhtml/validation.js" /> <#if parameters.onsubmit??> ${tag.addParameter('onsubmit', "${parameters.onsubmit}; return validateForm_${parameters.escapedId}();")} <#else> diff --git a/core/src/site/confluence/ww-template-autoexport.html b/core/src/site/confluence/ww-template-autoexport.html index 0d0c24ff1c..91d08f0bba 100644 --- a/core/src/site/confluence/ww-template-autoexport.html +++ b/core/src/site/confluence/ww-template-autoexport.html @@ -49,7 +49,7 @@ color: #666; } - +
-
+
-
+
-
+
-
+
- +
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/inputtransferselect-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/inputtransferselect-2.txt index 9c11a87b4d..6260cc68c5 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/inputtransferselect-2.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/inputtransferselect-2.txt @@ -1,7 +1,7 @@
- + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-1.txt index f168865240..c94d405654 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-1.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-1.txt @@ -1,7 +1,7 @@ - - + + + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-2.txt index 359475c64a..1939871cb9 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-2.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-2.txt @@ -1,7 +1,7 @@ - +
- + +
@@ -24,15 +24,15 @@



+ value="All Right" onclick="moveAllOptions(document.getElementById('id'), document.getElementById('doubleId'), false, 'Header Key', '');" />



-
-
-
- + +
@@ -25,14 +25,14 @@



+ value="All Right" onclick="moveAllOptions(document.getElementById('id'), document.getElementById('doubleId'), false, 'Header Key', '');" />
-
- + + - + +
@@ -24,15 +24,15 @@



+ value="All Right" onclick="moveAllOptions(document.getElementById('id'), document.getElementById('doubleId'), false, '');" />
-
- +
@@ -25,15 +25,15 @@



+ value="All Right" onclick="moveAllOptions(document.getElementById('id'), document.getElementById('doubleId'), false, 'Header Key', '');" />
- - +
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-5.txt index fb0c979346..2cdccaefe8 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-5.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-5.txt @@ -1,7 +1,7 @@ -
- + +
@@ -24,15 +24,15 @@



+ value="All Right" onclick="moveAllOptions(document.getElementById('id'), document.getElementById('doubleId'), false, 'Header Key', '');" />
-
- + +
@@ -25,15 +25,15 @@



+ value="All Right" onclick="moveAllOptions(document.getElementById('id'), document.getElementById('doubleId'), false, 'Header Key', '');" />
-
- + +
@@ -22,12 +22,12 @@ value="Left" onclick="moveSelectedOptions(document.getElementById('doubleId'), document.getElementById('id'), false, 'Double Header Key', '');alert('Moving Left');" />



-
-
- +
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-1.txt index d34b31d2d5..e80e916834 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-1.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-1.txt @@ -15,7 +15,7 @@
- + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-2.txt index e04c68858d..13b40700a4 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-2.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-2.txt @@ -15,5 +15,5 @@
- + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-3.txt index a705214552..5c891772d3 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-3.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-3.txt @@ -16,6 +16,6 @@ - + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-1.txt index 3d35427792..eb86508da8 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-1.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-1.txt @@ -1,5 +1,5 @@
- + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-11.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-11.txt index 3f68bc62ed..943766ef62 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-11.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-11.txt @@ -1,5 +1,5 @@
- +
-    -    -    +    +    +   
- +
- +
- +
- +
- +
- +
- +
- +
- +