Skip to content

Commit

Permalink
[Conflict Resolver] jQuery cleanup (#7380)
Browse files Browse the repository at this point in the history
Remove jQuery references in Conflict Resolver module.
  • Loading branch information
laemtl authored Mar 10, 2021
1 parent 1abab54 commit 6d9ba07
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
1 change: 0 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,6 @@
"files": [
"modules/media/**",
"modules/candidate_parameters/**",
"modules/conflict_resolver/**",
"modules/bvl_feedback/**",
"modules/dataquery/**",
"modules/dqt/**",
Expand Down
5 changes: 3 additions & 2 deletions modules/conflict_resolver/jsx/conflictResolverIndex.js
Original file line number Diff line number Diff line change
Expand Up @@ -338,8 +338,9 @@ window.addEventListener('load', () => {
);
// Prevent tab switching
const refresh = setInterval(function() {
if (document.getElementById('tab-ResolvedConflicts')) {
$('#tab-ResolvedConflicts').click(function(event) {
let resolvedTab = document.getElementById('tab-ResolvedConflicts');
if (resolvedTab) {
resolvedTab.addEventListener('click', function(event) {
event.preventDefault();
window.location.href = loris.BaseURL
+ '/conflict_resolver/resolved_conflicts/';
Expand Down
5 changes: 3 additions & 2 deletions modules/conflict_resolver/jsx/resolvedConflictsIndex.js
Original file line number Diff line number Diff line change
Expand Up @@ -327,8 +327,9 @@ window.addEventListener('load', () => {
);
// Prevent tab switching
const refresh = setInterval(function() {
if (document.getElementById('tab-ResolvedConflicts')) {
$('#tab-UnresolvedConflicts').click(function(event) {
let unresolvedTab = document.getElementById('tab-UnresolvedConflicts');
if (unresolvedTab) {
unresolvedTab.addEventListener('click', function(event) {
event.preventDefault();
window.location.href = loris.BaseURL + '/conflict_resolver/';
return false;
Expand Down

0 comments on commit 6d9ba07

Please sign in to comment.