Skip to content

Commit 467cd9a

Browse files
plup2plup2
committed
document.write now removed from JSP template
1 parent b3ae04c commit 467cd9a

10 files changed

Lines changed: 34 additions & 255 deletions

File tree

‎gocwebtemplate-core/gocwebtemplate-core-base/src/test/java/goc/webtemplate/component/abstractcorebeantest/RenderSetupTest.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,7 @@ public void testRenderSplashSetup() {
7676
//TODO: Update other tests
7777
//TODO: Get rid of RefTop and RefFooter (if no longer used)... and maybe getLocalPath() and other unused functions that were used to build these objects.
7878

79-
//TODO: Test that gson's default espcaping of ' with \u0027 works... (leaving secure site sample)
80-
81-
//TODO: Test that session timeout control still works
82-
//TODO: Search for "document.write" and "wet.builder." to be sure
8379
//TODO: Change log
84-
//TODO: JSP Bilingual error sample is UTF8 properly?
8580
//TODO: Remove some Deprecated?
81+
//TODO: Test with huge data
8682
}

‎gocwebtemplate-sample-jsp/src/main/webapp/templates/application-leftmenu-mastertemplate.jsp‎

Lines changed: 4 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -29,69 +29,40 @@
2929
<meta content="width=device-width,initial-scale=1" name="viewport" />
3030
<!-- Load closure template scripts -->
3131
<link rel="stylesheet" href="<s:property value="#goctemplateclientbean.appCssPath"/>">
32-
<script type="text/javascript" src="<s:property value="#goctemplateclientbean.wetJsPath"/>"></script>
32+
<script type="text/javascript" src="<s:property value="#goctemplateclientbean.wetJsPath"/>" data-cdts-setup='<s:property escapeHtml="false" value="#goctemplateclientbean.renderAppSetup"/>'></script>
3333
<noscript>
3434
<!-- Write closure fall-back static file -->
3535
<s:property escapeHtml="false" value="%{#applicationscopebean.getStaticFile(#goctemplateclientbean.staticFallbackFilePath, #request.wettheme, 'refTop.html')}" />
3636
</noscript>
37-
<!-- Write closure template -->
38-
<script type="text/javascript">
39-
document.write(wet.builder.refTop(<s:property escapeHtml="false" value="#goctemplateclientbean.renderRefTopForApp" />));
40-
</script>
4137
<s:property escapeHtml="false" value="#goctemplateclientbean.renderHtmlHeaderElements" />
4238
<!-- GoC Web Template Build Version <s:property value="#goctemplateclientbean.webTemplateDistributionVersion" /> -->
4339
</head>
4440
<body vocab="http://schema.org/" typeof="WebPage">
4541
<s:property escapeHtml="false" value="#goctemplateclientbean.renderSessionTimeoutControl" />
46-
<div id="def-top">
42+
<div id="cdts-def-top">
4743
<!-- Write closure fall-back static file -->
4844
<s:property escapeHtml="false" value="%{#applicationscopebean.getStaticFile(#goctemplateclientbean.staticFallbackFilePath, #request.wettheme, 'appTop-'.concat(#goctemplateclientbean.twoLetterCultureLanguage).concat('.html'))}" />
4945
</div>
50-
<!-- Write closure template -->
51-
<script type="text/javascript">
52-
var defTop = document.getElementById("def-top");
53-
defTop.outerHTML = wet.builder.appTop(<s:property escapeHtml="false" value="#goctemplateclientbean.renderAppTop" />);
54-
</script>
5546
<div class="container">
5647
<div class="row">
5748
<main role="main" property="mainContentOfPage" class="col-md-9 col-md-push-3" typeof="WebPageElement">
5849
<!-- the main content -->
5950
<tiles:insertAttribute name="body" />
6051
<!-- end main content -->
61-
<div id="def-preFooter">
52+
<div id="cdts-def-preFooter">
6253
<!-- Write closure fall-back static file -->
6354
<s:property escapeHtml="false" value="%{#applicationscopebean.getStaticFile(#goctemplateclientbean.staticFallbackFilePath, #request.wettheme, 'preFooter-'.concat(#goctemplateclientbean.twoLetterCultureLanguage).concat('.html'))}" />
6455
</div>
65-
<!-- Write closure template -->
66-
<script type="text/javascript">
67-
var defPreFooter = document.getElementById("def-preFooter");
68-
defPreFooter.outerHTML = wet.builder.preFooter(<s:property escapeHtml="false" value="#goctemplateclientbean.renderPreFooter" />);
69-
</script>
7056
</main>
7157
<nav class="wb-sec col-md-3 col-md-pull-9" typeof="SiteNavigationElement" id="wb-sec" role="navigation">
7258
<!-- Write closure fall-back static file -->
7359
<s:property escapeHtml="false" value="%{#applicationscopebean.getStaticFile(#goctemplateclientbean.staticFallbackFilePath, #request.wettheme, 'secMenu-'.concat(#goctemplateclientbean.twoLetterCultureLanguage).concat('.html'))}" />
7460
</nav>
75-
<!-- Write closure template -->
76-
<script type="text/javascript">
77-
var secondarymenu = document.getElementById("wb-sec");
78-
secondarymenu.innerHTML = wet.builder.secmenu(<s:property escapeHtml="false" value="#goctemplateclientbean.renderLeftMenuSections" />);
79-
</script>
8061
</div>
8162
</div>
82-
<div id="def-footer">
63+
<div id="cdts-def-footer">
8364
<!-- Write closure fall-back static file -->
8465
<s:property escapeHtml="false" value="%{#applicationscopebean.getStaticFile(#goctemplateclientbean.staticFallbackFilePath, #request.wettheme, 'appFooter-'.concat(#goctemplateclientbean.twoLetterCultureLanguage).concat('.html'))}" />
8566
</div>
86-
<!-- Write closure template -->
87-
<script type="text/javascript">
88-
var defFooter = document.getElementById("def-footer");
89-
defFooter.outerHTML = wet.builder.appFooter(<s:property escapeHtml="false" value="#goctemplateclientbean.renderAppFooter" />);
90-
</script>
91-
<!-- Write closure template -->
92-
<script type="text/javascript">
93-
document.write(wet.builder.refFooter(<s:property escapeHtml="false" value="#goctemplateclientbean.renderRefFooterForApp" />));
94-
</script>
95-
<s:property escapeHtml="false" value="#goctemplateclientbean.renderHtmlBodyElements" />
9667
</body>
9768
</html>

