mirror/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2026-02-05 05:09:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

#note-detail-wrapper => .note-tab-content

Browse Source
This commit is contained in:
zadam
2019-05-01 10:17:17 +02:00
parent bc2d1f1ef9
commit c9183f8bd4
5 changed files with 16 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/public/javascripts/services/note_detail.js
View File

@@ -26,7 +26,8 @@ const $noteDetailComponents = $(".note-detail-component");
const $protectButton = $("#protect-button");
const $unprotectButton = $("#unprotect-button");
const $noteDetailWrapper = $("#note-detail-wrapper");
const $noteTabContent = $(".note-tab-content");
const $noteTabsContainer = $("#note-tab-container");
const $childrenOverview = $("#children-overview");
const $scriptArea = $("#note-detail-script-area");
const $savedIndicator = $("#saved-indicator");
@@ -147,7 +148,7 @@ async function saveNoteIfChanged() {
}
function updateNoteView() {
$noteDetailWrapper.toggleClass("protected", activeNote.isProtected);
$noteTabContent.toggleClass("protected", activeNote.isProtected);
$protectButton.toggleClass("active", activeNote.isProtected);
$protectButton.prop("disabled", activeNote.isProtected);
$unprotectButton.toggleClass("active", !activeNote.isProtected);
@@ -203,7 +204,7 @@ async function loadNoteDetail(noteId) {
updateNoteView();
$noteDetailWrapper.show();
$noteTabContent.show();
noteChangeDisabled = true;
@@ -331,11 +332,11 @@ messagingService.subscribeToSyncMessages(syncData => {
}
});
$noteDetailWrapper.on("dragover", e => e.preventDefault());
$noteTabsContainer.on("dragover", e => e.preventDefault());
$noteDetailWrapper.on("dragleave", e => e.preventDefault());
$noteTabsContainer.on("dragleave", e => e.preventDefault());
$noteDetailWrapper.on("drop", e => {
$noteTabsContainer.on("drop", e => {
importDialog.uploadFiles(getActiveNoteId(), e.originalEvent.dataTransfer.files, {
safeImport: true,
shrinkImages: true,

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

@@ -10,7 +10,7 @@ const $component = $("#protected-session-password-component");
const $passwordForms = $(".protected-session-password-form");
const $passwordInputs = $(".protected-session-password");
const $passwordInModal = $("#protected-session-password-in-modal");
const $noteDetailWrapper = $("#note-detail-wrapper");
const $tabContent = $(".note-tab-content"); // FIXME TAB
const $protectButton = $("#protect-button");
const $unprotectButton = $("#unprotect-button");
const $enterProtectedSessionButton = $("#enter-protected-session-button");
@@ -44,7 +44,7 @@ function ensureProtectedSession(requireProtectedSession, modal) {
if (modal) {
if (treeService.getActiveNode().data.isProtected) {
$noteDetailWrapper.hide();
$tabContent.hide();
}
$dialog.modal();
@@ -83,7 +83,7 @@ async function setupProtectedSession(password) {
if (protectedSessionDeferred !== null) {
ensureDialogIsClosed();
$noteDetailWrapper.show();
$tabContent.show();
protectedSessionDeferred.resolve(true);
protectedSessionDeferred = null;