htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix display of custom annotations in ACE Editor

Browse Source 
With these changes, we no longer need our custom changes previously restored with 1013903.
This commit is contained in:
Sebastian Serth
2024-02-13 19:31:09 +01:00
committed by Sebastian Serth
parent e366ebd34c
commit 942dbd20db
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/request_for_comments.js
View File

@ -159,6 +159,7 @@ $(document).on('turbolinks:load', function () {
jqrequest.done(function (response) { jqrequest.done(function (response) {
$.each(response, function (index, comment) { $.each(response, function (index, comment) {
comment.className = 'code-ocean_comment'; comment.className = 'code-ocean_comment';
comment.type = 'info'; // Required for the annotation to be rendered correctly (besides being hidden through CSS).
}); });
session.setAnnotations(response); session.setAnnotations(response);
}); });
@ -267,10 +268,10 @@ $(document).on('turbolinks:load', function () {
let lastTarget = null; let lastTarget = null;
function showPopover(e) { function showPopover(e) {
const target = e.domEvent.target; const target = e.domEvent.target.closest('.ace_gutter-cell');
const row = e.getDocumentPosition().row; const row = e.getDocumentPosition().row;
if (target.className.indexOf('ace_gutter-cell') === -1 || lastRow === row) { if (target?.className?.indexOf('ace_gutter-cell') === -1 || lastRow === row) {
return; return;
} }
if (lastTarget === target) { if (lastTarget === target) {
@ -297,8 +298,9 @@ $(document).on('turbolinks:load', function () {
}); });
function handleSidebarClick(e) { function handleSidebarClick(e) {
const target = e.domEvent.target; const target = e.domEvent.target.closest('.ace_gutter-cell');
if (target.className.indexOf('ace_gutter-cell') === -1) return; if (target === null) return;
if (target?.className?.indexOf('ace_gutter-cell') === -1) return;
const editor = e.editor; const editor = e.editor;
const fileid = $(editor.container).data('file-id'); const fileid = $(editor.container).data('file-id');