mirror of
https://github.com/zadam/trilium.git
synced 2025-12-04 22:44:25 +01:00
Merge branch 'TriliumNext:main' into main
This commit is contained in:
commit
2e555debab
@ -487,7 +487,7 @@ type EventMappings = {
|
|||||||
relationMapResetPanZoom: { ntxId: string | null | undefined };
|
relationMapResetPanZoom: { ntxId: string | null | undefined };
|
||||||
relationMapResetZoomIn: { ntxId: string | null | undefined };
|
relationMapResetZoomIn: { ntxId: string | null | undefined };
|
||||||
relationMapResetZoomOut: { ntxId: string | null | undefined };
|
relationMapResetZoomOut: { ntxId: string | null | undefined };
|
||||||
activeNoteChanged: {};
|
activeNoteChanged: {ntxId: string | null | undefined};
|
||||||
showAddLinkDialog: AddLinkOpts;
|
showAddLinkDialog: AddLinkOpts;
|
||||||
showIncludeDialog: IncludeNoteOpts;
|
showIncludeDialog: IncludeNoteOpts;
|
||||||
openBulkActionsDialog: {
|
openBulkActionsDialog: {
|
||||||
|
|||||||
@ -165,7 +165,7 @@ export default class TabManager extends Component {
|
|||||||
const activeNoteContext = this.getActiveContext();
|
const activeNoteContext = this.getActiveContext();
|
||||||
this.updateDocumentTitle(activeNoteContext);
|
this.updateDocumentTitle(activeNoteContext);
|
||||||
|
|
||||||
this.triggerEvent("activeNoteChanged", {}); // trigger this even in on popstate event
|
this.triggerEvent("activeNoteChanged", {ntxId:activeNoteContext?.ntxId}); // trigger this even in on popstate event
|
||||||
}
|
}
|
||||||
|
|
||||||
calculateHash(): string {
|
calculateHash(): string {
|
||||||
|
|||||||
@ -32,6 +32,7 @@ import PromotedAttributes from "../widgets/PromotedAttributes.jsx";
|
|||||||
|
|
||||||
const MOBILE_CSS = `
|
const MOBILE_CSS = `
|
||||||
<style>
|
<style>
|
||||||
|
span.keyboard-shortcut,
|
||||||
kbd {
|
kbd {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,7 +1,9 @@
|
|||||||
|
import clsx from "clsx";
|
||||||
import {readCssVar} from "../utils/css-var";
|
import {readCssVar} from "../utils/css-var";
|
||||||
import Color, { ColorInstance } from "color";
|
import Color, { ColorInstance } from "color";
|
||||||
|
|
||||||
const registeredClasses = new Set<string>();
|
const registeredClasses = new Set<string>();
|
||||||
|
const colorsWithHue = new Set<string>();
|
||||||
|
|
||||||
// Read the color lightness limits defined in the theme as CSS variables
|
// Read the color lightness limits defined in the theme as CSS variables
|
||||||
|
|
||||||
@ -26,19 +28,23 @@ function createClassForColor(colorString: string | null) {
|
|||||||
if (!registeredClasses.has(className)) {
|
if (!registeredClasses.has(className)) {
|
||||||
const adjustedColor = adjustColorLightness(color, lightThemeColorMaxLightness!,
|
const adjustedColor = adjustColorLightness(color, lightThemeColorMaxLightness!,
|
||||||
darkThemeColorMinLightness!);
|
darkThemeColorMinLightness!);
|
||||||
|
const hue = getHue(color);
|
||||||
|
|
||||||
$("head").append(`<style>
|
$("head").append(`<style>
|
||||||
.${className}, span.fancytree-active.${className} {
|
.${className}, span.fancytree-active.${className} {
|
||||||
--light-theme-custom-color: ${adjustedColor.lightThemeColor};
|
--light-theme-custom-color: ${adjustedColor.lightThemeColor};
|
||||||
--dark-theme-custom-color: ${adjustedColor.darkThemeColor};
|
--dark-theme-custom-color: ${adjustedColor.darkThemeColor};
|
||||||
--custom-color-hue: ${getHue(color) ?? 'unset'};
|
--custom-color-hue: ${hue ?? 'unset'};
|
||||||
}
|
}
|
||||||
</style>`);
|
</style>`);
|
||||||
|
|
||||||
registeredClasses.add(className);
|
registeredClasses.add(className);
|
||||||
|
if (hue) {
|
||||||
|
colorsWithHue.add(className);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return className;
|
return clsx(className, colorsWithHue.has(className) && "with-hue");
|
||||||
}
|
}
|
||||||
|
|
||||||
function parseColor(color: string) {
|
function parseColor(color: string) {
|
||||||
|
|||||||
@ -4,6 +4,10 @@
|
|||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.dropdown-menu:not(.static).calendar-dropdown-menu {
|
||||||
|
padding: 0 !important;
|
||||||
|
}
|
||||||
|
|
||||||
.calendar-dropdown-widget {
|
.calendar-dropdown-widget {
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
|||||||
@ -25,7 +25,8 @@
|
|||||||
--bs-body-font-weight: var(--main-font-weight) !important;
|
--bs-body-font-weight: var(--main-font-weight) !important;
|
||||||
--bs-body-color: var(--main-text-color) !important;
|
--bs-body-color: var(--main-text-color) !important;
|
||||||
--bs-body-bg: var(--main-background-color) !important;
|
--bs-body-bg: var(--main-background-color) !important;
|
||||||
--ck-mention-list-max-height: 500px;
|
--ck-mention-list-max-height: 500px;
|
||||||
|
--tn-modal-max-height: 90vh;
|
||||||
}
|
}
|
||||||
|
|
||||||
body#trilium-app.motion-disabled *,
|
body#trilium-app.motion-disabled *,
|
||||||
@ -212,6 +213,16 @@ input::placeholder,
|
|||||||
background-color: var(--modal-backdrop-color) !important;
|
background-color: var(--modal-backdrop-color) !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
body.mobile .modal .modal-dialog {
|
||||||
|
left: 50%;
|
||||||
|
transform: translateX(-50%);
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
body.mobile .modal .modal-content {
|
||||||
|
border-radius: var(--bs-modal-border-radius) var(--bs-modal-border-radius) 0 0;
|
||||||
|
}
|
||||||
|
|
||||||
.component {
|
.component {
|
||||||
contain: size;
|
contain: size;
|
||||||
}
|
}
|
||||||
@ -706,11 +717,6 @@ table.promoted-attributes-in-tooltip th {
|
|||||||
z-index: 32767 !important;
|
z-index: 32767 !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.tooltip-trigger {
|
|
||||||
background: transparent;
|
|
||||||
pointer-events: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.bs-tooltip-bottom .tooltip-arrow::before {
|
.bs-tooltip-bottom .tooltip-arrow::before {
|
||||||
border-bottom-color: var(--main-border-color) !important;
|
border-bottom-color: var(--main-border-color) !important;
|
||||||
}
|
}
|
||||||
@ -1006,9 +1012,17 @@ div[data-notify="container"] {
|
|||||||
font-family: var(--monospace-font-family);
|
font-family: var(--monospace-font-family);
|
||||||
}
|
}
|
||||||
|
|
||||||
svg.ck-icon .note-icon {
|
svg.ck-icon {
|
||||||
color: var(--main-text-color);
|
&.ck-icon_inherit-color {
|
||||||
font-size: 20px;
|
* {
|
||||||
|
fill: currentColor;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
&.note-icon {
|
||||||
|
color: var(--main-text-color);
|
||||||
|
font-size: 20px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.ck-content {
|
.ck-content {
|
||||||
@ -1117,10 +1131,6 @@ a.external:not(.no-arrow):after, a[href^="http://"]:not(.no-arrow):after, a[href
|
|||||||
display: inline-block;
|
display: inline-block;
|
||||||
}
|
}
|
||||||
|
|
||||||
.note-detail-empty {
|
|
||||||
margin: 50px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.modal-header {
|
.modal-header {
|
||||||
padding: 0.5rem 1rem 0.5rem 1rem !important; /* make modal header padding slightly smaller */
|
padding: 0.5rem 1rem 0.5rem 1rem !important; /* make modal header padding slightly smaller */
|
||||||
}
|
}
|
||||||
@ -1316,7 +1326,7 @@ body.mobile #context-menu-container.mobile-bottom-menu {
|
|||||||
inset-inline-end: 0 !important;
|
inset-inline-end: 0 !important;
|
||||||
bottom: 0 !important;
|
bottom: 0 !important;
|
||||||
top: unset !important;
|
top: unset !important;
|
||||||
max-height: 90vh;
|
max-height: var(--tn-modal-max-height);
|
||||||
overflow: auto !important;
|
overflow: auto !important;
|
||||||
user-select: none;
|
user-select: none;
|
||||||
-webkit-user-select: none;
|
-webkit-user-select: none;
|
||||||
@ -1379,6 +1389,20 @@ body:not(.mobile) #launcher-pane.horizontal .dropdown-submenu > .dropdown-menu {
|
|||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.right-dropdown-widget .right-dropdown-button {
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tooltip-trigger {
|
||||||
|
background: transparent;
|
||||||
|
pointer-events: none;
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
right: 0;
|
||||||
|
bottom: 0;
|
||||||
|
}
|
||||||
|
|
||||||
#launcher-pane.horizontal .right-dropdown-widget {
|
#launcher-pane.horizontal .right-dropdown-widget {
|
||||||
width: 53px;
|
width: 53px;
|
||||||
}
|
}
|
||||||
@ -1554,12 +1578,15 @@ body:not(.mobile) #launcher-pane.horizontal .dropdown-submenu > .dropdown-menu {
|
|||||||
@media (max-width: 991px) {
|
@media (max-width: 991px) {
|
||||||
body.mobile #launcher-pane .dropdown.global-menu > .dropdown-menu.show,
|
body.mobile #launcher-pane .dropdown.global-menu > .dropdown-menu.show,
|
||||||
body.mobile #launcher-container .dropdown > .dropdown-menu.show {
|
body.mobile #launcher-container .dropdown > .dropdown-menu.show {
|
||||||
|
--dropdown-bottom: calc(var(--mobile-bottom-offset) + var(--launcher-pane-size));
|
||||||
position: fixed !important;
|
position: fixed !important;
|
||||||
bottom: calc(var(--mobile-bottom-offset) + var(--launcher-pane-size)) !important;
|
bottom: var(--dropdown-bottom) !important;
|
||||||
top: unset !important;
|
top: unset !important;
|
||||||
inset-inline-start: 0 !important;
|
inset-inline-start: 0 !important;
|
||||||
inset-inline-end: 0 !important;
|
inset-inline-end: 0 !important;
|
||||||
transform: unset !important;
|
transform: unset !important;
|
||||||
|
overflow-y: auto;
|
||||||
|
max-height: calc(var(--tn-modal-max-height) - var(--dropdown-bottom));
|
||||||
}
|
}
|
||||||
|
|
||||||
#mobile-sidebar-container {
|
#mobile-sidebar-container {
|
||||||
|
|||||||
@ -98,6 +98,7 @@
|
|||||||
--menu-item-delimiter-color: #ffffff1c;
|
--menu-item-delimiter-color: #ffffff1c;
|
||||||
--menu-item-group-header-color: #ffffff91;
|
--menu-item-group-header-color: #ffffff91;
|
||||||
--menu-section-background-color: #fefefe08;
|
--menu-section-background-color: #fefefe08;
|
||||||
|
--menu-submenu-mobile-background-color: rgba(0, 0, 0, 0.15);
|
||||||
|
|
||||||
--modal-backdrop-color: #000;
|
--modal-backdrop-color: #000;
|
||||||
--modal-shadow-color: rgba(0, 0, 0, .5);
|
--modal-shadow-color: rgba(0, 0, 0, .5);
|
||||||
@ -300,7 +301,7 @@ body .todo-list input[type="checkbox"]:not(:checked):before {
|
|||||||
border-color: var(--muted-text-color) !important;
|
border-color: var(--muted-text-color) !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.tinted-quick-edit-dialog {
|
.quick-edit-dialog-wrapper.with-hue {
|
||||||
--modal-background-color: hsl(var(--custom-color-hue), 8.8%, 11.2%);
|
--modal-background-color: hsl(var(--custom-color-hue), 8.8%, 11.2%);
|
||||||
--modal-border-color: hsl(var(--custom-color-hue), 9.4%, 25.1%);
|
--modal-border-color: hsl(var(--custom-color-hue), 9.4%, 25.1%);
|
||||||
--promoted-attribute-card-background-color: hsl(var(--custom-color-hue), 13.2%, 20.8%);
|
--promoted-attribute-card-background-color: hsl(var(--custom-color-hue), 13.2%, 20.8%);
|
||||||
|
|||||||
@ -276,7 +276,7 @@
|
|||||||
--custom-bg-color: hsl(var(--custom-color-hue), 37%, 89%, 1);
|
--custom-bg-color: hsl(var(--custom-color-hue), 37%, 89%, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
.tinted-quick-edit-dialog {
|
.quick-edit-dialog-wrapper.with-hue {
|
||||||
--modal-background-color: hsl(var(--custom-color-hue), 56%, 96%);
|
--modal-background-color: hsl(var(--custom-color-hue), 56%, 96%);
|
||||||
--modal-border-color: hsl(var(--custom-color-hue), 33%, 41%);
|
--modal-border-color: hsl(var(--custom-color-hue), 33%, 41%);
|
||||||
--promoted-attribute-card-background-color: hsl(var(--custom-color-hue), 40%, 88%);
|
--promoted-attribute-card-background-color: hsl(var(--custom-color-hue), 40%, 88%);
|
||||||
|
|||||||
@ -62,6 +62,7 @@
|
|||||||
|
|
||||||
--menu-padding-size: 8px;
|
--menu-padding-size: 8px;
|
||||||
--menu-item-icon-vert-offset: -2px;
|
--menu-item-icon-vert-offset: -2px;
|
||||||
|
--menu-submenu-mobile-background-color: rgba(255, 255, 255, 0.15);
|
||||||
|
|
||||||
--more-accented-background-color: var(--card-background-hover-color);
|
--more-accented-background-color: var(--card-background-hover-color);
|
||||||
|
|
||||||
@ -99,6 +100,14 @@
|
|||||||
--tree-item-dark-theme-min-color-lightness: 65;
|
--tree-item-dark-theme-min-color-lightness: 65;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
body {
|
||||||
|
user-select: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.selectable-text {
|
||||||
|
user-select: text;
|
||||||
|
}
|
||||||
|
|
||||||
body.backdrop-effects-disabled {
|
body.backdrop-effects-disabled {
|
||||||
/* Backdrop effects are disabled, replace the menu background color with the
|
/* Backdrop effects are disabled, replace the menu background color with the
|
||||||
* no-backdrop fallback color */
|
* no-backdrop fallback color */
|
||||||
@ -308,6 +317,19 @@ body.mobile #context-menu-cover {
|
|||||||
&.show {
|
&.show {
|
||||||
background: rgba(0, 0, 0, 0.7);
|
background: rgba(0, 0, 0, 0.7);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&.global-menu-cover {
|
||||||
|
bottom: calc(var(--mobile-bottom-offset) + var(--launcher-pane-size));
|
||||||
|
|
||||||
|
@media (min-width: 992px) {
|
||||||
|
bottom: 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
body.mobile .dropdown-menu.mobile-bottom-menu,
|
||||||
|
body.mobile .dropdown.global-menu .dropdown-menu {
|
||||||
|
border-radius: var(--dropdown-border-radius) var(--dropdown-border-radius) 0 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
body.mobile .dropdown-menu {
|
body.mobile .dropdown-menu {
|
||||||
@ -316,9 +338,8 @@ body.mobile .dropdown-menu {
|
|||||||
--hover-item-background-color: var(--card-background-color);
|
--hover-item-background-color: var(--card-background-color);
|
||||||
font-size: 1em !important;
|
font-size: 1em !important;
|
||||||
backdrop-filter: var(--dropdown-backdrop-filter);
|
backdrop-filter: var(--dropdown-backdrop-filter);
|
||||||
border-radius: var(--dropdown-border-radius) var(--dropdown-border-radius) 0 0;
|
|
||||||
position: relative;
|
position: relative;
|
||||||
|
|
||||||
.dropdown-toggle::after {
|
.dropdown-toggle::after {
|
||||||
top: 0.5em;
|
top: 0.5em;
|
||||||
right: var(--dropdown-menu-padding-horizontal);
|
right: var(--dropdown-menu-padding-horizontal);
|
||||||
@ -334,8 +355,8 @@ body.mobile .dropdown-menu {
|
|||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
padding: var(--dropdown-menu-padding-vertical) var(--dropdown-menu-padding-horizontal) !important;
|
padding: var(--dropdown-menu-padding-vertical) var(--dropdown-menu-padding-horizontal) !important;
|
||||||
background: var(--card-background-color);
|
background: var(--card-background-color);
|
||||||
border-bottom: 1px solid var(--main-border-color) !important;
|
border-bottom: 1px solid var(--menu-item-delimiter-color) !important;
|
||||||
border-radius: 0;
|
border-radius: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.dropdown-item:first-of-type,
|
.dropdown-item:first-of-type,
|
||||||
@ -368,18 +389,16 @@ body.mobile .dropdown-menu {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.dropdown-menu {
|
.dropdown-menu {
|
||||||
--menu-background-color: rgba(0, 0, 0, 0.15);
|
--menu-background-color: --menu-submenu-mobile-background-color;
|
||||||
|
--bs-dropdown-divider-margin-y: 0.25rem;
|
||||||
border-radius: 0;
|
border-radius: 0;
|
||||||
max-height: 0;
|
max-height: 0;
|
||||||
transition: max-height 100ms ease-in;
|
transition: max-height 100ms ease-in;
|
||||||
display: block !important;
|
display: block !important;
|
||||||
|
|
||||||
&.show {
|
&.show {
|
||||||
max-height: 1000px;
|
max-height: 1000px;
|
||||||
}
|
padding: 0.5rem 0.75rem !important;
|
||||||
|
|
||||||
.dropdown-item {
|
|
||||||
background: transparent;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -389,6 +408,20 @@ body.mobile .dropdown-menu {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.dropdown-custom-item:has(.note-color-picker) {
|
||||||
|
overflow-x: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.note-color-picker {
|
||||||
|
padding: 0;
|
||||||
|
width: fit-content;
|
||||||
|
|
||||||
|
.color-cell {
|
||||||
|
--color-picker-cell-size: 26px;
|
||||||
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
/* #endregion */
|
/* #endregion */
|
||||||
|
|
||||||
|
|||||||
@ -124,12 +124,8 @@
|
|||||||
|
|
||||||
/* The container */
|
/* The container */
|
||||||
|
|
||||||
.note-split.empty-note {
|
|
||||||
--max-content-width: 70%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.note-split.empty-note div.note-detail {
|
.note-split.empty-note div.note-detail {
|
||||||
margin: 50px auto;
|
margin-inline: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* The search results list */
|
/* The search results list */
|
||||||
|
|||||||
@ -345,7 +345,7 @@ body[dir=ltr] #launcher-container {
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
.calendar-dropdown-widget {
|
.calendar-dropdown-widget {
|
||||||
padding: 12px;
|
padding: 18px;
|
||||||
color: var(--calendar-color);
|
color: var(--calendar-color);
|
||||||
user-select: none;
|
user-select: none;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1557,7 +1557,8 @@
|
|||||||
"refresh-saved-search-results": "刷新保存的搜索结果",
|
"refresh-saved-search-results": "刷新保存的搜索结果",
|
||||||
"create-child-note": "创建子笔记",
|
"create-child-note": "创建子笔记",
|
||||||
"unhoist": "取消聚焦",
|
"unhoist": "取消聚焦",
|
||||||
"toggle-sidebar": "切换侧边栏"
|
"toggle-sidebar": "切换侧边栏",
|
||||||
|
"dropping-not-allowed": "不允许移动笔记到此处。"
|
||||||
},
|
},
|
||||||
"title_bar_buttons": {
|
"title_bar_buttons": {
|
||||||
"window-on-top": "保持此窗口置顶"
|
"window-on-top": "保持此窗口置顶"
|
||||||
@ -1660,7 +1661,8 @@
|
|||||||
"duplicate-launcher": "复制启动器 <kbd data-command=\"duplicateSubtree\">"
|
"duplicate-launcher": "复制启动器 <kbd data-command=\"duplicateSubtree\">"
|
||||||
},
|
},
|
||||||
"editable-text": {
|
"editable-text": {
|
||||||
"auto-detect-language": "自动检测"
|
"auto-detect-language": "自动检测",
|
||||||
|
"keeps-crashing": "编辑组件时持续崩溃。请尝试重启 Trilium。如果问题仍然存在,请考虑提交错误报告。"
|
||||||
},
|
},
|
||||||
"highlighting": {
|
"highlighting": {
|
||||||
"title": "代码块",
|
"title": "代码块",
|
||||||
|
|||||||
@ -70,7 +70,7 @@
|
|||||||
"cancel": "Zrušit",
|
"cancel": "Zrušit",
|
||||||
"ok": "OK",
|
"ok": "OK",
|
||||||
"confirmation": "Potvrzení",
|
"confirmation": "Potvrzení",
|
||||||
"are_you_sure_remove_note": "Opravdu chcete odstranit poznámku „{{title}}“ z mapy vztahů?",
|
"are_you_sure_remove_note": "Opravdu chcete odstranit poznámku „{{title}}“ z mapy vztahů? ",
|
||||||
"if_you_dont_check": "Pokud tuto možnost nezaškrtnete, poznámka bude odstraněna pouze z mapy vztahů.",
|
"if_you_dont_check": "Pokud tuto možnost nezaškrtnete, poznámka bude odstraněna pouze z mapy vztahů.",
|
||||||
"also_delete_note": "Odstraňte také poznámku"
|
"also_delete_note": "Odstraňte také poznámku"
|
||||||
},
|
},
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
},
|
},
|
||||||
"bundle-error": {
|
"bundle-error": {
|
||||||
"title": "Benutzerdefiniertes Skript konnte nicht geladen werden",
|
"title": "Benutzerdefiniertes Skript konnte nicht geladen werden",
|
||||||
"message": "Skript von der Notiz mit der ID \"{{id}}\", und dem Titel \"{{title}}\" konnte nicht ausgeführt werden wegen:\n\n{{message}}"
|
"message": "Skript aus der Notiz \"{{title}}\" mit der ID \"{{id}}\", konnte nicht ausgeführt werden wegen:\n\n{{message}}"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"add_link": {
|
"add_link": {
|
||||||
@ -41,7 +41,8 @@
|
|||||||
"save": "Speichern",
|
"save": "Speichern",
|
||||||
"branch_prefix_saved": "Zweigpräfix wurde gespeichert.",
|
"branch_prefix_saved": "Zweigpräfix wurde gespeichert.",
|
||||||
"branch_prefix_saved_multiple": "Der Zweigpräfix wurde für {{count}} Zweige gespeichert.",
|
"branch_prefix_saved_multiple": "Der Zweigpräfix wurde für {{count}} Zweige gespeichert.",
|
||||||
"edit_branch_prefix_multiple": "Präfix für {{count}} Zweige bearbeiten"
|
"edit_branch_prefix_multiple": "Branch-Präfix für {{count}} Zweige bearbeiten",
|
||||||
|
"affected_branches": "Betroffene Zweige ({{count}}):"
|
||||||
},
|
},
|
||||||
"bulk_actions": {
|
"bulk_actions": {
|
||||||
"bulk_actions": "Massenaktionen",
|
"bulk_actions": "Massenaktionen",
|
||||||
@ -770,7 +771,10 @@
|
|||||||
"board": "Tafel",
|
"board": "Tafel",
|
||||||
"include_archived_notes": "Zeige archivierte Notizen",
|
"include_archived_notes": "Zeige archivierte Notizen",
|
||||||
"presentation": "Präsentation",
|
"presentation": "Präsentation",
|
||||||
"expand_all_levels": "Alle Ebenen erweitern"
|
"expand_all_levels": "Alle Ebenen erweitern",
|
||||||
|
"expand_tooltip": "Erweitert die direkten Unterelemente dieser Sammlung (eine Ebene tiefer). Für weitere Optionen auf den Pfeil rechts klicken.",
|
||||||
|
"expand_first_level": "Direkte Unterelemente erweitern",
|
||||||
|
"expand_nth_level": "{{depth}} Ebenen erweitern"
|
||||||
},
|
},
|
||||||
"edited_notes": {
|
"edited_notes": {
|
||||||
"no_edited_notes_found": "An diesem Tag wurden noch keine Notizen bearbeitet...",
|
"no_edited_notes_found": "An diesem Tag wurden noch keine Notizen bearbeitet...",
|
||||||
@ -1517,7 +1521,8 @@
|
|||||||
"refresh-saved-search-results": "Gespeicherte Suchergebnisse aktualisieren",
|
"refresh-saved-search-results": "Gespeicherte Suchergebnisse aktualisieren",
|
||||||
"create-child-note": "Unternotiz anlegen",
|
"create-child-note": "Unternotiz anlegen",
|
||||||
"unhoist": "Fokus verlassen",
|
"unhoist": "Fokus verlassen",
|
||||||
"toggle-sidebar": "Seitenleiste ein-/ausblenden"
|
"toggle-sidebar": "Seitenleiste ein-/ausblenden",
|
||||||
|
"dropping-not-allowed": "Ablegen von Notizen an dieser Stelle ist nicht zulässig."
|
||||||
},
|
},
|
||||||
"title_bar_buttons": {
|
"title_bar_buttons": {
|
||||||
"window-on-top": "Dieses Fenster immer oben halten"
|
"window-on-top": "Dieses Fenster immer oben halten"
|
||||||
@ -1620,7 +1625,8 @@
|
|||||||
"duplicate-launcher": "Launcher duplizieren <kbd data-command=\"duplicateSubtree\">"
|
"duplicate-launcher": "Launcher duplizieren <kbd data-command=\"duplicateSubtree\">"
|
||||||
},
|
},
|
||||||
"editable-text": {
|
"editable-text": {
|
||||||
"auto-detect-language": "Automatisch erkannt"
|
"auto-detect-language": "Automatisch erkannt",
|
||||||
|
"keeps-crashing": "Die Bearbeitungskomponente stürzt immer wieder ab. Bitte starten Sie Trilium neu. Wenn das Problem weiterhin besteht, erstellen Sie einen Fehlerbericht."
|
||||||
},
|
},
|
||||||
"highlighting": {
|
"highlighting": {
|
||||||
"description": "Steuert die Syntaxhervorhebung für Codeblöcke in Textnotizen, Code-Notizen sind nicht betroffen.",
|
"description": "Steuert die Syntaxhervorhebung für Codeblöcke in Textnotizen, Code-Notizen sind nicht betroffen.",
|
||||||
@ -2089,7 +2095,7 @@
|
|||||||
"slide-overview": "Übersicht der Folien ein-/ausblenden"
|
"slide-overview": "Übersicht der Folien ein-/ausblenden"
|
||||||
},
|
},
|
||||||
"read-only-info": {
|
"read-only-info": {
|
||||||
"read-only-note": "Aktuell wird eine Notiz nur im Lese-Modus angezeigt.",
|
"read-only-note": "Aktuelle Notiz wird im Lese-Modus angezeigt.",
|
||||||
"auto-read-only-note": "Diese Notiz wird im Nur-Lesen-Modus angezeigt, um ein schnelleres Laden zu ermöglichen.",
|
"auto-read-only-note": "Diese Notiz wird im Nur-Lesen-Modus angezeigt, um ein schnelleres Laden zu ermöglichen.",
|
||||||
"auto-read-only-learn-more": "Mehr erfahren",
|
"auto-read-only-learn-more": "Mehr erfahren",
|
||||||
"edit-note": "Notiz bearbeiten"
|
"edit-note": "Notiz bearbeiten"
|
||||||
|
|||||||
@ -1647,7 +1647,6 @@
|
|||||||
"read-only-info": {
|
"read-only-info": {
|
||||||
"read-only-note": "Currently viewing a read-only note.",
|
"read-only-note": "Currently viewing a read-only note.",
|
||||||
"auto-read-only-note": "This note is shown in a read-only mode for faster loading.",
|
"auto-read-only-note": "This note is shown in a read-only mode for faster loading.",
|
||||||
"auto-read-only-learn-more": "Learn more",
|
|
||||||
"edit-note": "Edit note"
|
"edit-note": "Edit note"
|
||||||
},
|
},
|
||||||
"note_types": {
|
"note_types": {
|
||||||
|
|||||||
@ -1212,7 +1212,8 @@
|
|||||||
"unhoist": "ホイスト解除",
|
"unhoist": "ホイスト解除",
|
||||||
"saved-search-note-refreshed": "保存した検索ノートが更新されました。",
|
"saved-search-note-refreshed": "保存した検索ノートが更新されました。",
|
||||||
"refresh-saved-search-results": "保存した検索結果を更新",
|
"refresh-saved-search-results": "保存した検索結果を更新",
|
||||||
"toggle-sidebar": "サイドバーを切り替え"
|
"toggle-sidebar": "サイドバーを切り替え",
|
||||||
|
"dropping-not-allowed": "この場所にノートをドロップすることはできません。"
|
||||||
},
|
},
|
||||||
"bulk_actions": {
|
"bulk_actions": {
|
||||||
"bulk_actions": "一括操作",
|
"bulk_actions": "一括操作",
|
||||||
@ -1266,7 +1267,8 @@
|
|||||||
"reset_launcher_confirm": "本当に「{{title}}」をリセットしますか? このノート(およびその子ノート)のすべてのデータと設定が失われ、ランチャーは元の場所に戻ります。"
|
"reset_launcher_confirm": "本当に「{{title}}」をリセットしますか? このノート(およびその子ノート)のすべてのデータと設定が失われ、ランチャーは元の場所に戻ります。"
|
||||||
},
|
},
|
||||||
"editable-text": {
|
"editable-text": {
|
||||||
"auto-detect-language": "自動検出"
|
"auto-detect-language": "自動検出",
|
||||||
|
"keeps-crashing": "編集コンポーネントがクラッシュし続けます。Trilium を再起動してください。問題が解決しない場合は、バグレポートの作成をご検討ください。"
|
||||||
},
|
},
|
||||||
"highlighting": {
|
"highlighting": {
|
||||||
"title": "コードブロック",
|
"title": "コードブロック",
|
||||||
|
|||||||
@ -39,7 +39,9 @@
|
|||||||
"edit_branch_prefix": "브랜치 접두사 편집",
|
"edit_branch_prefix": "브랜치 접두사 편집",
|
||||||
"help_on_tree_prefix": "트리 접두사에 대한 도움말",
|
"help_on_tree_prefix": "트리 접두사에 대한 도움말",
|
||||||
"prefix": "접두사: ",
|
"prefix": "접두사: ",
|
||||||
"branch_prefix_saved": "브랜치 접두사가 저장되었습니다."
|
"branch_prefix_saved": "브랜치 접두사가 저장되었습니다.",
|
||||||
|
"edit_branch_prefix_multiple": "{{count}}개의 지점 접두사 편집",
|
||||||
|
"branch_prefix_saved_multiple": "{{count}}개의 지점에 대해 지점 접두사가 저장되었습니다."
|
||||||
},
|
},
|
||||||
"bulk_actions": {
|
"bulk_actions": {
|
||||||
"bulk_actions": "대량 작업",
|
"bulk_actions": "대량 작업",
|
||||||
|
|||||||
@ -1516,7 +1516,8 @@
|
|||||||
"refresh-saved-search-results": "重新整理儲存的搜尋結果",
|
"refresh-saved-search-results": "重新整理儲存的搜尋結果",
|
||||||
"create-child-note": "建立子筆記",
|
"create-child-note": "建立子筆記",
|
||||||
"unhoist": "取消聚焦",
|
"unhoist": "取消聚焦",
|
||||||
"toggle-sidebar": "切換側邊欄"
|
"toggle-sidebar": "切換側邊欄",
|
||||||
|
"dropping-not-allowed": "不允許移動筆記至此處。"
|
||||||
},
|
},
|
||||||
"title_bar_buttons": {
|
"title_bar_buttons": {
|
||||||
"window-on-top": "保持此視窗置頂"
|
"window-on-top": "保持此視窗置頂"
|
||||||
@ -1619,7 +1620,8 @@
|
|||||||
"duplicate-launcher": "複製啟動器 <kbd data-command=\"duplicateSubtree\">"
|
"duplicate-launcher": "複製啟動器 <kbd data-command=\"duplicateSubtree\">"
|
||||||
},
|
},
|
||||||
"editable-text": {
|
"editable-text": {
|
||||||
"auto-detect-language": "自動檢測"
|
"auto-detect-language": "自動檢測",
|
||||||
|
"keeps-crashing": "編輯元件持續發生崩潰。請嘗試重新啟動 Trilium。若問題仍存在,請考慮提交錯誤報告。"
|
||||||
},
|
},
|
||||||
"highlighting": {
|
"highlighting": {
|
||||||
"description": "控制文字筆記程式碼區塊中的語法高亮,程式碼筆記不會受到影響。",
|
"description": "控制文字筆記程式碼區塊中的語法高亮,程式碼筆記不會受到影響。",
|
||||||
|
|||||||
@ -28,8 +28,9 @@ export default function NoteDetail() {
|
|||||||
const { note, type, mime, noteContext, parentComponent } = useNoteInfo();
|
const { note, type, mime, noteContext, parentComponent } = useNoteInfo();
|
||||||
const { ntxId, viewScope } = noteContext ?? {};
|
const { ntxId, viewScope } = noteContext ?? {};
|
||||||
const isFullHeight = checkFullHeight(noteContext, type);
|
const isFullHeight = checkFullHeight(noteContext, type);
|
||||||
const noteTypesToRender = useRef<{ [ key in ExtendedNoteType ]?: (props: TypeWidgetProps) => VNode }>({});
|
const [ noteTypesToRender, setNoteTypesToRender ] = useState<{ [ key in ExtendedNoteType ]?: (props: TypeWidgetProps) => VNode }>({});
|
||||||
const [ activeNoteType, setActiveNoteType ] = useState<ExtendedNoteType>();
|
const [ activeNoteType, setActiveNoteType ] = useState<ExtendedNoteType>();
|
||||||
|
const widgetRequestId = useRef(0);
|
||||||
|
|
||||||
const props: TypeWidgetProps = {
|
const props: TypeWidgetProps = {
|
||||||
note: note!,
|
note: note!,
|
||||||
@ -38,19 +39,28 @@ export default function NoteDetail() {
|
|||||||
parentComponent,
|
parentComponent,
|
||||||
noteContext
|
noteContext
|
||||||
};
|
};
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!type) return;
|
if (!type) return;
|
||||||
|
const requestId = ++widgetRequestId.current;
|
||||||
|
|
||||||
if (!noteTypesToRender.current[type]) {
|
if (!noteTypesToRender[type]) {
|
||||||
getCorrespondingWidget(type).then((el) => {
|
getCorrespondingWidget(type).then((el) => {
|
||||||
if (!el) return;
|
if (!el) return;
|
||||||
noteTypesToRender.current[type] = el;
|
|
||||||
|
// Ignore stale requests
|
||||||
|
if (requestId !== widgetRequestId.current) return;
|
||||||
|
|
||||||
|
setNoteTypesToRender(prev => ({
|
||||||
|
...prev,
|
||||||
|
[type]: el
|
||||||
|
}));
|
||||||
setActiveNoteType(type);
|
setActiveNoteType(type);
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
setActiveNoteType(type);
|
setActiveNoteType(type);
|
||||||
}
|
}
|
||||||
}, [ note, viewScope, type ]);
|
}, [ note, viewScope, type, noteTypesToRender ]);
|
||||||
|
|
||||||
// Detect note type changes.
|
// Detect note type changes.
|
||||||
useTriliumEvent("entitiesReloaded", async ({ loadResults }) => {
|
useTriliumEvent("entitiesReloaded", async ({ loadResults }) => {
|
||||||
@ -95,9 +105,11 @@ export default function NoteDetail() {
|
|||||||
});
|
});
|
||||||
|
|
||||||
// Automatically focus the editor.
|
// Automatically focus the editor.
|
||||||
useTriliumEvent("activeNoteChanged", () => {
|
useTriliumEvent("activeNoteChanged", ({ ntxId: eventNtxId }) => {
|
||||||
// Restore focus to the editor when switching tabs, but only if the note tree is not already focused.
|
if (eventNtxId != ntxId) return;
|
||||||
if (!document.activeElement?.classList.contains("fancytree-title")) {
|
// Restore focus to the editor when switching tabs,
|
||||||
|
// but only if the note tree and the note panel (e.g., note title or note detail) are not focused.
|
||||||
|
if (!document.activeElement?.classList.contains("fancytree-title") && !parentComponent.$widget[0].closest(".note-split")?.contains(document.activeElement)) {
|
||||||
parentComponent.triggerCommand("focusOnDetail", { ntxId });
|
parentComponent.triggerCommand("focusOnDetail", { ntxId });
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -192,7 +204,7 @@ export default function NoteDetail() {
|
|||||||
ref={containerRef}
|
ref={containerRef}
|
||||||
class={`note-detail ${isFullHeight ? "full-height" : ""}`}
|
class={`note-detail ${isFullHeight ? "full-height" : ""}`}
|
||||||
>
|
>
|
||||||
{Object.entries(noteTypesToRender.current).map(([ itemType, Element ]) => {
|
{Object.entries(noteTypesToRender).map(([ itemType, Element ]) => {
|
||||||
return <NoteDetailWrapper
|
return <NoteDetailWrapper
|
||||||
Element={Element}
|
Element={Element}
|
||||||
key={itemType}
|
key={itemType}
|
||||||
|
|||||||
@ -3,34 +3,33 @@ import { t } from "../services/i18n";
|
|||||||
import { useIsNoteReadOnly, useNoteContext, useTriliumEvent } from "./react/hooks"
|
import { useIsNoteReadOnly, useNoteContext, useTriliumEvent } from "./react/hooks"
|
||||||
import Button from "./react/Button";
|
import Button from "./react/Button";
|
||||||
import InfoBar from "./react/InfoBar";
|
import InfoBar from "./react/InfoBar";
|
||||||
|
import HelpButton from "./react/HelpButton";
|
||||||
|
|
||||||
export default function ReadOnlyNoteInfoBar(props: {}) {
|
export default function ReadOnlyNoteInfoBar(props: {}) {
|
||||||
const {note, noteContext} = useNoteContext();
|
const { note, noteContext } = useNoteContext();
|
||||||
const {isReadOnly, enableEditing} = useIsNoteReadOnly(note, noteContext);
|
const { isReadOnly, enableEditing } = useIsNoteReadOnly(note, noteContext);
|
||||||
const isExplicitReadOnly = note?.isLabelTruthy("readOnly");
|
const isExplicitReadOnly = note?.isLabelTruthy("readOnly");
|
||||||
|
|
||||||
return <InfoBar className="read-only-note-info-bar-widget"
|
return (
|
||||||
type={(isExplicitReadOnly ? "subtle" : "prominent")}
|
<InfoBar
|
||||||
style={{display: (!isReadOnly) ? "none" : undefined}}>
|
className="read-only-note-info-bar-widget"
|
||||||
|
type={(isExplicitReadOnly ? "subtle" : "prominent")}
|
||||||
<div class="read-only-note-info-bar-widget-content">
|
style={{display: (!isReadOnly) ? "none" : undefined}}
|
||||||
{(isExplicitReadOnly) ? (
|
>
|
||||||
<div>{t("read-only-info.read-only-note")}</div>
|
<div class="read-only-note-info-bar-widget-content">
|
||||||
) : (
|
{(isExplicitReadOnly) ? (
|
||||||
<div>
|
<div>{t("read-only-info.read-only-note")}</div>
|
||||||
{t("read-only-info.auto-read-only-note")}
|
) : (
|
||||||
|
<div>
|
||||||
<a class="tn-link"
|
{t("read-only-info.auto-read-only-note")}
|
||||||
href="https://docs.triliumnotes.org/user-guide/concepts/notes/read-only-notes#automatic-read-only-mode">
|
{" "}
|
||||||
|
<HelpButton helpPage="CoFPLs3dRlXc" />
|
||||||
{t("read-only-info.auto-read-only-learn-more")}
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
<Button text={t("read-only-info.edit-note")}
|
|
||||||
icon="bx-pencil" onClick={() => enableEditing()} />
|
|
||||||
</div>
|
</div>
|
||||||
</InfoBar>
|
)}
|
||||||
|
|
||||||
}
|
<Button text={t("read-only-info.edit-note")}
|
||||||
|
icon="bx-pencil" onClick={() => enableEditing()} />
|
||||||
|
</div>
|
||||||
|
</InfoBar>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|||||||
@ -110,7 +110,7 @@ export default class CalendarWidget extends RightDropdownButtonWidget {
|
|||||||
private weekNotes: string[] = [];
|
private weekNotes: string[] = [];
|
||||||
|
|
||||||
constructor(title: string = "", icon: string = "") {
|
constructor(title: string = "", icon: string = "") {
|
||||||
super(title, icon, DROPDOWN_TPL);
|
super(title, icon, DROPDOWN_TPL, "calendar-dropdown-menu");
|
||||||
}
|
}
|
||||||
|
|
||||||
doRender() {
|
doRender() {
|
||||||
@ -211,8 +211,7 @@ export default class CalendarWidget extends RightDropdownButtonWidget {
|
|||||||
const $target = $(e.target);
|
const $target = $(e.target);
|
||||||
|
|
||||||
// Keep dropdown open when clicking on month select button or year selector area
|
// Keep dropdown open when clicking on month select button or year selector area
|
||||||
if ($target.closest('.btn.dropdown-toggle.select-button').length ||
|
if ($target.closest('.btn.dropdown-toggle.select-button').length) {
|
||||||
$target.closest('.calendar-year-selector').length) {
|
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -26,6 +26,7 @@ export default function GlobalMenu({ isHorizontalLayout }: { isHorizontalLayout:
|
|||||||
const isVerticalLayout = !isHorizontalLayout;
|
const isVerticalLayout = !isHorizontalLayout;
|
||||||
const parentComponent = useContext(ParentComponent);
|
const parentComponent = useContext(ParentComponent);
|
||||||
const { isUpdateAvailable, latestVersion } = useTriliumUpdateStatus();
|
const { isUpdateAvailable, latestVersion } = useTriliumUpdateStatus();
|
||||||
|
const isMobileLocal = isMobile();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Dropdown
|
<Dropdown
|
||||||
@ -38,6 +39,8 @@ export default function GlobalMenu({ isHorizontalLayout }: { isHorizontalLayout:
|
|||||||
</div>}
|
</div>}
|
||||||
</>}
|
</>}
|
||||||
noDropdownListStyle
|
noDropdownListStyle
|
||||||
|
onShown={isMobileLocal ? () => document.getElementById("context-menu-cover")?.classList.add("show", "global-menu-cover") : undefined}
|
||||||
|
onHidden={isMobileLocal ? () => document.getElementById("context-menu-cover")?.classList.remove("show", "global-menu-cover") : undefined}
|
||||||
>
|
>
|
||||||
|
|
||||||
<MenuItem command="openNewWindow" icon="bx bx-window-open" text={t("global_menu.open_new_window")} />
|
<MenuItem command="openNewWindow" icon="bx bx-window-open" text={t("global_menu.open_new_window")} />
|
||||||
|
|||||||
@ -7,9 +7,9 @@ const TPL = /*html*/`
|
|||||||
<div class="dropdown right-dropdown-widget">
|
<div class="dropdown right-dropdown-widget">
|
||||||
<button type="button" data-bs-toggle="dropdown"
|
<button type="button" data-bs-toggle="dropdown"
|
||||||
aria-haspopup="true" aria-expanded="false"
|
aria-haspopup="true" aria-expanded="false"
|
||||||
class="bx right-dropdown-button launcher-button"></button>
|
class="bx right-dropdown-button launcher-button">
|
||||||
|
<div class="tooltip-trigger"></div>
|
||||||
<div class="tooltip-trigger"></div>
|
</button>
|
||||||
|
|
||||||
<div class="dropdown-menu"></div>
|
<div class="dropdown-menu"></div>
|
||||||
</div>
|
</div>
|
||||||
@ -24,14 +24,16 @@ export default class RightDropdownButtonWidget extends BasicWidget {
|
|||||||
protected dropdown!: Dropdown;
|
protected dropdown!: Dropdown;
|
||||||
protected $tooltip!: JQuery<HTMLElement>;
|
protected $tooltip!: JQuery<HTMLElement>;
|
||||||
protected tooltip!: Tooltip;
|
protected tooltip!: Tooltip;
|
||||||
|
private dropdownClass?: string;
|
||||||
public $dropdownContent!: JQuery<HTMLElement>;
|
public $dropdownContent!: JQuery<HTMLElement>;
|
||||||
|
|
||||||
constructor(title: string, iconClass: string, dropdownTpl: string) {
|
constructor(title: string, iconClass: string, dropdownTpl: string, dropdownClass?: string) {
|
||||||
super();
|
super();
|
||||||
|
|
||||||
this.iconClass = iconClass;
|
this.iconClass = iconClass;
|
||||||
this.title = title;
|
this.title = title;
|
||||||
this.dropdownTpl = dropdownTpl;
|
this.dropdownTpl = dropdownTpl;
|
||||||
|
this.dropdownClass = dropdownClass;
|
||||||
|
|
||||||
this.settings = {
|
this.settings = {
|
||||||
titlePlacement: "right"
|
titlePlacement: "right"
|
||||||
@ -41,15 +43,17 @@ export default class RightDropdownButtonWidget extends BasicWidget {
|
|||||||
doRender() {
|
doRender() {
|
||||||
this.$widget = $(TPL);
|
this.$widget = $(TPL);
|
||||||
this.$dropdownMenu = this.$widget.find(".dropdown-menu");
|
this.$dropdownMenu = this.$widget.find(".dropdown-menu");
|
||||||
|
if (this.dropdownClass) {
|
||||||
|
this.$dropdownMenu.addClass(this.dropdownClass);
|
||||||
|
}
|
||||||
this.dropdown = Dropdown.getOrCreateInstance(this.$widget.find("[data-bs-toggle='dropdown']")[0], {
|
this.dropdown = Dropdown.getOrCreateInstance(this.$widget.find("[data-bs-toggle='dropdown']")[0], {
|
||||||
popperConfig: {
|
popperConfig: {
|
||||||
placement: this.settings.titlePlacement,
|
placement: this.settings.titlePlacement,
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
this.$widget.attr("title", this.title);
|
this.$tooltip = this.$widget.find(".tooltip-trigger").attr("title", this.title);
|
||||||
this.tooltip = Tooltip.getOrCreateInstance(this.$widget[0], {
|
this.tooltip = new Tooltip(this.$tooltip[0], {
|
||||||
trigger: "hover",
|
|
||||||
placement: handleRightToLeftPlacement(this.settings.titlePlacement),
|
placement: handleRightToLeftPlacement(this.settings.titlePlacement),
|
||||||
fallbackPlacements: [ handleRightToLeftPlacement(this.settings.titlePlacement) ]
|
fallbackPlacements: [ handleRightToLeftPlacement(this.settings.titlePlacement) ]
|
||||||
});
|
});
|
||||||
@ -57,7 +61,9 @@ export default class RightDropdownButtonWidget extends BasicWidget {
|
|||||||
this.$widget
|
this.$widget
|
||||||
.find(".right-dropdown-button")
|
.find(".right-dropdown-button")
|
||||||
.addClass(this.iconClass)
|
.addClass(this.iconClass)
|
||||||
.on("click", () => this.tooltip.hide());
|
.on("click", () => this.tooltip.hide())
|
||||||
|
.on("mouseenter", () => this.tooltip.show())
|
||||||
|
.on("mouseleave", () => this.tooltip.hide());
|
||||||
|
|
||||||
this.$widget.on("show.bs.dropdown", async () => {
|
this.$widget.on("show.bs.dropdown", async () => {
|
||||||
await this.dropdownShown();
|
await this.dropdownShown();
|
||||||
|
|||||||
@ -204,8 +204,19 @@ function AddNewColumn({ api, isInRelationMode }: { api: BoardApi, isInRelationMo
|
|||||||
setIsCreatingNewColumn(true);
|
setIsCreatingNewColumn(true);
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
|
const keydownCallback = useCallback((e: KeyboardEvent) => {
|
||||||
|
if (e.key === "Enter") {
|
||||||
|
setIsCreatingNewColumn(true);
|
||||||
|
}
|
||||||
|
}, []);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className={`board-add-column ${isCreatingNewColumn ? "editing" : ""}`} onClick={addColumnCallback}>
|
<div
|
||||||
|
className={`board-add-column ${isCreatingNewColumn ? "editing" : ""}`}
|
||||||
|
onClick={addColumnCallback}
|
||||||
|
onKeyDown={keydownCallback}
|
||||||
|
tabIndex={300}
|
||||||
|
>
|
||||||
{!isCreatingNewColumn
|
{!isCreatingNewColumn
|
||||||
? <>
|
? <>
|
||||||
<Icon icon="bx bx-plus" />{" "}
|
<Icon icon="bx bx-plus" />{" "}
|
||||||
|
|||||||
@ -29,7 +29,11 @@ export default class LeftPaneContainer extends FlexContainer<Component> {
|
|||||||
if (visible) {
|
if (visible) {
|
||||||
this.triggerEvent("focusTree", {});
|
this.triggerEvent("focusTree", {});
|
||||||
} else {
|
} else {
|
||||||
this.triggerEvent("focusOnDetail", { ntxId: appContext.tabManager.getActiveContext()?.ntxId });
|
const ntxId = appContext.tabManager.getActiveContext()?.ntxId;
|
||||||
|
const noteContainer = document.querySelector(`.note-split[data-ntx-id="${ntxId}"]`);
|
||||||
|
if (!noteContainer?.contains(document.activeElement)) {
|
||||||
|
this.triggerEvent("focusOnDetail", { ntxId });
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
options.save("leftPaneVisible", this.currentLeftPaneVisible.toString());
|
options.save("leftPaneVisible", this.currentLeftPaneVisible.toString());
|
||||||
|
|||||||
@ -1,12 +1,8 @@
|
|||||||
import FlexContainer from "./flex_container.js";
|
import FlexContainer from "./flex_container.js";
|
||||||
import appContext, { type CommandData, type CommandListenerData, type EventData, type EventNames, type NoteSwitchedContext } from "../../components/app_context.js";
|
import appContext, { type CommandData, type CommandListenerData, type EventData, type EventNames, type NoteSwitchedContext } from "../../components/app_context.js";
|
||||||
import type BasicWidget from "../basic_widget.js";
|
import type BasicWidget from "../basic_widget.js";
|
||||||
import type NoteContext from "../../components/note_context.js";
|
|
||||||
import Component from "../../components/component.js";
|
import Component from "../../components/component.js";
|
||||||
import splitService from "../../services/resizer.js";
|
import splitService from "../../services/resizer.js";
|
||||||
interface NoteContextEvent {
|
|
||||||
noteContext: NoteContext;
|
|
||||||
}
|
|
||||||
|
|
||||||
interface SplitNoteWidget extends BasicWidget {
|
interface SplitNoteWidget extends BasicWidget {
|
||||||
hasBeenAlreadyShown?: boolean;
|
hasBeenAlreadyShown?: boolean;
|
||||||
|
|||||||
@ -5,14 +5,24 @@ body.popup-editor-open .ck-clipboard-drop-target-line { z-index: 1000; }
|
|||||||
|
|
||||||
body.desktop .modal.popup-editor-dialog .modal-dialog {
|
body.desktop .modal.popup-editor-dialog .modal-dialog {
|
||||||
max-width: 75vw;
|
max-width: 75vw;
|
||||||
}
|
|
||||||
|
|
||||||
.modal.popup-editor-dialog .modal-dialog {
|
|
||||||
border-bottom-left-radius: var(--bs-modal-border-radius);
|
border-bottom-left-radius: var(--bs-modal-border-radius);
|
||||||
border-bottom-right-radius: var(--bs-modal-border-radius);
|
border-bottom-right-radius: var(--bs-modal-border-radius);
|
||||||
|
}
|
||||||
|
|
||||||
|
body.desktop .modal.popup-editor-dialog .modal-dialog {
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
body.mobile .modal.popup-editor-dialog .modal-dialog {
|
||||||
|
max-width: min(var(--preferred-max-content-width), 95vw);
|
||||||
|
max-height: var(--tn-modal-max-height);
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.modal.popup-editor-dialog .modal-content {
|
||||||
|
transition: background-color 250ms ease-in;
|
||||||
|
}
|
||||||
|
|
||||||
.modal.popup-editor-dialog .modal-header .modal-title {
|
.modal.popup-editor-dialog .modal-header .modal-title {
|
||||||
font-size: 1.1em;
|
font-size: 1.1em;
|
||||||
}
|
}
|
||||||
@ -52,13 +62,18 @@ body.desktop .modal.popup-editor-dialog .modal-dialog {
|
|||||||
font-size: 1em;
|
font-size: 1em;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.modal.popup-editor-dialog .classic-toolbar-outer-container.visible {
|
||||||
|
background-color: transparent;
|
||||||
|
}
|
||||||
|
|
||||||
.modal.popup-editor-dialog .classic-toolbar-widget {
|
.modal.popup-editor-dialog .classic-toolbar-widget {
|
||||||
position: sticky;
|
position: sticky;
|
||||||
top: 0;
|
top: 0;
|
||||||
inset-inline-start: 0;
|
inset-inline-start: 0;
|
||||||
inset-inline-end: 0;
|
inset-inline-end: 0;
|
||||||
background: var(--modal-background-color);
|
background: transparent;
|
||||||
z-index: 998;
|
z-index: 998;
|
||||||
|
align-items: flex-start;
|
||||||
}
|
}
|
||||||
|
|
||||||
.modal.popup-editor-dialog .note-detail.full-height {
|
.modal.popup-editor-dialog .note-detail.full-height {
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
import { useContext, useEffect, useMemo, useRef, useState } from "preact/hooks";
|
import { useContext, useEffect, useMemo, useRef, useState } from "preact/hooks";
|
||||||
import Modal from "../react/Modal";
|
import Modal from "../react/Modal";
|
||||||
import "./PopupEditor.css";
|
import "./PopupEditor.css";
|
||||||
import { useNoteContext, useTriliumEvent } from "../react/hooks";
|
import { useNoteContext, useNoteLabel, useTriliumEvent } from "../react/hooks";
|
||||||
import NoteTitleWidget from "../note_title";
|
import NoteTitleWidget from "../note_title";
|
||||||
import NoteIcon from "../note_icon";
|
import NoteIcon from "../note_icon";
|
||||||
import NoteContext from "../../components/note_context";
|
import NoteContext from "../../components/note_context";
|
||||||
@ -18,6 +18,7 @@ import utils from "../../services/utils";
|
|||||||
import tree from "../../services/tree";
|
import tree from "../../services/tree";
|
||||||
import froca from "../../services/froca";
|
import froca from "../../services/froca";
|
||||||
import ReadOnlyNoteInfoBar from "../ReadOnlyNoteInfoBar";
|
import ReadOnlyNoteInfoBar from "../ReadOnlyNoteInfoBar";
|
||||||
|
import MobileEditorToolbar from "../type_widgets/text/mobile_editor_toolbar";
|
||||||
|
|
||||||
export default function PopupEditor() {
|
export default function PopupEditor() {
|
||||||
const [ shown, setShown ] = useState(false);
|
const [ shown, setShown ] = useState(false);
|
||||||
@ -67,10 +68,15 @@ export default function PopupEditor() {
|
|||||||
}}
|
}}
|
||||||
onHidden={() => setShown(false)}
|
onHidden={() => setShown(false)}
|
||||||
keepInDom // needed for faster loading
|
keepInDom // needed for faster loading
|
||||||
|
noFocus // automatic focus breaks block popup
|
||||||
>
|
>
|
||||||
<ReadOnlyNoteInfoBar />
|
<ReadOnlyNoteInfoBar />
|
||||||
<PromotedAttributes />
|
<PromotedAttributes />
|
||||||
<StandaloneRibbonAdapter component={FormattingToolbar} />
|
|
||||||
|
{isMobile
|
||||||
|
? <MobileEditorToolbar inPopupEditor />
|
||||||
|
: <StandaloneRibbonAdapter component={FormattingToolbar} />}
|
||||||
|
|
||||||
<FloatingButtons items={items} />
|
<FloatingButtons items={items} />
|
||||||
<NoteDetail />
|
<NoteDetail />
|
||||||
<NoteList media="screen" displayOnlyCollections />
|
<NoteList media="screen" displayOnlyCollections />
|
||||||
@ -83,17 +89,10 @@ export default function PopupEditor() {
|
|||||||
export function DialogWrapper({ children }: { children: ComponentChildren }) {
|
export function DialogWrapper({ children }: { children: ComponentChildren }) {
|
||||||
const { note } = useNoteContext();
|
const { note } = useNoteContext();
|
||||||
const wrapperRef = useRef<HTMLDivElement>(null);
|
const wrapperRef = useRef<HTMLDivElement>(null);
|
||||||
const [ hasTint, setHasTint ] = useState(false);
|
useNoteLabel(note, "color"); // to update color class
|
||||||
|
|
||||||
// Apply the tinted-dialog class only if the custom color CSS class specifies a hue
|
|
||||||
useEffect(() => {
|
|
||||||
if (!wrapperRef.current) return;
|
|
||||||
const customHue = getComputedStyle(wrapperRef.current).getPropertyValue("--custom-color-hue");
|
|
||||||
setHasTint(!!customHue);
|
|
||||||
}, [ note ]);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div ref={wrapperRef} class={`quick-edit-dialog-wrapper ${note?.getColorClass() ?? ""} ${hasTint ? "tinted-quick-edit-dialog" : ""}`}>
|
<div ref={wrapperRef} class={`quick-edit-dialog-wrapper ${note?.getColorClass() ?? ""}`}>
|
||||||
{children}
|
{children}
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
|
|||||||
@ -31,29 +31,29 @@ export default function AboutDialog() {
|
|||||||
<tbody>
|
<tbody>
|
||||||
<tr>
|
<tr>
|
||||||
<th>{t("about.homepage")}</th>
|
<th>{t("about.homepage")}</th>
|
||||||
<td><a className="tn-link external" href="https://github.com/TriliumNext/Trilium" style={forceWordBreak}>https://github.com/TriliumNext/Trilium</a></td>
|
<td className="selectable-text"><a className="tn-link external" href="https://github.com/TriliumNext/Trilium" style={forceWordBreak}>https://github.com/TriliumNext/Trilium</a></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<th>{t("about.app_version")}</th>
|
<th>{t("about.app_version")}</th>
|
||||||
<td className="app-version">{appInfo?.appVersion}</td>
|
<td className="app-version selectable-text">{appInfo?.appVersion}</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<th>{t("about.db_version")}</th>
|
<th>{t("about.db_version")}</th>
|
||||||
<td className="db-version">{appInfo?.dbVersion}</td>
|
<td className="db-version selectable-text">{appInfo?.dbVersion}</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<th>{t("about.sync_version")}</th>
|
<th>{t("about.sync_version")}</th>
|
||||||
<td className="sync-version">{appInfo?.syncVersion}</td>
|
<td className="sync-version selectable-text">{appInfo?.syncVersion}</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<th>{t("about.build_date")}</th>
|
<th>{t("about.build_date")}</th>
|
||||||
<td className="build-date">
|
<td className="build-date selectable-text">
|
||||||
{appInfo?.buildDate ? formatDateTime(appInfo.buildDate) : ""}
|
{appInfo?.buildDate ? formatDateTime(appInfo.buildDate) : ""}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<th>{t("about.build_revision")}</th>
|
<th>{t("about.build_revision")}</th>
|
||||||
<td>
|
<td className="selectable-text">
|
||||||
{appInfo?.buildRevision && <a className="tn-link build-revision external" href={`https://github.com/TriliumNext/Trilium/commit/${appInfo.buildRevision}`} target="_blank" style={forceWordBreak}>{appInfo.buildRevision}</a>}
|
{appInfo?.buildRevision && <a className="tn-link build-revision external" href={`https://github.com/TriliumNext/Trilium/commit/${appInfo.buildRevision}`} target="_blank" style={forceWordBreak}>{appInfo.buildRevision}</a>}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
@ -76,8 +76,8 @@ function DirectoryLink({ directory, style }: { directory: string, style?: CSSPro
|
|||||||
openService.openDirectory(directory);
|
openService.openDirectory(directory);
|
||||||
};
|
};
|
||||||
|
|
||||||
return <a className="tn-link" href="#" onClick={onClick} style={style}>{directory}</a>
|
return <a className="tn-link selectable-text" href="#" onClick={onClick} style={style}>{directory}</a>
|
||||||
} else {
|
} else {
|
||||||
return <span style={style}>{directory}</span>;
|
return <span className="selectable-text" style={style}>{directory}</span>;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -208,7 +208,7 @@ function RevisionPreview({noteContent, revisionItem, showDiff, setShown, onRevis
|
|||||||
}
|
}
|
||||||
</div>)}
|
</div>)}
|
||||||
</div>
|
</div>
|
||||||
<div className="revision-content use-tn-links" style={{ overflow: "auto", wordBreak: "break-word" }}>
|
<div className="revision-content use-tn-links selectable-text" style={{ overflow: "auto", wordBreak: "break-word" }}>
|
||||||
<RevisionContent noteContent={noteContent} revisionItem={revisionItem} fullRevision={fullRevision} showDiff={showDiff}/>
|
<RevisionContent noteContent={noteContent} revisionItem={revisionItem} fullRevision={fullRevision} showDiff={showDiff}/>
|
||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
|
|||||||
@ -19,9 +19,11 @@ export interface DropdownProps extends Pick<HTMLProps<HTMLDivElement>, "id" | "c
|
|||||||
disabled?: boolean;
|
disabled?: boolean;
|
||||||
text?: ComponentChildren;
|
text?: ComponentChildren;
|
||||||
forceShown?: boolean;
|
forceShown?: boolean;
|
||||||
|
onShown?: () => void;
|
||||||
|
onHidden?: () => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
export default function Dropdown({ id, className, buttonClassName, isStatic, children, title, text, dropdownContainerStyle, dropdownContainerClassName, hideToggleArrow, iconAction, disabled, noSelectButtonStyle, noDropdownListStyle, forceShown }: DropdownProps) {
|
export default function Dropdown({ id, className, buttonClassName, isStatic, children, title, text, dropdownContainerStyle, dropdownContainerClassName, hideToggleArrow, iconAction, disabled, noSelectButtonStyle, noDropdownListStyle, forceShown, onShown: externalOnShown, onHidden: externalOnHidden }: DropdownProps) {
|
||||||
const dropdownRef = useRef<HTMLDivElement | null>(null);
|
const dropdownRef = useRef<HTMLDivElement | null>(null);
|
||||||
const triggerRef = useRef<HTMLButtonElement | null>(null);
|
const triggerRef = useRef<HTMLButtonElement | null>(null);
|
||||||
|
|
||||||
@ -40,10 +42,12 @@ export default function Dropdown({ id, className, buttonClassName, isStatic, chi
|
|||||||
|
|
||||||
const onShown = useCallback(() => {
|
const onShown = useCallback(() => {
|
||||||
setShown(true);
|
setShown(true);
|
||||||
|
externalOnShown?.();
|
||||||
}, [])
|
}, [])
|
||||||
|
|
||||||
const onHidden = useCallback(() => {
|
const onHidden = useCallback(() => {
|
||||||
setShown(false);
|
setShown(false);
|
||||||
|
externalOnHidden?.();
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
|||||||
@ -66,9 +66,13 @@ interface ModalProps {
|
|||||||
* If true, the modal will remain in the DOM even when not shown. This can be useful for certain CSS transitions or when you want to avoid re-mounting the modal content.
|
* If true, the modal will remain in the DOM even when not shown. This can be useful for certain CSS transitions or when you want to avoid re-mounting the modal content.
|
||||||
*/
|
*/
|
||||||
keepInDom?: boolean;
|
keepInDom?: boolean;
|
||||||
|
/**
|
||||||
|
* If true, the modal will not focus itself after becoming visible.
|
||||||
|
*/
|
||||||
|
noFocus?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
export default function Modal({ children, className, size, title, header, footer, footerStyle, footerAlignment, onShown, onSubmit, helpPageId, minWidth, maxWidth, zIndex, scrollable, onHidden: onHidden, modalRef: externalModalRef, formRef, bodyStyle, show, stackable, keepInDom }: ModalProps) {
|
export default function Modal({ children, className, size, title, header, footer, footerStyle, footerAlignment, onShown, onSubmit, helpPageId, minWidth, maxWidth, zIndex, scrollable, onHidden: onHidden, modalRef: externalModalRef, formRef, bodyStyle, show, stackable, keepInDom, noFocus }: ModalProps) {
|
||||||
const modalRef = useSyncedRef<HTMLDivElement>(externalModalRef);
|
const modalRef = useSyncedRef<HTMLDivElement>(externalModalRef);
|
||||||
const modalInstanceRef = useRef<BootstrapModal>();
|
const modalInstanceRef = useRef<BootstrapModal>();
|
||||||
const elementToFocus = useRef<Element | null>();
|
const elementToFocus = useRef<Element | null>();
|
||||||
@ -100,13 +104,15 @@ export default function Modal({ children, className, size, title, header, footer
|
|||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (show && modalRef.current) {
|
if (show && modalRef.current) {
|
||||||
elementToFocus.current = document.activeElement;
|
elementToFocus.current = document.activeElement;
|
||||||
openDialog($(modalRef.current), !stackable).then(($widget) => {
|
openDialog($(modalRef.current), !stackable, {
|
||||||
|
focus: !noFocus
|
||||||
|
}).then(($widget) => {
|
||||||
modalInstanceRef.current = BootstrapModal.getOrCreateInstance($widget[0]);
|
modalInstanceRef.current = BootstrapModal.getOrCreateInstance($widget[0]);
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
modalInstanceRef.current?.hide();
|
modalInstanceRef.current?.hide();
|
||||||
}
|
}
|
||||||
}, [ show, modalRef.current ]);
|
}, [ show, modalRef.current, noFocus ]);
|
||||||
|
|
||||||
// Memoize styles to prevent recreation on every render
|
// Memoize styles to prevent recreation on every render
|
||||||
const dialogStyle = useMemo<CSSProperties>(() => {
|
const dialogStyle = useMemo<CSSProperties>(() => {
|
||||||
|
|||||||
@ -461,27 +461,31 @@ export function useNoteLabelInt(note: FNote | undefined | null, labelName: Filte
|
|||||||
|
|
||||||
export function useNoteBlob(note: FNote | null | undefined, componentId?: string): FBlob | null | undefined {
|
export function useNoteBlob(note: FNote | null | undefined, componentId?: string): FBlob | null | undefined {
|
||||||
const [ blob, setBlob ] = useState<FBlob | null>();
|
const [ blob, setBlob ] = useState<FBlob | null>();
|
||||||
|
const requestIdRef = useRef(0);
|
||||||
|
|
||||||
function refresh() {
|
async function refresh() {
|
||||||
note?.getBlob().then(setBlob);
|
const requestId = ++requestIdRef.current;
|
||||||
|
const newBlob = await note?.getBlob();
|
||||||
|
|
||||||
|
// Only update if this is the latest request.
|
||||||
|
if (requestId === requestIdRef.current) {
|
||||||
|
setBlob(newBlob);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
useEffect(refresh, [ note?.noteId ]);
|
useEffect(() => { refresh() }, [ note?.noteId ]);
|
||||||
useTriliumEvent("entitiesReloaded", ({ loadResults }) => {
|
useTriliumEvent("entitiesReloaded", ({ loadResults }) => {
|
||||||
if (!note) return;
|
if (!note) return;
|
||||||
|
|
||||||
// Check if the note was deleted.
|
// Check if the note was deleted.
|
||||||
if (loadResults.getEntityRow("notes", note.noteId)?.isDeleted) {
|
if (loadResults.getEntityRow("notes", note.noteId)?.isDeleted) {
|
||||||
|
requestIdRef.current++; // invalidate pending results
|
||||||
setBlob(null);
|
setBlob(null);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check if a revision occurred.
|
if (loadResults.hasRevisionForNote(note.noteId) ||
|
||||||
if (loadResults.hasRevisionForNote(note.noteId)) {
|
loadResults.isNoteContentReloaded(note.noteId, componentId)) {
|
||||||
refresh();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (loadResults.isNoteContentReloaded(note.noteId, componentId)) {
|
|
||||||
refresh();
|
refresh();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -791,7 +795,7 @@ export function useKeyboardShortcuts(scope: "code-detail" | "text-detail", conta
|
|||||||
* and provides a way to switch to editing mode.
|
* and provides a way to switch to editing mode.
|
||||||
*/
|
*/
|
||||||
export function useIsNoteReadOnly(note: FNote | null | undefined, noteContext: NoteContext | undefined) {
|
export function useIsNoteReadOnly(note: FNote | null | undefined, noteContext: NoteContext | undefined) {
|
||||||
const [isReadOnly, setIsReadOnly] = useState<boolean | undefined>(undefined);
|
const [ isReadOnly, setIsReadOnly ] = useState<boolean | undefined>(undefined);
|
||||||
|
|
||||||
const enableEditing = useCallback(() => {
|
const enableEditing = useCallback(() => {
|
||||||
if (noteContext?.viewScope) {
|
if (noteContext?.viewScope) {
|
||||||
@ -806,7 +810,7 @@ export function useIsNoteReadOnly(note: FNote | null | undefined, noteContext: N
|
|||||||
setIsReadOnly(readOnly);
|
setIsReadOnly(readOnly);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}, [note, noteContext]);
|
}, [ note, noteContext, noteContext?.viewScope ]);
|
||||||
|
|
||||||
useTriliumEvent("readOnlyTemporarilyDisabled", ({noteContext: eventNoteContext}) => {
|
useTriliumEvent("readOnlyTemporarilyDisabled", ({noteContext: eventNoteContext}) => {
|
||||||
if (noteContext?.ntxId === eventNoteContext.ntxId) {
|
if (noteContext?.ntxId === eventNoteContext.ntxId) {
|
||||||
@ -814,7 +818,7 @@ export function useIsNoteReadOnly(note: FNote | null | undefined, noteContext: N
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
return {isReadOnly, enableEditing};
|
return { isReadOnly, enableEditing };
|
||||||
}
|
}
|
||||||
|
|
||||||
async function isNoteReadOnly(note: FNote, noteContext: NoteContext) {
|
async function isNoteReadOnly(note: FNote, noteContext: NoteContext) {
|
||||||
|
|||||||
@ -17,24 +17,24 @@ export default function FilePropertiesTab({ note }: { note?: FNote | null }) {
|
|||||||
return (
|
return (
|
||||||
<div className="file-properties-widget">
|
<div className="file-properties-widget">
|
||||||
{note && (
|
{note && (
|
||||||
<table class="file-table">
|
<table className="file-table">
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr>
|
<tr>
|
||||||
<th class="text-nowrap">{t("file_properties.note_id")}:</th>
|
<th className="text-nowrap">{t("file_properties.note_id")}:</th>
|
||||||
<td class="file-note-id">{note.noteId}</td>
|
<td className="file-note-id selectable-text">{note.noteId}</td>
|
||||||
<th class="text-nowrap">{t("file_properties.original_file_name")}:</th>
|
<th className="text-nowrap">{t("file_properties.original_file_name")}:</th>
|
||||||
<td class="file-filename">{originalFileName ?? "?"}</td>
|
<td className="file-filename selectable-text">{originalFileName ?? "?"}</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<th class="text-nowrap">{t("file_properties.file_type")}:</th>
|
<th className="text-nowrap">{t("file_properties.file_type")}:</th>
|
||||||
<td class="file-filetype">{note.mime}</td>
|
<td className="file-filetype selectable-text">{note.mime}</td>
|
||||||
<th class="text-nowrap">{t("file_properties.file_size")}:</th>
|
<th className="text-nowrap">{t("file_properties.file_size")}:</th>
|
||||||
<td class="file-filesize">{formatSize(blob?.contentLength ?? 0)}</td>
|
<td className="file-filesize selectable-text">{formatSize(blob?.contentLength ?? 0)}</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
<td colSpan={4}>
|
<td colSpan={4}>
|
||||||
<div class="file-buttons">
|
<div className="file-buttons">
|
||||||
<Button
|
<Button
|
||||||
icon="bx bx-download"
|
icon="bx bx-download"
|
||||||
text={t("file_properties.download")}
|
text={t("file_properties.download")}
|
||||||
|
|||||||
@ -23,17 +23,17 @@ export default function ImagePropertiesTab({ note, ntxId }: TabContext) {
|
|||||||
<div style={{ display: "flex", justifyContent: "space-evenly", margin: "10px" }}>
|
<div style={{ display: "flex", justifyContent: "space-evenly", margin: "10px" }}>
|
||||||
<span>
|
<span>
|
||||||
<strong>{t("image_properties.original_file_name")}:</strong>{" "}
|
<strong>{t("image_properties.original_file_name")}:</strong>{" "}
|
||||||
<span>{originalFileName ?? "?"}</span>
|
<span className="selectable-text">{originalFileName ?? "?"}</span>
|
||||||
</span>
|
</span>
|
||||||
|
|
||||||
<span>
|
<span>
|
||||||
<strong>{t("image_properties.file_type")}:</strong>{" "}
|
<strong>{t("image_properties.file_type")}:</strong>{" "}
|
||||||
<span>{note.mime}</span>
|
<span className="selectable-text">{note.mime}</span>
|
||||||
</span>
|
</span>
|
||||||
|
|
||||||
<span>
|
<span>
|
||||||
<strong>{t("image_properties.file_size")}:</strong>{" "}
|
<strong>{t("image_properties.file_size")}:</strong>{" "}
|
||||||
<span>{formatSize(blob?.contentLength)}</span>
|
<span className="selectable-text">{formatSize(blob?.contentLength)}</span>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@ -37,7 +37,7 @@ export default function InheritedAttributesTab({ note, componentId }: TabContext
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="inherited-attributes-widget">
|
<div className="inherited-attributes-widget">
|
||||||
<div className="inherited-attributes-container">
|
<div className="inherited-attributes-container selectable-text">
|
||||||
{inheritedAttributes?.length ? (
|
{inheritedAttributes?.length ? (
|
||||||
joinElements(inheritedAttributes.map(attribute => (
|
joinElements(inheritedAttributes.map(attribute => (
|
||||||
<InheritedAttribute
|
<InheritedAttribute
|
||||||
|
|||||||
@ -39,21 +39,21 @@ export default function NoteInfoTab({ note }: TabContext) {
|
|||||||
<>
|
<>
|
||||||
<div className="note-info-item">
|
<div className="note-info-item">
|
||||||
<span>{t("note_info_widget.note_id")}:</span>
|
<span>{t("note_info_widget.note_id")}:</span>
|
||||||
<span className="note-info-id">{note.noteId}</span>
|
<span className="note-info-id selectable-text">{note.noteId}</span>
|
||||||
</div>
|
</div>
|
||||||
<div className="note-info-item">
|
<div className="note-info-item">
|
||||||
<span>{t("note_info_widget.created")}:</span>
|
<span>{t("note_info_widget.created")}:</span>
|
||||||
<span>{formatDateTime(metadata?.dateCreated)}</span>
|
<span className="selectable-text">{formatDateTime(metadata?.dateCreated)}</span>
|
||||||
</div>
|
</div>
|
||||||
<div className="note-info-item">
|
<div className="note-info-item">
|
||||||
<span>{t("note_info_widget.modified")}:</span>
|
<span>{t("note_info_widget.modified")}:</span>
|
||||||
<span>{formatDateTime(metadata?.dateModified)}</span>
|
<span className="selectable-text">{formatDateTime(metadata?.dateModified)}</span>
|
||||||
</div>
|
</div>
|
||||||
<div className="note-info-item">
|
<div className="note-info-item">
|
||||||
<span>{t("note_info_widget.type")}:</span>
|
<span>{t("note_info_widget.type")}:</span>
|
||||||
<span>
|
<span>
|
||||||
<span className="note-info-type">{note.type}</span>{' '}
|
<span className="note-info-type">{note.type}</span>{' '}
|
||||||
{note.mime && <span className="note-info-mime">({note.mime})</span>}
|
{note.mime && <span className="note-info-mime selectable-text">({note.mime})</span>}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div className="note-info-item">
|
<div className="note-info-item">
|
||||||
@ -77,7 +77,7 @@ export default function NoteInfoTab({ note }: TabContext) {
|
|||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<span className="note-sizes-wrapper">
|
<span className="note-sizes-wrapper selectable-text">
|
||||||
<span className="note-size">{formatSize(noteSizeResponse?.noteSize)}</span>
|
<span className="note-size">{formatSize(noteSizeResponse?.noteSize)}</span>
|
||||||
{" "}
|
{" "}
|
||||||
{subtreeSizeResponse && subtreeSizeResponse.subTreeNoteCount > 1 &&
|
{subtreeSizeResponse && subtreeSizeResponse.subTreeNoteCount > 1 &&
|
||||||
|
|||||||
@ -8,6 +8,7 @@ import NoteActions from "./NoteActions";
|
|||||||
import { KeyboardActionNames } from "@triliumnext/commons";
|
import { KeyboardActionNames } from "@triliumnext/commons";
|
||||||
import { RIBBON_TAB_DEFINITIONS } from "./RibbonDefinition";
|
import { RIBBON_TAB_DEFINITIONS } from "./RibbonDefinition";
|
||||||
import { TabConfiguration, TitleContext } from "./ribbon-interface";
|
import { TabConfiguration, TitleContext } from "./ribbon-interface";
|
||||||
|
import clsx from "clsx";
|
||||||
|
|
||||||
const TAB_CONFIGURATION = numberObjectsInPlace<TabConfiguration>(RIBBON_TAB_DEFINITIONS);
|
const TAB_CONFIGURATION = numberObjectsInPlace<TabConfiguration>(RIBBON_TAB_DEFINITIONS);
|
||||||
|
|
||||||
@ -63,62 +64,61 @@ export default function Ribbon() {
|
|||||||
}, [ computedTabs, activeTabIndex ]));
|
}, [ computedTabs, activeTabIndex ]));
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="ribbon-container" style={{ contain: "none" }}>
|
<div
|
||||||
{noteContext?.viewScope?.viewMode === "default" && (
|
className={clsx("ribbon-container", noteContext?.viewScope?.viewMode !== "default" && "hidden-ext")}
|
||||||
<>
|
style={{ contain: "none" }}
|
||||||
<div className="ribbon-top-row">
|
>
|
||||||
<div className="ribbon-tab-container">
|
<div className="ribbon-top-row">
|
||||||
{computedTabs && computedTabs.map(({ title, icon, index, toggleCommand, shouldShow }) => (
|
<div className="ribbon-tab-container">
|
||||||
shouldShow && <RibbonTab
|
{computedTabs && computedTabs.map(({ title, icon, index, toggleCommand, shouldShow }) => (
|
||||||
icon={icon}
|
shouldShow && <RibbonTab
|
||||||
title={typeof title === "string" ? title : title(titleContext)}
|
icon={icon}
|
||||||
active={index === activeTabIndex}
|
title={typeof title === "string" ? title : title(titleContext)}
|
||||||
toggleCommand={toggleCommand}
|
active={index === activeTabIndex}
|
||||||
onClick={() => {
|
toggleCommand={toggleCommand}
|
||||||
if (activeTabIndex !== index) {
|
onClick={() => {
|
||||||
setActiveTabIndex(index);
|
if (activeTabIndex !== index) {
|
||||||
} else {
|
setActiveTabIndex(index);
|
||||||
// Collapse
|
} else {
|
||||||
setActiveTabIndex(undefined);
|
// Collapse
|
||||||
}
|
setActiveTabIndex(undefined);
|
||||||
}}
|
}
|
||||||
/>
|
}}
|
||||||
))}
|
/>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
<div className="ribbon-button-container">
|
||||||
|
{ note && <NoteActions note={note} noteContext={noteContext} /> }
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="ribbon-body-container">
|
||||||
|
{computedTabs && computedTabs.map(tab => {
|
||||||
|
const isActive = tab.index === activeTabIndex;
|
||||||
|
if (!isActive && !tab.stayInDom) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const TabContent = tab.content;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className={`ribbon-body ${!isActive ? "hidden-ext" : ""}`}>
|
||||||
|
<TabContent
|
||||||
|
note={note}
|
||||||
|
hidden={!isActive}
|
||||||
|
ntxId={ntxId}
|
||||||
|
hoistedNoteId={hoistedNoteId}
|
||||||
|
notePath={notePath}
|
||||||
|
noteContext={noteContext}
|
||||||
|
componentId={componentId}
|
||||||
|
activate={useCallback(() => {
|
||||||
|
setActiveTabIndex(tab.index)
|
||||||
|
}, [setActiveTabIndex])}
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div className="ribbon-button-container">
|
);
|
||||||
{ note && <NoteActions note={note} noteContext={noteContext} /> }
|
})}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="ribbon-body-container">
|
|
||||||
{computedTabs && computedTabs.map(tab => {
|
|
||||||
const isActive = tab.index === activeTabIndex;
|
|
||||||
if (!isActive && !tab.stayInDom) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const TabContent = tab.content;
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className={`ribbon-body ${!isActive ? "hidden-ext" : ""}`}>
|
|
||||||
<TabContent
|
|
||||||
note={note}
|
|
||||||
hidden={!isActive}
|
|
||||||
ntxId={ntxId}
|
|
||||||
hoistedNoteId={hoistedNoteId}
|
|
||||||
notePath={notePath}
|
|
||||||
noteContext={noteContext}
|
|
||||||
componentId={componentId}
|
|
||||||
activate={useCallback(() => {
|
|
||||||
setActiveTabIndex(tab.index)
|
|
||||||
}, [setActiveTabIndex])}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
})}
|
|
||||||
</div>
|
|
||||||
</>
|
|
||||||
)}
|
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,5 +1,6 @@
|
|||||||
.note-detail-doc-content {
|
.note-detail-doc-content {
|
||||||
padding: 15px;
|
padding: 15px;
|
||||||
|
user-select: text;
|
||||||
}
|
}
|
||||||
|
|
||||||
.note-detail-doc-content pre {
|
.note-detail-doc-content pre {
|
||||||
|
|||||||
@ -1,3 +1,21 @@
|
|||||||
|
.note-detail-empty {
|
||||||
|
container-type: size;
|
||||||
|
padding-top: 50px;
|
||||||
|
min-width: 350px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.note-detail-empty > * {
|
||||||
|
margin-inline: auto;
|
||||||
|
max-width: 850px;
|
||||||
|
padding-inline: 50px;
|
||||||
|
}
|
||||||
|
|
||||||
|
@container (max-width: 600px) {
|
||||||
|
.note-detail-empty > * {
|
||||||
|
padding-inline: 20px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.workspace-notes {
|
.workspace-notes {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
@ -14,7 +32,8 @@
|
|||||||
|
|
||||||
.workspace-notes .workspace-note:hover {
|
.workspace-notes .workspace-note:hover {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
border: 1px solid var(--main-border-color);
|
background-color: var(--icon-button-hover-background);
|
||||||
|
border-radius: 8px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.note-detail-empty-results .aa-dropdown-menu {
|
.note-detail-empty-results .aa-dropdown-menu {
|
||||||
@ -24,6 +43,11 @@
|
|||||||
border-top: 0;
|
border-top: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.empty-tab-search label {
|
||||||
|
margin-bottom: 8px;
|
||||||
|
color: var(--muted-text-color);
|
||||||
|
}
|
||||||
|
|
||||||
.empty-tab-search .note-autocomplete-input {
|
.empty-tab-search .note-autocomplete-input {
|
||||||
border-bottom-left-radius: 0;
|
border-bottom-left-radius: 0;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -10,16 +10,16 @@ import FNote from "../../entities/fnote";
|
|||||||
import search from "../../services/search";
|
import search from "../../services/search";
|
||||||
import { TypeWidgetProps } from "./type_widget";
|
import { TypeWidgetProps } from "./type_widget";
|
||||||
|
|
||||||
export default function Empty({ }: TypeWidgetProps) {
|
export default function Empty({ ntxId }: TypeWidgetProps) {
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<WorkspaceSwitcher />
|
<WorkspaceSwitcher />
|
||||||
<NoteSearch />
|
<NoteSearch ntxId={ntxId ?? null} />
|
||||||
</>
|
</>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
function NoteSearch() {
|
function NoteSearch({ ntxId }: { ntxId: string | null }) {
|
||||||
const resultsContainerRef = useRef<HTMLDivElement>(null);
|
const resultsContainerRef = useRef<HTMLDivElement>(null);
|
||||||
const autocompleteRef = useRef<HTMLInputElement>(null);
|
const autocompleteRef = useRef<HTMLInputElement>(null);
|
||||||
|
|
||||||
@ -45,10 +45,9 @@ function NoteSearch() {
|
|||||||
if (!suggestion?.notePath) {
|
if (!suggestion?.notePath) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
const activeNoteContext = appContext.tabManager.getNoteContextById(ntxId) ?? appContext.tabManager.getActiveContext();
|
||||||
const activeContext = appContext.tabManager.getActiveContext();
|
if (activeNoteContext) {
|
||||||
if (activeContext) {
|
activeNoteContext.setNote(suggestion.notePath);
|
||||||
activeContext.setNote(suggestion.notePath);
|
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
|
|||||||
10
apps/client/src/widgets/type_widgets/NoteMap.css
Normal file
10
apps/client/src/widgets/type_widgets/NoteMap.css
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
.note-detail-note-map {
|
||||||
|
&>div {
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
right: 0;
|
||||||
|
bottom: 0;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,6 +1,7 @@
|
|||||||
import { TypeWidgetProps } from "./type_widget";
|
import { TypeWidgetProps } from "./type_widget";
|
||||||
import NoteMapEl from "../note_map/NoteMap";
|
import NoteMapEl from "../note_map/NoteMap";
|
||||||
import { useRef } from "preact/hooks";
|
import { useRef } from "preact/hooks";
|
||||||
|
import "./NoteMap.css";
|
||||||
|
|
||||||
export default function NoteMap({ note }: TypeWidgetProps) {
|
export default function NoteMap({ note }: TypeWidgetProps) {
|
||||||
const containerRef = useRef<HTMLDivElement>(null);
|
const containerRef = useRef<HTMLDivElement>(null);
|
||||||
|
|||||||
@ -104,7 +104,7 @@ export function BackupList({ backups }: { backups: DatabaseBackup[] }) {
|
|||||||
backups.map(({ mtime, filePath }) => (
|
backups.map(({ mtime, filePath }) => (
|
||||||
<tr>
|
<tr>
|
||||||
<td>{mtime ? formatDateTime(mtime) : "-"}</td>
|
<td>{mtime ? formatDateTime(mtime) : "-"}</td>
|
||||||
<td>{filePath}</td>
|
<td className="selectable-text">{filePath}</td>
|
||||||
</tr>
|
</tr>
|
||||||
))
|
))
|
||||||
) : (
|
) : (
|
||||||
|
|||||||
@ -226,7 +226,7 @@ function CodeBlockPreview({ theme, wordWrap }: { theme: string, wordWrap: boolea
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="note-detail-readonly-text-content ck-content code-sample-wrapper">
|
<div className="note-detail-readonly-text-content ck-content code-sample-wrapper">
|
||||||
<pre className="hljs" style={{ marginBottom: 0 }}>
|
<pre className="hljs selectable-text" style={{ marginBottom: 0 }}>
|
||||||
<code className="code-sample" style={codeStyle} dangerouslySetInnerHTML={getHtml(code)} />
|
<code className="code-sample" style={codeStyle} dangerouslySetInnerHTML={getHtml(code)} />
|
||||||
</pre>
|
</pre>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -98,6 +98,14 @@ export default function EditableText({ note, parentComponent, ntxId, noteContext
|
|||||||
editorApi: editorApiRef.current,
|
editorApi: editorApiRef.current,
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
insertDateTimeToTextCommand() {
|
||||||
|
if (!editorApiRef.current) return;
|
||||||
|
const date = new Date();
|
||||||
|
const customDateTimeFormat = options.get("customDateTimeFormat");
|
||||||
|
const dateString = utils.formatDateTime(date, customDateTimeFormat);
|
||||||
|
|
||||||
|
addTextToEditor(dateString);
|
||||||
|
},
|
||||||
// Include note functionality note
|
// Include note functionality note
|
||||||
addIncludeNoteToTextCommand() {
|
addIncludeNoteToTextCommand() {
|
||||||
if (!editorApiRef.current) return;
|
if (!editorApiRef.current) return;
|
||||||
@ -197,14 +205,6 @@ export default function EditableText({ note, parentComponent, ntxId, noteContext
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
useTriliumEvent("insertDateTimeToText", ({ ntxId: eventNtxId }) => {
|
|
||||||
if (eventNtxId !== ntxId) return;
|
|
||||||
const date = new Date();
|
|
||||||
const customDateTimeFormat = options.get("customDateTimeFormat");
|
|
||||||
const dateString = utils.formatDateTime(date, customDateTimeFormat);
|
|
||||||
|
|
||||||
addTextToEditor(dateString);
|
|
||||||
});
|
|
||||||
useTriliumEvent("addTextToActiveEditor", ({ text }) => {
|
useTriliumEvent("addTextToActiveEditor", ({ text }) => {
|
||||||
if (!noteContext?.isActive()) return;
|
if (!noteContext?.isActive()) return;
|
||||||
addTextToEditor(text);
|
addTextToEditor(text);
|
||||||
|
|||||||
@ -41,7 +41,6 @@ export default function ReadOnlyText({ note, noteContext, ntxId }: TypeWidgetPro
|
|||||||
|
|
||||||
// React to included note changes.
|
// React to included note changes.
|
||||||
useTriliumEvent("refreshIncludedNote", ({ noteId }) => {
|
useTriliumEvent("refreshIncludedNote", ({ noteId }) => {
|
||||||
console.log("Refresh ", noteId);
|
|
||||||
if (!contentRef.current) return;
|
if (!contentRef.current) return;
|
||||||
refreshIncludedNote(contentRef.current, noteId);
|
refreshIncludedNote(contentRef.current, noteId);
|
||||||
});
|
});
|
||||||
@ -56,7 +55,7 @@ export default function ReadOnlyText({ note, noteContext, ntxId }: TypeWidgetPro
|
|||||||
<>
|
<>
|
||||||
<RawHtmlBlock
|
<RawHtmlBlock
|
||||||
containerRef={contentRef}
|
containerRef={contentRef}
|
||||||
className={clsx("note-detail-readonly-text-content ck-content use-tn-links", codeBlockWordWrap && "word-wrap")}
|
className={clsx("note-detail-readonly-text-content ck-content use-tn-links selectable-text", codeBlockWordWrap && "word-wrap")}
|
||||||
tabindex={100}
|
tabindex={100}
|
||||||
dir={isRtl ? "rtl" : "ltr"}
|
dir={isRtl ? "rtl" : "ltr"}
|
||||||
html={blob?.content}
|
html={blob?.content}
|
||||||
|
|||||||
@ -1,52 +1,54 @@
|
|||||||
.classic-toolbar-outer-container {
|
body.mobile {
|
||||||
contain: none !important;
|
.classic-toolbar-outer-container {
|
||||||
}
|
contain: none !important;
|
||||||
|
}
|
||||||
.classic-toolbar-outer-container.visible {
|
|
||||||
height: 38px;
|
.classic-toolbar-outer-container.visible {
|
||||||
background-color: var(--main-background-color);
|
height: 38px;
|
||||||
position: relative;
|
background-color: var(--main-background-color);
|
||||||
overflow: visible;
|
position: relative;
|
||||||
flex-shrink: 0;
|
overflow: visible;
|
||||||
}
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
#root-widget.virtual-keyboard-opened .classic-toolbar-outer-container.ios {
|
|
||||||
position: absolute;
|
#root-widget.virtual-keyboard-opened .classic-toolbar-outer-container.ios {
|
||||||
inset-inline-start: 0;
|
position: absolute;
|
||||||
inset-inline-end: 0;
|
inset-inline-start: 0;
|
||||||
bottom: 0;
|
inset-inline-end: 0;
|
||||||
}
|
bottom: 0;
|
||||||
|
}
|
||||||
.classic-toolbar-widget {
|
|
||||||
position: absolute;
|
.classic-toolbar-widget {
|
||||||
bottom: 0;
|
position: absolute;
|
||||||
inset-inline-start: 0;
|
bottom: 0;
|
||||||
inset-inline-end: 0;
|
inset-inline-start: 0;
|
||||||
height: 38px;
|
inset-inline-end: 0;
|
||||||
overflow: scroll;
|
height: 38px;
|
||||||
display: flex;
|
overflow: scroll;
|
||||||
align-items: flex-end;
|
display: flex;
|
||||||
user-select: none;
|
align-items: flex-end;
|
||||||
scrollbar-width: 0 !important;
|
user-select: none;
|
||||||
}
|
scrollbar-width: 0 !important;
|
||||||
|
}
|
||||||
.classic-toolbar-widget::-webkit-scrollbar:horizontal {
|
|
||||||
height: 0 !important;
|
.classic-toolbar-widget::-webkit-scrollbar:horizontal {
|
||||||
}
|
height: 0 !important;
|
||||||
|
}
|
||||||
.classic-toolbar-widget.dropdown-active {
|
|
||||||
height: 50vh;
|
.classic-toolbar-widget.dropdown-active {
|
||||||
}
|
height: 50vh;
|
||||||
|
}
|
||||||
.classic-toolbar-widget .ck.ck-toolbar {
|
|
||||||
--ck-color-toolbar-background: transparent;
|
.classic-toolbar-widget .ck.ck-toolbar {
|
||||||
--ck-color-button-default-background: transparent;
|
--ck-color-toolbar-background: transparent;
|
||||||
--ck-color-button-default-disabled-background: transparent;
|
--ck-color-button-default-background: transparent;
|
||||||
position: absolute;
|
--ck-color-button-default-disabled-background: transparent;
|
||||||
background-color: transparent;
|
position: absolute;
|
||||||
border: none;
|
background-color: transparent;
|
||||||
}
|
border: none;
|
||||||
|
}
|
||||||
.classic-toolbar-widget .ck.ck-button.ck-disabled {
|
|
||||||
opacity: 0.3;
|
.classic-toolbar-widget .ck.ck-button.ck-disabled {
|
||||||
|
opacity: 0.3;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@ -4,19 +4,23 @@ import "./mobile_editor_toolbar.css";
|
|||||||
import { isIOS } from "../../../services/utils";
|
import { isIOS } from "../../../services/utils";
|
||||||
import { CKTextEditor, ClassicEditor } from "@triliumnext/ckeditor5";
|
import { CKTextEditor, ClassicEditor } from "@triliumnext/ckeditor5";
|
||||||
|
|
||||||
|
interface MobileEditorToolbarProps {
|
||||||
|
inPopupEditor?: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Handles the editing toolbar for CKEditor in mobile mode. The toolbar acts as a floating bar, with two different mechanism:
|
* Handles the editing toolbar for CKEditor in mobile mode. The toolbar acts as a floating bar, with two different mechanism:
|
||||||
*
|
*
|
||||||
* - On iOS, because it does not respect the viewport meta value `interactive-widget=resizes-content`, we need to listen to window resizes and scroll and reposition the toolbar using absolute positioning.
|
* - On iOS, because it does not respect the viewport meta value `interactive-widget=resizes-content`, we need to listen to window resizes and scroll and reposition the toolbar using absolute positioning.
|
||||||
* - On Android, the viewport change makes the keyboard resize the content area, all we have to do is to hide the tab bar and global menu (handled in the global style).
|
* - On Android, the viewport change makes the keyboard resize the content area, all we have to do is to hide the tab bar and global menu (handled in the global style).
|
||||||
*/
|
*/
|
||||||
export default function MobileEditorToolbar() {
|
export default function MobileEditorToolbar({ inPopupEditor }: MobileEditorToolbarProps) {
|
||||||
const containerRef = useRef<HTMLDivElement>(null);
|
const containerRef = useRef<HTMLDivElement>(null);
|
||||||
const { note, noteContext, ntxId } = useNoteContext();
|
const { note, noteContext, ntxId } = useNoteContext();
|
||||||
const [ shouldDisplay, setShouldDisplay ] = useState(false);
|
const [ shouldDisplay, setShouldDisplay ] = useState(false);
|
||||||
const [ dropdownActive, setDropdownActive ] = useState(false);
|
const [ dropdownActive, setDropdownActive ] = useState(false);
|
||||||
|
|
||||||
usePositioningOniOS(containerRef);
|
usePositioningOniOS(!inPopupEditor, containerRef);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
noteContext?.isReadOnly().then(isReadOnly => {
|
noteContext?.isReadOnly().then(isReadOnly => {
|
||||||
@ -29,7 +33,10 @@ export default function MobileEditorToolbar() {
|
|||||||
if (eventNtxId !== ntxId || !containerRef.current) return;
|
if (eventNtxId !== ntxId || !containerRef.current) return;
|
||||||
const toolbar = editor.ui.view.toolbar?.element;
|
const toolbar = editor.ui.view.toolbar?.element;
|
||||||
|
|
||||||
repositionDropdowns(editor);
|
if (!inPopupEditor) {
|
||||||
|
repositionDropdowns(editor);
|
||||||
|
}
|
||||||
|
|
||||||
if (toolbar) {
|
if (toolbar) {
|
||||||
containerRef.current.replaceChildren(toolbar);
|
containerRef.current.replaceChildren(toolbar);
|
||||||
} else {
|
} else {
|
||||||
@ -60,7 +67,7 @@ export default function MobileEditorToolbar() {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
function usePositioningOniOS(wrapperRef: MutableRef<HTMLDivElement | null>) {
|
function usePositioningOniOS(enabled: boolean, wrapperRef: MutableRef<HTMLDivElement | null>) {
|
||||||
const adjustPosition = useCallback(() => {
|
const adjustPosition = useCallback(() => {
|
||||||
if (!wrapperRef.current) return;
|
if (!wrapperRef.current) return;
|
||||||
let bottom = window.innerHeight - (window.visualViewport?.height || 0);
|
let bottom = window.innerHeight - (window.visualViewport?.height || 0);
|
||||||
@ -68,7 +75,7 @@ function usePositioningOniOS(wrapperRef: MutableRef<HTMLDivElement | null>) {
|
|||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!isIOS()) return;
|
if (!isIOS() || !enabled) return;
|
||||||
|
|
||||||
window.visualViewport?.addEventListener("resize", adjustPosition);
|
window.visualViewport?.addEventListener("resize", adjustPosition);
|
||||||
window.addEventListener("scroll", adjustPosition);
|
window.addEventListener("scroll", adjustPosition);
|
||||||
@ -77,7 +84,7 @@ function usePositioningOniOS(wrapperRef: MutableRef<HTMLDivElement | null>) {
|
|||||||
window.visualViewport?.removeEventListener("resize", adjustPosition);
|
window.visualViewport?.removeEventListener("resize", adjustPosition);
|
||||||
window.removeEventListener("scroll", adjustPosition);
|
window.removeEventListener("scroll", adjustPosition);
|
||||||
};
|
};
|
||||||
}, []);
|
}, [ enabled ]);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@electron/remote": "2.1.3",
|
"@electron/remote": "2.1.3",
|
||||||
"better-sqlite3": "12.4.6",
|
"better-sqlite3": "12.5.0",
|
||||||
"electron-debug": "4.1.0",
|
"electron-debug": "4.1.0",
|
||||||
"electron-dl": "4.0.0",
|
"electron-dl": "4.0.0",
|
||||||
"electron-squirrel-startup": "1.0.1",
|
"electron-squirrel-startup": "1.0.1",
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
"description": "Standalone tool to dump contents of Trilium document.db file into a directory tree of notes",
|
"description": "Standalone tool to dump contents of Trilium document.db file into a directory tree of notes",
|
||||||
"private": true,
|
"private": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"better-sqlite3": "12.4.6",
|
"better-sqlite3": "12.5.0",
|
||||||
"mime-types": "3.0.2",
|
"mime-types": "3.0.2",
|
||||||
"sanitize-filename": "1.6.3",
|
"sanitize-filename": "1.6.3",
|
||||||
"tsx": "4.20.6",
|
"tsx": "4.20.6",
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
"description": "Desktop version of Trilium which imports the demo database (presented to new users at start-up) or the user guide and other documentation and saves the modifications for committing.",
|
"description": "Desktop version of Trilium which imports the demo database (presented to new users at start-up) or the user guide and other documentation and saves the modifications for committing.",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"archiver": "7.0.1",
|
"archiver": "7.0.1",
|
||||||
"better-sqlite3": "12.4.6"
|
"better-sqlite3": "12.5.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@triliumnext/client": "workspace:*",
|
"@triliumnext/client": "workspace:*",
|
||||||
|
|||||||
72
apps/server-e2e/src/layout/split_pane.spec.ts
Normal file
72
apps/server-e2e/src/layout/split_pane.spec.ts
Normal file
@ -0,0 +1,72 @@
|
|||||||
|
import { test, expect } from "@playwright/test";
|
||||||
|
import App from "../support/app";
|
||||||
|
|
||||||
|
const TEXT_NOTE_TITLE = "Text notes";
|
||||||
|
const CODE_NOTE_TITLE = "Code notes";
|
||||||
|
|
||||||
|
test("Open the note in the correct split pane", async ({ page, context }) => {
|
||||||
|
const app = new App(page, context);
|
||||||
|
await app.goto();
|
||||||
|
await app.closeAllTabs();
|
||||||
|
|
||||||
|
// Open the first split.
|
||||||
|
await app.goToNoteInNewTab(TEXT_NOTE_TITLE);
|
||||||
|
const split1 = app.currentNoteSplit;
|
||||||
|
|
||||||
|
// Create a new split.
|
||||||
|
const splitButton = split1.locator("button.bx-dock-right");
|
||||||
|
await expect(splitButton).toBeVisible();
|
||||||
|
await splitButton.click();
|
||||||
|
|
||||||
|
// Search for "Code notes" in the empty area of the second split.
|
||||||
|
const split2 = app.currentNoteSplit.nth(1);;
|
||||||
|
await expect(split2).toBeVisible();
|
||||||
|
const autocomplete = split2.locator(".note-autocomplete");
|
||||||
|
await autocomplete.fill(CODE_NOTE_TITLE);
|
||||||
|
const resultsSelector = split2.locator(".note-detail-empty-results");
|
||||||
|
await expect(resultsSelector).toContainText(CODE_NOTE_TITLE);
|
||||||
|
|
||||||
|
//Focus on the first split.
|
||||||
|
const noteContent = split1.locator(".note-detail-editable-text-editor");
|
||||||
|
await expect(noteContent.locator("p")).toBeVisible();
|
||||||
|
await noteContent.focus();
|
||||||
|
|
||||||
|
// Click the search result in the second split.
|
||||||
|
await resultsSelector.locator(".aa-suggestion", { hasText: CODE_NOTE_TITLE })
|
||||||
|
.nth(1).click();
|
||||||
|
|
||||||
|
await expect(split2).toContainText(CODE_NOTE_TITLE);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("Can directly focus the autocomplete input within the split", async ({ page, context }) => {
|
||||||
|
const app = new App(page, context);
|
||||||
|
await app.goto();
|
||||||
|
await app.closeAllTabs();
|
||||||
|
|
||||||
|
// Open the first split.
|
||||||
|
await app.goToNoteInNewTab(TEXT_NOTE_TITLE);
|
||||||
|
const split1 = app.currentNoteSplit;
|
||||||
|
|
||||||
|
// Create a new split.
|
||||||
|
const splitButton = split1.locator("button.bx-dock-right");
|
||||||
|
await expect(splitButton).toBeVisible();
|
||||||
|
await splitButton.click();
|
||||||
|
|
||||||
|
// Search for "Code notes" in the empty area of the second split.
|
||||||
|
const split2 = app.currentNoteSplit.nth(1);;
|
||||||
|
await expect(split2).toBeVisible();
|
||||||
|
|
||||||
|
// Focus the first split.
|
||||||
|
const noteContent = split1.locator(".note-detail-editable-text-editor");
|
||||||
|
await expect(noteContent.locator("p")).toBeVisible();
|
||||||
|
await noteContent.focus();
|
||||||
|
await noteContent.click();
|
||||||
|
|
||||||
|
// click the autocomplete input box of the second split
|
||||||
|
const autocomplete = split2.locator(".note-autocomplete");
|
||||||
|
await autocomplete.focus();
|
||||||
|
await autocomplete.click();
|
||||||
|
|
||||||
|
await page.waitForTimeout(100);
|
||||||
|
await expect(autocomplete).toBeFocused();
|
||||||
|
});
|
||||||
@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"better-sqlite3": "12.4.6"
|
"better-sqlite3": "12.5.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -25,7 +25,7 @@
|
|||||||
"docker-start-rootless-alpine": "pnpm docker-build-rootless-alpine && docker run -p 8081:8080 triliumnext-rootless-alpine"
|
"docker-start-rootless-alpine": "pnpm docker-build-rootless-alpine && docker run -p 8081:8080 triliumnext-rootless-alpine"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"better-sqlite3": "12.4.6",
|
"better-sqlite3": "12.5.0",
|
||||||
"html-to-text": "9.0.5",
|
"html-to-text": "9.0.5",
|
||||||
"node-html-parser": "7.0.1"
|
"node-html-parser": "7.0.1"
|
||||||
},
|
},
|
||||||
|
|||||||
@ -39,7 +39,28 @@
|
|||||||
"activate-previous-tab": "좌측 탭 활성화",
|
"activate-previous-tab": "좌측 탭 활성화",
|
||||||
"open-new-window": "새 비어있는 창 열기",
|
"open-new-window": "새 비어있는 창 열기",
|
||||||
"toggle-tray": "시스템 트레이에서 애플리케이션 보여주기/숨기기",
|
"toggle-tray": "시스템 트레이에서 애플리케이션 보여주기/숨기기",
|
||||||
"tabs-and-windows": "탭 & 창"
|
"tabs-and-windows": "탭 & 창",
|
||||||
|
"first-tab": "목록의 첫 번째 탭 활성화",
|
||||||
|
"second-tab": "목록의 두 번째 탭 활성화",
|
||||||
|
"third-tab": "목록의 세 번째 탭 활성화",
|
||||||
|
"fourth-tab": "목록의 네 번째 탭 활성화",
|
||||||
|
"fifth-tab": "목록의 다섯 번째 탭 활성화",
|
||||||
|
"sixth-tab": "목록의 여섯 번째 탭 활성화",
|
||||||
|
"seventh-tab": "목록의 일곱 번째 탭 활성화",
|
||||||
|
"eight-tab": "목록의 여덟 번째 탭 활성화",
|
||||||
|
"ninth-tab": "목록의 아홉 번째 탭 활성화",
|
||||||
|
"last-tab": "목록의 마지막 탭 활성화",
|
||||||
|
"dialogs": "대화 상자",
|
||||||
|
"show-note-source": "\"노트 소스\" 대화 상자 표시",
|
||||||
|
"show-options": "\"옵션\" 페이지 열기",
|
||||||
|
"show-revisions": "\"노트 리비젼\" 대화 상자 표시",
|
||||||
|
"show-recent-changes": "\"최근 변경 사항\" 대화 상자 표시",
|
||||||
|
"show-sql-console": "\"SQL 콘솔\" 페이지 열기",
|
||||||
|
"show-backend-log": "\"백엔드 로그\" 페이지 열기",
|
||||||
|
"show-help": "내장 사용자 설명서 열기",
|
||||||
|
"show-cheatsheet": "일반적인 키보드 형식의 팝업 표시",
|
||||||
|
"text-note-operations": "텍스트 노트 작업",
|
||||||
|
"add-link-to-text": "텍스트에 링크 추가를 위한 대화 상자 열기"
|
||||||
},
|
},
|
||||||
"hidden-subtree": {
|
"hidden-subtree": {
|
||||||
"zen-mode": "젠 모드",
|
"zen-mode": "젠 모드",
|
||||||
|
|||||||
@ -13,10 +13,6 @@ import BBlob from "./entities/bblob.js";
|
|||||||
import BRecentNote from "./entities/brecent_note.js";
|
import BRecentNote from "./entities/brecent_note.js";
|
||||||
import type AbstractBeccaEntity from "./entities/abstract_becca_entity.js";
|
import type AbstractBeccaEntity from "./entities/abstract_becca_entity.js";
|
||||||
|
|
||||||
interface AttachmentOpts {
|
|
||||||
includeContentLength?: boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Becca is a backend cache of all notes, branches, and attributes.
|
* Becca is a backend cache of all notes, branches, and attributes.
|
||||||
* There's a similar frontend cache Froca, and share cache Shaca.
|
* There's a similar frontend cache Froca, and share cache Shaca.
|
||||||
@ -167,21 +163,18 @@ export default class Becca {
|
|||||||
return revision;
|
return revision;
|
||||||
}
|
}
|
||||||
|
|
||||||
getAttachment(attachmentId: string, opts: AttachmentOpts = {}): BAttachment | null {
|
getAttachment(attachmentId: string): BAttachment | null {
|
||||||
opts.includeContentLength = !!opts.includeContentLength;
|
const query = /*sql*/`\
|
||||||
|
SELECT attachments.*, LENGTH(blobs.content) AS contentLength
|
||||||
const query = opts.includeContentLength
|
FROM attachments
|
||||||
? /*sql*/`SELECT attachments.*, LENGTH(blobs.content) AS contentLength
|
JOIN blobs USING (blobId)
|
||||||
FROM attachments
|
WHERE attachmentId = ? AND isDeleted = 0`;
|
||||||
JOIN blobs USING (blobId)
|
|
||||||
WHERE attachmentId = ? AND isDeleted = 0`
|
|
||||||
: /*sql*/`SELECT * FROM attachments WHERE attachmentId = ? AND isDeleted = 0`;
|
|
||||||
|
|
||||||
return sql.getRows<AttachmentRow>(query, [attachmentId]).map((row) => new BAttachment(row))[0];
|
return sql.getRows<AttachmentRow>(query, [attachmentId]).map((row) => new BAttachment(row))[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
getAttachmentOrThrow(attachmentId: string, opts: AttachmentOpts = {}): BAttachment {
|
getAttachmentOrThrow(attachmentId: string): BAttachment {
|
||||||
const attachment = this.getAttachment(attachmentId, opts);
|
const attachment = this.getAttachment(attachmentId);
|
||||||
if (!attachment) {
|
if (!attachment) {
|
||||||
throw new NotFoundError(`Attachment '${attachmentId}' has not been found.`);
|
throw new NotFoundError(`Attachment '${attachmentId}' has not been found.`);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -61,10 +61,6 @@ interface ContentOpts {
|
|||||||
forceFrontendReload?: boolean;
|
forceFrontendReload?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
interface AttachmentOpts {
|
|
||||||
includeContentLength?: boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
interface Relationship {
|
interface Relationship {
|
||||||
parentNoteId: string;
|
parentNoteId: string;
|
||||||
childNoteId: string;
|
childNoteId: string;
|
||||||
@ -1102,31 +1098,23 @@ class BNote extends AbstractBeccaEntity<BNote> {
|
|||||||
return sql.getRows<RevisionRow>("SELECT * FROM revisions WHERE noteId = ? ORDER BY revisions.utcDateCreated ASC", [this.noteId]).map((row) => new BRevision(row));
|
return sql.getRows<RevisionRow>("SELECT * FROM revisions WHERE noteId = ? ORDER BY revisions.utcDateCreated ASC", [this.noteId]).map((row) => new BRevision(row));
|
||||||
}
|
}
|
||||||
|
|
||||||
getAttachments(opts: AttachmentOpts = {}) {
|
getAttachments() {
|
||||||
opts.includeContentLength = !!opts.includeContentLength;
|
const query = /*sql*/`\
|
||||||
// from testing, it looks like calculating length does not make a difference in performance even on large-ish DB
|
SELECT attachments.*, LENGTH(blobs.content) AS contentLength
|
||||||
// given that we're always fetching attachments only for a specific note, we might just do it always
|
FROM attachments
|
||||||
|
JOIN blobs USING (blobId)
|
||||||
const query = opts.includeContentLength
|
WHERE ownerId = ? AND isDeleted = 0
|
||||||
? /*sql*/`SELECT attachments.*, LENGTH(blobs.content) AS contentLength
|
ORDER BY position`;
|
||||||
FROM attachments
|
|
||||||
JOIN blobs USING (blobId)
|
|
||||||
WHERE ownerId = ? AND isDeleted = 0
|
|
||||||
ORDER BY position`
|
|
||||||
: /*sql*/`SELECT * FROM attachments WHERE ownerId = ? AND isDeleted = 0 ORDER BY position`;
|
|
||||||
|
|
||||||
return sql.getRows<AttachmentRow>(query, [this.noteId]).map((row) => new BAttachment(row));
|
return sql.getRows<AttachmentRow>(query, [this.noteId]).map((row) => new BAttachment(row));
|
||||||
}
|
}
|
||||||
|
|
||||||
getAttachmentById(attachmentId: string, opts: AttachmentOpts = {}) {
|
getAttachmentById(attachmentId: string) {
|
||||||
opts.includeContentLength = !!opts.includeContentLength;
|
const query = /*sql*/`\
|
||||||
|
SELECT attachments.*, LENGTH(blobs.content) AS contentLength
|
||||||
const query = opts.includeContentLength
|
FROM attachments
|
||||||
? /*sql*/`SELECT attachments.*, LENGTH(blobs.content) AS contentLength
|
JOIN blobs USING (blobId)
|
||||||
FROM attachments
|
WHERE ownerId = ? AND attachmentId = ? AND isDeleted = 0`;
|
||||||
JOIN blobs USING (blobId)
|
|
||||||
WHERE ownerId = ? AND attachmentId = ? AND isDeleted = 0`
|
|
||||||
: /*sql*/`SELECT * FROM attachments WHERE ownerId = ? AND attachmentId = ? AND isDeleted = 0`;
|
|
||||||
|
|
||||||
return sql.getRows<AttachmentRow>(query, [this.noteId, attachmentId]).map((row) => new BAttachment(row))[0];
|
return sql.getRows<AttachmentRow>(query, [this.noteId, attachmentId]).map((row) => new BAttachment(row))[0];
|
||||||
}
|
}
|
||||||
|
|||||||
@ -92,7 +92,7 @@ function getAndCheckNote(noteId: string) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function getAndCheckAttachment(attachmentId: string) {
|
function getAndCheckAttachment(attachmentId: string) {
|
||||||
const attachment = becca.getAttachment(attachmentId, { includeContentLength: true });
|
const attachment = becca.getAttachment(attachmentId);
|
||||||
|
|
||||||
if (attachment) {
|
if (attachment) {
|
||||||
return attachment;
|
return attachment;
|
||||||
|
|||||||
@ -185,7 +185,7 @@ function register(router: Router) {
|
|||||||
|
|
||||||
eu.route(router, "get", "/etapi/notes/:noteId/attachments", (req, res, next) => {
|
eu.route(router, "get", "/etapi/notes/:noteId/attachments", (req, res, next) => {
|
||||||
const note = eu.getAndCheckNote(req.params.noteId);
|
const note = eu.getAndCheckNote(req.params.noteId);
|
||||||
const attachments = note.getAttachments({ includeContentLength: true });
|
const attachments = note.getAttachments();
|
||||||
|
|
||||||
res.json(attachments.map((attachment) => mappers.mapAttachmentToPojo(attachment)));
|
res.json(attachments.map((attachment) => mappers.mapAttachmentToPojo(attachment)));
|
||||||
});
|
});
|
||||||
|
|||||||
@ -14,13 +14,13 @@ function getAttachmentBlob(req: Request) {
|
|||||||
function getAttachments(req: Request) {
|
function getAttachments(req: Request) {
|
||||||
const note = becca.getNoteOrThrow(req.params.noteId);
|
const note = becca.getNoteOrThrow(req.params.noteId);
|
||||||
|
|
||||||
return note.getAttachments({ includeContentLength: true });
|
return note.getAttachments();
|
||||||
}
|
}
|
||||||
|
|
||||||
function getAttachment(req: Request) {
|
function getAttachment(req: Request) {
|
||||||
const { attachmentId } = req.params;
|
const { attachmentId } = req.params;
|
||||||
|
|
||||||
return becca.getAttachmentOrThrow(attachmentId, { includeContentLength: true });
|
return becca.getAttachmentOrThrow(attachmentId);
|
||||||
}
|
}
|
||||||
|
|
||||||
function getAllAttachments(req: Request) {
|
function getAllAttachments(req: Request) {
|
||||||
@ -28,7 +28,7 @@ function getAllAttachments(req: Request) {
|
|||||||
// one particular attachment is requested, but return all note's attachments
|
// one particular attachment is requested, but return all note's attachments
|
||||||
|
|
||||||
const attachment = becca.getAttachmentOrThrow(attachmentId);
|
const attachment = becca.getAttachmentOrThrow(attachmentId);
|
||||||
return attachment.getNote()?.getAttachments({ includeContentLength: true }) || [];
|
return attachment.getNote()?.getAttachments() || [];
|
||||||
}
|
}
|
||||||
|
|
||||||
function saveAttachment(req: Request) {
|
function saveAttachment(req: Request) {
|
||||||
|
|||||||
@ -764,7 +764,7 @@ function updateNoteData(noteId: string, content: string, attachments: Attachment
|
|||||||
note.setContent(newContent, { forceFrontendReload });
|
note.setContent(newContent, { forceFrontendReload });
|
||||||
|
|
||||||
if (attachments?.length > 0) {
|
if (attachments?.length > 0) {
|
||||||
const existingAttachmentsByTitle = toMap(note.getAttachments({ includeContentLength: false }), "title");
|
const existingAttachmentsByTitle = toMap(note.getAttachments(), "title");
|
||||||
|
|
||||||
for (const { attachmentId, role, mime, title, position, content } of attachments) {
|
for (const { attachmentId, role, mime, title, position, content } of attachments) {
|
||||||
const existingAttachment = existingAttachmentsByTitle.get(title);
|
const existingAttachment = existingAttachmentsByTitle.get(title);
|
||||||
|
|||||||
@ -18,8 +18,8 @@
|
|||||||
"title": "Organizace",
|
"title": "Organizace",
|
||||||
"note_structure_title": "Struktura poznámek",
|
"note_structure_title": "Struktura poznámek",
|
||||||
"note_structure_description": "Poznámky lze uspořádat hierarchicky. Není třeba používat složky, protože každá poznámka může obsahovat podpoznámky. Jednu poznámku lze přidat na více míst v hierarchii.",
|
"note_structure_description": "Poznámky lze uspořádat hierarchicky. Není třeba používat složky, protože každá poznámka může obsahovat podpoznámky. Jednu poznámku lze přidat na více míst v hierarchii.",
|
||||||
"attributes_title": "Poznámky k štítkům a vztahům",
|
"attributes_title": "Poznámky k štítkům a vazbám",
|
||||||
"attributes_description": "Využijte vztahy mezi poznámkami nebo přidejte štítky pro snadnou kategorizaci. Pomocí propagovaných atributů zadejte strukturované informace, které lze použít v tabulkách.",
|
"attributes_description": "Využijte vazby mezi poznámkami nebo přidejte štítky pro snadnou kategorizaci. Pomocí propagovaných atributů zadejte strukturované informace, které lze použít v různých tabulkách.",
|
||||||
"hoisting_title": "Pracovní prostředí a hoisting",
|
"hoisting_title": "Pracovní prostředí a hoisting",
|
||||||
"hoisting_description": "Snadno oddělte své osobní a pracovní poznámky tím, že je seskupíte do pracovního prostoru, který zaměří strom poznámek tak, aby zobrazoval pouze konkrétní sadu poznámek."
|
"hoisting_description": "Snadno oddělte své osobní a pracovní poznámky tím, že je seskupíte do pracovního prostoru, který zaměří strom poznámek tak, aby zobrazoval pouze konkrétní sadu poznámek."
|
||||||
},
|
},
|
||||||
|
|||||||
@ -19,7 +19,9 @@
|
|||||||
"note_structure_title": "Notizstruktur",
|
"note_structure_title": "Notizstruktur",
|
||||||
"attributes_title": "Notiz Labels und Beziehungen",
|
"attributes_title": "Notiz Labels und Beziehungen",
|
||||||
"note_structure_description": "Notizen lassen sich hierarchisch anordnen. Ordner sind nicht nötig, da jede Notiz Unternotizen enthalten kann. Eine einzelne Notiz kann an mehreren Stellen in der Hierarchie hinzugefügt werden.",
|
"note_structure_description": "Notizen lassen sich hierarchisch anordnen. Ordner sind nicht nötig, da jede Notiz Unternotizen enthalten kann. Eine einzelne Notiz kann an mehreren Stellen in der Hierarchie hinzugefügt werden.",
|
||||||
"hoisting_description": "Trennen Sie Ihre persönlichen und beruflichen Notizen ganz einfach, indem Sie sie in einem Arbeitsbereich gruppieren. Dadurch wird Ihre Notizstruktur so fokussiert, dass nur ein bestimmter Satz von Notizen angezeigt wird."
|
"hoisting_description": "Trennen Sie Ihre persönlichen und beruflichen Notizen ganz einfach, indem Sie sie in einem Arbeitsbereich gruppieren. Dadurch wird Ihre Notizstruktur so fokussiert, dass nur ein bestimmter Satz von Notizen angezeigt wird.",
|
||||||
|
"hoisting_title": "Arbeitsbereiche und Fokusansicht",
|
||||||
|
"attributes_description": "Nutzen Sie Verbindungen zwischen Notizen oder fügen Sie Labels hinzu, um die Kategorisierung zu erleichtern. Mit hervorgehobenen („promoted“) Attributen können Sie strukturierte Informationen erfassen, die sich direkt in Tabellen und Boards verwenden lassen."
|
||||||
},
|
},
|
||||||
"productivity_benefits": {
|
"productivity_benefits": {
|
||||||
"revisions_title": "Notizrevisionen",
|
"revisions_title": "Notizrevisionen",
|
||||||
@ -29,7 +31,12 @@
|
|||||||
"jump_to_title": "Schnellsuche und Kommandos",
|
"jump_to_title": "Schnellsuche und Kommandos",
|
||||||
"search_title": "Leistungsstarke Suche",
|
"search_title": "Leistungsstarke Suche",
|
||||||
"web_clipper_title": "Web clipper",
|
"web_clipper_title": "Web clipper",
|
||||||
"revisions_content": "Notizen werden regelmäßig im Hintergrund gespeichert und Revisionen können zur Überprüfung oder zum Rückgängigmachen versehentlicher Änderungen verwendet werden. Revisionen können auch bei Bedarf erstellt werden."
|
"revisions_content": "Notizen werden regelmäßig im Hintergrund gespeichert und Revisionen können zur Überprüfung oder zum Rückgängigmachen versehentlicher Änderungen verwendet werden. Revisionen können auch bei Bedarf erstellt werden.",
|
||||||
|
"sync_content": "Verwenden Sie eine selbst gehostete oder Cloud-Instanz, um Ihre Notizen ganz einfach auf mehreren Geräten zu synchronisieren und über eine WebApp von Ihrem mobilen Gerät aus darauf zuzugreifen.",
|
||||||
|
"protected_notes_content": "Halten Sie vertrauliche Informationen sicher, indem Sie Notizen verschlüsseln und mit einem Passwort schützen.",
|
||||||
|
"jump_to_content": "Springen Sie schnell zu Notizen oder UI-Befehlen in der gesamten Hierarchie, indem Sie nach ihrem Titel suchen. Dank Fuzzy-Matching finden Sie auch Treffer bei Tippfehlern oder leicht abweichenden Schreibweisen.",
|
||||||
|
"search_content": "Oder durchsuchen Sie den Inhalt von Notizen und grenzen Sie die Suche ein, indem Sie nach übergeordneten Notizen oder der Hierarchieebene filtern.",
|
||||||
|
"web_clipper_content": "Webseiten oder Screenshots direkt in Trilium speichern – mit der Web Clipper Browser-Erweiterung."
|
||||||
},
|
},
|
||||||
"note_types": {
|
"note_types": {
|
||||||
"text_title": "Text Notizen",
|
"text_title": "Text Notizen",
|
||||||
@ -38,15 +45,38 @@
|
|||||||
"mermaid_title": "Mermaid Diagramm",
|
"mermaid_title": "Mermaid Diagramm",
|
||||||
"mindmap_title": "Mind Map",
|
"mindmap_title": "Mind Map",
|
||||||
"text_description": "Die Notizen werden mit einem visuellen Editor (WYSIWYG) bearbeitet, der Tabellen, Bilder, mathematische Ausdrücke und Code-Blöcke mit Syntaxhervorhebung unterstützt. Formatieren Sie den Text schnell mit einer Markdown-ähnlichen Syntax oder mit Slash-Befehlen.",
|
"text_description": "Die Notizen werden mit einem visuellen Editor (WYSIWYG) bearbeitet, der Tabellen, Bilder, mathematische Ausdrücke und Code-Blöcke mit Syntaxhervorhebung unterstützt. Formatieren Sie den Text schnell mit einer Markdown-ähnlichen Syntax oder mit Slash-Befehlen.",
|
||||||
"code_description": "Große Quellcode- oder Skriptdateien werden mit einem speziellen Editor bearbeitet, der Syntaxhervorhebung für viele Programmiersprachen und diverse Farbschemata bietet."
|
"code_description": "Große Quellcode- oder Skriptdateien werden mit einem speziellen Editor bearbeitet, der Syntaxhervorhebung für viele Programmiersprachen und diverse Farbschemata bietet.",
|
||||||
|
"title": "Verschiedene Darstellungsformen für Ihre Informationen",
|
||||||
|
"file_title": "Datei Notizen",
|
||||||
|
"file_description": "Betten Sie Multimedia-Dateien wie PDFs, Bilder und Videos mit einer Vorschau innerhalb der Anwendung ein.",
|
||||||
|
"canvas_description": "Ordnen Sie Formen, Bilder und Text auf einer unendlichen Leinwand an, indem Sie dieselbe Technologie verwenden, die auch hinter excalidraw.com steckt. Ideal für Diagramme, Skizzen und visuelle Planung.",
|
||||||
|
"mermaid_description": "Erstellen Sie Fluss-, Klassen-, Sequenz- sowie Gantt-Diagramme und vieles mehr mit der Mermaid-Syntax.",
|
||||||
|
"mindmap_description": "Strukturieren Sie Ihre Gedanken visuell oder nutzen Sie eine Brainstorming-Sitzung.",
|
||||||
|
"others_list": "und andere: <0>note map</0>, <1>relation map</1>, <2>saved searches</2>, <3>render note</3>, and <4>web views</4>."
|
||||||
},
|
},
|
||||||
"extensibility_benefits": {
|
"extensibility_benefits": {
|
||||||
"import_export_title": "Import/Export",
|
"import_export_title": "Import/Export",
|
||||||
"scripting_title": "Erweitertes Scripting",
|
"scripting_title": "Erweitertes Scripting",
|
||||||
"api_title": "REST API"
|
"api_title": "REST API",
|
||||||
|
"title": "Freigabe & Erweiterung",
|
||||||
|
"import_export_description": "Einfache Interaktion mit anderen Anwendungen mithilfe von Markdown, ENEX und OML Formaten.",
|
||||||
|
"share_title": "Notizen im Web teilen",
|
||||||
|
"share_description": "Wenn Sie über einen Server verfügen, können Sie diesen nutzen, um einen Teil Ihrer Notizen mit anderen zu teilen.",
|
||||||
|
"scripting_description": "Erstellen Sie Ihre eigenen Integrationen innerhalb von Trilium mit benutzerdefinierten Widgets oder serverseitiger Logik.",
|
||||||
|
"api_description": "Nutzen Sie die integrierte REST-API, um flexibel und automatisiert mit Trilium zu interagieren."
|
||||||
},
|
},
|
||||||
"collections": {
|
"collections": {
|
||||||
"calendar_title": "Kalender"
|
"calendar_title": "Kalender",
|
||||||
|
"title": "Sammlungen",
|
||||||
|
"calendar_description": "Organisieren Sie Ihre privaten oder beruflichen Termine mithilfe eines Kalenders, der ganztägige und mehrtägige Termine unterstützt. Verschaffen Sie sich mit der Wochen-, Monats- und Jahresansicht einen Überblick über Ihre Termine. Einfaches Hinzufügen oder Verschieben von Terminen.",
|
||||||
|
"table_title": "Tabelle",
|
||||||
|
"table_description": "Zeigen Sie Informationen zu Notizen in einer tabellarischen Ansicht an und bearbeiten Sie diese. Dabei stehen verschiedene Spaltentypen wie Text, Zahlen, Kontrollkästchen, Datum sowie Uhrzeit, Links und Farben zur Verfügung, auch Beziehungen werden unterstützt. Optional können Sie die Notizen innerhalb einer Baumhierarchie in der Tabelle anzeigen.",
|
||||||
|
"board_title": "Kanban-Board",
|
||||||
|
"board_description": "Organisieren Sie Aufgaben und Projektstatus in einem Kanban-Board und ändern Sie den Status ganz einfach per Drag & Drop.",
|
||||||
|
"geomap_title": "Geokarte",
|
||||||
|
"geomap_description": "Planen Sie Ihren Urlaub oder markieren Sie Ihre Sehenswürdigkeiten direkt auf einer geografischen Karte mit individuellen Markierungen. Zeigen Sie aufgezeichnete GPX-Tracks an, um Reiserouten zu verfolgen.",
|
||||||
|
"presentation_title": "Präsentation",
|
||||||
|
"presentation_description": "Organisieren Sie Informationen in Folien und präsentieren Sie diese im Vollbildmodus mit flüssigen Übergängen. Die Folien können als PDF gespeichert und einfach geteilt werden."
|
||||||
},
|
},
|
||||||
"download_helper_desktop_macos": {
|
"download_helper_desktop_macos": {
|
||||||
"quick_start": "Installieren mit Homebrew:",
|
"quick_start": "Installieren mit Homebrew:",
|
||||||
@ -69,7 +99,13 @@
|
|||||||
"download_nixpkgs": "nixpkgs",
|
"download_nixpkgs": "nixpkgs",
|
||||||
"download_zip": "Portable (.zip)",
|
"download_zip": "Portable (.zip)",
|
||||||
"download_flatpak": ".flatpak",
|
"download_flatpak": ".flatpak",
|
||||||
"download_rpm": ".rpm"
|
"download_rpm": ".rpm",
|
||||||
|
"title_x64": "Linux 64-bit",
|
||||||
|
"title_arm64": "Linux on ARM",
|
||||||
|
"description_x64": "Für die meisten Linux-Distributionen, kompatibel mit der x86_64-Architektur.",
|
||||||
|
"description_arm64": "Für ARM-basierte Linux-Distributionen, kompatibel mit der aarch64-Architektur.",
|
||||||
|
"quick_start": "Wählen Sie je nach Ihrer Distribution ein geeignetes Paketformat aus:",
|
||||||
|
"download_deb": ".deb"
|
||||||
},
|
},
|
||||||
"download_helper_server_linux": {
|
"download_helper_server_linux": {
|
||||||
"title": "Self-hosted auf Linux",
|
"title": "Self-hosted auf Linux",
|
||||||
@ -83,5 +119,82 @@
|
|||||||
"description": "Trilium Notes wird auf PikaPods gehostet, einem kostenpflichtigen Dienst für einfachen Zugriff und Verwaltung. Es besteht keine direkte Verbindung zum Trilium-Team.",
|
"description": "Trilium Notes wird auf PikaPods gehostet, einem kostenpflichtigen Dienst für einfachen Zugriff und Verwaltung. Es besteht keine direkte Verbindung zum Trilium-Team.",
|
||||||
"download_pikapod": "Auf PikaPods installieren",
|
"download_pikapod": "Auf PikaPods installieren",
|
||||||
"download_triliumcc": "Alternativ siehe trilium.cc"
|
"download_triliumcc": "Alternativ siehe trilium.cc"
|
||||||
|
},
|
||||||
|
"faq": {
|
||||||
|
"title": "Häufig gestellte Fragen",
|
||||||
|
"mobile_question": "Gibt es eine mobile Applikation?",
|
||||||
|
"mobile_answer": "Derzeit gibt es keine offizielle mobile Anwendung. Wenn Sie jedoch über eine Serverinstanz verfügen, können Sie über einen Webbrowser darauf zugreifen und sie sogar als PWA installieren. Für Android gibt es eine inoffizielle Anwendung namens TriliumDroid, die sogar offline funktioniert (genau wie ein Desktop-Client).",
|
||||||
|
"database_question": "Wo werden die Daten gespeichert?",
|
||||||
|
"database_answer": "Alle Ihre Notizen werden in einer SQLite-Datenbank in einem Anwendungsordner gespeichert. Der Grund, warum Trilium eine Datenbank anstelle von einfachen Textdateien verwendet, liegt sowohl in der Leistung als auch darin, dass einige Funktionen, wie z. B. Klone (gleiche Notiz an mehreren Stellen im Baum), viel schwieriger zu implementieren wären. Um den Anwendungsordner zu finden, gehen Sie einfach zum Fenster „Über“.",
|
||||||
|
"server_question": "Benötige ich einen Server um Trilium zu nutzen?",
|
||||||
|
"server_answer": "Nein, der Server ermöglicht den Zugriff über einen Webbrowser und verwaltet die Synchronisierung, wenn Sie mehrere Geräte haben. Um loszulegen, reicht es aus, die Desktop-Anwendung herunterzuladen und zu verwenden.",
|
||||||
|
"scaling_question": "Wie gut skaliert die Anwendung bei einer großen Anzahl von Notizen?",
|
||||||
|
"scaling_answer": "Je nach Nutzung sollte die Anwendung min. 100.000 Notizen problemlos verarbeiten können. Beachten Sie, dass der Synchronisierungsvorgang manchmal fehlschlagen kann, wenn viele große Dateien (1 GB pro Datei) hochgeladen werden, da Trilium eher als Wissensdatenbank-Anwendung und nicht als Dateispeicher (wie beispielsweise NextCloud) konzipiert ist.",
|
||||||
|
"network_share_question": "Kann ich meine Datenbank über ein Netzlaufwerk freigeben?",
|
||||||
|
"network_share_answer": "Nein, es ist im Allgemeinen keine gute Idee, eine SQLite-Datenbank über ein Netzlaufwerk freizugeben. Auch wenn dies manchmal funktionieren mag, besteht die Gefahr, dass die Datenbank aufgrund unvollständiger Dateisperren über ein Netzwerk beschädigt wird.",
|
||||||
|
"security_question": "Wie werden meine Daten geschützt?",
|
||||||
|
"security_answer": "Standardmäßig sind Notizen nicht verschlüsselt und können direkt aus der Datenbank gelesen werden. Sobald eine Notiz als verschlüsselt markiert ist, wird diese mit AES-128-CBC verschlüsselt."
|
||||||
|
},
|
||||||
|
"final_cta": {
|
||||||
|
"title": "Sind Sie bereit, um mit Trilium Notes zu starten?",
|
||||||
|
"description": "Baue dein persönliches Wissensarchiv mit leistungsstarken Funktionen und vollständigem Datenschutz auf.",
|
||||||
|
"get_started": "Loslegen"
|
||||||
|
},
|
||||||
|
"components": {
|
||||||
|
"link_learn_more": "Mehr erfahren..."
|
||||||
|
},
|
||||||
|
"download_now": {
|
||||||
|
"text": "Herunterladen ",
|
||||||
|
"platform_big": "v{{version}} für {{platform}}",
|
||||||
|
"platform_small": "für {{platform}}",
|
||||||
|
"linux_big": "v{{version}} für Linux",
|
||||||
|
"linux_small": "für Linux",
|
||||||
|
"more_platforms": "Weitere Plattformen & Server-Einrichtung"
|
||||||
|
},
|
||||||
|
"header": {
|
||||||
|
"get-started": "Loslegen",
|
||||||
|
"documentation": "Dokumentation",
|
||||||
|
"support-us": "Unterstützt uns"
|
||||||
|
},
|
||||||
|
"footer": {
|
||||||
|
"copyright_and_the": " und die ",
|
||||||
|
"copyright_community": "Community"
|
||||||
|
},
|
||||||
|
"social_buttons": {
|
||||||
|
"github": "GitHub",
|
||||||
|
"github_discussions": "GitHub Discussions",
|
||||||
|
"matrix": "Matrix",
|
||||||
|
"reddit": "Reddit"
|
||||||
|
},
|
||||||
|
"support_us": {
|
||||||
|
"title": "Unterstütze uns",
|
||||||
|
"financial_donations_title": "Geldspenden",
|
||||||
|
"financial_donations_description": "Trilium wurde mit <Link>Hunderten von Arbeitsstunden</Link> entwickelt und wird mit diesem Aufwand auch gewartet. Ihre Unterstützung sorgt dafür, dass es Open Source bleibt, verbessert die Funktionen und deckt Kosten wie das Hosting.",
|
||||||
|
"financial_donations_cta": "Bitte unterstützen Sie den Hauptentwickler (<Link>eliandoran</Link>) der Anwendung über:",
|
||||||
|
"github_sponsors": "GitHub Sponsoren",
|
||||||
|
"paypal": "PayPal",
|
||||||
|
"buy_me_a_coffee": "Buy Me A Coffee"
|
||||||
|
},
|
||||||
|
"contribute": {
|
||||||
|
"title": "Weitere Möglichkeiten zum Mitwirken",
|
||||||
|
"way_translate": "Übersetzen Sie die Anwendung über <Link>Weblate</Link> in Ihre Muttersprache.",
|
||||||
|
"way_community": "Interagieren Sie mit der Community auf <Discussions>GitHub Discussions</Discussions> oder auf <Matrix>Matrix</Matrix>.",
|
||||||
|
"way_reports": "Fehlfunktionen über <Link>GitHub-Issues</Link> melden.",
|
||||||
|
"way_document": "Verbessern Sie die Dokumentation, indem Sie uns auf Lücken hinweisen oder durch eigene Beiträge wie Anleitungen, FAQs oder Tutorials unterstützen.",
|
||||||
|
"way_market": "Weitersagen: Teilen Sie Trilium Notes mit Freunden, in Blogs und sozialen Medien."
|
||||||
|
},
|
||||||
|
"404": {
|
||||||
|
"title": "404: Not Found",
|
||||||
|
"description": "Die gesuchte Seite konnte nicht gefunden werden. Möglicherweise wurde sie gelöscht oder die URL ist falsch."
|
||||||
|
},
|
||||||
|
"download_helper_desktop_windows": {
|
||||||
|
"title_x64": "Windows 64-bit",
|
||||||
|
"title_arm64": "Windows on ARM",
|
||||||
|
"description_x64": "Kompatibel mit Intel- oder AMD-Geräten unter Windows 10 und 11.",
|
||||||
|
"description_arm64": "Kompatibel mit ARM-Geräten (z. B. mit Qualcomm Snapdragon).",
|
||||||
|
"quick_start": "Installation über Winget:",
|
||||||
|
"download_exe": "Download Installer (.exe)",
|
||||||
|
"download_zip": "Portable (.zip)",
|
||||||
|
"download_scoop": "Scoop"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -38,7 +38,13 @@
|
|||||||
"sync_title": "동기화",
|
"sync_title": "동기화",
|
||||||
"sync_content": "자체 호스팅 또는 클라우드 인스턴스를 이용하여 여러 기기 사이에서 노트를 쉽게 동기화하고 PWA를 통해 모바일 폰에서 접근할 수 있습니다.",
|
"sync_content": "자체 호스팅 또는 클라우드 인스턴스를 이용하여 여러 기기 사이에서 노트를 쉽게 동기화하고 PWA를 통해 모바일 폰에서 접근할 수 있습니다.",
|
||||||
"protected_notes_title": "보호된 노트",
|
"protected_notes_title": "보호된 노트",
|
||||||
"protected_notes_content": "노트를 암호화하고 비밀번호로 보호되는 세션 뒤에 잠궈 민감한 개인 정보를 보호하세요."
|
"protected_notes_content": "노트를 암호화하고 비밀번호로 보호되는 세션 뒤에 잠궈 민감한 개인 정보를 보호하세요.",
|
||||||
|
"jump_to_title": "빠른 검색 및 명령어",
|
||||||
|
"jump_to_content": "제목을 검색하고 오타나 약간의 차이를 설명하기 위해 퍼지 매칭을 통해 계층 전반에 걸쳐 노트나 UI 명령으로 빠르게 이동하세요.",
|
||||||
|
"search_title": "상세 검색",
|
||||||
|
"search_content": "또는 노트 내부에서 문자를 검색하거나 부모 노트 또는 단계별로 필터링 하는 등 검색 범위를 조정하세요.",
|
||||||
|
"web_clipper_title": "웹 클리퍼",
|
||||||
|
"web_clipper_content": "웹 클리퍼 확장 프로그램을 사용하여 웹 페이지(또는 스크린샷)를 Trilium으로 가져와 문서에 사용하세요."
|
||||||
},
|
},
|
||||||
"header": {
|
"header": {
|
||||||
"get-started": "시작하기",
|
"get-started": "시작하기",
|
||||||
@ -79,5 +85,8 @@
|
|||||||
"title_arm64": "ARM 기반 리눅스",
|
"title_arm64": "ARM 기반 리눅스",
|
||||||
"description_x64": "대부분의 리눅스 배포판에서 x86_64 아키텍처와 호환됩니다.",
|
"description_x64": "대부분의 리눅스 배포판에서 x86_64 아키텍처와 호환됩니다.",
|
||||||
"description_arm64": "ARM 기반 리눅스 배포판에서 aarch64 아키텍처와 호환됩니다."
|
"description_arm64": "ARM 기반 리눅스 배포판에서 aarch64 아키텍처와 호환됩니다."
|
||||||
|
},
|
||||||
|
"note_types": {
|
||||||
|
"text_title": "텍스트 노트"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -33,7 +33,7 @@
|
|||||||
"eslint-config-ckeditor5": ">=9.1.0",
|
"eslint-config-ckeditor5": ">=9.1.0",
|
||||||
"http-server": "14.1.1",
|
"http-server": "14.1.1",
|
||||||
"lint-staged": "16.2.7",
|
"lint-staged": "16.2.7",
|
||||||
"stylelint": "16.26.0",
|
"stylelint": "16.26.1",
|
||||||
"stylelint-config-ckeditor5": ">=9.1.0",
|
"stylelint-config-ckeditor5": ">=9.1.0",
|
||||||
"ts-node": "10.9.2",
|
"ts-node": "10.9.2",
|
||||||
"typescript": "5.9.3",
|
"typescript": "5.9.3",
|
||||||
|
|||||||
@ -34,7 +34,7 @@
|
|||||||
"eslint-config-ckeditor5": ">=9.1.0",
|
"eslint-config-ckeditor5": ">=9.1.0",
|
||||||
"http-server": "14.1.1",
|
"http-server": "14.1.1",
|
||||||
"lint-staged": "16.2.7",
|
"lint-staged": "16.2.7",
|
||||||
"stylelint": "16.26.0",
|
"stylelint": "16.26.1",
|
||||||
"stylelint-config-ckeditor5": ">=9.1.0",
|
"stylelint-config-ckeditor5": ">=9.1.0",
|
||||||
"ts-node": "10.9.2",
|
"ts-node": "10.9.2",
|
||||||
"typescript": "5.9.3",
|
"typescript": "5.9.3",
|
||||||
|
|||||||
@ -36,7 +36,7 @@
|
|||||||
"eslint-config-ckeditor5": ">=9.1.0",
|
"eslint-config-ckeditor5": ">=9.1.0",
|
||||||
"http-server": "14.1.1",
|
"http-server": "14.1.1",
|
||||||
"lint-staged": "16.2.7",
|
"lint-staged": "16.2.7",
|
||||||
"stylelint": "16.26.0",
|
"stylelint": "16.26.1",
|
||||||
"stylelint-config-ckeditor5": ">=9.1.0",
|
"stylelint-config-ckeditor5": ">=9.1.0",
|
||||||
"ts-node": "10.9.2",
|
"ts-node": "10.9.2",
|
||||||
"typescript": "5.9.3",
|
"typescript": "5.9.3",
|
||||||
|
|||||||
@ -37,7 +37,7 @@
|
|||||||
"eslint-config-ckeditor5": ">=9.1.0",
|
"eslint-config-ckeditor5": ">=9.1.0",
|
||||||
"http-server": "14.1.1",
|
"http-server": "14.1.1",
|
||||||
"lint-staged": "16.2.7",
|
"lint-staged": "16.2.7",
|
||||||
"stylelint": "16.26.0",
|
"stylelint": "16.26.1",
|
||||||
"stylelint-config-ckeditor5": ">=9.1.0",
|
"stylelint-config-ckeditor5": ">=9.1.0",
|
||||||
"ts-node": "10.9.2",
|
"ts-node": "10.9.2",
|
||||||
"typescript": "5.9.3",
|
"typescript": "5.9.3",
|
||||||
|
|||||||
@ -36,7 +36,7 @@
|
|||||||
"eslint-config-ckeditor5": ">=9.1.0",
|
"eslint-config-ckeditor5": ">=9.1.0",
|
||||||
"http-server": "14.1.1",
|
"http-server": "14.1.1",
|
||||||
"lint-staged": "16.2.7",
|
"lint-staged": "16.2.7",
|
||||||
"stylelint": "16.26.0",
|
"stylelint": "16.26.1",
|
||||||
"stylelint-config-ckeditor5": ">=9.1.0",
|
"stylelint-config-ckeditor5": ">=9.1.0",
|
||||||
"ts-node": "10.9.2",
|
"ts-node": "10.9.2",
|
||||||
"typescript": "5.9.3",
|
"typescript": "5.9.3",
|
||||||
|
|||||||
110
pnpm-lock.yaml
generated
110
pnpm-lock.yaml
generated
@ -369,8 +369,8 @@ importers:
|
|||||||
specifier: 2.1.3
|
specifier: 2.1.3
|
||||||
version: 2.1.3(electron@38.7.2)
|
version: 2.1.3(electron@38.7.2)
|
||||||
better-sqlite3:
|
better-sqlite3:
|
||||||
specifier: 12.4.6
|
specifier: 12.5.0
|
||||||
version: 12.4.6
|
version: 12.5.0
|
||||||
electron-debug:
|
electron-debug:
|
||||||
specifier: 4.1.0
|
specifier: 4.1.0
|
||||||
version: 4.1.0
|
version: 4.1.0
|
||||||
@ -433,8 +433,8 @@ importers:
|
|||||||
apps/dump-db:
|
apps/dump-db:
|
||||||
dependencies:
|
dependencies:
|
||||||
better-sqlite3:
|
better-sqlite3:
|
||||||
specifier: 12.4.6
|
specifier: 12.5.0
|
||||||
version: 12.4.6
|
version: 12.5.0
|
||||||
mime-types:
|
mime-types:
|
||||||
specifier: 3.0.2
|
specifier: 3.0.2
|
||||||
version: 3.0.2
|
version: 3.0.2
|
||||||
@ -464,8 +464,8 @@ importers:
|
|||||||
specifier: 7.0.1
|
specifier: 7.0.1
|
||||||
version: 7.0.1
|
version: 7.0.1
|
||||||
better-sqlite3:
|
better-sqlite3:
|
||||||
specifier: 12.4.6
|
specifier: 12.5.0
|
||||||
version: 12.4.6
|
version: 12.5.0
|
||||||
devDependencies:
|
devDependencies:
|
||||||
'@triliumnext/client':
|
'@triliumnext/client':
|
||||||
specifier: workspace:*
|
specifier: workspace:*
|
||||||
@ -489,8 +489,8 @@ importers:
|
|||||||
apps/server:
|
apps/server:
|
||||||
dependencies:
|
dependencies:
|
||||||
better-sqlite3:
|
better-sqlite3:
|
||||||
specifier: 12.4.6
|
specifier: 12.5.0
|
||||||
version: 12.4.6
|
version: 12.5.0
|
||||||
html-to-text:
|
html-to-text:
|
||||||
specifier: 9.0.5
|
specifier: 9.0.5
|
||||||
version: 9.0.5
|
version: 9.0.5
|
||||||
@ -915,11 +915,11 @@ importers:
|
|||||||
specifier: 16.2.7
|
specifier: 16.2.7
|
||||||
version: 16.2.7
|
version: 16.2.7
|
||||||
stylelint:
|
stylelint:
|
||||||
specifier: 16.26.0
|
specifier: 16.26.1
|
||||||
version: 16.26.0(typescript@5.9.3)
|
version: 16.26.1(typescript@5.9.3)
|
||||||
stylelint-config-ckeditor5:
|
stylelint-config-ckeditor5:
|
||||||
specifier: '>=9.1.0'
|
specifier: '>=9.1.0'
|
||||||
version: 13.0.0(stylelint@16.26.0(typescript@5.9.3))
|
version: 13.0.0(stylelint@16.26.1(typescript@5.9.3))
|
||||||
ts-node:
|
ts-node:
|
||||||
specifier: 10.9.2
|
specifier: 10.9.2
|
||||||
version: 10.9.2(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@24.10.1)(typescript@5.9.3)
|
version: 10.9.2(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@24.10.1)(typescript@5.9.3)
|
||||||
@ -975,11 +975,11 @@ importers:
|
|||||||
specifier: 16.2.7
|
specifier: 16.2.7
|
||||||
version: 16.2.7
|
version: 16.2.7
|
||||||
stylelint:
|
stylelint:
|
||||||
specifier: 16.26.0
|
specifier: 16.26.1
|
||||||
version: 16.26.0(typescript@5.9.3)
|
version: 16.26.1(typescript@5.9.3)
|
||||||
stylelint-config-ckeditor5:
|
stylelint-config-ckeditor5:
|
||||||
specifier: '>=9.1.0'
|
specifier: '>=9.1.0'
|
||||||
version: 13.0.0(stylelint@16.26.0(typescript@5.9.3))
|
version: 13.0.0(stylelint@16.26.1(typescript@5.9.3))
|
||||||
ts-node:
|
ts-node:
|
||||||
specifier: 10.9.2
|
specifier: 10.9.2
|
||||||
version: 10.9.2(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@24.10.1)(typescript@5.9.3)
|
version: 10.9.2(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@24.10.1)(typescript@5.9.3)
|
||||||
@ -1035,11 +1035,11 @@ importers:
|
|||||||
specifier: 16.2.7
|
specifier: 16.2.7
|
||||||
version: 16.2.7
|
version: 16.2.7
|
||||||
stylelint:
|
stylelint:
|
||||||
specifier: 16.26.0
|
specifier: 16.26.1
|
||||||
version: 16.26.0(typescript@5.9.3)
|
version: 16.26.1(typescript@5.9.3)
|
||||||
stylelint-config-ckeditor5:
|
stylelint-config-ckeditor5:
|
||||||
specifier: '>=9.1.0'
|
specifier: '>=9.1.0'
|
||||||
version: 13.0.0(stylelint@16.26.0(typescript@5.9.3))
|
version: 13.0.0(stylelint@16.26.1(typescript@5.9.3))
|
||||||
ts-node:
|
ts-node:
|
||||||
specifier: 10.9.2
|
specifier: 10.9.2
|
||||||
version: 10.9.2(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@24.10.1)(typescript@5.9.3)
|
version: 10.9.2(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@24.10.1)(typescript@5.9.3)
|
||||||
@ -1102,11 +1102,11 @@ importers:
|
|||||||
specifier: 16.2.7
|
specifier: 16.2.7
|
||||||
version: 16.2.7
|
version: 16.2.7
|
||||||
stylelint:
|
stylelint:
|
||||||
specifier: 16.26.0
|
specifier: 16.26.1
|
||||||
version: 16.26.0(typescript@5.9.3)
|
version: 16.26.1(typescript@5.9.3)
|
||||||
stylelint-config-ckeditor5:
|
stylelint-config-ckeditor5:
|
||||||
specifier: '>=9.1.0'
|
specifier: '>=9.1.0'
|
||||||
version: 13.0.0(stylelint@16.26.0(typescript@5.9.3))
|
version: 13.0.0(stylelint@16.26.1(typescript@5.9.3))
|
||||||
ts-node:
|
ts-node:
|
||||||
specifier: 10.9.2
|
specifier: 10.9.2
|
||||||
version: 10.9.2(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@24.10.1)(typescript@5.9.3)
|
version: 10.9.2(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@24.10.1)(typescript@5.9.3)
|
||||||
@ -1169,11 +1169,11 @@ importers:
|
|||||||
specifier: 16.2.7
|
specifier: 16.2.7
|
||||||
version: 16.2.7
|
version: 16.2.7
|
||||||
stylelint:
|
stylelint:
|
||||||
specifier: 16.26.0
|
specifier: 16.26.1
|
||||||
version: 16.26.0(typescript@5.9.3)
|
version: 16.26.1(typescript@5.9.3)
|
||||||
stylelint-config-ckeditor5:
|
stylelint-config-ckeditor5:
|
||||||
specifier: '>=9.1.0'
|
specifier: '>=9.1.0'
|
||||||
version: 13.0.0(stylelint@16.26.0(typescript@5.9.3))
|
version: 13.0.0(stylelint@16.26.1(typescript@5.9.3))
|
||||||
ts-node:
|
ts-node:
|
||||||
specifier: 10.9.2
|
specifier: 10.9.2
|
||||||
version: 10.9.2(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@24.10.1)(typescript@5.9.3)
|
version: 10.9.2(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@24.10.1)(typescript@5.9.3)
|
||||||
@ -2151,6 +2151,10 @@ packages:
|
|||||||
peerDependencies:
|
peerDependencies:
|
||||||
'@csstools/css-tokenizer': ^3.0.4
|
'@csstools/css-tokenizer': ^3.0.4
|
||||||
|
|
||||||
|
'@csstools/css-syntax-patches-for-csstree@1.0.19':
|
||||||
|
resolution: {integrity: sha512-QW5/SM2ARltEhoKcmRI1LoLf3/C7dHGswwCnfLcoMgqurBT4f8GvwXMgAbK/FwcxthmJRK5MGTtddj0yQn0J9g==}
|
||||||
|
engines: {node: '>=18'}
|
||||||
|
|
||||||
'@csstools/css-tokenizer@3.0.4':
|
'@csstools/css-tokenizer@3.0.4':
|
||||||
resolution: {integrity: sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==}
|
resolution: {integrity: sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==}
|
||||||
engines: {node: '>=18'}
|
engines: {node: '>=18'}
|
||||||
@ -6367,8 +6371,8 @@ packages:
|
|||||||
peerDependencies:
|
peerDependencies:
|
||||||
ajv: 4.11.8 - 8
|
ajv: 4.11.8 - 8
|
||||||
|
|
||||||
better-sqlite3@12.4.6:
|
better-sqlite3@12.5.0:
|
||||||
resolution: {integrity: sha512-gaYt9yqTbQ1iOxLpJA8FPR5PiaHP+jlg8I5EX0Rs2KFwNzhBsF40KzMZS5FwelY7RG0wzaucWdqSAJM3uNCPCg==}
|
resolution: {integrity: sha512-WwCZ/5Diz7rsF29o27o0Gcc1Du+l7Zsv7SYtVPG0X3G/uUI1LqdxrQI7c9Hs2FWpqXXERjW9hp6g3/tH7DlVKg==}
|
||||||
engines: {node: 20.x || 22.x || 23.x || 24.x || 25.x}
|
engines: {node: 20.x || 22.x || 23.x || 24.x || 25.x}
|
||||||
|
|
||||||
bezier-easing@2.1.0:
|
bezier-easing@2.1.0:
|
||||||
@ -13615,8 +13619,8 @@ packages:
|
|||||||
peerDependencies:
|
peerDependencies:
|
||||||
stylelint: '>=16.0.0'
|
stylelint: '>=16.0.0'
|
||||||
|
|
||||||
stylelint@16.26.0:
|
stylelint@16.26.1:
|
||||||
resolution: {integrity: sha512-Y/3AVBefrkqqapVYH3LBF5TSDZ1kw+0XpdKN2KchfuhMK6lQ85S4XOG4lIZLcrcS4PWBmvcY6eS2kCQFz0jukQ==}
|
resolution: {integrity: sha512-v20V59/crfc8sVTAtge0mdafI3AdnzQ2KsWe6v523L4OA1bJO02S7MO2oyXDCS6iWb9ckIPnqAFVItqSBQr7jw==}
|
||||||
engines: {node: '>=18.12.0'}
|
engines: {node: '>=18.12.0'}
|
||||||
hasBin: true
|
hasBin: true
|
||||||
|
|
||||||
@ -15778,8 +15782,6 @@ snapshots:
|
|||||||
'@ckeditor/ckeditor5-core': 47.2.0
|
'@ckeditor/ckeditor5-core': 47.2.0
|
||||||
'@ckeditor/ckeditor5-utils': 47.2.0
|
'@ckeditor/ckeditor5-utils': 47.2.0
|
||||||
ckeditor5: 47.2.0(patch_hash=8331a09d41443b39ea1c784daaccfeb0da4f9065ed556e7de92e9c77edd9eb41)
|
ckeditor5: 47.2.0(patch_hash=8331a09d41443b39ea1c784daaccfeb0da4f9065ed556e7de92e9c77edd9eb41)
|
||||||
transitivePeerDependencies:
|
|
||||||
- supports-color
|
|
||||||
|
|
||||||
'@ckeditor/ckeditor5-code-block@47.2.0(patch_hash=2361d8caad7d6b5bddacc3a3b4aa37dbfba260b1c1b22a450413a79c1bb1ce95)':
|
'@ckeditor/ckeditor5-code-block@47.2.0(patch_hash=2361d8caad7d6b5bddacc3a3b4aa37dbfba260b1c1b22a450413a79c1bb1ce95)':
|
||||||
dependencies:
|
dependencies:
|
||||||
@ -16454,8 +16456,8 @@ snapshots:
|
|||||||
process: 0.11.10
|
process: 0.11.10
|
||||||
raw-loader: 4.0.2(webpack@5.101.3(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.27.0))
|
raw-loader: 4.0.2(webpack@5.101.3(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.27.0))
|
||||||
style-loader: 2.0.0(webpack@5.101.3(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.27.0))
|
style-loader: 2.0.0(webpack@5.101.3(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.27.0))
|
||||||
stylelint: 16.26.0(typescript@5.0.4)
|
stylelint: 16.26.1(typescript@5.0.4)
|
||||||
stylelint-config-ckeditor5: 2.0.1(stylelint@16.26.0(typescript@5.9.3))
|
stylelint-config-ckeditor5: 2.0.1(stylelint@16.26.1(typescript@5.9.3))
|
||||||
terser-webpack-plugin: 5.3.14(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.27.0)(webpack@5.101.3(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.27.0))
|
terser-webpack-plugin: 5.3.14(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.27.0)(webpack@5.101.3(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.27.0))
|
||||||
ts-loader: 9.5.4(typescript@5.0.4)(webpack@5.101.3(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.27.0))
|
ts-loader: 9.5.4(typescript@5.0.4)(webpack@5.101.3(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.27.0))
|
||||||
ts-node: 10.9.2(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@24.10.1)(typescript@5.0.4)
|
ts-node: 10.9.2(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@24.10.1)(typescript@5.0.4)
|
||||||
@ -16550,8 +16552,6 @@ snapshots:
|
|||||||
'@ckeditor/ckeditor5-ui': 47.2.0
|
'@ckeditor/ckeditor5-ui': 47.2.0
|
||||||
'@ckeditor/ckeditor5-utils': 47.2.0
|
'@ckeditor/ckeditor5-utils': 47.2.0
|
||||||
ckeditor5: 47.2.0(patch_hash=8331a09d41443b39ea1c784daaccfeb0da4f9065ed556e7de92e9c77edd9eb41)
|
ckeditor5: 47.2.0(patch_hash=8331a09d41443b39ea1c784daaccfeb0da4f9065ed556e7de92e9c77edd9eb41)
|
||||||
transitivePeerDependencies:
|
|
||||||
- supports-color
|
|
||||||
|
|
||||||
'@ckeditor/ckeditor5-restricted-editing@47.2.0':
|
'@ckeditor/ckeditor5-restricted-editing@47.2.0':
|
||||||
dependencies:
|
dependencies:
|
||||||
@ -16749,6 +16749,8 @@ snapshots:
|
|||||||
'@ckeditor/ckeditor5-icons': 47.2.0
|
'@ckeditor/ckeditor5-icons': 47.2.0
|
||||||
'@ckeditor/ckeditor5-ui': 47.2.0
|
'@ckeditor/ckeditor5-ui': 47.2.0
|
||||||
'@ckeditor/ckeditor5-utils': 47.2.0
|
'@ckeditor/ckeditor5-utils': 47.2.0
|
||||||
|
transitivePeerDependencies:
|
||||||
|
- supports-color
|
||||||
|
|
||||||
'@ckeditor/ckeditor5-upload@47.2.0':
|
'@ckeditor/ckeditor5-upload@47.2.0':
|
||||||
dependencies:
|
dependencies:
|
||||||
@ -16981,6 +16983,8 @@ snapshots:
|
|||||||
dependencies:
|
dependencies:
|
||||||
'@csstools/css-tokenizer': 3.0.4
|
'@csstools/css-tokenizer': 3.0.4
|
||||||
|
|
||||||
|
'@csstools/css-syntax-patches-for-csstree@1.0.19': {}
|
||||||
|
|
||||||
'@csstools/css-tokenizer@3.0.4': {}
|
'@csstools/css-tokenizer@3.0.4': {}
|
||||||
|
|
||||||
'@csstools/media-query-list-parser@3.0.1(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)':
|
'@csstools/media-query-list-parser@3.0.1(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)':
|
||||||
@ -20241,7 +20245,7 @@ snapshots:
|
|||||||
- supports-color
|
- supports-color
|
||||||
- typescript
|
- typescript
|
||||||
|
|
||||||
'@stylistic/stylelint-plugin@3.1.3(stylelint@16.26.0(typescript@5.9.3))':
|
'@stylistic/stylelint-plugin@3.1.3(stylelint@16.26.1(typescript@5.9.3))':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4)
|
'@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4)
|
||||||
'@csstools/css-tokenizer': 3.0.4
|
'@csstools/css-tokenizer': 3.0.4
|
||||||
@ -20251,7 +20255,7 @@ snapshots:
|
|||||||
postcss-selector-parser: 6.1.2
|
postcss-selector-parser: 6.1.2
|
||||||
postcss-value-parser: 4.2.0
|
postcss-value-parser: 4.2.0
|
||||||
style-search: 0.1.0
|
style-search: 0.1.0
|
||||||
stylelint: 16.26.0(typescript@5.9.3)
|
stylelint: 16.26.1(typescript@5.9.3)
|
||||||
|
|
||||||
'@swc/core-darwin-arm64@1.11.29':
|
'@swc/core-darwin-arm64@1.11.29':
|
||||||
optional: true
|
optional: true
|
||||||
@ -21874,7 +21878,7 @@ snapshots:
|
|||||||
jsonpointer: 5.0.1
|
jsonpointer: 5.0.1
|
||||||
leven: 3.1.0
|
leven: 3.1.0
|
||||||
|
|
||||||
better-sqlite3@12.4.6:
|
better-sqlite3@12.5.0:
|
||||||
dependencies:
|
dependencies:
|
||||||
bindings: 1.5.0
|
bindings: 1.5.0
|
||||||
prebuild-install: 7.1.3
|
prebuild-install: 7.1.3
|
||||||
@ -30767,33 +30771,34 @@ snapshots:
|
|||||||
postcss: 8.5.6
|
postcss: 8.5.6
|
||||||
postcss-selector-parser: 7.1.0
|
postcss-selector-parser: 7.1.0
|
||||||
|
|
||||||
stylelint-config-ckeditor5@13.0.0(stylelint@16.26.0(typescript@5.9.3)):
|
stylelint-config-ckeditor5@13.0.0(stylelint@16.26.1(typescript@5.9.3)):
|
||||||
dependencies:
|
dependencies:
|
||||||
'@stylistic/stylelint-plugin': 3.1.3(stylelint@16.26.0(typescript@5.9.3))
|
'@stylistic/stylelint-plugin': 3.1.3(stylelint@16.26.1(typescript@5.9.3))
|
||||||
stylelint: 16.26.0(typescript@5.9.3)
|
stylelint: 16.26.1(typescript@5.9.3)
|
||||||
stylelint-config-recommended: 16.0.0(stylelint@16.26.0(typescript@5.9.3))
|
stylelint-config-recommended: 16.0.0(stylelint@16.26.1(typescript@5.9.3))
|
||||||
stylelint-plugin-ckeditor5-rules: 13.0.0(stylelint@16.26.0(typescript@5.9.3))
|
stylelint-plugin-ckeditor5-rules: 13.0.0(stylelint@16.26.1(typescript@5.9.3))
|
||||||
|
|
||||||
stylelint-config-ckeditor5@2.0.1(stylelint@16.26.0(typescript@5.9.3)):
|
stylelint-config-ckeditor5@2.0.1(stylelint@16.26.1(typescript@5.9.3)):
|
||||||
dependencies:
|
dependencies:
|
||||||
stylelint: 16.26.0(typescript@5.9.3)
|
stylelint: 16.26.1(typescript@5.9.3)
|
||||||
stylelint-config-recommended: 3.0.0(stylelint@16.26.0(typescript@5.9.3))
|
stylelint-config-recommended: 3.0.0(stylelint@16.26.1(typescript@5.9.3))
|
||||||
|
|
||||||
stylelint-config-recommended@16.0.0(stylelint@16.26.0(typescript@5.9.3)):
|
stylelint-config-recommended@16.0.0(stylelint@16.26.1(typescript@5.9.3)):
|
||||||
dependencies:
|
dependencies:
|
||||||
stylelint: 16.26.0(typescript@5.9.3)
|
stylelint: 16.26.1(typescript@5.9.3)
|
||||||
|
|
||||||
stylelint-config-recommended@3.0.0(stylelint@16.26.0(typescript@5.9.3)):
|
stylelint-config-recommended@3.0.0(stylelint@16.26.1(typescript@5.9.3)):
|
||||||
dependencies:
|
dependencies:
|
||||||
stylelint: 16.26.0(typescript@5.9.3)
|
stylelint: 16.26.1(typescript@5.9.3)
|
||||||
|
|
||||||
stylelint-plugin-ckeditor5-rules@13.0.0(stylelint@16.26.0(typescript@5.9.3)):
|
stylelint-plugin-ckeditor5-rules@13.0.0(stylelint@16.26.1(typescript@5.9.3)):
|
||||||
dependencies:
|
dependencies:
|
||||||
stylelint: 16.26.0(typescript@5.9.3)
|
stylelint: 16.26.1(typescript@5.9.3)
|
||||||
|
|
||||||
stylelint@16.26.0(typescript@5.0.4):
|
stylelint@16.26.1(typescript@5.0.4):
|
||||||
dependencies:
|
dependencies:
|
||||||
'@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4)
|
'@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4)
|
||||||
|
'@csstools/css-syntax-patches-for-csstree': 1.0.19
|
||||||
'@csstools/css-tokenizer': 3.0.4
|
'@csstools/css-tokenizer': 3.0.4
|
||||||
'@csstools/media-query-list-parser': 4.0.3(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)
|
'@csstools/media-query-list-parser': 4.0.3(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)
|
||||||
'@csstools/selector-specificity': 5.0.0(postcss-selector-parser@7.1.0)
|
'@csstools/selector-specificity': 5.0.0(postcss-selector-parser@7.1.0)
|
||||||
@ -30835,9 +30840,10 @@ snapshots:
|
|||||||
- supports-color
|
- supports-color
|
||||||
- typescript
|
- typescript
|
||||||
|
|
||||||
stylelint@16.26.0(typescript@5.9.3):
|
stylelint@16.26.1(typescript@5.9.3):
|
||||||
dependencies:
|
dependencies:
|
||||||
'@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4)
|
'@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4)
|
||||||
|
'@csstools/css-syntax-patches-for-csstree': 1.0.19
|
||||||
'@csstools/css-tokenizer': 3.0.4
|
'@csstools/css-tokenizer': 3.0.4
|
||||||
'@csstools/media-query-list-parser': 4.0.3(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)
|
'@csstools/media-query-list-parser': 4.0.3(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)
|
||||||
'@csstools/selector-specificity': 5.0.0(postcss-selector-parser@7.1.0)
|
'@csstools/selector-specificity': 5.0.0(postcss-selector-parser@7.1.0)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user