Skip to content

Commit 78c95f8

Browse files
mike-podolskiy90mike-podolskiy90
committed
#2637 Move makeSureResourceParameterIsPresentInURL to global.js
1 parent aeaaf35 commit 78c95f8

24 files changed

+35
-303
lines changed

Diff for: ‎src/main/webapp/WEB-INF/pages/manage/dp-metadata/camtrap/basic.ftl

+1-15
Original file line numberDiff line numberDiff line change
@@ -402,21 +402,7 @@
402402
theme: 'bootstrap4'
403403
});
404404
405-
makeSureResourceParameterIsPresentInURL();
406-
407-
function makeSureResourceParameterIsPresentInURL() {
408-
const currentUrl = window.location.href;
409-
const url = new URL(currentUrl);
410-
411-
const searchParams = url.searchParams;
412-
413-
if (!searchParams.has('r')) {
414-
console.log('Resource shortname (Camtrap DP basic metadata):')
415-
console.log('${resource.shortname}');
416-
searchParams.set('r', '${resource.shortname}');
417-
window.history.replaceState({}, '', url.toString());
418-
}
419-
}
405+
makeSureResourceParameterIsPresentInURL('${resource.shortname}');
420406
});
421407
</script>
422408
<#assign currentMenu="manage"/>

Diff for: ‎src/main/webapp/WEB-INF/pages/manage/dp-metadata/camtrap/citation.ftl

+1-13
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,7 @@
3939
$("#generateOff").hide();
4040
});
4141
42-
makeSureResourceParameterIsPresentInURL();
43-
44-
function makeSureResourceParameterIsPresentInURL() {
45-
const currentUrl = window.location.href;
46-
const url = new URL(currentUrl);
47-
48-
const searchParams = url.searchParams;
49-
50-
if (!searchParams.has('r')) {
51-
searchParams.set('r', '${resource.shortname}');
52-
window.history.replaceState({}, '', url.toString());
53-
}
54-
}
42+
makeSureResourceParameterIsPresentInURL('${resource.shortname}');
5543
});
5644
</script>
5745
<#assign currentMenu="manage"/>

Diff for: ‎src/main/webapp/WEB-INF/pages/manage/dp-metadata/camtrap/geographic.ftl

+1-13
Original file line numberDiff line numberDiff line change
@@ -76,19 +76,7 @@
7676
7777
$("#re-infer-link").on('click', displayProcessing);
7878
79-
makeSureResourceParameterIsPresentInURL();
80-
81-
function makeSureResourceParameterIsPresentInURL() {
82-
const currentUrl = window.location.href;
83-
const url = new URL(currentUrl);
84-
85-
const searchParams = url.searchParams;
86-
87-
if (!searchParams.has('r')) {
88-
searchParams.set('r', '${resource.shortname}');
89-
window.history.replaceState({}, '', url.toString());
90-
}
91-
}
79+
makeSureResourceParameterIsPresentInURL('${resource.shortname}');
9280
});
9381
</script>
9482
<#assign currentMenu="manage"/>

Diff for: ‎src/main/webapp/WEB-INF/pages/manage/dp-metadata/camtrap/keywords.ftl

+1-13
Original file line numberDiff line numberDiff line change
@@ -74,19 +74,7 @@
7474
$('body, html').animate({scrollTop: pos});
7575
}
7676
77-
makeSureResourceParameterIsPresentInURL();
78-
79-
function makeSureResourceParameterIsPresentInURL() {
80-
const currentUrl = window.location.href;
81-
const url = new URL(currentUrl);
82-
83-
const searchParams = url.searchParams;
84-
85-
if (!searchParams.has('r')) {
86-
searchParams.set('r', '${resource.shortname}');
87-
window.history.replaceState({}, '', url.toString());
88-
}
89-
}
77+
makeSureResourceParameterIsPresentInURL('${resource.shortname}');
9078
});
9179
</script>
9280
<#assign currentMenu="manage"/>

Diff for: ‎src/main/webapp/WEB-INF/pages/manage/dp-metadata/camtrap/other.ftl

