Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frontend/discourse/app/components/d-modal.gjs
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ export default class DModal extends Component {
event.preventDefault();
}

if (event.key === "Escape" && this.dismissable) {
if (event.key === "Escape" && this.dismissable && !event.defaultPrevented) {
event.stopPropagation();
this.closeModal(CLOSE_INITIATED_BY_ESC);
}
Expand Down
9 changes: 9 additions & 0 deletions frontend/discourse/app/lib/load-codemirror.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { waitForPromise } from "@ember/test-waiters";

export default async function loadCodemirrorEditor() {
return (
await waitForPromise(
import("discourse/static/codemirror/components/codemirror-editor")
)
).default;
}
17 changes: 17 additions & 0 deletions frontend/discourse/app/static/codemirror/build-extensions.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import * as cmAutocomplete from "@codemirror/autocomplete";
import * as cmLanguage from "@codemirror/language";
import * as cmState from "@codemirror/state";
import * as cmView from "@codemirror/view";
import * as lezerHighlight from "@lezer/highlight";
import { expressionUtils } from "./expression-utils";

export function buildCmParams() {
return {
cmAutocomplete,
cmLanguage,
cmState,
cmView,
lezerHighlight,
utils: expressionUtils,
};
}
Loading
Loading