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

[WW-5362] Removes type attribute out of <s:script/> tag
apache · Jan 1, 2024 · 3dabcf1 · 3dabcf1
2 parents b5e0790 + b9c797e
commit 3dabcf1
Show file tree

Hide file tree

Showing 62 changed files with 139 additions and 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
@@ -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>');

diff --git 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
@@ -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;

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -49,7 +49,7 @@
         color:                 #666;
       }
     </style>
-    <script type="text/javascript" language="javascript">
+    <script>
       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
@@ -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
@@ -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
@@ -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
@@ -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;
     }

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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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] = [];