Update jdd and jdd-editor
This commit is contained in:
parent
fa94d03911
commit
63dbe4fbaa
18
package-lock.json
generated
18
package-lock.json
generated
@ -15,8 +15,8 @@
|
|||||||
"@sealcode/add-to-head": "^1.0.0",
|
"@sealcode/add-to-head": "^1.0.0",
|
||||||
"@sealcode/crud-ui": "^0.0.17",
|
"@sealcode/crud-ui": "^0.0.17",
|
||||||
"@sealcode/file-manager": "^1.0.2",
|
"@sealcode/file-manager": "^1.0.2",
|
||||||
"@sealcode/jdd": "^0.6.6",
|
"@sealcode/jdd": "^0.7.1",
|
||||||
"@sealcode/jdd-editor": "^0.1.18",
|
"@sealcode/jdd-editor": "^0.1.19",
|
||||||
"@sealcode/sealgen": "^0.17.24",
|
"@sealcode/sealgen": "^0.17.24",
|
||||||
"@sealcode/simplemde": "^1.12.1",
|
"@sealcode/simplemde": "^1.12.1",
|
||||||
"@sealcode/ts-predicates": "^0.6.2",
|
"@sealcode/ts-predicates": "^0.6.2",
|
||||||
@ -939,9 +939,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@sealcode/jdd": {
|
"node_modules/@sealcode/jdd": {
|
||||||
"version": "0.6.6",
|
"version": "0.7.1",
|
||||||
"resolved": "https://registry.npmjs.org/@sealcode/jdd/-/jdd-0.6.6.tgz",
|
"resolved": "https://registry.npmjs.org/@sealcode/jdd/-/jdd-0.7.1.tgz",
|
||||||
"integrity": "sha512-UVZErDYUzTeKMDmDJcRhJR6GqVT67K/sIEbaJqDTD2CeV0aUMqUqEpVOJlZmvGZxFuQI6QIXvcQuqmsZhj/Zng==",
|
"integrity": "sha512-9B3dtzOmrELuuIvtKErL75UaX91ZTvJbD8tUyik6iygc/p0k1RIHdTAM+Fl5Xt2D1i3mUshaLsf0wXJpYDe/yw==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@sealcode/file-manager": "^1.0.2",
|
"@sealcode/file-manager": "^1.0.2",
|
||||||
"@sealcode/ts-predicates": "^0.5.3",
|
"@sealcode/ts-predicates": "^0.5.3",
|
||||||
@ -962,12 +962,12 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@sealcode/jdd-editor": {
|
"node_modules/@sealcode/jdd-editor": {
|
||||||
"version": "0.1.18",
|
"version": "0.1.19",
|
||||||
"resolved": "https://registry.npmjs.org/@sealcode/jdd-editor/-/jdd-editor-0.1.18.tgz",
|
"resolved": "https://registry.npmjs.org/@sealcode/jdd-editor/-/jdd-editor-0.1.19.tgz",
|
||||||
"integrity": "sha512-iQfaa5FrKJ0OfWZe4FHYIOI1bex1DdCNfkeRY3PFApI2rMroD7iTxYxmNq+RSpJwuCFEJP6Wa5TsvyEQnzC11w==",
|
"integrity": "sha512-dSXN2YMJR7s3fiBlypajZBECpeSHSlJwxy4PU0n0RrBzzwF8Y2hbiu+dhaQVoAfhJyVnOOBE22UlAZ137iKlfQ==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@koa/router": "^13.1.0",
|
"@koa/router": "^13.1.0",
|
||||||
"@sealcode/jdd": "^0.6.5",
|
"@sealcode/jdd": "^0.7.1",
|
||||||
"@sealcode/sealcodemirror": "^5.70.0-beta5",
|
"@sealcode/sealcodemirror": "^5.70.0-beta5",
|
||||||
"@sealcode/sealgen": "^0.17.4",
|
"@sealcode/sealgen": "^0.17.4",
|
||||||
"@types/object-path": "^0.11.4",
|
"@types/object-path": "^0.11.4",
|
||||||
|
@ -80,8 +80,8 @@
|
|||||||
"@sealcode/add-to-head": "^1.0.0",
|
"@sealcode/add-to-head": "^1.0.0",
|
||||||
"@sealcode/crud-ui": "^0.0.17",
|
"@sealcode/crud-ui": "^0.0.17",
|
||||||
"@sealcode/file-manager": "^1.0.2",
|
"@sealcode/file-manager": "^1.0.2",
|
||||||
"@sealcode/jdd": "^0.6.6",
|
"@sealcode/jdd": "^0.7.1",
|
||||||
"@sealcode/jdd-editor": "^0.1.18",
|
"@sealcode/jdd-editor": "^0.1.19",
|
||||||
"@sealcode/sealgen": "^0.17.24",
|
"@sealcode/sealgen": "^0.17.24",
|
||||||
"@sealcode/simplemde": "^1.12.1",
|
"@sealcode/simplemde": "^1.12.1",
|
||||||
"@sealcode/ts-predicates": "^0.6.2",
|
"@sealcode/ts-predicates": "^0.6.2",
|
||||||
|
@ -4,11 +4,12 @@ import type { FilePointer } from "@sealcode/file-manager";
|
|||||||
import { makeSimpleJDDContext } from "@sealcode/jdd";
|
import { makeSimpleJDDContext } from "@sealcode/jdd";
|
||||||
import { TheFileManager } from "./file-manager.js";
|
import { TheFileManager } from "./file-manager.js";
|
||||||
import { imageRouter } from "./image-router.js";
|
import { imageRouter } from "./image-router.js";
|
||||||
|
import { registry } from "./jdd-components/registry.js";
|
||||||
|
|
||||||
export function makeJDDContext(ctx: Context): JDDContext {
|
export function makeJDDContext(ctx: Context): JDDContext {
|
||||||
return {
|
return {
|
||||||
language: "pl",
|
language: "pl",
|
||||||
...makeSimpleJDDContext(TheFileManager),
|
...makeSimpleJDDContext(TheFileManager, registry),
|
||||||
render_image: async (image: string | FilePointer | null, args) => {
|
render_image: async (image: string | FilePointer | null, args) => {
|
||||||
if (!image) {
|
if (!image) {
|
||||||
return "";
|
return "";
|
||||||
|
@ -40,11 +40,8 @@ export const customUrlView =
|
|||||||
: null;
|
: null;
|
||||||
|
|
||||||
if (page && pageContent) {
|
if (page && pageContent) {
|
||||||
const jdd = await JDD.fromStorage(
|
const jdd_context = makeJDDContext(ctx);
|
||||||
registry,
|
const jdd = await JDD.fromStorage(registry, jdd_context, pageContent);
|
||||||
makeJDDContext(ctx),
|
|
||||||
pageContent
|
|
||||||
);
|
|
||||||
const title = page.get("title");
|
const title = page.get("title");
|
||||||
const heading = page.get("heading");
|
const heading = page.get("heading");
|
||||||
const hideNavigation = page.get("hideNavigation") || false;
|
const hideNavigation = page.get("hideNavigation") || false;
|
||||||
@ -54,7 +51,7 @@ export const customUrlView =
|
|||||||
ctx,
|
ctx,
|
||||||
title: title || ctx.$app.manifest.name,
|
title: title || ctx.$app.manifest.name,
|
||||||
description: page.get("description") || "",
|
description: page.get("description") || "",
|
||||||
css_clumps: jdd.getAllCSSClumps(),
|
css_clumps: jdd.getAllCSSClumps(jdd_context),
|
||||||
hideNavigation,
|
hideNavigation,
|
||||||
htmlOptions: {
|
htmlOptions: {
|
||||||
showFooter: !hideNavigation,
|
showFooter: !hideNavigation,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user