+1-13
Original file line numberDiff line numberDiff line change
@@ -218,19 +218,7 @@
218218
theme: 'bootstrap4'
219219
});
220220
221-
makeSureResourceParameterIsPresentInURL();
222-
223-
function makeSureResourceParameterIsPresentInURL() {
224-
const currentUrl = window.location.href;
225-
const url = new URL(currentUrl);
226-
227-
const searchParams = url.searchParams;
228-
229-
if (!searchParams.has('r')) {
230-
searchParams.set('r', '${resource.shortname}');
231-
window.history.replaceState({}, '', url.toString());
232-
}
233-
}
221+
makeSureResourceParameterIsPresentInURL('${resource.shortname}');
234222
});
235223
</script>
236224
<#assign currentMenu="manage"/>

Diff for: ‎src/main/webapp/WEB-INF/pages/manage/dp-metadata/camtrap/project.ftl

+1-13
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,7 @@
4444
theme: 'bootstrap4'
4545
});
4646
47-
makeSureResourceParameterIsPresentInURL();
48-
49-
function makeSureResourceParameterIsPresentInURL() {
50-
const currentUrl = window.location.href;
51-
const url = new URL(currentUrl);
52-
53-
const searchParams = url.searchParams;
54-
55-
if (!searchParams.has('r')) {
56-
searchParams.set('r', '${resource.shortname}');
57-
window.history.replaceState({}, '', url.toString());
58-
}
59-
}
47+
makeSureResourceParameterIsPresentInURL('${resource.shortname}');
6048
});
6149
</script>
6250
<#assign currentMenu="manage"/>

Diff for: ‎src/main/webapp/WEB-INF/pages/manage/dp-metadata/camtrap/taxonomic.ftl

+1-13
Original file line numberDiff line numberDiff line change
@@ -301,19 +301,7 @@
301301
302302
$("#re-infer-link").on('click', displayProcessing);
303303
304-
makeSureResourceParameterIsPresentInURL();
305-
306-
function makeSureResourceParameterIsPresentInURL() {
307-
const currentUrl = window.location.href;
308-
const url = new URL(currentUrl);
309-
310-
const searchParams = url.searchParams;
311-
312-
if (!searchParams.has('r')) {
313-
searchParams.set('r', '${resource.shortname}');
314-
window.history.replaceState({}, '', url.toString());
315-
}
316-
}
304+
makeSureResourceParameterIsPresentInURL('${resource.shortname}');
317305
});
318306
</script>
319307
<#assign currentMenu="manage"/>

Diff for: ‎src/main/webapp/WEB-INF/pages/manage/dp-metadata/camtrap/temporal.ftl

+1-13
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,7 @@
4848
4949
$("#re-infer-link").on('click', displayProcessing);
5050
51-
makeSureResourceParameterIsPresentInURL();
52-
53-
function makeSureResourceParameterIsPresentInURL() {
54-
const currentUrl = window.location.href;
55-
const url = new URL(currentUrl);
56-
57-
const searchParams = url.searchParams;
58-
59-
if (!searchParams.has('r')) {
60-
searchParams.set('r', '${resource.shortname}');
61-
window.history.replaceState({}, '', url.toString());
62-
}
63-
}
51+
makeSureResourceParameterIsPresentInURL('${resource.shortname}');
6452
});
6553
</script>
6654
<#assign currentMenu="manage"/>

Diff for: ‎src/main/webapp/WEB-INF/pages/manage/dp-metadata/frictionless/basic.ftl

+1-13
Original file line numberDiff line numberDiff line change
@@ -230,19 +230,7 @@
230230
$('body, html').animate({scrollTop: pos});
231231
}
232232
233-
makeSureResourceParameterIsPresentInURL();
234-
235-
function makeSureResourceParameterIsPresentInURL() {
236-
const currentUrl = window.location.href;
237-
const url = new URL(currentUrl);
238-
239-
const searchParams = url.searchParams;
240-
241-
if (!searchParams.has('r')) {
242-
searchParams.set('r', '${resource.shortname}');
243-
window.history.replaceState({}, '', url.toString());
244-
}
245-
}
233+
makeSureResourceParameterIsPresentInURL('${resource.shortname}');
246234
});
247235
</script>
248236
<#assign currentMenu="manage"/>

