Skip to content

Commit c1b520c

Browse files
mmoquimmoqui
committed
Bug #14491
Delete the spacesInURL.js files as no code in this files are used. Remove the reference to the spacesInURL.js file in the JSPs. Refine the code of those JSPs.
1 parent f60583a commit c1b520c

File tree

9 files changed

+133
-204
lines changed

9 files changed

+133
-204
lines changed

‎webSites/webSites-war/src/main/webapp/webSites/jsp/javaScript/spacesInURL.js

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎webSites/webSites-war/src/main/webapp/webSites/jsp/listSite.jsp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
<view:sp-page angularJsAppName="silverpeas.bookmark">
3939
<view:sp-head-part>
4040
<view:includePlugin name="toggle"/>
41-
<view:script src="javaScript/spacesInURL.js"/>
4241
<view:script src="javaScript/commons.js"/>
4342
<script type="text/javascript">
4443
window.wsm = new WebSiteManager('listSite.jsp');

‎webSites/webSites-war/src/main/webapp/webSites/jsp/listSitePortlet.jsp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ FolderDetail webSitesCurrentFolder = (FolderDetail) request.getAttribute("Curren
3939
<!-- listSite -->
4040
<view:sp-page>
4141
<view:sp-head-part>
42-
<view:script src="javaScript/spacesInURL.js"/>
4342
<view:script src="javaScript/commons.js"/>
4443
<script type="text/javascript">
4544
window.wsm = new WebSiteManager({

‎webSites/webSites-war/src/main/webapp/webSites/jsp/listSite_reader.jsp

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,22 +39,19 @@
3939
String singleSiteId = (siteList != null && siteList.size() == 1) ? siteList.iterator().next().getVersion() : null;
4040
String suggestionName = (String) request.getAttribute("SuggestionName");
4141
String suggestionUrl = (String) request.getAttribute("SuggestionUrl");
42-
boolean suggestionSent = false;
43-
if (suggestionName != null) {
44-
suggestionSent = true;
45-
}
42+
boolean suggestionSent = suggestionName != null;
4643
String suggestLabel = resources.getString("Suggerer");
4744
%>
4845

4946
<!-- listSite_reader -->
5047

5148
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
52-
<html xmlns="http://www.w3.org/1999/xhtml" id="ng-app" ng-app="silverpeas.bookmark">
49+
<html xmlns="http://www.w3.org/1999/xhtml" id="ng-app" ng-app="silverpeas.bookmark"
50+
lang="<%=resources.getLanguage()%>">
5351
<head>
5452
<view:looknfeel/>
5553
<view:includePlugin name="toggle"/>
5654
<title><%=resources.getString("GML.popupTitle")%></title>
57-
<view:script src="javaScript/spacesInURL.js"/>
5855
<view:script src="javaScript/commons.js"/>
5956
<script type="text/javascript">
6057
window.wsm = new WebSiteManager('listSite_reader.jsp');
@@ -68,11 +65,11 @@
6865
}
6966
7067
function openSuggestionConfirmation() {
71-
var theURL = "suggestionConfirmation.jsp?nomSite=<%=suggestionName%>&nomPage=<%=suggestionUrl%>";
72-
var winName = "suggestionConfirmation";
73-
var larg = "480";
74-
var haut = "300";
75-
var windowParams = "scrollbars=yes, resizable, alwaysRaised";
68+
const theURL = "suggestionConfirmation.jsp?nomSite=<%=suggestionName%>&nomPage=<%=suggestionUrl%>";
69+
const winName = "suggestionConfirmation";
70+
const larg = "480";
71+
const haut = "300";
72+
const windowParams = "scrollbars=yes, resizable, alwaysRaised";
7673
SP_openWindow(theURL, winName, larg, haut, windowParams);
7774
}
7875
</script>
@@ -91,7 +88,8 @@
9188
</view:window>
9289
<script type="text/javascript">
9390
/* declare the module myapp and its dependencies (here in the silverpeas module) */
94-
var myapp = angular.module('silverpeas.bookmark', ['silverpeas.services', 'silverpeas.directives']);
91+
window.myapp = angular.module('silverpeas.bookmark', ['silverpeas.services',
92+
'silverpeas.directives']);
9593
</script>
9694
</body>
9795
</html>

‎webSites/webSites-war/src/main/webapp/webSites/jsp/listSite_readerPortlet.jsp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ FolderDetail webSitesCurrentFolder = (FolderDetail) request.getAttribute("Curren
4141

4242
<view:sp-page>
4343
<view:sp-head-part>
44-
<view:script src="javaScript/spacesInURL.js"/>
4544
<view:script src="javaScript/commons.js"/>
4645
<script type="text/javascript">
4746
window.wsm = new WebSiteManager({

‎webSites/webSites-war/src/main/webapp/webSites/jsp/organize.jsp

Lines changed: 52 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -68,66 +68,65 @@ if (action == null) {
6868

6969
<view:sp-page>
7070
<view:sp-head-part>
71-
<view:script src="javaScript/spacesInURL.js"/>
7271
<view:script src="javaScript/commons.js"/>
7372
<script type="text/javascript">
7473
75-
var topicAddWindow = window;
76-
var topicUpdateWindow = window;
74+
let topicAddWindow = window;
75+
let topicUpdateWindow = window;
7776
78-
/***************************************************************************/
77+
/***************************************************************************/
7978
8079
function declassify(nbTopic, nbSite) {
8180
closeWindows();
8281
83-
okTopic = "false";
84-
okSites = "false";
82+
let okTopic = false;
83+
let okSites = false;
8584
8685
if (nbTopic > 0) {
87-
if (nbTopic == 1) {
86+
if (nbTopic === 1) {
8887
if (document.liste.checkbox.checked)
89-
okTopic = "true";
88+
okTopic = true;
9089
}
9190
else {
92-
for (i=0; i<nbTopic; i++) {
91+
for (let i=0; i<nbTopic; i++) {
9392
if (document.liste.checkbox[i] != null) {
9493
if (document.liste.checkbox[i].checked)
95-
okTopic = "true";
94+
okTopic = true;
9695
}
9796
else break;
9897
}
9998
}
10099
}
101100
102101
if (nbSite > 0) {
103-
if (nbSite == 1) {
102+
if (nbSite === 1) {
104103
if (document.liste.supSite.checked)
105-
okSites = "true";
104+
okSites = true;
106105
}
107106
else {
108-
for (i=0; i<nbSite; i++) {
107+
for (let i=0; i<nbSite; i++) {
109108
if (document.liste.supSite[i] != null) {
110109
if (document.liste.supSite[i].checked)
111-
okSites = "true";
110+
okSites = true;
112111
}
113112
else break;
114113
}
115114
}
116115
}
117116
118117
119-
if (okTopic != "false" || okSites != "false") { //au moins un theme ou un site est selectionne
118+
if (okTopic !== false || okSites !== false) { //au moins un theme ou un site est selectionne
120119
121-
var label = "<%=resources.getString("FolderSiteDeleteConfirmation")%>";
122-
jQuery.popup.confirm(label, function() {
123-
listeSite = "";
120+
const label = "<%=resources.getString("FolderSiteDeleteConfirmation")%>";
121+
jQuery.popup.confirm(label, function() {
122+
let listeSite = "";
124123
125124
if (nbSite > 0) {
126-
if (nbSite == 1) {
125+
if (nbSite === 1) {
127126
if (document.liste.supSite.checked)
128127
listeSite += document.liste.supSite.value + ",";
129128
} else {
130-
for (i=0; i<nbSite; i++) {
129+
for (let i=0; i<nbSite; i++) {
131130
if (document.liste.supSite[i] != null) {
132131
if (document.liste.supSite[i].checked)
133132
listeSite += document.liste.supSite[i].value + ",";
@@ -147,15 +146,15 @@ function declassify(nbTopic, nbSite) {
147146
/***************************************************************************/
148147
149148
function topicAdd(fatherId) {
150-
if (!topicAddWindow.closed && topicAddWindow.name == "topicAddWindow")
151-
topicAddWindow.close();
152-
153-
path = document.liste.Path.value;
154-
windowName = "topicAddWindow";
155-
larg = "670";
156-
haut = "270";
157-
windowParams = "directories=0,menubar=0,toolbar=0,alwaysRaised";
158-
topicAddWindow = SP_openWindow({
149+
if (!topicAddWindow.closed && topicAddWindow.name === "topicAddWindow")
150+
topicAddWindow.close();
151+
152+
const path = document.liste.Path.value;
153+
const windowName = "topicAddWindow";
154+
const larg = "670";
155+
const haut = "270";
156+
const windowParams = "directories=0,menubar=0,toolbar=0,alwaysRaised";
157+
topicAddWindow = SP_openWindow({
159158
url : 'addTopic.jsp',
160159
params : {
161160
'Id' : fatherId,
@@ -168,16 +167,16 @@ function topicAdd(fatherId) {
168167
/***************************************************************************/
169168
170169
function topicUpdate(id) {
171-
if (!topicUpdateWindow.closed && topicUpdateWindow.name== "topicUpdateWindow")
170+
if (!topicUpdateWindow.closed && topicUpdateWindow.name === "topicUpdateWindow")
172171
topicUpdateWindow.close();
173172
174173
document.liste.ChildId.value = id;
175-
path = document.liste.Path.value;
176-
windowName = "topicUpdateWindow";
177-
larg = "670";
178-
haut = "270";
179-
windowParams = "directories=0,menubar=0,toolbar=0, alwaysRaised";
180-
topicUpdateWindow = SP_openWindow({
174+
const path = document.liste.Path.value;
175+
const windowName = "topicUpdateWindow";
176+
const larg = "670";
177+
const haut = "270";
178+
const windowParams = "directories=0,menubar=0,toolbar=0, alwaysRaised";
179+
topicUpdateWindow = SP_openWindow({
181180
url : 'updateTopic.jsp',
182181
params : {
183182
'ChildId' : id,
@@ -200,10 +199,10 @@ function publicationAdd(topicId){
200199
/***************************************************************************/
201200
202201
function closeWindows() {
203-
if (!topicAddWindow.closed && topicAddWindow.name=="topicAddWindow")
202+
if (!topicAddWindow.closed && topicAddWindow.name === "topicAddWindow")
204203
topicAddWindow.close();
205204
206-
if (!topicUpdateWindow.closed && topicUpdateWindow.name=="topicUpdateWindow")
205+
if (!topicUpdateWindow.closed && topicUpdateWindow.name === "topicUpdateWindow")
207206
topicUpdateWindow.close();
208207
}
209208
@@ -361,10 +360,10 @@ window.wsm = new WebSiteManager({
361360
out.println(arrayPane.print());
362361
363362
//Liste des sites du th�me courant
364-
String liste = "";
363+
StringBuilder liste = new StringBuilder();
365364
366-
if (listeSites.size() > 0) {
367-
liste += "<table border=\"0\">\n";
365+
if (!listeSites.isEmpty()) {
366+
liste.append("<table border=\"0\">\n");
368367
369368
nbChild = 0;
370369
@@ -373,8 +372,8 @@ window.wsm = new WebSiteManager({
373372
String siteId = site.getVersion();
374373
String siteName = site.getName();
375374
String siteDescription = WebEncodeHelper.javaStringToHtmlParagraphe(site.getDescription());
376-
liste += "<tr>\n";
377-
liste += "<td valign=\"top\" width=\"5%\"><input type=\"checkbox\" name=\"supSite\" value=\""+pubId+"\"/></td>\n";
375+
liste.append("<tr>\n");
376+
liste.append("<td valign=\"top\" width=\"5%\"><input type=\"checkbox\" name=\"supSite\" value=\"").append(pubId).append("\"/></td>\n");
378377
if (scc.isSortedTopicsEnabled()) {
379378
IconPane sortPane = gef.getIconPane();
380379
if (nbChild != 0) {
@@ -387,27 +386,27 @@ window.wsm = new WebSiteManager({
387386
downIcon.setProperties(downIconSrc, resources.getString("PubDown")+" '"+siteName+"'", "javascript:onClick=pubDown('"+pubId+"')");
388387
}
389388
390-
liste += "<td width=\"10px\">&nbsp;</td>\n";
389+
liste.append("<td width=\"10px\">&nbsp;</td>\n");
391390
392-
liste += "<td width=\"20px\" valign=\"top\">\n";
393-
liste += sortPane.print();
394-
liste += "</td>\n";
391+
liste.append("<td width=\"20px\" valign=\"top\">\n");
392+
liste.append(sortPane.print());
393+
liste.append("</td>\n");
395394
396-
liste += "<td width=\"10px\">&nbsp;</td>\n";
395+
liste.append("<td width=\"10px\">&nbsp;</td>\n");
397396
}
398-
liste += "<td valign=\"top\">&#149;&nbsp;<a class=\"textePetitBold\" href=\"javascript:onClick=wsm.goToSite('"+siteId+"')\">"+siteName+"</a><br/>\n";
397+
liste.append("<td valign=\"top\">&#149;&nbsp;<a class=\"textePetitBold\" href=\"javascript:onClick=wsm.goToSite('").append(siteId).append("')\">").append(siteName).append("</a><br/>\n");
399398
400-
liste += "<span class=\"txtnote\">&nbsp;&nbsp;"+siteDescription+"</span><br/><br/></td>\n";
401-
liste += "</tr>\n";
399+
liste.append("<span class=\"txtnote\">&nbsp;&nbsp;").append(siteDescription).append("</span><br/><br/></td>\n");
400+
liste.append("</tr>\n");
402401
403402
nbChild++;
404403
}
405404
406-
liste += "</table>\n";
405+
liste.append("</table>\n");
407406
%>
408407
<br/>
409408
<view:board>
410-
<%=liste %>
409+
<%=liste.toString() %>
411410
</view:board>
412411
<%
413412
}

0 commit comments

Comments
 (0)