-
-
+
-
-
+
-
-
+
-
+
diff --git a/src/public/app/widgets/note_detail.js b/src/public/app/widgets/note_detail.js
index 21f84dbc1..7c1e4f1d9 100644
--- a/src/public/app/widgets/note_detail.js
+++ b/src/public/app/widgets/note_detail.js
@@ -261,6 +261,7 @@ export default class NoteDetailWidget extends NoteContextAwareWidget {
const { ipcRenderer } = utils.dynamicRequire("electron");
ipcRenderer.send("export-as-pdf", {
title: this.note.title,
+ pageSize: this.note.getAttributeValue("label", "printPageSize") ?? "Letter",
landscape: this.note.hasAttribute("label", "printLandscape")
});
}
diff --git a/src/public/app/widgets/type_widgets/attachment_detail.js b/src/public/app/widgets/type_widgets/attachment_detail.js
index 2a797fba5..15932d63b 100644
--- a/src/public/app/widgets/type_widgets/attachment_detail.js
+++ b/src/public/app/widgets/type_widgets/attachment_detail.js
@@ -15,18 +15,18 @@ const TPL = `
display: flex;
flex-direction: column;
}
-
+
.attachment-detail .links-wrapper {
font-size: larger;
padding: 0 0 16px 0;
}
-
+
.attachment-detail .attachment-wrapper {
flex-grow: 1;
}
-
+
`;
@@ -57,7 +57,7 @@ export default class AttachmentDetailTypeWidget extends TypeWidget {
this.$linksWrapper.empty().append(
t("attachment_detail.owning_note"),
- await linkService.createLink(this.noteId),
+ (await linkService.createLink(this.noteId)),
t("attachment_detail.you_can_also_open"),
await linkService.createLink(this.noteId, {
title: t("attachment_detail.list_of_all_attachments"),
diff --git a/src/public/app/widgets/type_widgets/doc.js b/src/public/app/widgets/type_widgets/doc.ts
similarity index 90%
rename from src/public/app/widgets/type_widgets/doc.js
rename to src/public/app/widgets/type_widgets/doc.ts
index 4fd2d76f0..433abccda 100644
--- a/src/public/app/widgets/type_widgets/doc.js
+++ b/src/public/app/widgets/type_widgets/doc.ts
@@ -1,3 +1,4 @@
+import type FNote from "../../entities/fnote.js";
import TypeWidget from "./type_widget.js";
const TPL = `
@@ -5,7 +6,7 @@ const TPL = `
.note-detail-doc-content {
padding: 15px;
}
-
+
.note-detail-doc-content pre {
background-color: var(--accented-background-color);
border: 1px solid var(--main-border-color);
@@ -13,11 +14,14 @@ const TPL = `;
+
static getType() {
return "doc";
}
@@ -29,7 +33,7 @@ export default class DocTypeWidget extends TypeWidget {
super.doRender();
}
- async doRefresh(note) {
+ async doRefresh(note: FNote) {
const docName = note.getLabelValue("docName");
if (docName) {
diff --git a/src/public/app/widgets/type_widgets/geo_map.ts b/src/public/app/widgets/type_widgets/geo_map.ts
index 60166cd41..fdca64cbc 100644
--- a/src/public/app/widgets/type_widgets/geo_map.ts
+++ b/src/public/app/widgets/type_widgets/geo_map.ts
@@ -1,4 +1,4 @@
-import { Marker, type LatLng, type LeafletMouseEvent } from "leaflet";
+import { GPX, Marker, type LatLng, type LeafletMouseEvent } from "leaflet";
import type FNote from "../../entities/fnote.js";
import GeoMapWidget, { type InitCallback, type Leaflet } from "../geo_map.js";
import TypeWidget from "./type_widget.js"
@@ -91,8 +91,6 @@ interface CreateChildResponse {
}
}
-type MarkerData = Record;
-
enum State {
Normal,
NewNote
@@ -103,7 +101,9 @@ export default class GeoMapTypeWidget extends TypeWidget {
private geoMapWidget: GeoMapWidget;
private _state: State;
private L!: Leaflet;
- private currentMarkerData: MarkerData;
+ private currentMarkerData: Record;
+ private currentTrackData: Record;
+ private gpxLoaded?: boolean;
static getType() {
return "geoMap";
@@ -114,6 +114,7 @@ export default class GeoMapTypeWidget extends TypeWidget {
this.geoMapWidget = new GeoMapWidget("type", (L: Leaflet) => this.#onMapInitialized(L));
this.currentMarkerData = {};
+ this.currentTrackData = {};
this._state = State.Normal;
this.child(this.geoMapWidget);
@@ -159,9 +160,7 @@ export default class GeoMapTypeWidget extends TypeWidget {
}
async #reloadMarkers() {
- const map = this.geoMapWidget.map;
-
- if (!this.note || !map) {
+ if (!this.note) {
return;
}
@@ -170,51 +169,91 @@ export default class GeoMapTypeWidget extends TypeWidget {
marker.remove();
}
+ // Delete all existing tracks
+ for (const track of Object.values(this.currentTrackData)) {
+ track.remove();
+ }
+
// Add the new markers.
this.currentMarkerData = {};
const childNotes = await this.note.getChildNotes();
- const L = this.L;
for (const childNote of childNotes) {
- const latLng = childNote.getAttributeValue("label", LOCATION_ATTRIBUTE);
- if (!latLng) {
+ if (childNote.mime === "application/gpx+xml") {
+ this.#processNoteWithGpxTrack(childNote);
continue;
}
- const [ lat, lng ] = latLng.split(",", 2).map((el) => parseFloat(el));
- const icon = L.divIcon({
- html: `\
- 
- 
-
- ${childNote.title}`,
- iconSize: [ 25, 41 ],
- iconAnchor: [ 12, 41 ]
- })
+ const latLng = childNote.getAttributeValue("label", LOCATION_ATTRIBUTE);
+ if (latLng) {
+ this.#processNoteWithMarker(childNote, latLng);
+ }
+ }
+ }
- const marker = L.marker(L.latLng(lat, lng), {
- icon,
- draggable: true,
- autoPan: true,
- autoPanSpeed: 5,
- })
- .addTo(map)
- .on("moveend", e => {
- this.moveMarker(childNote.noteId, (e.target as Marker).getLatLng());
- });
+ async #processNoteWithGpxTrack(note: FNote) {
+ if (!this.L || !this.geoMapWidget.map) {
+ return;
+ }
- marker.on("contextmenu", (e) => {
- openContextMenu(childNote.noteId, e.originalEvent);
+ if (!this.gpxLoaded) {
+ await import("leaflet-gpx");
+ this.gpxLoaded = true;
+ }
+
+ // TODO: This is not very efficient as it's probably a string response that is parsed and then converted back to string and parsed again.
+ const xmlResponse = await server.get(`notes/${note.noteId}/open`);
+ const stringResponse = new XMLSerializer().serializeToString(xmlResponse);
+
+ const track = new this.L.GPX(stringResponse, {});
+ track.addTo(this.geoMapWidget.map);
+ this.currentTrackData[note.noteId] = track;
+ }
+
+ #processNoteWithMarker(note: FNote, latLng: string) {
+ const map = this.geoMapWidget.map;
+ if (!map) {
+ return;
+ }
+
+ const [ lat, lng ] = latLng.split(",", 2).map((el) => parseFloat(el));
+ const L = this.L;
+ const icon = this.#buildIcon(note.getIcon(), note.title);
+
+ const marker = L.marker(L.latLng(lat, lng), {
+ icon,
+ draggable: true,
+ autoPan: true,
+ autoPanSpeed: 5,
+ })
+ .addTo(map)
+ .on("moveend", e => {
+ this.moveMarker(note.noteId, (e.target as Marker).getLatLng());
});
- const el = marker.getElement();
- if (el) {
- const $el = $(el);
- $el.attr("data-href", `#${childNote.noteId}`);
- note_tooltip.setupElementTooltip($($el));
- }
+ marker.on("contextmenu", (e) => {
+ openContextMenu(note.noteId, e.originalEvent);
+ });
- this.currentMarkerData[childNote.noteId] = marker;
+ const el = marker.getElement();
+ if (el) {
+ const $el = $(el);
+ $el.attr("data-href", `#${note.noteId}`);
+ note_tooltip.setupElementTooltip($($el));
}
+
+ this.currentMarkerData[note.noteId] = marker;
+ }
+
+ #buildIcon(bxIconClass: string, title: string) {
+ return this.L.divIcon({
+ html: `\
+
+
+
+ ${title}`,
+ iconSize: [ 25, 41 ],
+ iconAnchor: [ 12, 41 ]
+ })
}
#changeState(newState: State) {
@@ -299,6 +338,14 @@ export default class GeoMapTypeWidget extends TypeWidget {
}
entitiesReloadedEvent({ loadResults }: EventData<"entitiesReloaded">) {
+ // If any of the children branches are altered.
+ if (loadResults.getBranchRows().find((branch) => branch.parentNoteId === this.noteId)) {
+ this.#reloadMarkers();
+ return;
+ }
+
+ // If any of note has its location attribute changed.
+ // TODO: Should probably filter by parent here as well.
const attributeRows = loadResults.getAttributeRows();
if (attributeRows.find((at) => at.name === LOCATION_ATTRIBUTE)) {
this.#reloadMarkers();
diff --git a/src/public/app/widgets/type_widgets/protected_session.js b/src/public/app/widgets/type_widgets/protected_session.js
index 620946012..a8726de74 100644
--- a/src/public/app/widgets/type_widgets/protected_session.js
+++ b/src/public/app/widgets/type_widgets/protected_session.js
@@ -9,6 +9,12 @@ const TPL = `
width: 300px;
margin: 30px auto auto;
}
+
+ .protected-session-password-component input,
+ .protected-session-password-component button {
+ margin-top: 12px;
+ }
+
border-radius: 5px;
}
-
+
`;
export default class DocTypeWidget extends TypeWidget {
+
+ private $content!: JQuery
-
-
- ${childNote.title}`,
- iconSize: [ 25, 41 ],
- iconAnchor: [ 12, 41 ]
- })
+ const latLng = childNote.getAttributeValue("label", LOCATION_ATTRIBUTE);
+ if (latLng) {
+ this.#processNoteWithMarker(childNote, latLng);
+ }
+ }
+ }
- const marker = L.marker(L.latLng(lat, lng), {
- icon,
- draggable: true,
- autoPan: true,
- autoPanSpeed: 5,
- })
- .addTo(map)
- .on("moveend", e => {
- this.moveMarker(childNote.noteId, (e.target as Marker).getLatLng());
- });
+ async #processNoteWithGpxTrack(note: FNote) {
+ if (!this.L || !this.geoMapWidget.map) {
+ return;
+ }
- marker.on("contextmenu", (e) => {
- openContextMenu(childNote.noteId, e.originalEvent);
+ if (!this.gpxLoaded) {
+ await import("leaflet-gpx");
+ this.gpxLoaded = true;
+ }
+
+ // TODO: This is not very efficient as it's probably a string response that is parsed and then converted back to string and parsed again.
+ const xmlResponse = await server.get
+
+
+ ${title}`,
+ iconSize: [ 25, 41 ],
+ iconAnchor: [ 12, 41 ]
+ })
}
#changeState(newState: State) {
@@ -299,6 +338,14 @@ export default class GeoMapTypeWidget extends TypeWidget {
}
entitiesReloadedEvent({ loadResults }: EventData<"entitiesReloaded">) {
+ // If any of the children branches are altered.
+ if (loadResults.getBranchRows().find((branch) => branch.parentNoteId === this.noteId)) {
+ this.#reloadMarkers();
+ return;
+ }
+
+ // If any of note has its location attribute changed.
+ // TODO: Should probably filter by parent here as well.
const attributeRows = loadResults.getAttributeRows();
if (attributeRows.find((at) => at.name === LOCATION_ATTRIBUTE)) {
this.#reloadMarkers();
diff --git a/src/public/app/widgets/type_widgets/protected_session.js b/src/public/app/widgets/type_widgets/protected_session.js
index 620946012..a8726de74 100644
--- a/src/public/app/widgets/type_widgets/protected_session.js
+++ b/src/public/app/widgets/type_widgets/protected_session.js
@@ -9,6 +9,12 @@ const TPL = `
width: 300px;
margin: 30px auto auto;
}
+
+ .protected-session-password-component input,
+ .protected-session-password-component button {
+ margin-top: 12px;
+ }
+