gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

rename "current" to "active" based on recent refactorings

Browse Source
This commit is contained in:
zadam 2019-03-30 10:15:19 +01:00
parent 9f69294f7f
commit 66e2a12f3d
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/public/javascripts/dialogs/add_link.js
View File

@ -25,7 +25,7 @@ function setLinkType(linkType) {
} }
async function showDialogForClone() { async function showDialogForClone() {
showDialog('selected-to-current'); showDialog('selected-to-active');
} }
async function showDialog(linkType) { async function showDialog(linkType) {
@ -39,10 +39,10 @@ async function showDialog(linkType) {
else { else {
$linkTypeHtml.prop('disabled', true); $linkTypeHtml.prop('disabled', true);
setLinkType('selected-to-current'); setLinkType('selected-to-active');
} }
if (linkType==='selected-to-current') { if (linkType === 'selected-to-active') {
setLinkType(linkType); setLinkType(linkType);
} }
@ -104,14 +104,14 @@ $form.submit(() => {
linkService.addLinkToEditor(linkTitle, linkHref); linkService.addLinkToEditor(linkTitle, linkHref);
} }
} }
else if (linkType === 'selected-to-current') { else if (linkType === 'selected-to-active') {
const prefix = $clonePrefix.val(); const prefix = $clonePrefix.val();
cloningService.cloneNoteTo(noteId, noteDetailService.getActiveNoteId(), prefix); cloningService.cloneNoteTo(noteId, noteDetailService.getActiveNoteId(), prefix);
$dialog.modal('hide'); $dialog.modal('hide');
} }
else if (linkType === 'current-to-selected') { else if (linkType === 'active-to-selected') {
const prefix = $clonePrefix.val(); const prefix = $clonePrefix.val();
cloningService.cloneNoteTo(noteDetailService.getActiveNoteId(), noteId, prefix); cloningService.cloneNoteTo(noteDetailService.getActiveNoteId(), noteId, prefix);

4
src/views/dialogs/add_link.ejs
View File

@ -18,11 +18,11 @@
add normal HTML link</label> add normal HTML link</label>
<label title="Add selected note as a child of active note"> <label title="Add selected note as a child of active note">
<input type="radio" name="add-link-type" value="selected-to-current"/> <input type="radio" name="add-link-type" value="selected-to-active"/>
add selected note to active note</label> add selected note to active note</label>
<label title="Add active note as a child of the selected note"> <label title="Add active note as a child of the selected note">
<input type="radio" name="add-link-type" value="current-to-selected"/> <input type="radio" name="add-link-type" value="active-to-selected"/>
add active note to selected note</label> add active note to selected note</label>
</div> </div>