Diff for: ‎src/main/webapp/WEB-INF/pages/manage/eml/acknowledgements.ftl

+1-13
Original file line numberDiff line numberDiff line change
@@ -53,19 +53,7 @@
5353
this.submit();
5454
});
5555
56-
makeSureResourceParameterIsPresentInURL();
57-
58-
function makeSureResourceParameterIsPresentInURL() {
59-
const currentUrl = window.location.href;
60-
const url = new URL(currentUrl);
61-
62-
const searchParams = url.searchParams;
63-
64-
if (!searchParams.has('r')) {
65-
searchParams.set('r', '${resource.shortname}');
66-
window.history.replaceState({}, '', url.toString());
67-
}
68-
}
56+
makeSureResourceParameterIsPresentInURL('${resource.shortname}');
6957
});
7058
</script>
7159
<#assign currentMenu="manage"/>

Diff for: ‎src/main/webapp/WEB-INF/pages/manage/eml/additional.ftl

+1-13
Original file line numberDiff line numberDiff line change
@@ -116,19 +116,7 @@
116116
hideProcessing();
117117
}
118118
119-
makeSureResourceParameterIsPresentInURL();
120-
121-
function makeSureResourceParameterIsPresentInURL() {
122-
const currentUrl = window.location.href;
123-
const url = new URL(currentUrl);
124-
125-
const searchParams = url.searchParams;
126-
127-
if (!searchParams.has('r')) {
128-
searchParams.set('r', '${resource.shortname}');
129-
window.history.replaceState({}, '', url.toString());
130-
}
131-
}
119+
makeSureResourceParameterIsPresentInURL('${resource.shortname}');
132120
});
133121
</script>
134122
<#assign currentMetadataPage = "additional"/>

Diff for: ‎src/main/webapp/WEB-INF/pages/manage/eml/additionalDescription.ftl

+1-13
Original file line numberDiff line numberDiff line change
@@ -124,19 +124,7 @@
124124
this.submit();
125125
});
126126
127-
makeSureResourceParameterIsPresentInURL();
128-
129-
function makeSureResourceParameterIsPresentInURL() {
130-
const currentUrl = window.location.href;
131-
const url = new URL(currentUrl);
132-
133-
const searchParams = url.searchParams;
134-
135-
if (!searchParams.has('r')) {
136-
searchParams.set('r', '${resource.shortname}');
137-
window.history.replaceState({}, '', url.toString());
138-
}
139-
}
127+
makeSureResourceParameterIsPresentInURL('${resource.shortname}');
140128
});
141129
</script>
142130
<#assign currentMenu="manage"/>

Diff for: ‎src/main/webapp/WEB-INF/pages/manage/eml/basic.ftl

+1-15
Original file line numberDiff line numberDiff line change
@@ -272,21 +272,7 @@
272272
this.submit();
273273
});
274274
275-
makeSureResourceParameterIsPresentInURL();
276-
277-
function makeSureResourceParameterIsPresentInURL() {
278-
const currentUrl = window.location.href;
279-
const url = new URL(currentUrl);
280-
281-
const searchParams = url.searchParams;
282-
283-
if (!searchParams.has('r')) {
284-
console.log('Resource shortname (EML basic metadata):')
285-
console.log('${resource.shortname}');
286-
searchParams.set('r', '${resource.shortname}');
287-
window.history.replaceState({}, '', url.toString());
288-
}
289-
}
275+
makeSureResourceParameterIsPresentInURL('${resource.shortname}');
290276
});
291277
</script>
292278
<style>

Diff for: ‎src/main/webapp/WEB-INF/pages/manage/eml/citations.ftl

