Skip to content

Commit 6d9ba07

Browse files
authored
[Conflict Resolver] jQuery cleanup (#7380)
Remove jQuery references in Conflict Resolver module.
1 parent 1abab54 commit 6d9ba07

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

.eslintrc.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@
149149
"files": [
150150
"modules/media/**",
151151
"modules/candidate_parameters/**",
152-
"modules/conflict_resolver/**",
153152
"modules/bvl_feedback/**",
154153
"modules/dataquery/**",
155154
"modules/dqt/**",

modules/conflict_resolver/jsx/conflictResolverIndex.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -338,8 +338,9 @@ window.addEventListener('load', () => {
338338
);
339339
// Prevent tab switching
340340
const refresh = setInterval(function() {
341-
if (document.getElementById('tab-ResolvedConflicts')) {
342-
$('#tab-ResolvedConflicts').click(function(event) {
341+
let resolvedTab = document.getElementById('tab-ResolvedConflicts');
342+
if (resolvedTab) {
343+
resolvedTab.addEventListener('click', function(event) {
343344
event.preventDefault();
344345
window.location.href = loris.BaseURL
345346
+ '/conflict_resolver/resolved_conflicts/';

modules/conflict_resolver/jsx/resolvedConflictsIndex.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -327,8 +327,9 @@ window.addEventListener('load', () => {
327327
);
328328
// Prevent tab switching
329329
const refresh = setInterval(function() {
330-
if (document.getElementById('tab-ResolvedConflicts')) {
331-
$('#tab-UnresolvedConflicts').click(function(event) {
330+
let unresolvedTab = document.getElementById('tab-UnresolvedConflicts');
331+
if (unresolvedTab) {
332+
unresolvedTab.addEventListener('click', function(event) {
332333
event.preventDefault();
333334
window.location.href = loris.BaseURL + '/conflict_resolver/';
334335
return false;

0 commit comments

Comments
 (0)