MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

chg: [markdownEditor] Adapt popover container if inside modal

pull/6412/head
mokaddem 2020-10-09 13:34:46 +02:00
parent b6d5136df6
commit fcca50bf05
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/webroot/js/markdownEditor/event-report.js
View File

@ -555,7 +555,7 @@ function setupMISPElementMarkdownListeners() {
$('.misp-element-wrapper').filter('.attribute').popover({
trigger: 'click',
html: true,
container: '#viewer-container',
container: isInsideModal() ? 'body' : '#viewer-container',
placement: 'top',
title: getTitleFromMISPElementDOM,
content: getContentFromMISPElementDOM
@ -563,7 +563,7 @@ function setupMISPElementMarkdownListeners() {
$('.misp-picture-wrapper > img').popover({
trigger: 'click',
html: true,
container: '#viewer-container',
container: isInsideModal() ? 'body' : '#viewer-container',
placement: 'top',
title: getTitleFromMISPElementDOM,
content: getContentFromMISPElementDOM,
@ -572,7 +572,7 @@ function setupMISPElementMarkdownListeners() {
$('.misp-element-wrapper').filter('.object').popover({
trigger: 'click',
html: true,
container: '#viewer-container',
container: isInsideModal() ? 'body' : '#viewer-container',
placement: 'top',
title: getTitleFromMISPElementDOM,
content: getContentFromMISPElementDOM
@ -580,7 +580,7 @@ function setupMISPElementMarkdownListeners() {
$('.embeddedTag').popover({
trigger: 'click',
html: true,
container: '#viewer-container',
container: isInsideModal() ? 'body' : '#viewer-container',
placement: 'top',
title: getTitleFromMISPElementDOM,
content: getContentFromMISPElementDOM

6
app/webroot/js/markdownEditor/markdownEditor.js
View File

@ -647,6 +647,10 @@ function getRuleStatus(context, rulername, rulename) {
return false
}
function isInsideModal() {
return $(cm.getWrapperElement()).closest('.modal').length > 0
}
// Inject line numbers for sync scroll. Notes:
//
// - We track only headings and paragraphs on first level. That's enough.
@ -683,7 +687,7 @@ function buildScrollMap() {
}).appendTo('body');
offset = $viewerContainer.scrollTop() - $viewerContainer.offset().top;
if ($(cm.getWrapperElement()).closest('.modal').length > 0) { // inside a modal
if (isInsideModal()) { // inside a modal
offset -= 20
}
_scrollMap = [];