‎gocwebtemplate-sample-jsp/src/main/webapp/templates/application-mastertemplate.jsp‎

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -29,56 +29,32 @@
2929
<meta content="width=device-width,initial-scale=1" name="viewport" />
3030
<!-- Load closure template scripts -->
3131
<link rel="stylesheet" href="<s:property value="#goctemplateclientbean.appCssPath"/>">
32-
<script type="text/javascript" src="<s:property value="#goctemplateclientbean.wetJsPath"/>"></script>
32+
<script type="text/javascript" src="<s:property value="#goctemplateclientbean.wetJsPath"/>" data-cdts-setup='<s:property escapeHtml="false" value="#goctemplateclientbean.renderAppSetup"/>'></script>
3333
<noscript>
3434
<!-- Write closure fall-back static file -->
3535
<s:property escapeHtml="false" value="%{#applicationscopebean.getStaticFile(#goctemplateclientbean.staticFallbackFilePath, #request.wettheme, 'refTop.html')}" />
3636
</noscript>
37-
<!-- Write closure template -->
38-
<script type="text/javascript">
39-
document.write(wet.builder.refTop(<s:property escapeHtml="false" value="#goctemplateclientbean.renderRefTopForApp" />));
40-
</script>
4137
<s:property escapeHtml="false" value="#goctemplateclientbean.renderHtmlHeaderElements" />
4238
<!-- GoC Web Template Build Version <s:property value="#goctemplateclientbean.webTemplateDistributionVersion" /> -->
4339
</head>
4440
<body vocab="http://schema.org/" typeof="WebPage">
4541
<s:property escapeHtml="false" value="#goctemplateclientbean.renderSessionTimeoutControl" />
46-
<div id="def-top">
42+
<div id="cdts-def-top">
4743
<!-- Write closure fall-back static file -->
4844
<s:property escapeHtml="false" value="%{#applicationscopebean.getStaticFile(#goctemplateclientbean.staticFallbackFilePath, #request.wettheme, 'appTop-'.concat(#goctemplateclientbean.twoLetterCultureLanguage).concat('.html'))}" />
4945
</div>
50-
<!-- Write closure template -->
51-
<script type="text/javascript">
52-
var defTop = document.getElementById("def-top");
53-
defTop.outerHTML = wet.builder.appTop(<s:property escapeHtml="false" value="#goctemplateclientbean.renderAppTop" />);
54-
</script>
5546
<main role="main" property="mainContentOfPage" class="container" typeof="WebPageElement">
5647
<!-- the main content -->
5748
<tiles:insertAttribute name="body" />
5849
<!-- end main content -->
59-
<div id="def-preFooter">
50+
<div id="cdts-def-preFooter">
6051
<!-- Write closure fall-back static file -->
6152
<s:property escapeHtml="false" value="%{#applicationscopebean.getStaticFile(#goctemplateclientbean.staticFallbackFilePath, #request.wettheme, 'preFooter-'.concat(#goctemplateclientbean.twoLetterCultureLanguage).concat('.html'))}" />
6253
</div>
63-
<!-- Write closure template -->
64-
<script type="text/javascript">
65-
var defPreFooter = document.getElementById("def-preFooter");
66-
defPreFooter.outerHTML = wet.builder.preFooter(<s:property escapeHtml="false" value="#goctemplateclientbean.renderPreFooter" />);
67-
</script>
6854
</main>
69-
<div id="def-footer">
55+
<div id="cdts-def-footer">
7056
<!-- Write closure fall-back static file -->
7157
<s:property escapeHtml="false" value="%{#applicationscopebean.getStaticFile(#goctemplateclientbean.staticFallbackFilePath, #request.wettheme, 'appFooter-'.concat(#goctemplateclientbean.twoLetterCultureLanguage).concat('.html'))}" />
7258
</div>
73-
<!-- Write closure template -->
74-
<script type="text/javascript">
75-
var defFooter = document.getElementById("def-footer");
76-
defFooter.outerHTML = wet.builder.appFooter(<s:property escapeHtml="false" value="#goctemplateclientbean.renderAppFooter" />);
77-
</script>
78-
<!-- Write closure template -->
79-
<script type="text/javascript">
80-
document.write(wet.builder.refFooter(<s:property escapeHtml="false" value="#goctemplateclientbean.renderRefFooterForApp" />));
81-
</script>
82-
<s:property escapeHtml="false" value="#goctemplateclientbean.renderHtmlBodyElements" />
8359
</body>
8460
</html>

