Merge branch 'stable'

# Conflicts:
#	package-lock.json
#	package.json
This commit is contained in:
zadam
2019-10-10 21:26:57 +02:00
9 changed files with 97 additions and 197 deletions

View File

@@ -117,7 +117,7 @@ function addTextToEditor(text) {
}
}
function tabContextMenu(e) {
function newTabContextMenu(e) {
const $link = $(e.target);
const notePath = getNotePathFromLink($link);
@@ -142,9 +142,9 @@ function tabContextMenu(e) {
});
}
$(document).on('contextmenu', '.note-detail-text a', tabContextMenu);
$(document).on('contextmenu', "a[data-action='note']", tabContextMenu);
$(document).on('contextmenu', ".note-detail-render a", tabContextMenu);
$(document).on('contextmenu', '.note-detail-text a', newTabContextMenu);
$(document).on('contextmenu', "a[data-action='note']", newTabContextMenu);
$(document).on('contextmenu', ".note-detail-render a", newTabContextMenu);
// when click on link popup, in case of internal link, just go the the referenced note instead of default behavior
// of opening the link in new window/tab