mirror of
https://github.com/zadam/trilium.git
synced 2025-11-14 01:05:49 +01:00
feat(client/code-note): add support for batch files
This commit is contained in:
@@ -12,21 +12,32 @@ const CKEDITOR: Library = {
|
||||
};
|
||||
|
||||
const CODE_MIRROR: Library = {
|
||||
js: [
|
||||
"node_modules/codemirror/lib/codemirror.js",
|
||||
"node_modules/codemirror/addon/display/placeholder.js",
|
||||
"node_modules/codemirror/addon/edit/matchbrackets.js",
|
||||
"node_modules/codemirror/addon/edit/matchtags.js",
|
||||
"node_modules/codemirror/addon/fold/xml-fold.js",
|
||||
"node_modules/codemirror/addon/lint/lint.js",
|
||||
"node_modules/codemirror/addon/mode/loadmode.js",
|
||||
"node_modules/codemirror/addon/mode/multiplex.js",
|
||||
"node_modules/codemirror/addon/mode/overlay.js",
|
||||
"node_modules/codemirror/addon/mode/simple.js",
|
||||
"node_modules/codemirror/addon/search/match-highlighter.js",
|
||||
"node_modules/codemirror/mode/meta.js",
|
||||
"node_modules/codemirror/keymap/vim.js"
|
||||
],
|
||||
js: () => {
|
||||
const scriptsToLoad = [
|
||||
"node_modules/codemirror/lib/codemirror.js",
|
||||
"node_modules/codemirror/addon/display/placeholder.js",
|
||||
"node_modules/codemirror/addon/edit/matchbrackets.js",
|
||||
"node_modules/codemirror/addon/edit/matchtags.js",
|
||||
"node_modules/codemirror/addon/fold/xml-fold.js",
|
||||
"node_modules/codemirror/addon/lint/lint.js",
|
||||
"node_modules/codemirror/addon/mode/loadmode.js",
|
||||
"node_modules/codemirror/addon/mode/multiplex.js",
|
||||
"node_modules/codemirror/addon/mode/overlay.js",
|
||||
"node_modules/codemirror/addon/mode/simple.js",
|
||||
"node_modules/codemirror/addon/search/match-highlighter.js",
|
||||
"node_modules/codemirror/mode/meta.js",
|
||||
"node_modules/codemirror/keymap/vim.js"
|
||||
];
|
||||
|
||||
const mimeTypes = mimeTypesService.getMimeTypes();
|
||||
for (const mimeType of mimeTypes) {
|
||||
if (mimeType.codeMirrorSource) {
|
||||
scriptsToLoad.push(mimeType.codeMirrorSource);
|
||||
}
|
||||
}
|
||||
|
||||
return scriptsToLoad;
|
||||
},
|
||||
css: [
|
||||
"node_modules/codemirror/lib/codemirror.css",
|
||||
"node_modules/codemirror/addon/lint/lint.css"
|
||||
@@ -74,7 +85,7 @@ const FORCE_GRAPH: Library = {
|
||||
|
||||
const MERMAID: Library = {
|
||||
js: [
|
||||
"node_modules/mermaid/dist/mermaid.min.js"
|
||||
"node_modules/mermaid/dist/mermaid.min.js"
|
||||
]
|
||||
}
|
||||
|
||||
@@ -134,7 +145,7 @@ const HIGHLIGHT_JS: Library = {
|
||||
scriptsToLoad.add(`node_modules/@highlightjs/cdn-assets/languages/${id}.min.js`);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
const currentTheme = String(optionsService.get("codeBlockTheme"));
|
||||
loadHighlightingTheme(currentTheme);
|
||||
|
||||
@@ -195,7 +206,7 @@ async function requireCss(url: string, prependAssetPath = true) {
|
||||
|
||||
let highlightingThemeEl: JQuery<HTMLElement> | null = null;
|
||||
function loadHighlightingTheme(theme: string) {
|
||||
if (!theme) {
|
||||
if (!theme) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -207,12 +218,12 @@ function loadHighlightingTheme(theme: string) {
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
if (!highlightingThemeEl) {
|
||||
highlightingThemeEl = $(`<link rel="stylesheet" type="text/css" />`);
|
||||
$("head").append(highlightingThemeEl);
|
||||
}
|
||||
|
||||
|
||||
const url = getStylesheetUrl(theme);
|
||||
if (url) {
|
||||
highlightingThemeEl.attr("href", url);
|
||||
|
||||
@@ -17,6 +17,8 @@ interface MimeTypeDefinition {
|
||||
highlightJs?: string;
|
||||
/** If specified, will load the corresponding highlight.js file from the `libraries/highlightjs/${id}.js` instead of `node_modules/@highlightjs/cdn-assets/languages/${id}.min.js`. */
|
||||
highlightJsSource?: "libraries";
|
||||
/** If specified, will load the corresponding highlight file from the given path instead of `node_modules`. */
|
||||
codeMirrorSource?: string;
|
||||
}
|
||||
|
||||
interface MimeType extends MimeTypeDefinition {
|
||||
@@ -29,6 +31,7 @@ const MIME_TYPES_DICT: MimeTypeDefinition[] = [
|
||||
{ title: "ASN.1", mime: "text/x-ttcn-asn" },
|
||||
{ title: "ASP.NET", mime: "application/x-aspx" },
|
||||
{ title: "Asterisk", mime: "text/x-asterisk" },
|
||||
{ title: "Batch file (DOS)", mime: "application/x-bat", codeMirrorSource: "libraries/codemirror/batch.js" },
|
||||
{ title: "Brainfuck", mime: "text/x-brainfuck", highlightJs: "brainfuck" },
|
||||
{ default: true, title: "C", mime: "text/x-csrc", highlightJs: "c" },
|
||||
{ default: true, title: "C#", mime: "text/x-csharp", highlightJs: "csharp" },
|
||||
@@ -209,13 +212,13 @@ let mimeToHighlightJsMapping: Record<string, string> | null = null;
|
||||
|
||||
/**
|
||||
* Obtains the corresponding language tag for highlight.js for a given MIME type.
|
||||
*
|
||||
*
|
||||
* The mapping is built the first time this method is built and then the results are cached for better performance.
|
||||
*
|
||||
*
|
||||
* @param mimeType The MIME type of the code block, in the CKEditor-normalized format (e.g. `text-c-src` instead of `text/c-src`).
|
||||
* @returns the corresponding highlight.js tag, for example `c` for `text-c-src`.
|
||||
*/
|
||||
function getHighlightJsNameForMime(mimeType: string) {
|
||||
function getHighlightJsNameForMime(mimeType: string) {
|
||||
if (!mimeToHighlightJsMapping) {
|
||||
const mimeTypes = getMimeTypes();
|
||||
mimeToHighlightJsMapping = {};
|
||||
@@ -234,7 +237,7 @@ function getHighlightJsNameForMime(mimeType: string) {
|
||||
/**
|
||||
* Given a MIME type in the usual format (e.g. `text/csrc`), it returns a MIME type that can be passed down to the CKEditor
|
||||
* code plugin.
|
||||
*
|
||||
*
|
||||
* @param mimeType The MIME type to normalize, in the usual format (e.g. `text/c-src`).
|
||||
* @returns the normalized MIME type (e.g. `text-c-src`).
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user