‎gocwebtemplate-sample-jsp/src/main/webapp/templates/bilingualerror-mastertemplate.jsp‎

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -29,47 +29,28 @@
2929
<meta content="width=device-width,initial-scale=1" name="viewport" />
3030
<!-- Load closure template scripts -->
3131
<link rel="stylesheet" href="<s:property value="#goctemplateclientbean.cssPath"/>">
32-
<script type="text/javascript" src="<s:property value="#goctemplateclientbean.wetJsPath"/>"></script>
32+
<script type="text/javascript" src="<s:property value="#goctemplateclientbean.wetJsPath"/>" data-cdts-setup='<s:property escapeHtml="false" value="#goctemplateclientbean.renderServerSetup"/>'></script>
3333
<noscript>
3434
<!-- Write closure fall-back static file -->
3535
<s:property escapeHtml="false" value="%{#applicationscopebean.getStaticFile(#goctemplateclientbean.staticFallbackFilePath, #request.wettheme, 'serverRefTop.html')}" />
3636
</noscript>
37-
<!-- Write closure template -->
38-
<script type="text/javascript">
39-
document.write(wet.builder.serverRefTop(<s:property escapeHtml="false" value="#goctemplateclientbean.renderServerRefTop" />));
40-
</script>
4137
<s:property escapeHtml="false" value="#goctemplateclientbean.renderHtmlHeaderElements" />
4238
<!-- GoC Web Template Build Version <s:property value="#goctemplateclientbean.webTemplateDistributionVersion" /> -->
4339
</head>
4440
<body vocab="http://schema.org/" typeof="WebPage">
4541
<s:property escapeHtml="false" value="#goctemplateclientbean.renderSessionTimeoutControl" />
46-
<div id="def-top">
42+
<div id="cdts-def-top">
4743
<!-- Write closure fall-back static file -->
4844
<s:property escapeHtml="false" value="%{#applicationscopebean.getStaticFile(#goctemplateclientbean.staticFallbackFilePath, #request.wettheme, 'serverTop.html'))}" />
4945
</div>
50-
<!-- Write closure template -->
51-
<script type="text/javascript">
52-
var defTop = document.getElementById("def-top");
53-
defTop.outerHTML = wet.builder.serverTop(<s:property escapeHtml="false" value="#goctemplateclientbean.renderServerTop" />);
54-
</script>
5546
<main role="main" property="mainContentOfPage" class="container" typeof="WebPageElement">
5647
<!-- the main content -->
5748
<tiles:insertAttribute name="body" />
5849
<!-- end main content -->
5950
</main>
60-
<div id="def-footer">
51+
<div id="cdts-def-footer">
6152
<!-- Write closure fall-back static file -->
6253
<s:property escapeHtml="false" value="%{#applicationscopebean.getStaticFile(#goctemplateclientbean.staticFallbackFilePath, #request.wettheme, 'serverBottom.html'))}" />
6354
</div>
64-
<!-- Write closure template -->
65-
<script type="text/javascript">
66-
var defFooter = document.getElementById("def-footer");
67-
defFooter.outerHTML = wet.builder.serverBottom(<s:property escapeHtml="false" value="#goctemplateclientbean.renderServerBottom" />);
68-
</script>
69-
<!-- Write closure template -->
70-
<script type="text/javascript">
71-
document.write(wet.builder.refFooter(<s:property escapeHtml="false" value="#goctemplateclientbean.renderServerRefFooter" />));
72-
</script>
73-
<s:property escapeHtml="false" value="#goctemplateclientbean.renderHtmlBodyElements" />
7455
</body>
7556
</html>

