This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/WW-5362-remove-type
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 94dd7a5267f89d857d46e7abe29a291167cf892b
Author: Lukasz Lenart <lukaszlen...@apache.org>
AuthorDate: Sun Dec 17 16:40:22 2023 +0100
WW-5362 Removes type attribute out of <s:script/> tag
---
.../src/main/webapp/WEB-INF/decorators/main.jsp | 2 +-
.../webapp/WEB-INF/validation/ajaxFormSubmit.jsp | 2 +-
assembly/src/main/resources/template.vm | 8 ++++----
.../admin/src/main/resources/osgi/admin/shell.ftl | 12 ++++++------
.../src/main/resources/osgi/admin/viewBundle.ftl | 14 +++++++-------
.../src/main/resources/osgi/admin/viewBundles.ftl | 10 +++++-----
.../apache/struts2/interceptor/debugging/browser.ftl | 20 ++++++++++----------
.../apache/struts2/interceptor/debugging/console.ftl | 2 +-
.../resources/template/css_xhtml/form-validate.ftl | 2 +-
core/src/main/resources/template/simple/combobox.ftl | 2 +-
.../main/resources/template/simple/doubleselect.ftl | 2 +-
.../template/simple/form-close-tooltips.ftl | 2 +-
.../main/resources/template/simple/form-close.ftl | 2 +-
core/src/main/resources/template/simple/head.ftl | 2 +-
.../template/simple/inputtransferselect.ftl | 2 +-
.../template/simple/optiontransferselect.ftl | 2 +-
.../main/resources/template/simple/updownselect.ftl | 2 +-
.../resources/template/xhtml/form-close-validate.ftl | 2 +-
.../src/main/resources/template/xhtml/form-close.ftl | 2 +-
.../main/resources/template/xhtml/form-validate.ftl | 2 +-
core/src/site/confluence/ww-template-autoexport.html | 2 +-
.../org/apache/struts2/views/jsp/ui/ComboBox-1.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/ComboBox-2.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/ComboBox-3.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/ComboBox-4.txt | 2 +-
.../apache/struts2/views/jsp/ui/DoubleSelect-1.txt | 2 +-
.../apache/struts2/views/jsp/ui/DoubleSelect-2.txt | 2 +-
.../apache/struts2/views/jsp/ui/DoubleSelect-3.txt | 2 +-
.../apache/struts2/views/jsp/ui/DoubleSelect-4.txt | 2 +-
.../apache/struts2/views/jsp/ui/DoubleSelect-5.txt | 2 +-
.../apache/struts2/views/jsp/ui/DoubleSelect-6.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/Formtag-11.txt | 6 +++---
.../org/apache/struts2/views/jsp/ui/Formtag-12.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/Formtag-2.txt | 8 ++++----
.../org/apache/struts2/views/jsp/ui/Formtag-22.txt | 8 ++++----
.../org/apache/struts2/views/jsp/ui/Formtag-24.txt | 8 ++++----
.../org/apache/struts2/views/jsp/ui/Formtag-6.txt | 6 +++---
.../apache/struts2/views/jsp/ui/HeadTagTest-1.txt | 2 +-
.../struts2/views/jsp/ui/inputtransferselect-1.txt | 2 +-
.../struts2/views/jsp/ui/inputtransferselect-2.txt | 2 +-
.../struts2/views/jsp/ui/optiontransferselect-1.txt | 16 ++++++++--------
.../struts2/views/jsp/ui/optiontransferselect-2.txt | 10 +++++-----
.../struts2/views/jsp/ui/optiontransferselect-3.txt | 10 +++++-----
.../struts2/views/jsp/ui/optiontransferselect-4.txt | 12 ++++++------
.../struts2/views/jsp/ui/optiontransferselect-5.txt | 12 ++++++------
.../struts2/views/jsp/ui/optiontransferselect-6.txt | 10 +++++-----
.../struts2/views/jsp/ui/optiontransferselect-7.txt | 10 +++++-----
.../struts2/views/jsp/ui/optiontransferselect-8.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/tooltip-1.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/tooltip-2.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/tooltip-3.txt | 2 +-
.../struts2/views/jsp/ui/updownselecttag-1.txt | 2 +-
.../struts2/views/jsp/ui/updownselecttag-10.txt | 10 +++++-----
.../struts2/views/jsp/ui/updownselecttag-11.txt | 2 +-
.../struts2/views/jsp/ui/updownselecttag-2.txt | 2 +-
.../struts2/views/jsp/ui/updownselecttag-3.txt | 2 +-
.../struts2/views/jsp/ui/updownselecttag-4.txt | 2 +-
.../struts2/views/jsp/ui/updownselecttag-5.txt | 2 +-
.../struts2/views/jsp/ui/updownselecttag-6.txt | 2 +-
.../struts2/views/jsp/ui/updownselecttag-7.txt | 2 +-
.../struts2/views/jsp/ui/updownselecttag-8.txt | 2 +-
.../struts2/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 77f387ace..8483741a1 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 @@
<s:script src="%{jqueryJs}"/>
<s:url var="bootstrapJs" value='/js/bootstrap.min.js' encode='false'
includeParams='none'/>
<s:script src="%{bootstrapJs}"/>
- <s:script type="text/javascript">
+ <s:script>
$(function () {
var alerts = $('ul.alert').wrap('<div />');
alerts.prepend('<a class="close" data-dismiss="alert"
href="#">×</a>');
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 3064aa251..cf8fddaeb 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 @@
</div>
</div>
-<s:script type="text/javascript">
+<s:script>
/********************************************************************
* 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 e254e59a0..9a533598b 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";)
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
-<!--
+<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
@@ -16,7 +16,7 @@ software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
-under the License.
+under the License.
-->
<html>
<head>
@@ -43,12 +43,12 @@ under the License.
<script src='http://struts.apache.org/highlighter/js/$hscript'
type='text/javascript'></script>
#end
- <script type="text/javascript">
+ <script>
SyntaxHighlighter.defaults['toolbar'] = false;
SyntaxHighlighter.all();
</script>
#end
- <script type="text/javascript" language="javascript">
+ <script language="javascript">
var hide = null;
var show = null;
var children = null;
diff --git a/bundles/admin/src/main/resources/osgi/admin/shell.ftl
b/bundles/admin/src/main/resources/osgi/admin/shell.ftl
index 62d0cce6c..927795e1a 100644
--- a/bundles/admin/src/main/resources/osgi/admin/shell.ftl
+++ b/bundles/admin/src/main/resources/osgi/admin/shell.ftl
@@ -22,13 +22,13 @@
<head>
<title>OSGi Console</title>
- <link rel="stylesheet" type="text/css" href="<@s.url
value="${parameters.staticContentPath}/css/shell.css" />" />
- <link rel="stylesheet" type="text/css" href="<@s.url
value="${parameters.staticContentPath}/css/main.css" />" />
- <link rel="stylesheet" type="text/css" href="<@s.url
value="${parameters.staticContentPath}/css/redmond/jquery-ui-1.12.1.redmond.css"
/>" />
+ <@s.link rel="stylesheet" type="text/css"
href="${base}${parameters.staticContentPath}/css/shell.css" />
+ <@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"
/>
- <script src="<@s.url
value="${parameters.staticContentPath}/js/shell.js" />"></script>
- <script src="<@s.url
value="${parameters.staticContentPath}/js/jquery-1.12.4.min.js" />"></script>
- <script src="<@s.url
value="${parameters.staticContentPath}/js/jquery-ui-1.12.1.min.js" />"></script>
+ <@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" />
</head>
<body>
<div class="menu">
diff --git a/bundles/admin/src/main/resources/osgi/admin/viewBundle.ftl
b/bundles/admin/src/main/resources/osgi/admin/viewBundle.ftl
index 97f22a3d6..886662268 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 @@
<head>
<title>${bundle.symbolicName!}</title>
- <link rel="stylesheet" type="text/css" href="<@s.url
value="${parameters.staticContentPath}/css/main.css" />" />
- <link rel="stylesheet" type="text/css" href="<@s.url
value="${parameters.staticContentPath}/css/redmond/jquery-ui-1.12.1.redmond.css"
/>" />
+ <@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"
/>
- <script src="<@s.url
value="${parameters.staticContentPath}/js/jquery-1.12.4.min.js" />"></script>
- <script src="<@s.url
value="${parameters.staticContentPath}/js/jquery-ui-1.12.1.min.js" />"></script>
+ <@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" />
- <script type="text/javascript">
+ <@s.script>
$(function() {
$("#tabs").tabs();
});
- </script>
+ </@s.script>
</head>
<body>
@@ -72,7 +72,7 @@
<span class="ui-icon ui-icon-transferthick-e-w"></span>
OSGi Shell
</a>
- </div>
+ </div>
</div>
<@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 f20fed85a..77d60d33b 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 @@
<head>
<title>OSGi Bundles</title>
- <link rel="stylesheet" type="text/css" href="<@s.url
value="${parameters.staticContentPath}/css/main.css" />" />
- <link rel="stylesheet" type="text/css" href="<@s.url
value="${parameters.staticContentPath}/css/redmond/jquery-ui-1.12.1.redmond.css"
/>" />
+ <@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"
/>
- <script src="<@s.url
value="${parameters.staticContentPath}/js/jquery-1.12.4.min.js" />"></script>
- <script src="<@s.url
value="${parameters.staticContentPath}/js/jquery-ui-1.12.1.min.js" />"></script>
+ <@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" />
</head>
<body>
@@ -42,7 +42,7 @@
<span class="ui-icon ui-icon-transferthick-e-w"></span>
OSGi Shell
</a>
- </div>
+ </div>
</div>
<@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 f1dcbbf6b..3f0dbb339 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 @@
-->
<!DOCTYPE html>
<html>
- <style>
+ <@s.style>
.debugTable {
border-style: solid;
border-width: 1px;
}
-
+
.debugTable td {
border-style: solid;
border-width: 1px;
}
-
+
.nameColumn {
background-color:#CCDDFF;
}
-
+
.valueColumn {
background-color: #CCFFCC;
}
-
+
.nullValue {
background-color: #FF0000;
}
-
+
.typeColumn {
background-color: white;
}
-
+
.emptyCollection {
background-color: #EEEEEE;
}
- </style>
+ </@s.style>
- <script>
+ <@s.script>
function expand(src, path) {
var baseUrl = location.href;
var i = baseUrl.indexOf("&object=");
@@ -83,7 +83,7 @@
};
request.send();
}
- </script>
+ </@s.script>
<body>
${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 4aaccaa01..520a8add1 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 @@
<!DOCTYPE html>
<html>
<head>
- <@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');
</@s.script>
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 da7b24080..8d46b594d 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>
-<script type="text/javascript"
src="${base}${parameters.staticContentPath}/css_xhtml/validation.js"></script>
+<@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 1cef11754..733e33c5f 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 2a87e30f5..a0c5cf82d 100644
--- a/core/src/main/resources/template/simple/doubleselect.ftl
+++ b/core/src/main/resources/template/simple/doubleselect.ftl
@@ -114,7 +114,7 @@
</#if>
/><#rt/>
</#if>
-<@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 1a418b985..6007081c4 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/><!-- javascript that is needed for tooltips -->
- <#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" />
</#if><#t/>
diff --git a/core/src/main/resources/template/simple/form-close.ftl
b/core/src/main/resources/template/simple/form-close.ftl
index ce2b91259..f8bb047d6 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 @@
</form>
<#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 82fe8db20..623ec70f2 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 9b28a02ce..117390ea7 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/>
</#if><#t/>
<table>
diff --git a/core/src/main/resources/template/simple/optiontransferselect.ftl
b/core/src/main/resources/template/simple/optiontransferselect.ftl
index adf770499..408196e0d 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/>
</#if><#t/>
<table>
diff --git a/core/src/main/resources/template/simple/updownselect.ftl
b/core/src/main/resources/template/simple/updownselect.ftl
index 7491f9a08..a67194f63 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/>
</#if><#t/>
<table>
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 dfc338cbc..dce718e6c 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 300de7a04..1d17228b7 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 028c5d9ec..ffd811610 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 0d0c24ff1..91d08f0bb 100644
--- a/core/src/site/confluence/ww-template-autoexport.html
+++ b/core/src/site/confluence/ww-template-autoexport.html
@@ -49,7 +49,7 @@ under the License.
color: #666;
}
</style>
- <script type="text/javascript" language="javascript">
+ <script language="javascript">
var hide = null;
var show = null;
var children = null;
diff --git
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-1.txt
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-1.txt
index 0121ef451..670f704c3 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-1.txt
@@ -1,7 +1,7 @@
<tr>
<td class="tdLabel"><label for="cb" class="label">mylabel:</label></td>
<td class="tdInput">
-<script type="text/javascript" nonce="r4nd0m">
+<script nonce="r4nd0m">
function autoPopulate_cb(targetElement) {
targetElement.form.elements['foo'].value=targetElement.options[targetElement.selectedIndex].value;
}
diff --git
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-2.txt
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-2.txt
index c993bf92d..4f908b1e7 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-2.txt
@@ -1,7 +1,7 @@
<tr>
<td class="tdLabel"><label for="myFavouriteFruit" class="label">My
Favourite Fruit:</label></td>
<td class="tdInput">
-<script type="text/javascript">
+<script>
function autoPopulate_myFavouriteFruit(targetElement) {
if (targetElement.options[targetElement.selectedIndex].value ==
'-1') {
return;
diff --git
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-3.txt
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-3.txt
index c993bf92d..4f908b1e7 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-3.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-3.txt
@@ -1,7 +1,7 @@
<tr>
<td class="tdLabel"><label for="myFavouriteFruit" class="label">My
Favourite Fruit:</label></td>
<td class="tdInput">
-<script type="text/javascript">
+<script>
function autoPopulate_myFavouriteFruit(targetElement) {
if (targetElement.options[targetElement.selectedIndex].value ==
'-1') {
return;
diff --git
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-4.txt
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-4.txt
index f724754e4..2e925eff7 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-4.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-4.txt
@@ -1,7 +1,7 @@
<tr>
<td class="tdLabel"><label for="cb['"."']=bc(){};//"
class="label">mylabel:</label></td>
<td class="tdInput">
- <script type="text/javascript">
+ <script>
function autoPopulate_cb__________bc_______(targetElement) {
targetElement.form.elements['foo'].value=targetElement.options[targetElement.selectedIndex].value;
}
diff --git
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-1.txt
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-1.txt
index f5219cf1a..5efb2bf7b 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-1.txt
@@ -8,7 +8,7 @@
<br/>
<select name="region" id="region" class="c2" style="s2">
</select>
-<script type="text/javascript" nonce="r4nd0m">
+<script nonce="r4nd0m">
var fooGroup = new Array(2 + 0);
for (var i = 0; i < (2 + 0); i++) {
fooGroup[i] = [];
diff --git
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-2.txt
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-2.txt
index 662e3bac7..654142518 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-2.txt
@@ -8,7 +8,7 @@
<br/>
<select name="region" id="region">
</select>
-<script type="text/javascript">
+<script>
var fooGroup = new Array(2 + 0);
for (var i = 0; i < (2 + 0); i++) {
fooGroup[i] = [];
diff --git
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-3.txt
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-3.txt
index b36023aa9..83ed4ac6d 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-3.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-3.txt
@@ -8,7 +8,7 @@
<br/>
<select name="region" id="region">
</select>
-<script type="text/javascript">
+<script>
var foo_barGroup = new Array(2 + 0);
for (var i = 0; i < (2 + 0); i++) {
foo_barGroup[i] = [];
diff --git
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-4.txt
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-4.txt
index 660843983..14b6be612 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-4.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-4.txt
@@ -8,7 +8,7 @@
<br/>
<select name="region" id="region" class="c2" style="s2">
</select>
-<script type="text/javascript">
+<script>
var fooGroup = new Array(2 + 0);
for (var i = 0; i < (2 + 0); i++) {
fooGroup[i] = [];
diff --git
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-5.txt
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-5.txt
index 20c5d62d6..80fe51719 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-5.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-5.txt
@@ -8,7 +8,7 @@
</select>
<br />
<select name="region" disabled="disabled" id="region" title="someTitle"
select-name="secondName"></select>
-<script type="text/javascript">
+<script>
var someIdGroup = newArray(2 + 0);
for (var i = 0; i < (2 + 0); i++) {
someIdGroup[i] = [];
diff --git
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-6.txt
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-6.txt
index a0a51aa49..53ea38ec8 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-6.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-6.txt
@@ -6,7 +6,7 @@
<br/>
<select name="region" id="region" onclick="testMe()" ondblclick="testMe()"
onmousedown="testMe()" onmouseup="testMe()" onmouseover="testMe()"
onmousemove="testMe()" onmouseout="testMe()" onfocus="testMe()"
onblur="testMe()" onkeypress="testMe()" onkeydown="testMe()"
onselect="testMe()" onchange="testMe()">
</select>
-<script type="text/javascript" >
+<script>
var fooGroup = new Array(2 + 0);
for (var i = 0; i < (2 + 0); i++) {
fooGroup[i] = [];
diff --git
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt
index 7a4889cab..6098d380e 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt
@@ -1,8 +1,8 @@
-<script type="text/javascript" src="/static/xhtml/validation.js"></script>
+<script src="/static/xhtml/validation.js"></script>
<form id="testAction" name="myForm" onsubmit="submitMe(); return
validateForm_testAction();" action="/testAction.action" method="post"
enctype="myEncType" title="mytitle" accept-charset="UTF-8"
onreset="clearErrorMessages(this);clearErrorLabels(this);">
<table class="wwFormTable"> <tr>
<td class="tdLabel"></td>
- <td class="tdInput"> <script type="text/javascript"
src="/static/optiontransferselect.js"></script>
+ <td class="tdInput"> <script
src="/static/optiontransferselect.js"></script>
<table>
<tr><td>
<select name="myUpDownSelectTag" size="5" id="testAction_myUpDownSelectTag"
multiple="multiple">
@@ -21,7 +21,7 @@
</form>
-<script type="text/javascript">
+<script>
var containingForm = document.getElementById("testAction");
StrutsUtils.addEventListener(containingForm, "submit",
function(evt) {
diff --git
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-12.txt
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-12.txt
index 2fcdd8a8f..aec8481a8 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-12.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-12.txt
@@ -3,7 +3,7 @@
</table>
</form>
-<script type="text/javascript">
+<script>
StrutsUtils.addOnLoad(function() {
var element = document.getElementById("felement");
if(element) {
diff --git
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt
index e52e2c036..4a698bffb 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt
@@ -1,8 +1,8 @@
-<script type="text/javascript" src="/static/xhtml/validation.js"></script>
+<script src="/static/xhtml/validation.js"></script>
<form id="doubleValidationAction" name="myForm" onsubmit="submitMe(); return
validateForm_doubleValidationAction();" action="/doubleValidationAction.action"
method="post" enctype="myEncType" title="mytitle" accept-charset="UTF-8"
onreset="clearErrorMessages(this);clearErrorLabels(this);">
<table class="wwFormTable"> <tr>
<td class="tdLabel"></td>
- <td class="tdInput"> <script type="text/javascript"
src="/static/optiontransferselect.js"></script>
+ <td class="tdInput"> <script
src="/static/optiontransferselect.js"></script>
<table>
<tr><td>
<select name="myUpDownSelectTag" size="5"
id="doubleValidationAction_myUpDownSelectTag" multiple="multiple">
@@ -21,7 +21,7 @@
</form>
-<script type="text/javascript">
+<script>
var containingForm = document.getElementById("doubleValidationAction");
StrutsUtils.addEventListener(containingForm, "submit",
function(evt) {
@@ -30,7 +30,7 @@
}, true);
</script>
-<script type="text/javascript">
+<script>
function validateForm_doubleValidationAction() {
var getFieldValue = function(field) {
diff --git
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-22.txt
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-22.txt
index 4cc6773cf..bb5ebea3d 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-22.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-22.txt
@@ -1,8 +1,8 @@
-<script type="text/javascript" src="/static/xhtml/validation.js"></script>
+<script src="/static/xhtml/validation.js"></script>
<form id="doubleValidationAction" name="myForm" onsubmit="submitMe(); return
validateForm_doubleValidationAction();" action="/doubleValidationAction.action"
method="post" enctype="myEncType" title="mytitle" accept-charset="UTF-8"
onreset="clearErrorMessages(this);clearErrorLabels(this);">
<table class="wwFormTable"> <tr>
<td class="tdLabel"></td>
- <td class="tdInput"> <script type="text/javascript"
src="/static/optiontransferselect.js"></script>
+ <td class="tdInput"> <script
src="/static/optiontransferselect.js"></script>
<table>
<tr><td>
<select name="myUpDownSelectTag" size="5"
id="doubleValidationAction_myUpDownSelectTag" multiple="multiple">
@@ -21,7 +21,7 @@
</form>
-<script type="text/javascript">
+<script>
var containingForm = document.getElementById("doubleValidationAction");
StrutsUtils.addEventListener(containingForm, "submit",
function(evt) {
@@ -30,7 +30,7 @@
}, true);
</script>
-<script type="text/javascript">
+<script>
function validateForm_doubleValidationAction() {
var getFieldValue = function(field) {
var type = field.type ? field.type : field[0].type;
diff --git
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-24.txt
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-24.txt
index 61c78011a..f63d81d2d 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-24.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-24.txt
@@ -1,8 +1,8 @@
-<script type="text/javascript" src="/static/xhtml/validation.js"></script>
+<script src="/static/xhtml/validation.js"></script>
<form id="doubleValidationAction" name="myForm" onsubmit="submitMe(); return
validateForm_doubleValidationAction();" action="/doubleValidationAction.action"
method="post" enctype="myEncType" title="mytitle" accept-charset="UTF-8"
onreset="clearErrorMessages(this);clearErrorLabels(this);">
<table class="wwFormTable"> <tr>
<td class="tdLabel"></td>
- <td class="tdInput"> <script type="text/javascript"
src="/static/optiontransferselect.js"></script>
+ <td class="tdInput"> <script
src="/static/optiontransferselect.js"></script>
<table>
<tr><td>
<select name="myUpDownSelectTag" size="5"
id="doubleValidationAction_myUpDownSelectTag" multiple="multiple">
@@ -21,7 +21,7 @@
</form>
-<script type="text/javascript">
+<script>
var containingForm = document.getElementById("doubleValidationAction");
StrutsUtils.addEventListener(containingForm, "submit",
function(evt) {
@@ -30,7 +30,7 @@
}, true);
</script>
-<script type="text/javascript">
+<script>
function validateForm_doubleValidationAction() {
var getFieldValue = function(field) {
var type = field.type ? field.type : field[0].type;
diff --git
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt
index 3ffab9499..859c79a6f 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt
@@ -1,7 +1,7 @@
<form id="myAction" name="myForm" onsubmit="submitMe()" action="myAction"
method="post" enctype="myEncType" title="mytitle">
<table class="wwFormTable"> <tr>
<td class="tdLabel"></td>
- <td class="tdInput"> <script type="text/javascript"
src="/static/optiontransferselect.js"></script>
+ <td class="tdInput"> <script
src="/static/optiontransferselect.js"></script>
<table>
<tr><td>
<select name="myUpDownSelectTag" size="5" id="myAction_myUpDownSelectTag"
multiple="multiple">
@@ -20,9 +20,9 @@
</form>
-<script type="text/javascript">
+<script>
var containingForm = document.getElementById("myAction");
- StrutsUtils.addEventListener(containingForm, "submit",
+ StrutsUtils.addEventListener(containingForm, "submit",
function(evt) {
var updownselectObj =
document.getElementById("myAction_myUpDownSelectTag");
selectAllOptionsExceptSome(updownselectObj,
"key", "");
diff --git
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/HeadTagTest-1.txt
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/HeadTagTest-1.txt
index cf6ed8e56..4d97b6fdb 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/HeadTagTest-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/HeadTagTest-1.txt
@@ -1,2 +1,2 @@
<link rel="stylesheet" type="text/css" href="/static/xhtml/styles.css"
nonce="r4nd0m"/>
-<script type="text/javascript" src="/static/utils.js" nonce="r4nd0m"></script>
+<script src="/static/utils.js" nonce="r4nd0m"></script>
diff --git
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/inputtransferselect-1.txt
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/inputtransferselect-1.txt
index f3c81d10e..ef160a5c2 100644
---
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/inputtransferselect-1.txt
+++
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/inputtransferselect-1.txt
@@ -1,7 +1,7 @@
<tr>
<td class="tdLabel"></td>
<td class="tdInput">
- <script type="text/javascript" src="/static/inputtransferselect.js"
nonce="r4nd0m"></script>
+ <script src="/static/inputtransferselect.js" nonce="r4nd0m"></script>
<table>
<tr><td><input type="text" name="collection_input"
id="collection_input"/></td>
<td
class="tdTransferSelect"><inputtype="button"value="->"onclick="addOption(document.getElementById('collection_input'),document.getElementById('collection'))"/>
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 9c11a87b4..6260cc68c 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 @@
<tr>
<td class="tdLabel"></td>
<td class="tdInput">
- <script type="text/javascript"
src="/static/inputtransferselect.js"></script>
+ <script src="/static/inputtransferselect.js"></script>
<table>
<tr>
<td><input type="text" name="collection_input" id="collection_input"
collection-name="inputName" /></td>
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 f16886524..c94d40565 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 @@
-<tr>
-<td class="tdLabel"></td>
+<tr>
+<td class="tdLabel"></td>
<td class="tdInput">
-<script type="text/javascript" src="/static/optiontransferselect.js"
nonce="r4nd0m"></script>
+<script src="/static/optiontransferselect.js" nonce="r4nd0m"></script>
<table>
<tr>
<td>
@@ -24,15 +24,15 @@
<input type="button" class="buttonCssClass" style="buttonCssStyle"
value="All Left"
onclick="moveAllOptions(document.getElementById('doubleId'),
document.getElementById('id'), false, 'Double Header Key', '');" /><br/><br/>
<input type="button" class="buttonCssClass" style="buttonCssStyle"
- value="All Right"
onclick="moveAllOptions(document.getElementById('id'),
document.getElementById('doubleId'), false, 'Header Key', '');" /><br/><br/>
+ value="All Right"
onclick="moveAllOptions(document.getElementById('id'),
document.getElementById('doubleId'), false, 'Header Key', '');" /><br/><br/>
<input type="button" class="buttonCssClass" style="buttonCssStyle"
value="Select All"
onclick="selectAllOptionsExceptSome(document.getElementById('id'), 'key',
'Header Key');selectAllOptionsExceptSome(document.getElementById('doubleId'),
'key', 'Double Header Key');" /><br/><br/>
-</td>
+</td>
<td>
<label for="rightTitle">Title Right</label><br/>
- <select
+ <select
name="list2"
- size="20"
+ size="20"
multiple="multiple"
id="doubleId"
class="c2"
@@ -49,5 +49,5 @@
</td>
</tr>
</table>
-</td>
+</td>
</tr>
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 359475c64..1939871cb 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 @@
-<tr>
+<tr>
<td class="tdLabel"></td>
<td class="tdInput">
-<script type="text/javascript" src="/static/optiontransferselect.js"></script>
+<script src="/static/optiontransferselect.js"></script>
<table>
<tr>
<td>
@@ -25,14 +25,14 @@
<input type="button" class="buttonCssClass" style="buttonCssStyle"
value="All Left"
onclick="moveAllOptions(document.getElementById('doubleId'),
document.getElementById('id'), false, 'Double Header Key', '');" /><br/><br/>
<input type="button" class="buttonCssClass" style="buttonCssStyle"
- value="All Right"
onclick="moveAllOptions(document.getElementById('id'),
document.getElementById('doubleId'), false, 'Header Key', '');" /><br/><br/>
+ value="All Right"
onclick="moveAllOptions(document.getElementById('id'),
document.getElementById('doubleId'), false, 'Header Key', '');" /><br/><br/>
<input type="button" class="buttonCssClass" style="buttonCssStyle"
value="Select All"
onclick="selectAllOptionsExceptSome(document.getElementById('id'), 'key',
'Header Key');selectAllOptionsExceptSome(document.getElementById('doubleId'),
'key', 'Double Header Key');" /><br/><br/>
</td> <td>
<label for="rightTitle">Title Right</label><br/>
- <select
+ <select
name="list2"
- size="20"
+ size="20"
multiple="multiple"
id="doubleId"
>
diff --git
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-3.txt
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-3.txt
index 46724ab70..1b0d645d5 100644
---
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-3.txt
+++
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-3.txt
@@ -1,7 +1,7 @@
-<tr>
+<tr>
<td class="tdLabel"></td>
<td class="tdInput">
-<script type="text/javascript" src="/static/optiontransferselect.js"></script>
+<script src="/static/optiontransferselect.js"></script>
<table>
<tr>
<td>
@@ -24,15 +24,15 @@
<input type="button" class="buttonCssClass" style="buttonCssStyle"
value="All Left"
onclick="moveAllOptions(document.getElementById('doubleId'),
document.getElementById('id'), false, '');" /><br/><br/>
<input type="button" class="buttonCssClass" style="buttonCssStyle"
- value="All Right"
onclick="moveAllOptions(document.getElementById('id'),
document.getElementById('doubleId'), false, '');" /><br/><br/>
+ value="All Right"
onclick="moveAllOptions(document.getElementById('id'),
document.getElementById('doubleId'), false, '');" /><br/><br/>
<input type="button" class="buttonCssClass" style="buttonCssStyle"
value="Select All"
onclick="selectAllOptions(document.getElementById('id'));selectAllOptions(document.getElementById('doubleId'));"
/><br/><br/>
</td>
<td>
<label for="rightTitle">Title Right</label><br/>
- <select
+ <select
name="list2"
- size="20"
+ size="20"
multiple="multiple"
id="doubleId"
>
diff --git
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-4.txt
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-4.txt
index 39d5b1b79..6f0952327 100644
---
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-4.txt
+++
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-4.txt
@@ -1,7 +1,7 @@
-<tr>
+<tr>
<td class="tdLabel"></td>
<td class="tdInput">
-<script type="text/javascript" src="/static/optiontransferselect.js"></script>
+<script src="/static/optiontransferselect.js"></script>
<table>
<tr>
<td>
@@ -25,15 +25,15 @@
<input type="button" class="buttonCssClass" style="buttonCssStyle"
value="All Left"
onclick="moveAllOptions(document.getElementById('doubleId'),
document.getElementById('id'), false, '');" /><br/><br/>
<input type="button" class="buttonCssClass" style="buttonCssStyle"
- value="All Right"
onclick="moveAllOptions(document.getElementById('id'),
document.getElementById('doubleId'), false, 'Header Key', '');" /><br/><br/>
+ value="All Right"
onclick="moveAllOptions(document.getElementById('id'),
document.getElementById('doubleId'), false, 'Header Key', '');" /><br/><br/>
<input type="button" class="buttonCssClass" style="buttonCssStyle"
value="Select All"
onclick="selectAllOptionsExceptSome(document.getElementById('id'), 'key',
'Header Key');selectAllOptions(document.getElementById('doubleId'));"
/><br/><br/>
</td>
<td>
<label for="rightTitle">Title Right</label><br/>
- <select
+ <select
name="list2"
- size="20"
+ size="20"
multiple="multiple"
id="doubleId"
>
@@ -45,7 +45,7 @@
<input type="hidden" id="__multiselect_doubleId"
name="__multiselect_list2" value=""/>
<input type="button"
onclick="moveOptionDown(document.getElementById('doubleId'), 'key', '');"
value="v" />
<input type="button"
onclick="moveOptionUp(document.getElementById('doubleId'), 'key', '');"
value="^" />
-
+
</td>
</tr>
</table>
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 fb0c97934..2cdccaefe 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 @@
-<tr>
-<td class="tdLabel"></td>
+<tr>
+<td class="tdLabel"></td>
<td class="tdInput">
-<script type="text/javascript" src="/static/optiontransferselect.js"></script>
+<script src="/static/optiontransferselect.js"></script>
<table>
<tr>
<td>
@@ -24,15 +24,15 @@
<input type="button" class="buttonCssClass" style="buttonCssStyle"
value="All Left"
onclick="moveAllOptions(document.getElementById('doubleId'),
document.getElementById('id'), false, 'Double Header Key', '');" /><br/><br/>
<input type="button" class="buttonCssClass" style="buttonCssStyle"
- value="All Right"
onclick="moveAllOptions(document.getElementById('id'),
document.getElementById('doubleId'), false, 'Header Key', '');" /><br/><br/>
+ value="All Right"
onclick="moveAllOptions(document.getElementById('id'),
document.getElementById('doubleId'), false, 'Header Key', '');" /><br/><br/>
<input type="button" class="buttonCssClass" style="buttonCssStyle"
value="Select All"
onclick="selectAllOptionsExceptSome(document.getElementById('id'), 'key',
'Header Key');selectAllOptionsExceptSome(document.getElementById('doubleId'),
'key', 'Double Header Key');" /><br/><br/>
</td>
<td>
<label for="rightTitle">Title Right</label><br/>
- <select
+ <select
name="list2"
- size="20"
+ size="20"
multiple="multiple"
id="doubleId"
>
diff --git
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-6.txt
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-6.txt
index 68b99d066..56fdba726 100644
---
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-6.txt
+++
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-6.txt
@@ -1,7 +1,7 @@
-<tr>
+<tr>
<td class="tdLabel"></td>
<td class="tdInput">
-<script type="text/javascript" src="/static/optiontransferselect.js"></script>
+<script src="/static/optiontransferselect.js"></script>
<table>
<tr>
<td>
@@ -25,15 +25,15 @@
<input type="button" class="buttonCssClass" style="buttonCssStyle"
value="All Left"
onclick="moveAllOptions(document.getElementById('doubleId'),
document.getElementById('id'), false, 'Double Header Key', '');" /><br/><br/>
<input type="button" class="buttonCssClass" style="buttonCssStyle"
- value="All Right"
onclick="moveAllOptions(document.getElementById('id'),
document.getElementById('doubleId'), false, 'Header Key', '');" /><br/><br/>
+ value="All Right"
onclick="moveAllOptions(document.getElementById('id'),
document.getElementById('doubleId'), false, 'Header Key', '');" /><br/><br/>
<input type="button" class="buttonCssClass" style="buttonCssStyle"
value="Select All"
onclick="selectAllOptionsExceptSome(document.getElementById('id'), 'key',
'Header Key');selectAllOptionsExceptSome(document.getElementById('doubleId'),
'key', 'Double Header Key');" /><br/><br/>
</td>
<td>
<label for="rightTitle">Title Right</label><br/>
- <select
+ <select
name="list2"
- size="20"
+ size="20"
multiple="multiple"
id="doubleId"
>
diff --git
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-7.txt
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-7.txt
index 270464f26..e5a039230 100644
---
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-7.txt
+++
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-7.txt
@@ -1,7 +1,7 @@
-<tr>
+<tr>
<td class="tdLabel"></td>
<td class="tdInput">
-<script type="text/javascript" src="/static/optiontransferselect.js"></script>
+<script src="/static/optiontransferselect.js"></script>
<table>
<tr>
<td>
@@ -22,12 +22,12 @@
value="Left"
onclick="moveSelectedOptions(document.getElementById('doubleId'),
document.getElementById('id'), false, 'Double Header Key', '');alert('Moving
Left');" /><br/><br/>
<input type="button" class="buttonCssClass" style="buttonCssStyle"
value="Right"
onclick="moveSelectedOptions(document.getElementById('id'),
document.getElementById('doubleId'), false, 'Header Key', '');alert('Moving
Right');" /><br/><br/>
-</td>
+</td>
<td>
<label for="rightTitle">Title Right</label><br/>
- <select
+ <select
name="list2"
- size="20"
+ size="20"
multiple="multiple"
id="doubleId"
>
diff --git
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-8.txt
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-8.txt
index 4f6274914..69358f932 100644
---
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-8.txt
+++
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-8.txt
@@ -1,7 +1,7 @@
<tr>
<td class="tdLabel"></td>
<td class="tdInput">
- <script type="text/javascript"
src="/static/optiontransferselect.js"></script>
+ <script src="/static/optiontransferselect.js"></script>
<table>
<tr>
<td>
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 d34b31d2d..e80e91683 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 @@
</table>
</form>
<!--javascript that is needed for tooltips-->
-<script type="text/javascript" src="/static/domTT.js"></script>
+<script src="/static/domTT.js"></script>
<link rel="stylesheet" type="text/css" href="/static/domTT.css"/>
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 e04c68858..13b40700a 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 @@
</table>
</form>
<!--javascript that is needed for tooltips-->
-<script type="text/javascript" src="/static/domTT.js"></script>
+<script src="/static/domTT.js"></script>
<link rel="stylesheet" type="text/css" href="/static/domTT.css"/>
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 a70521455..5c891772d 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 @@
</form>
<!--javascript that is needed for tooltips-->
-<script type="text/javascript" src="/static/domTT.js"></script>
+<script src="/static/domTT.js"></script>
<link rel="stylesheet" type="text/css" href="/static/domTT.css"/>
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 3d3542779..eb86508da 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 @@
<tr> <td class="tdLabel"></td> <td class="tdInput">
-<script type="text/javascript" src="/static/optiontransferselect.js"></script>
+<script src="/static/optiontransferselect.js"></script>
<table>
<tr><td>
<select name="myName" size="5" id="myId" multiple="multiple">
diff --git
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-10.txt
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-10.txt
index 74e0ab553..76489dda3 100644
---
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-10.txt
+++
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-10.txt
@@ -1,9 +1,9 @@
<tr> <td class="tdLabel"></td> <td class="tdInput">
-<script type="text/javascript" src="/static/optiontransferselect.js"></script>
+<script src="/static/optiontransferselect.js"></script>
<table>
<tr><td>
<select name="myName" size="5" id="myId" multiple="multiple">
- <option value=""></option>
+ <option value=""></option>
<option value="england">England</option>
<option value="america" selected="selected">America</option>
<option value="australia">Australia</option>
@@ -12,9 +12,9 @@
<input type="hidden" id="__multiselect_myId" name="__multiselect_myName"
value=""/>
</td></tr>
<tr><td>
- <input type="button" value="Move Up"
onclick="moveOptionUp(document.getElementById('myId'), 'key', '');" />
- <input type="button" value="v"
onclick="moveOptionDown(document.getElementById('myId'), 'key', '');" />
- <input type="button" value="*"
onclick="selectAllOptions(document.getElementById('myId'), 'key', '');" />
+ <input type="button" value="Move Up"
onclick="moveOptionUp(document.getElementById('myId'), 'key', '');" />
+ <input type="button" value="v"
onclick="moveOptionDown(document.getElementById('myId'), 'key', '');" />
+ <input type="button" value="*"
onclick="selectAllOptions(document.getElementById('myId'), 'key', '');" />
</td></tr>
</table>
</td> </tr>
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 3f68bc62e..943766ef6 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 @@
<tr> <td class="tdLabel"></td> <td class="tdInput">
-<script type="text/javascript" src="/static/optiontransferselect.js"></script>
+<script src="/static/optiontransferselect.js"></script>
<table>
<tr><td>
<select name="myName" size="5" id="myId" multiple="multiple">
diff --git
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-2.txt
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-2.txt
index f890aed35..fd2d70840 100644
---
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-2.txt
+++
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-2.txt
@@ -1,5 +1,5 @@
<tr> <td class="tdLabel"></td> <td class="tdInput">
-<script type="text/javascript" src="/static/optiontransferselect.js"
nonce="r4nd0m"></script>
+<script src="/static/optiontransferselect.js" nonce="r4nd0m"></script>
<table>
<tr><td>
<select name="myName" size="5" id="myId" multiple="multiple">
diff --git
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-3.txt
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-3.txt
index 004b42ad9..3a1cf7e65 100644
---
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-3.txt
+++
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-3.txt
@@ -1,5 +1,5 @@
<tr> <td class="tdLabel"></td> <td class="tdInput">
-<script type="text/javascript" src="/static/optiontransferselect.js"></script>
+<script src="/static/optiontransferselect.js"></script>
<table>
<tr><td>
<select name="myName" size="5" id="myId" multiple="multiple">
diff --git
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-4.txt
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-4.txt
index 2e54fc103..c27eeb97d 100644
---
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-4.txt
+++
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-4.txt
@@ -1,5 +1,5 @@
<tr> <td class="tdLabel"></td> <td class="tdInput">
-<script type="text/javascript" src="/static/optiontransferselect.js"></script>
+<script src="/static/optiontransferselect.js"></script>
<table>
<tr><td>
<select name="myName" size="5" id="myId" multiple="multiple">
diff --git
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-5.txt
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-5.txt
index 37629caaa..168ed9c07 100644
---
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-5.txt
+++
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-5.txt
@@ -1,5 +1,5 @@
<tr> <td class="tdLabel"></td> <td class="tdInput">
-<script type="text/javascript" src="/static/optiontransferselect.js"></script>
+<script src="/static/optiontransferselect.js"></script>
<table>
<tr><td>
<select name="myName" size="5" id="myId" multiple="multiple">
diff --git
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-6.txt
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-6.txt
index c0fbd7558..47644f52d 100644
---
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-6.txt
+++
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-6.txt
@@ -1,5 +1,5 @@
<tr> <td class="tdLabel"></td> <td class="tdInput">
-<script type="text/javascript" src="/static/optiontransferselect.js"></script>
+<script src="/static/optiontransferselect.js"></script>
<table>
<tr><td>
<select name="myName" size="5" id="myId" multiple="multiple">
diff --git
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-7.txt
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-7.txt
index 75f15d775..551e39741 100644
---
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-7.txt
+++
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-7.txt
@@ -1,5 +1,5 @@
<tr> <td class="tdLabel"></td> <td class="tdInput">
-<script type="text/javascript" src="/static/optiontransferselect.js"></script>
+<script src="/static/optiontransferselect.js"></script>
<table>
<tr><td>
<select name="myName" size="5" id="myId" multiple="multiple">
diff --git
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-8.txt
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-8.txt
index 90e4e0b6c..d089a88be 100644
---
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-8.txt
+++
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-8.txt
@@ -1,5 +1,5 @@
<tr> <td class="tdLabel"></td> <td class="tdInput">
-<script type="text/javascript" src="/static/optiontransferselect.js"></script>
+<script src="/static/optiontransferselect.js"></script>
<table>
<tr><td>
<select name="myName" size="5" id="myId" multiple="multiple">
diff --git
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-9.txt
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-9.txt
index 5869c6783..26d4629bc 100644
---
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-9.txt
+++
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-9.txt
@@ -1,5 +1,5 @@
<tr> <td class="tdLabel"></td> <td class="tdInput">
-<script type="text/javascript" src="/static/optiontransferselect.js"></script>
+<script src="/static/optiontransferselect.js"></script>
<table>
<tr><td>
<select name="myName" size="5" id="myId" multiple="multiple">
