diff --git a/CHANGELOG.md b/CHANGELOG.md index ef579d3..39a7c53 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,11 @@ All notable changes to easymde will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). - +## [Unreleased] +### Added +- Missing minHeight option in type definition (Thanks to [@t49tran], [#123]). +- Other missing type definitions ([#126]). + ## [2.8.0] - 2019-08-20 ### Added - Upload images functionality (Thanks to [@roipoussiere] and [@JeroenvO], [#71], [#101]). @@ -119,6 +123,7 @@ Project forked from [SimpleMDE](https://github.com/sparksuite/simplemde-markdown - Cursor not always showing in "text" mode over the edit field +[#126]: https://github.com/Ionaru/easy-markdown-editor/issues/126 [#99]: https://github.com/Ionaru/easy-markdown-editor/issues/99 [#45]: https://github.com/Ionaru/easy-markdown-editor/issues/45 [#44]: https://github.com/Ionaru/easy-markdown-editor/issues/44 @@ -131,6 +136,7 @@ Project forked from [SimpleMDE](https://github.com/sparksuite/simplemde-markdown [#9]: https://github.com/Ionaru/easy-markdown-editor/issues/9 +[#123]: https://github.com/Ionaru/easy-markdown-editor/pull/123 [#109]: https://github.com/Ionaru/easy-markdown-editor/pull/109 [#106]: https://github.com/Ionaru/easy-markdown-editor/pull/106 [#101]: https://github.com/Ionaru/easy-markdown-editor/pull/101 @@ -144,6 +150,7 @@ Project forked from [SimpleMDE](https://github.com/sparksuite/simplemde-markdown [#19]: https://github.com/Ionaru/easy-markdown-editor/pull/19 +[@t49tran]: https://github.com/t49tran [@richtera]: https://github.com/richtera [@jfly]: https://github.com/jfly [@sperezp]: https://github.com/sperezp diff --git a/package-lock.json b/package-lock.json index 581f0a6..b12c0c2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,6 +39,12 @@ "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==", "dev": true }, + "@types/marked": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/@types/marked/-/marked-0.6.5.tgz", + "integrity": "sha512-6kBKf64aVfx93UJrcyEZ+OBM5nGv4RLsI6sR1Ar34bpgvGVRoyTgpxn4ZmtxOM5aDTAaaznYuYUH8bUX3Nk3YA==", + "dev": true + }, "@types/tern": { "version": "0.23.3", "resolved": "https://registry.npmjs.org/@types/tern/-/tern-0.23.3.tgz", diff --git a/package.json b/package.json index 804828d..5231546 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ }, "devDependencies": { "@types/codemirror": "0.0.76", + "@types/marked": "^0.6.5", "browserify": "^16.5.0", "gulp": "^4.0.2", "gulp-clean-css": "^4.2.0", diff --git a/types/easymde-test.ts b/types/easymde-test.ts index df9d878..2aa0514 100644 --- a/types/easymde-test.ts +++ b/types/easymde-test.ts @@ -121,5 +121,18 @@ const editorImagesCustom = new EasyMDE({ }, errorCallback: errorMessage => { console.error(errorMessage); - } -}); + }, + renderingConfig: { + codeSyntaxHighlighting: true, + markedOptions: { + silent: true, + highlight(code: string, lang: string, callback?: (error: (any | undefined), code: string) => void): string { + return 'something' + }, + }, + }, + promptTexts: { + image: 'Insert URL' + }, + syncSideBySidePreviewScroll: true + }); diff --git a/types/easymde.d.ts b/types/easymde.d.ts index 0473cea..09211ce 100644 --- a/types/easymde.d.ts +++ b/types/easymde.d.ts @@ -20,6 +20,7 @@ // SOFTWARE. /// +/// declare namespace EasyMDE { interface AutoSaveOptions { @@ -47,9 +48,16 @@ declare namespace EasyMDE { underscoresBreakWords?: boolean; } + interface PromptTexts { + image?: string; + link?: string; + } + interface RenderingOptions { + codeSyntaxHighlighting?: boolean; + hljs?: any; + markedOptions?: marked.MarkedOptions; singleLineBreaks?: boolean; - codeSyntaxHighlighting: boolean; } interface Shortcuts { @@ -141,6 +149,9 @@ declare namespace EasyMDE { imageTexts?: ImageTextsOptions; errorMessages?: ImageErrorTextsOptions; errorCallback?: (errorMessage: string) => void; + + promptTexts?: PromptTexts; + syncSideBySidePreviewScroll?: boolean; } }