‎gocwebtemplate-sample-jsp/src/main/webapp/templates/leftmenu-mastertemplate.jsp‎

Lines changed: 4 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -29,69 +29,40 @@
2929
<meta content="width=device-width,initial-scale=1" name="viewport" />
3030
<!-- Load closure template scripts -->
3131
<link rel="stylesheet" href="<s:property value="#goctemplateclientbean.cssPath"/>">
32-
<script type="text/javascript" src="<s:property value="#goctemplateclientbean.wetJsPath"/>"></script>
32+
<script type="text/javascript" src="<s:property value="#goctemplateclientbean.wetJsPath"/>" data-cdts-setup='<s:property escapeHtml="false" value="#goctemplateclientbean.renderSetup"/>'></script>
3333
<noscript>
3434
<!-- Write closure fall-back static file -->
3535
<s:property escapeHtml="false" value="%{#applicationscopebean.getStaticFile(#goctemplateclientbean.staticFallbackFilePath, #request.wettheme, 'refTop.html')}" />
3636
</noscript>
37-
<!-- Write closure template -->
38-
<script type="text/javascript">
39-
document.write(wet.builder.refTop(<s:property escapeHtml="false" value="#goctemplateclientbean.renderRefTop" />));
40-
</script>
4137
<s:property escapeHtml="false" value="#goctemplateclientbean.renderHtmlHeaderElements" />
4238
<!-- GoC Web Template Build Version <s:property value="#goctemplateclientbean.webTemplateDistributionVersion" /> -->
4339
</head>
4440
<body vocab="http://schema.org/" typeof="WebPage">
4541
<s:property escapeHtml="false" value="#goctemplateclientbean.renderSessionTimeoutControl" />
46-
<div id="def-top">
42+
<div id="cdts-def-top">
4743
<!-- Write closure fall-back static file -->
4844
<s:property escapeHtml="false" value="%{#applicationscopebean.getStaticFile(#goctemplateclientbean.staticFallbackFilePath, #request.wettheme, 'top-'.concat(#goctemplateclientbean.twoLetterCultureLanguage).concat('.html'))}" />
4945
</div>
50-
<!-- Write closure template -->
51-
<script type="text/javascript">
52-
var defTop = document.getElementById("def-top");
53-
defTop.outerHTML = wet.builder.top(<s:property escapeHtml="false" value="#goctemplateclientbean.renderTop" />);
54-
</script>
5546
<div class="container">
5647
<div class="row">
5748
<main role="main" property="mainContentOfPage" class="col-md-9 col-md-push-3" typeof="WebPageElement">
5849
<!-- the main content -->
5950
<tiles:insertAttribute name="body" />
6051
<!-- end main content -->
61-
<div id="def-preFooter">
52+
<div id="cdts-def-preFooter">
6253
<!-- Write closure fall-back static file -->
6354
<s:property escapeHtml="false" value="%{#applicationscopebean.getStaticFile(#goctemplateclientbean.staticFallbackFilePath, #request.wettheme, 'preFooter-'.concat(#goctemplateclientbean.twoLetterCultureLanguage).concat('.html'))}" />
6455
</div>
65-
<!-- Write closure template -->
66-
<script type="text/javascript">
67-
var defPreFooter = document.getElementById("def-preFooter");
68-
defPreFooter.outerHTML = wet.builder.preFooter(<s:property escapeHtml="false" value="#goctemplateclientbean.renderPreFooter" />);
69-
</script>
7056
</main>
7157
<nav class="wb-sec col-md-3 col-md-pull-9" typeof="SiteNavigationElement" id="wb-sec" role="navigation">
7258
<!-- Write closure fall-back static file -->
7359
<s:property escapeHtml="false" value="%{#applicationscopebean.getStaticFile(#goctemplateclientbean.staticFallbackFilePath, #request.wettheme, 'secMenu-'.concat(#goctemplateclientbean.twoLetterCultureLanguage).concat('.html'))}" />
7460
</nav>
75-
<!-- Write closure template -->
76-
<script type="text/javascript">
77-
var secondarymenu = document.getElementById("wb-sec");
78-
secondarymenu.innerHTML = wet.builder.secmenu(<s:property escapeHtml="false" value="#goctemplateclientbean.renderLeftMenuSections" />);
79-
</script>
8061
</div>
8162
</div>
82-
<div id="def-footer">
63+
<div id="cdts-def-footer">
8364
<!-- Write closure fall-back static file -->
8465
<s:property escapeHtml="false" value="%{#applicationscopebean.getStaticFile(#goctemplateclientbean.staticFallbackFilePath, #request.wettheme, 'footer-'.concat(#goctemplateclientbean.twoLetterCultureLanguage).concat('.html'))}" />
8566
</div>
86-
<!-- Write closure template -->
87-
<script type="text/javascript">
88-
var defFooter = document.getElementById("def-footer");
89-
defFooter.outerHTML = wet.builder.footer(<s:property escapeHtml="false" value="#goctemplateclientbean.renderFooter" />);
90-
</script>
91-
<!-- Write closure template -->
92-
<script type="text/javascript">
93-
document.write(wet.builder.refFooter(<s:property escapeHtml="false" value="#goctemplateclientbean.renderRefFooter" />));
94-
</script>
95-
<s:property escapeHtml="false" value="#goctemplateclientbean.renderHtmlBodyElements" />
9667
</body>
9768
</html>

0 commit comments

Comments
 (0)