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

Refactoring script and link elements for CSP nonce propagation

Browse Source
This commit is contained in:
Ecenaz Ozmen
2020-08-31 11:39:57 +03:00
committed by GitHub
parent bf802542c6
commit 62424ef30c
52 changed files with 311 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
+9 -9
View File
@@ -63,26 +63,26 @@
<title><decorator:title default="Struts2 Showcase"/></title>
<link href="<s:url value='/styles/bootstrap.css' encode='false' includeParams='none'/>" rel="stylesheet" type="text/css" media="all">
<link href="<s:url value='/styles/main.css' encode='false' includeParams='none'/>" rel="stylesheet" type="text/css" media="all"/>
<s:link href="<s:url value='/styles/bootstrap.css' encode='false' includeParams='none'/>" rel="stylesheet" type="text/css" media="all">
<s:link href="<s:url value='/styles/main.css' encode='false' includeParams='none'/>" rel="stylesheet" type="text/css" media="all"/>
<script src="<s:url value='/js/jquery-2.1.4.min.js' encode='false' includeParams='none'/>"></script>
<script src="<s:url value='/js/bootstrap.min.js' encode='false' includeParams='none'/>"></script>
<script type="text/javascript">
<s:script src="<s:url value='/js/jquery-2.1.4.min.js' encode='false' includeParams='none'/>"></s:script>
<s:script src="<s:url value='/js/bootstrap.min.js' encode='false' includeParams='none'/>"></s:script>
<s:script type="text/javascript">
$(function () {
var alerts = $('ul.alert').wrap('<div />');
alerts.prepend('<a class="close" data-dismiss="alert" href="#">&times;</a>');
alerts.alert();
});
</script>
</s:script>
<!-- Prettify -->
<link href="<s:url value='/styles/prettify.css' encode='false' includeParams='none'/>" rel="stylesheet">
<script src="<s:url value='/js/prettify.js' encode='false' includeParams='none'/>"></script>
<s:link href="<s:url value='/styles/prettify.css' encode='false' includeParams='none'/>" rel="stylesheet">
<s:script src="<s:url value='/js/prettify.js' encode='false' includeParams='none'/>"></s:script>
<!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<s:script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></s:script>
<![endif]-->
<decorator:head/>
apps/showcase/src/main/webapp/WEB-INF/validation/ajaxFormSubmit.jsp
+2 -2
View File
@@ -72,7 +72,7 @@
</div>
</div>
<script type="text/javascript">
<s:script type="text/javascript">
/********************************************************************
* JS just used on this page.
* Usually this would be placed in a JS file
@@ -196,6 +196,6 @@ function _handleValidationResult(form, errors) {
$(window).bind('load', function() {
$('form').bind('submit', ajaxFormValidation);
});
</script>
</s:script>
</body>
</html>
apps/showcase/src/main/webapp/WEB-INF/validation/quiz-dwr.jsp
+5 -5
View File
@@ -26,10 +26,10 @@
<head>
<title>Struts2 Showcase - Validation - DWR</title>
<s:head/>
<script type='text/javascript' src='../dwr/engine.js'></script>
<script type='text/javascript' src='../dwr/util.js'></script>
<script type='text/javascript' src='../dwr/interface/validator.js'></script>
<script type='text/javascript'>
<s:script type='text/javascript' src='../dwr/engine.js'></s:script>
<s:script type='text/javascript' src='../dwr/util.js'></s:script>
<s:script type='text/javascript' src='../dwr/interface/validator.js'></s:script>
<s:script type='text/javascript'>
var dwrValidateReply = function(data) {
var validationResult = '';
for (index = 0; index < data.actionErrors.length; ++index) {
@@ -62,7 +62,7 @@
validator.doPost('/validation', 'quizDwr', postData, dwrValidateReply);
return false;
}
</script>
</s:script>
</head>
<body>
apps/showcase/src/main/webapp/WEB-INF/viewSource.jsp
+2 -2
View File
@@ -64,11 +64,11 @@
</div>
<script>
<s:script>
$('#codeTab a').click(function (e) {
e.preventDefault();
$(this).tab('show');
})
</script>
</s:script>
</body>
</html>