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

Merge pull request #812 from apache/feature/WW-5362-remove-type

Browse Source 
[WW-5362] Removes type attribute out of <s:script/> tag
This commit is contained in:
Lukasz Lenart
2024-01-01 10:54:55 +01:00
committed by GitHub
parent b5e07903f2 b9c797e1b4
commit 3dabcf127b
62 changed files with 139 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
+1 -1
View File
@@ -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="#">&times;</a>');
apps/showcase/src/main/webapp/WEB-INF/validation/ajaxFormSubmit.jsp
+1 -1
View File
@@ -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
assembly/src/main/resources/template.vm
+4 -4
View File
@@ -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>
var hide = null;
var show = null;
var children = null;
bundles/admin/src/main/resources/osgi/admin/shell.ftl
+6 -6
View File
@@ -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">
bundles/admin/src/main/resources/osgi/admin/viewBundle.ftl
+7 -7
View File
@@ -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 />
bundles/admin/src/main/resources/osgi/admin/viewBundles.ftl
+5 -5
View File
@@ -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 />
core/src/main/resources/org/apache/struts2/interceptor/debugging/browser.ftl
+10 -10
View File
@@ -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}
core/src/main/resources/org/apache/struts2/interceptor/debugging/console.ftl
+1 -1
View File
@@ -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>
core/src/main/resources/template/css_xhtml/form-validate.ftl
+1 -1
View File
@@ -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>
core/src/main/resources/template/simple/combobox.ftl
+1 -1
View File
@@ -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}') {
core/src/main/resources/template/simple/doubleselect.ftl
+1 -1
View File
@@ -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++) {
core/src/main/resources/template/simple/form-close-tooltips.ftl
+1 -1
View File
@@ -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/>
core/src/main/resources/template/simple/form-close.ftl
+1 -1
View File
@@ -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.
core/src/main/resources/template/simple/head.ftl
+1 -1
View File
@@ -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" />
core/src/main/resources/template/simple/inputtransferselect.ftl
+1 -1
View File
@@ -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>
core/src/main/resources/template/simple/optiontransferselect.ftl
+1 -1
View File
@@ -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>
core/src/main/resources/template/simple/updownselect.ftl
+1 -1
View File
@@ -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>
core/src/main/resources/template/xhtml/form-close-validate.ftl
+1 -1
View File
@@ -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.
core/src/main/resources/template/xhtml/form-close.ftl
+1 -1
View File
@@ -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) {
core/src/main/resources/template/xhtml/form-validate.ftl
+1 -1
View File
@@ -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>
core/src/site/confluence/ww-template-autoexport.html
+1 -1
View File
@@ -49,7 +49,7 @@ under the License.
color: #666;
}
</style>
<script type="text/javascript" language="javascript">
<script>
var hide = null;
var show = null;
var children = null;
core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-1.txt
+1 -1
View File
@@ -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;
}
core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-2.txt
+1 -1
View File
@@ -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;
core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-3.txt
+1 -1
View File
@@ -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;
core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-4.txt
+1 -1
View File
@@ -1,7 +1,7 @@
<tr>
<td class="tdLabel"><label for="cb[&#39;&quot;.&quot;&#39;]=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;
}
core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-1.txt
+1 -1
View File
@@ -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] = [];
core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-2.txt
+1 -1
View File
@@ -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] = [];
core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-3.txt
+1 -1
View File
@@ -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] = [];
core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-4.txt
+1 -1
View File
@@ -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] = [];
core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-5.txt
+1 -1
View File
@@ -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] = [];
core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-6.txt
+1 -1
View File
@@ -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] = [];
core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt
+3 -3
View File
@@ -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) {
core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-12.txt
+1 -1
View File
@@ -3,7 +3,7 @@
</table>
</form>
<script type="text/javascript">
<script>
StrutsUtils.addOnLoad(function() {
var element = document.getElementById("felement");
if(element) {
core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt
+4 -4
View File
@@ -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) {
core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-22.txt
+4 -4
View File
@@ -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;
core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-24.txt
+4 -4
View File
@@ -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;
core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt
+3 -3
View File
@@ -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", "");
core/src/test/resources/org/apache/struts2/views/jsp/ui/HeadTagTest-1.txt
+1 -1
View File
@@ -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>
core/src/test/resources/org/apache/struts2/views/jsp/ui/inputtransferselect-1.txt
+1 -1
View File
@@ -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="-&gt;"onclick="addOption(document.getElementById('collection_input'),document.getElementById('collection'))"/>
core/src/test/resources/org/apache/struts2/views/jsp/ui/inputtransferselect-2.txt
+1 -1
View File
@@ -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>
core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-1.txt
+8 -8
View File
@@ -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>
core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-2.txt
+5 -5
View File
@@ -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"
>
core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-3.txt
+5 -5
View File
@@ -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"
>
core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-4.txt
+6 -6
View File
@@ -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>
core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-5.txt
+6 -6
View File
@@ -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"
>
core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-6.txt
+5 -5
View File
@@ -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"
>
core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-7.txt
+5 -5
View File
@@ -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"
>
core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-8.txt
+1 -1
View File
@@ -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>
core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-1.txt
+1 -1
View File
@@ -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"/>
core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-2.txt
+1 -1
View File
@@ -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"/>
core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-3.txt
+1 -1
View File
@@ -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"/>
core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-1.txt
+1 -1
View File
@@ -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">
core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-10.txt
+5 -5
View File
@@ -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>
&nbsp;<input type="button" value="Move Up" onclick="moveOptionUp(document.getElementById('myId'), 'key', '');" />&nbsp;
&nbsp;<input type="button" value="v" onclick="moveOptionDown(document.getElementById('myId'), 'key', '');" />&nbsp;
&nbsp;<input type="button" value="*" onclick="selectAllOptions(document.getElementById('myId'), 'key', '');" />&nbsp;
&nbsp;<input type="button" value="Move Up" onclick="moveOptionUp(document.getElementById('myId'), 'key', '');" />&nbsp;
&nbsp;<input type="button" value="v" onclick="moveOptionDown(document.getElementById('myId'), 'key', '');" />&nbsp;
&nbsp;<input type="button" value="*" onclick="selectAllOptions(document.getElementById('myId'), 'key', '');" />&nbsp;
</td></tr>
</table>
</td> </tr>
core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-11.txt
+1 -1
View File
@@ -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">
core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-2.txt
+1 -1
View File
@@ -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">
core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-3.txt
+1 -1
View File
@@ -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">
core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-4.txt
+1 -1
View File
@@ -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">
core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-5.txt
+1 -1
View File
@@ -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">
core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-6.txt
+1 -1
View File
@@ -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">
core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-7.txt
+1 -1
View File
@@ -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">
core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-8.txt
+1 -1
View File
@@ -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">
core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-9.txt
+1 -1
View File
@@ -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">