+1-13
Original file line numberDiff line numberDiff line change
@@ -91,19 +91,7 @@
9191
hideProcessing();
9292
}
9393
94-
makeSureResourceParameterIsPresentInURL();
95-
96-
function makeSureResourceParameterIsPresentInURL() {
97-
const currentUrl = window.location.href;
98-
const url = new URL(currentUrl);
99-
100-
const searchParams = url.searchParams;
101-
102-
if (!searchParams.has('r')) {
103-
searchParams.set('r', '${resource.shortname}');
104-
window.history.replaceState({}, '', url.toString());
105-
}
106-
}
94+
makeSureResourceParameterIsPresentInURL('${resource.shortname}');
10795
});
10896
</script>
10997
<#include "/WEB-INF/pages/macros/metadata.ftl"/>

Diff for: ‎src/main/webapp/WEB-INF/pages/manage/eml/collections.ftl

+1-13
Original file line numberDiff line numberDiff line change
@@ -126,19 +126,7 @@
126126
theme: 'bootstrap4'
127127
});
128128
129-
makeSureResourceParameterIsPresentInURL();
130-
131-
function makeSureResourceParameterIsPresentInURL() {
132-
const currentUrl = window.location.href;
133-
const url = new URL(currentUrl);
134-
135-
const searchParams = url.searchParams;
136-
137-
if (!searchParams.has('r')) {
138-
searchParams.set('r', '${resource.shortname}');
139-
window.history.replaceState({}, '', url.toString());
140-
}
141-
}
129+
makeSureResourceParameterIsPresentInURL('${resource.shortname}');
142130
});
143131
</script>
144132

Diff for: ‎src/main/webapp/WEB-INF/pages/manage/eml/contacts.ftl

+1-13
Original file line numberDiff line numberDiff line change
@@ -205,19 +205,7 @@
205205
}
206206
});
207207
208-
makeSureResourceParameterIsPresentInURL();
209-
210-
function makeSureResourceParameterIsPresentInURL() {
211-
const currentUrl = window.location.href;
212-
const url = new URL(currentUrl);
213-
214-
const searchParams = url.searchParams;
215-
216-
if (!searchParams.has('r')) {
217-
searchParams.set('r', '${resource.shortname}');
218-
window.history.replaceState({}, '', url.toString());
219-
}
220-
}
208+
makeSureResourceParameterIsPresentInURL('${resource.shortname}');
221209
});
222210
</script>
223211
<style>

Diff for: ‎src/main/webapp/WEB-INF/pages/manage/eml/geocoverage.ftl

+1-13
Original file line numberDiff line numberDiff line change
@@ -428,19 +428,7 @@
428428
validateCoordinates(event);
429429
});
430430
431-
makeSureResourceParameterIsPresentInURL();
432-
433-
function makeSureResourceParameterIsPresentInURL() {
434-
const currentUrl = window.location.href;
435-
const url = new URL(currentUrl);
436-
437-
const searchParams = url.searchParams;
438-
439-
if (!searchParams.has('r')) {
440-
searchParams.set('r', '${resource.shortname}');
441-
window.history.replaceState({}, '', url.toString());
442-
}
443-
}
431+
makeSureResourceParameterIsPresentInURL('${resource.shortname}');
444432
});
445433
</script>
446434

Diff for: ‎src/main/webapp/WEB-INF/pages/manage/eml/keywords.ftl

+1-13
Original file line numberDiff line numberDiff line change
@@ -60,19 +60,7 @@
6060
hideProcessing();
6161
}
6262
63-
makeSureResourceParameterIsPresentInURL();
64-
65-
function makeSureResourceParameterIsPresentInURL() {
66-
const currentUrl = window.location.href;
67-
const url = new URL(currentUrl);
68-
69-
const searchParams = url.searchParams;
70-
71-
if (!searchParams.has('r')) {
72-
searchParams.set('r', '${resource.shortname}');
73-
window.history.replaceState({}, '', url.toString());
74-
}
75-
}
63+
makeSureResourceParameterIsPresentInURL('${resource.shortname}');
7664
});
7765
</script>
7866
<#include "/WEB-INF/pages/macros/metadata.ftl"/>

0 commit comments

Comments
 (0)