gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-04 05:28:59 +01:00
Code Issues Actions 26 Packages Projects Releases Wiki Activity

naming standards

Browse Source
This commit is contained in:
azivner 2018-04-08 09:25:35 -04:00
parent 120888b53e
commit 0104b19502
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/public/javascripts/services/note_type.js
View File

@ -1,5 +1,5 @@
import treeService from './tree.js'; import treeService from './tree.js';
import noteDetail from './note_detail.js'; import noteDetailService from './note_detail.js';
import server from './server.js'; import server from './server.js';
import infoService from "./info.js"; import infoService from "./info.js";
@ -84,13 +84,13 @@ function NoteTypeModel() {
}; };
async function save() { async function save() {
const note = noteDetail.getCurrentNote(); const note = noteDetailService.getCurrentNote();
await server.put('notes/' + note.noteId await server.put('notes/' + note.noteId
+ '/type/' + encodeURIComponent(self.type()) + '/type/' + encodeURIComponent(self.type())
+ '/mime/' + encodeURIComponent(self.mime())); + '/mime/' + encodeURIComponent(self.mime()));
await noteDetail.reload(); await noteDetailService.reload();
// for the note icon to be updated in the tree // for the note icon to be updated in the tree
await treeService.reload(); await treeService.reload();

18
src/public/javascripts/services/protected_session.js
View File

@ -1,5 +1,5 @@
import treeService from './tree.js'; import treeService from './tree.js';
import noteDetail from './note_detail.js'; import noteDetailService from './note_detail.js';
import utils from './utils.js'; import utils from './utils.js';
import server from './server.js'; import server from './server.js';
import protectedSessionHolder from './protected_session_holder.js'; import protectedSessionHolder from './protected_session_holder.js';
@ -57,7 +57,7 @@ async function setupProtectedSession() {
$dialog.dialog("close"); $dialog.dialog("close");
noteDetail.reload(); noteDetailService.reload();
treeService.reload(); treeService.reload();
if (protectedSessionDeferred !== null) { if (protectedSessionDeferred !== null) {
@ -90,27 +90,27 @@ async function enterProtectedSession(password) {
async function protectNoteAndSendToServer() { async function protectNoteAndSendToServer() {
await ensureProtectedSession(true, true); await ensureProtectedSession(true, true);
const note = noteDetail.getCurrentNote(); const note = noteDetailService.getCurrentNote();
note.isProtected = true; note.isProtected = true;
await noteDetail.saveNote(note); await noteDetailService.saveNote(note);
treeService.setProtected(note.noteId, note.isProtected); treeService.setProtected(note.noteId, note.isProtected);
noteDetail.setNoteBackgroundIfProtected(note); noteDetailService.setNoteBackgroundIfProtected(note);
} }
async function unprotectNoteAndSendToServer() { async function unprotectNoteAndSendToServer() {
await ensureProtectedSession(true, true); await ensureProtectedSession(true, true);
const note = noteDetail.getCurrentNote(); const note = noteDetailService.getCurrentNote();
note.isProtected = false; note.isProtected = false;
await noteDetail.saveNote(note); await noteDetailService.saveNote(note);
treeService.setProtected(note.noteId, note.isProtected); treeService.setProtected(note.noteId, note.isProtected);
noteDetail.setNoteBackgroundIfProtected(note); noteDetailService.setNoteBackgroundIfProtected(note);
} }
async function protectBranch(noteId, protect) { async function protectBranch(noteId, protect) {
@ -121,7 +121,7 @@ async function protectBranch(noteId, protect) {
infoService.showMessage("Request to un/protect sub tree has finished successfully"); infoService.showMessage("Request to un/protect sub tree has finished successfully");
treeService.reload(); treeService.reload();
noteDetail.reload(); noteDetailService.reload();
} }
$passwordForm.submit(() => { $passwordForm.submit(() => {

2
src/public/javascripts/services/tree.js
View File

@ -293,7 +293,7 @@ function initFancyTree(branch) {
keyboard: false, // we takover keyboard handling in the hotkeys plugin keyboard: false, // we takover keyboard handling in the hotkeys plugin
extensions: ["hotkeys", "filter", "dnd", "clones"], extensions: ["hotkeys", "filter", "dnd", "clones"],
source: branch, source: branch,
scrollParent: $("#tree"), scrollParent: $tree,
click: (event, data) => { click: (event, data) => {
const targetType = data.targetType; const targetType = data.targetType;
const node = data.node; const node = data.node;