Merge branch 'master' into new_translate

4 years ago · 5344b3a1b5
parent 63dcda3452 754bdc3ab2
commit 5344b3a1b5
8 changed files with 319 additions and 193 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -4,13 +4,16 @@ 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]
+<!--## [Unreleased]-->
+## [2.11.0] - 2020-07-16
 ### Added
 - Support for Node.js 14.
+- Preview without fullscreen (Thanks to [@nick-denry], [#196]).

 ### Fixed
- Fix cursor displayed position on activity ([#183]).
+- Fix cursor displayed position on activity (Thanks to [@firm1], [#184]).
 - Checkboxes always have bullets in front of them ([#136]).
+- Save the text only when modifying the content of the easymde instance (Thanks to [@firm1], [#181]).

 ## [2.10.1] - 2020-04-06
 ### Fixed
@ -152,7 +155,6 @@ Project forked from [SimpleMDE](https://github.com/sparksuite/simplemde-markdown
 - Cursor not always showing in "text" mode over the edit field

 <!-- Linked issues -->
-[#183]: https://github.com/Ionaru/easy-markdown-editor/issues/183
 [#178]: https://github.com/Ionaru/easy-markdown-editor/issues/178
 [#136]: https://github.com/Ionaru/easy-markdown-editor/issues/136
 [#126]: https://github.com/Ionaru/easy-markdown-editor/issues/126
@ -168,6 +170,9 @@ Project forked from [SimpleMDE](https://github.com/sparksuite/simplemde-markdown
 [#9]: https://github.com/Ionaru/easy-markdown-editor/issues/9

 <!-- Linked PRs -->
+[#196]: https://github.com/Ionaru/easy-markdown-editor/pull/196
+[#184]: https://github.com/Ionaru/easy-markdown-editor/pull/184
+[#181]: https://github.com/Ionaru/easy-markdown-editor/pull/181
 [#175]: https://github.com/Ionaru/easy-markdown-editor/pull/175
 [#173]: https://github.com/Ionaru/easy-markdown-editor/pull/173
 [#170]: https://github.com/Ionaru/easy-markdown-editor/pull/170
@ -192,6 +197,7 @@ Project forked from [SimpleMDE](https://github.com/sparksuite/simplemde-markdown
 [#19]: https://github.com/Ionaru/easy-markdown-editor/pull/19

 <!-- Linked users -->
+[@nick-denry]: https://github.com/nick-denry
 [@StefKors]: https://github.com/StefKors
 [@felipefdl]: https://github.com/felipefdl
 [@A-312]: https://github.com/A-312
@ -217,7 +223,8 @@ Project forked from [SimpleMDE](https://github.com/sparksuite/simplemde-markdown
 [@sne11ius]: https://github.com/sne11ius

 <!-- Linked versions -->
-[Unreleased]: https://github.com/Ionaru/easy-markdown-editor/compare/2.10.1...HEAD
+[Unreleased]: https://github.com/Ionaru/easy-markdown-editor/compare/2.11.0...HEAD
+[2.11.0]: https://github.com/Ionaru/easy-markdown-editor/compare/2.10.1...2.11.0
 [2.10.1]: https://github.com/Ionaru/easy-markdown-editor/compare/2.10.0...2.10.1
 [2.10.0]: https://github.com/Ionaru/easy-markdown-editor/compare/2.9.0...2.10.0
 [2.9.0]: https://github.com/Ionaru/easy-markdown-editor/compare/2.8.0...2.9.0
--- a/README.md
+++ b/README.md
@ -140,6 +140,7 @@ easyMDE.value('New input for **EasyMDE**');
 - **lineWrapping**: If set to `false`, disable line wrapping. Defaults to `true`.
 - **minHeight**: Sets the minimum height for the composition area, before it starts auto-growing. Should be a string containing a valid CSS value like `"500px"`. Defaults to `"300px"`.
 - **markdownUrl**: Customize url for guide.
+- **maxHeight**: Sets fixed height for the composition area. `minHeight` option will be ignored. Should be a string containing a valid CSS value like `"500px"`. Defaults to `undefined`.
 - **onToggleFullScreen**: A function that gets called when the editor's full screen mode is toggled. The function will be passed a boolean as parameter, `true` when the editor is currently going into full screen mode, or `false`.
 - **parsingConfig**: Adjust settings for parsing the Markdown during editing (not previewing).
  - **allowAtxHeaderWithoutSpace**: If set to `true`, will render headers without a space after the `#`. Defaults to `false`.
@ -186,6 +187,7 @@ easyMDE.value('New input for **EasyMDE**');
 - **spellChecker**: If set to `false`, disable the spell checker. Defaults to `true`.
 - **inputStyle**: `textarea` or `contenteditable`. Defaults to `textarea` for desktop and `contenteditable` for mobile. `contenteditable` option is necessary to enable nativeSpellcheck.
 - **nativeSpellcheck**: If set to `false`, disable native spell checker. Defaults to `true`.
+- **sideBySideFullscreen**: If set to `false`, allows side-by-side editing without going into fullscreen. Defaults to `true`.
 - **status**: If set to `false`, hide the status bar. Defaults to the array of built-in status bar items.
  - Optionally, you can set an array of status bar items to include, and in what order. You can even define your own custom status bar items.
 - **statusTexts**: Customize the text used to status bar.
@ -245,10 +247,10 @@ var editor = new EasyMDE({
 		underscoresBreakWords: true,
 	},
 	placeholder: "Type here...",
-	
+
 	previewClass: "my-custom-styling",
 	previewClass: ["my-custom-styling", "more-custom-styling"],
-	
+
 	previewRender: function(plainText) {
 		return customMarkdownParser(plainText); // Returns HTML from a custom parser
 	},
@ -295,6 +297,7 @@ var editor = new EasyMDE({
 		autosave: "Autosaved: ",
 	},
 	styleSelectedText: false,
+	sideBySideFullscreen: false,
 	syncSideBySidePreviewScroll: false,
 	tabSize: 4,
 	toolbar: false,
--- a/package-lock.json
+++ b/package-lock.json
@ -1,39 +1,39 @@
 {
    "name": "easymde",
-    "version": "2.10.1",
+    "version": "2.11.0",
    "lockfileVersion": 1,
    "requires": true,
    "dependencies": {
        "@babel/code-frame": {
-            "version": "7.8.3",
-            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
-            "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+            "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
            "dev": true,
            "requires": {
-                "@babel/highlight": "^7.8.3"
+                "@babel/highlight": "^7.10.4"
            }
        },
        "@babel/helper-validator-identifier": {
-            "version": "7.9.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz",
-            "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==",
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+            "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
            "dev": true
        },
        "@babel/highlight": {
-            "version": "7.9.0",
-            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
-            "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
+            "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
            "dev": true,
            "requires": {
-                "@babel/helper-validator-identifier": "^7.9.0",
+                "@babel/helper-validator-identifier": "^7.10.4",
                "chalk": "^2.0.0",
                "js-tokens": "^4.0.0"
            }
        },
        "@types/codemirror": {
-            "version": "0.0.91",
-            "resolved": "https://registry.npmjs.org/@types/codemirror/-/codemirror-0.0.91.tgz",
-            "integrity": "sha512-FZcfBNjhVc6slo6RbtbCqYa+KTQa9sykV5OdRLqd3FeMPddVLFuqSR3KNZUbzU9qoEBudBZX0nbItJ52ml37KA==",
+            "version": "0.0.97",
+            "resolved": "https://registry.npmjs.org/@types/codemirror/-/codemirror-0.0.97.tgz",
+            "integrity": "sha512-n5d7o9nWhC49DjfhsxANP7naWSeTzrjXASkUDQh7626sM4zK9XP2EVcHp1IcCf/IPV6c7ORzDUDF3Bkt231VKg==",
            "dev": true,
            "requires": {
                "@types/tern": "*"
@ -46,15 +46,15 @@
            "dev": true
        },
        "@types/estree": {
-            "version": "0.0.44",
-            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.44.tgz",
-            "integrity": "sha512-iaIVzr+w2ZJ5HkidlZ3EJM8VTZb2MJLCjw3V+505yVts0gRC4UMvjw0d1HPtGqI/HQC/KdsYtayfzl+AXY2R8g==",
+            "version": "0.0.45",
+            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.45.tgz",
+            "integrity": "sha512-jnqIUKDUqJbDIUxm0Uj7bnlMnRm1T/eZ9N+AVMqhPgzrba2GhGG5o/jCTwmdPK709nEZsGoMzXEDUjcXHa3W0g==",
            "dev": true
        },
        "@types/marked": {
-            "version": "0.7.4",
-            "resolved": "https://registry.npmjs.org/@types/marked/-/marked-0.7.4.tgz",
-            "integrity": "sha512-fdg0NO4qpuHWtZk6dASgsrBggY+8N4dWthl1bAQG9ceKUNKFjqpHaDKCAhRUI6y8vavG7hLSJ4YBwJtZyZEXqw==",
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@types/marked/-/marked-1.1.0.tgz",
+            "integrity": "sha512-j8XXj6/l9kFvCwMyVqozznqpd/nk80krrW+QiIJN60Uu9gX5Pvn4/qPJ2YngQrR3QREPwmrE1f9/EWKVTFzoEw==",
            "dev": true
        },
        "@types/tern": {
@ -77,9 +77,9 @@
            }
        },
        "acorn": {
-            "version": "7.1.1",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz",
-            "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==",
+            "version": "7.3.1",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.3.1.tgz",
+            "integrity": "sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA==",
            "dev": true
        },
        "acorn-jsx": {
@ -100,15 +100,15 @@
            }
        },
        "acorn-walk": {
-            "version": "7.1.1",
-            "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.1.1.tgz",
-            "integrity": "sha512-wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ==",
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
+            "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
            "dev": true
        },
        "ajv": {
-            "version": "6.12.2",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz",
-            "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==",
+            "version": "6.12.3",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+            "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
            "dev": true,
            "requires": {
                "fast-deep-equal": "^3.1.1",
@ -327,9 +327,9 @@
            },
            "dependencies": {
                "bn.js": {
-                    "version": "4.11.8",
-                    "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-                    "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
+                    "version": "4.11.9",
+                    "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+                    "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
                    "dev": true
                }
            }
@ -517,9 +517,9 @@
            }
        },
        "bn.js": {
-            "version": "5.1.1",
-            "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.1.tgz",
-            "integrity": "sha512-IUTD/REb78Z2eodka1QZyyEk66pciRcP6Sroka0aI3tG/iwIdYLrBD62RsubR7vqdt3WyX8p4jxeatzmRSphtA==",
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.2.tgz",
+            "integrity": "sha512-40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA==",
            "dev": true
        },
        "brace-expansion": {
@ -702,17 +702,17 @@
            },
            "dependencies": {
                "bn.js": {
-                    "version": "4.11.8",
-                    "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-                    "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
+                    "version": "4.11.9",
+                    "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+                    "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
                    "dev": true
                }
            }
        },
        "browserify-sign": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.1.0.tgz",
-            "integrity": "sha512-VYxo7cDCeYUoBZ0ZCy4UyEUCP3smyBd4DRQM5nrFS1jJjPJjX7rP3oLRpPoWfkhQfyJ0I9ZbHbKafrFD/SGlrg==",
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.0.tgz",
+            "integrity": "sha512-hEZC1KEeYuoHRqhGhTy6gWrpJA3ZDjFWv0DE61643ZnOXAKJb3u7yWcrU0mMc9SwAqK1n7myPGndkp0dFG7NFA==",
            "dev": true,
            "requires": {
                "bn.js": "^5.1.1",
@ -722,7 +722,8 @@
                "elliptic": "^6.5.2",
                "inherits": "^2.0.4",
                "parse-asn1": "^5.1.5",
-                "readable-stream": "^3.6.0"
+                "readable-stream": "^3.6.0",
+                "safe-buffer": "^5.2.0"
            },
            "dependencies": {
                "readable-stream": {
@ -921,9 +922,9 @@
            }
        },
        "cli-width": {
-            "version": "2.2.1",
-            "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
-            "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==",
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
+            "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
            "dev": true
        },
        "cliui": {
@ -973,9 +974,9 @@
            "dev": true
        },
        "codemirror": {
-            "version": "5.53.2",
-            "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.53.2.tgz",
-            "integrity": "sha512-wvSQKS4E+P8Fxn/AQ+tQtJnF1qH5UOlxtugFLpubEZ5jcdH2iXTVinb+Xc/4QjshuOxRm4fUsU2QPF1JJKiyXA=="
+            "version": "5.55.0",
+            "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.55.0.tgz",
+            "integrity": "sha512-TumikSANlwiGkdF/Blnu/rqovZ0Y3Jh8yy9TqrPbSM0xxSucq3RgnpVDQ+mD9q6JERJEIT2FMuF/fBGfkhIR/g=="
        },
        "codemirror-spell-checker": {
            "version": "1.1.2",
@ -1137,9 +1138,9 @@
            },
            "dependencies": {
                "bn.js": {
-                    "version": "4.11.8",
-                    "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-                    "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
+                    "version": "4.11.9",
+                    "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+                    "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
                    "dev": true
                }
            }
@ -1376,9 +1377,9 @@
            },
            "dependencies": {
                "bn.js": {
-                    "version": "4.11.8",
-                    "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-                    "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
+                    "version": "4.11.9",
+                    "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+                    "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
                    "dev": true
                }
            }
@ -1430,9 +1431,9 @@
            }
        },
        "elliptic": {
-            "version": "6.5.2",
-            "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.2.tgz",
-            "integrity": "sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==",
+            "version": "6.5.3",
+            "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
+            "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==",
            "dev": true,
            "requires": {
                "bn.js": "^4.4.0",
@ -1445,9 +1446,9 @@
            },
            "dependencies": {
                "bn.js": {
-                    "version": "4.11.8",
-                    "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-                    "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
+                    "version": "4.11.9",
+                    "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+                    "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
                    "dev": true
                }
            }
@ -1619,9 +1620,9 @@
            }
        },
        "eslint-scope": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz",
-            "integrity": "sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==",
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.0.tgz",
+            "integrity": "sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==",
            "dev": true,
            "requires": {
                "esrecurse": "^4.1.0",
@ -1638,9 +1639,9 @@
            }
        },
        "eslint-visitor-keys": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz",
-            "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==",
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+            "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
            "dev": true
        },
        "espree": {
@ -1891,9 +1892,9 @@
            }
        },
        "fast-deep-equal": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz",
-            "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==",
+            "version": "3.1.3",
+            "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+            "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
            "dev": true
        },
        "fast-json-stable-stringify": {
@ -2239,9 +2240,9 @@
            },
            "dependencies": {
                "gulp-cli": {
-                    "version": "2.2.0",
-                    "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.2.0.tgz",
-                    "integrity": "sha512-rGs3bVYHdyJpLqR0TUBnlcZ1O5O++Zs4bA0ajm+zr3WFCfiSLjGwoCBqFs18wzN+ZxahT9DkOK5nDf26iDsWjA==",
+                    "version": "2.3.0",
+                    "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.3.0.tgz",
+                    "integrity": "sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==",
                    "dev": true,
                    "requires": {
                        "ansi-colors": "^1.0.1",
@ -2252,7 +2253,7 @@
                        "copy-props": "^2.0.1",
                        "fancy-log": "^1.3.2",
                        "gulplog": "^1.0.0",
-                        "interpret": "^1.1.0",
+                        "interpret": "^1.4.0",
                        "isobject": "^3.0.1",
                        "liftoff": "^3.1.0",
                        "matchdep": "^2.0.0",
@ -2260,7 +2261,7 @@
                        "pretty-hrtime": "^1.0.0",
                        "replace-homedir": "^1.0.0",
                        "semver-greatest-satisfied-range": "^1.1.0",
-                        "v8flags": "^3.0.1",
+                        "v8flags": "^3.2.0",
                        "yargs": "^7.1.0"
                    }
                }
@ -2342,11 +2343,12 @@
            },
            "dependencies": {
                "through2": {
-                    "version": "3.0.1",
-                    "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz",
-                    "integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==",
+                    "version": "3.0.2",
+                    "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz",
+                    "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==",
                    "dev": true,
                    "requires": {
+                        "inherits": "^2.0.4",
                        "readable-stream": "2 || 3"
                    }
                }
@ -2582,21 +2584,21 @@
            }
        },
        "inquirer": {
-            "version": "7.1.0",
-            "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.1.0.tgz",
-            "integrity": "sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==",
+            "version": "7.3.2",
+            "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.2.tgz",
+            "integrity": "sha512-DF4osh1FM6l0RJc5YWYhSDB6TawiBRlbV9Cox8MWlidU218Tb7fm3lQTULyUJDfJ0tjbzl0W4q651mrCCEM55w==",
            "dev": true,
            "requires": {
                "ansi-escapes": "^4.2.1",
-                "chalk": "^3.0.0",
+                "chalk": "^4.1.0",
                "cli-cursor": "^3.1.0",
-                "cli-width": "^2.0.0",
+                "cli-width": "^3.0.0",
                "external-editor": "^3.0.3",
                "figures": "^3.0.0",
-                "lodash": "^4.17.15",
+                "lodash": "^4.17.16",
                "mute-stream": "0.0.8",
                "run-async": "^2.4.0",
-                "rxjs": "^6.5.3",
+                "rxjs": "^6.6.0",
                "string-width": "^4.1.0",
                "strip-ansi": "^6.0.0",
                "through": "^2.3.6"
@ -2619,9 +2621,9 @@
                    }
                },
                "chalk": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-                    "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+                    "version": "4.1.0",
+                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+                    "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
                    "dev": true,
                    "requires": {
                        "ansi-styles": "^4.1.0",
@ -2705,9 +2707,9 @@
            }
        },
        "interpret": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz",
-            "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==",
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
+            "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
            "dev": true
        },
        "invert-kv": {
@ -2932,9 +2934,9 @@
            "dev": true
        },
        "js-yaml": {
-            "version": "3.13.1",
-            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
-            "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+            "version": "3.14.0",
+            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
+            "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
            "dev": true,
            "requires": {
                "argparse": "^1.0.7",
@ -3073,9 +3075,9 @@
            }
        },
        "lodash": {
-            "version": "4.17.15",
-            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-            "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+            "version": "4.17.19",
+            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
+            "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
            "dev": true
        },
        "lodash._reinterpolate": {
@ -3155,9 +3157,9 @@
            }
        },
        "marked": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/marked/-/marked-1.0.0.tgz",
-            "integrity": "sha512-Wo+L1pWTVibfrSr+TTtMuiMfNzmZWiOPeO7rZsQUY5bgsxpHesBEcIWJloWVTFnrMXnf/TL30eTFSGJddmQAng=="
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/marked/-/marked-1.1.1.tgz",
+            "integrity": "sha512-mJzT8D2yPxoPh7h0UXkB+dBj4FykPJ2OIfxAWeIHrvoHDkFxukV/29QxoFQoPM6RLEwhIFdJpmKBlqVM3s2ZIw=="
        },
        "matchdep": {
            "version": "2.0.0",
@ -3237,9 +3239,9 @@
            },
            "dependencies": {
                "bn.js": {
-                    "version": "4.11.8",
-                    "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-                    "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
+                    "version": "4.11.9",
+                    "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+                    "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
                    "dev": true
                }
            }
@ -3749,9 +3751,9 @@
            }
        },
        "pbkdf2": {
-            "version": "3.0.17",
-            "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz",
-            "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==",
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.1.tgz",
+            "integrity": "sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==",
            "dev": true,
            "requires": {
                "create-hash": "^1.1.2",
@ -3845,9 +3847,9 @@
            },
            "dependencies": {
                "bn.js": {
-                    "version": "4.11.8",
-                    "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-                    "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
+                    "version": "4.11.9",
+                    "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+                    "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
                    "dev": true
                }
            }
@ -4158,18 +4160,18 @@
            "dev": true
        },
        "rxjs": {
-            "version": "6.5.5",
-            "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz",
-            "integrity": "sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==",
+            "version": "6.6.0",
+            "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.0.tgz",
+            "integrity": "sha512-3HMA8z/Oz61DUHe+SdOiQyzIf4tOx5oQHmMir7IZEu6TMqCLHT4LRcmNaUS0NwOz8VLvmmBduMsoaUvMaIiqzg==",
            "dev": true,
            "requires": {
                "tslib": "^1.9.0"
            }
        },
        "safe-buffer": {
-            "version": "5.2.0",
-            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
-            "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==",
+            "version": "5.2.1",
+            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+            "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
            "dev": true
        },
        "safe-regex": {
@ -4469,9 +4471,9 @@
            "dev": true
        },
        "spdx-correct": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
-            "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
+            "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
            "dev": true,
            "requires": {
                "spdx-expression-parse": "^3.0.0",
@ -4485,9 +4487,9 @@
            "dev": true
        },
        "spdx-expression-parse": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
-            "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+            "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
            "dev": true,
            "requires": {
                "spdx-exceptions": "^2.1.0",
@ -4648,9 +4650,9 @@
            }
        },
        "strip-json-comments": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.0.tgz",
-            "integrity": "sha512-e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w==",
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+            "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
            "dev": true
        },
        "subarg": {
@ -4743,9 +4745,9 @@
            }
        },
        "terser": {
-            "version": "4.6.13",
-            "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.13.tgz",
-            "integrity": "sha512-wMvqukYgVpQlymbnNbabVZbtM6PN63AzqexpwJL8tbh/mRT9LE5o+ruVduAGL7D6Fpjl+Q+06U5I9Ul82odAhw==",
+            "version": "4.8.0",
+            "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
+            "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==",
            "dev": true,
            "requires": {
                "commander": "^2.20.0",
@ -4879,9 +4881,9 @@
            }
        },
        "tslib": {
-            "version": "1.11.2",
-            "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.2.tgz",
-            "integrity": "sha512-tTSkux6IGPnUGUd1XAZHcpu85MOkIl5zX49pO+jfsie3eP0B6pyhOlLXm3cAC6T7s+euSDDUUV+Acop5WmtkVg==",
+            "version": "1.13.0",
+            "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
+            "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
            "dev": true
        },
        "tty-browserify": {
@ -4918,9 +4920,9 @@
            "dev": true
        },
        "typescript": {
-            "version": "3.8.3",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz",
-            "integrity": "sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==",
+            "version": "3.9.6",
+            "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.6.tgz",
+            "integrity": "sha512-Pspx3oKAPJtjNwE92YS05HQoY7z2SFyOpHo9MqJor3BXAGNaPUs83CuVp9VISFkSjyRfiTpmKuAYGJB7S7hOxw==",
            "dev": true
        },
        "typo-js": {
@ -4929,13 +4931,10 @@
            "integrity": "sha512-W3kLbx+ML9PBl5Bzso/lTvVxk4BCveSNAtQeht59FEtxCdGThmn6wSHA4Xq3eQYAK24NHdisMM4JmsK0GFy/pg=="
        },
        "uglify-js": {
-            "version": "3.9.2",
-            "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.9.2.tgz",
-            "integrity": "sha512-zGVwKslUAD/EeqOrD1nQaBmXIHl1Vw371we8cvS8I6mYK9rmgX5tv8AAeJdfsQ3Kk5mGax2SVV/AizxdNGhl7Q==",
-            "dev": true,
-            "requires": {
-                "commander": "~2.20.3"
-            }
+            "version": "3.10.0",
+            "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.0.tgz",
+            "integrity": "sha512-Esj5HG5WAyrLIdYU74Z3JdG2PxdIusvj6IWHMtlyESxc7kcDz7zYlYjpnSokn1UbpV0d/QX9fan7gkCNd/9BQA==",
+            "dev": true
        },
        "umd": {
            "version": "3.0.3",
@ -5124,15 +5123,15 @@
            "dev": true
        },
        "v8-compile-cache": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz",
-            "integrity": "sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==",
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz",
+            "integrity": "sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==",
            "dev": true
        },
        "v8flags": {
-            "version": "3.1.3",
-            "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.1.3.tgz",
-            "integrity": "sha512-amh9CCg3ZxkzQ48Mhcb8iX7xpAfYJgePHxWMQCBWECpOSqJUXgY26ncA61UTV0BkPqfhcy6mzwCIoP4ygxpW8w==",
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
+            "integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==",
            "dev": true,
            "requires": {
                "homedir-polyfill": "^1.0.1"
@ -5319,9 +5318,9 @@
            "dev": true
        },
        "yargs": {
-            "version": "7.1.0",
-            "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
-            "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
+            "version": "7.1.1",
+            "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.1.tgz",
+            "integrity": "sha512-huO4Fr1f9PmiJJdll5kwoS2e4GqzGSsMT3PPMpOwoVkOK8ckqAewMTZyA6LXVQWflleb/Z8oPBEvNsMft0XE+g==",
            "dev": true,
            "requires": {
                "camelcase": "^3.0.0",
@ -5336,16 +5335,17 @@
                "string-width": "^1.0.2",
                "which-module": "^1.0.0",
                "y18n": "^3.2.1",
-                "yargs-parser": "^5.0.0"
+                "yargs-parser": "5.0.0-security.0"
            }
        },
        "yargs-parser": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
-            "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
+            "version": "5.0.0-security.0",
+            "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0-security.0.tgz",
+            "integrity": "sha512-T69y4Ps64LNesYxeYGYPvfoMTt/7y1XtfpIslUeK4um+9Hu7hlGoRtaDLvdXb7+/tfq4opVa2HRY5xGip022rQ==",
            "dev": true,
            "requires": {
-                "camelcase": "^3.0.0"
+                "camelcase": "^3.0.0",
+                "object.assign": "^4.1.0"
            }
        }
    }
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
    "name": "easymde",
-    "version": "2.10.1",
+    "version": "2.11.0",
    "description": "A simple, beautiful, and embeddable JavaScript Markdown editor that easy to use. Features include autosaving and spell checking.",
    "files": [
        "dist/**/*",
@ -19,13 +19,13 @@
    "license": "MIT",
    "author": "Jeroen Akkerman",
    "dependencies": {
-        "codemirror": "^5.53.2",
+        "codemirror": "^5.55.0",
        "codemirror-spell-checker": "1.1.2",
-        "marked": "^1.0.0"
+        "marked": "^1.1.1"
    },
    "devDependencies": {
-        "@types/codemirror": "0.0.91",
-        "@types/marked": "^0.7.4",
+        "@types/codemirror": "0.0.97",
+        "@types/marked": "^1.1.0",
        "browserify": "^16.5.1",
        "gulp": "^4.0.2",
        "gulp-clean-css": "^4.2.0",
@ -35,7 +35,7 @@
        "gulp-rename": "^2.0.0",
        "gulp-terser": "^1.2.0",
        "gulp-uglify": "^3.0.2",
-        "typescript": "^3.7.5",
+        "typescript": "^3.9.6",
        "vinyl-buffer": "^1.0.0",
        "vinyl-source-stream": "^2.0.0"
    },
--- a/src/css/easymde.css
+++ b/src/css/easymde.css
@ -1,3 +1,13 @@
+.EasyMDEContainer {
+    display: block;
+}
+
+.EasyMDEContainer.sided--no-fullscreen {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+}
+
 .CodeMirror {
    box-sizing: border-box;
    height: auto;
@ -31,6 +41,13 @@
    width: 50% !important;
 }

+.CodeMirror-sided.sided--no-fullscreen {
+    border-right: none!important;
+    border-bottom-right-radius: 0px;
+    position: relative;
+    flex: 1 1 auto;
+}
+
 .CodeMirror-placeholder {
    opacity: .5;
 }
@ -116,6 +133,10 @@
    padding: 0;
 }

+.editor-toolbar.sided--no-fullscreen {
+    width: 100%;
+}
+
 .editor-toolbar button, .editor-toolbar .easymde-dropdown {
    background: transparent;
    display: inline-block;
@ -195,6 +216,10 @@
    text-align: right;
 }

+.editor-statusbar.sided--no-fullscreen {
+    width: 100%;
+}
+
 .editor-statusbar span {
    display: inline-block;
    min-width: 4em;
@ -243,6 +268,12 @@
    display: block
 }

+.editor-preview-active-side.sided--no-fullscreen {
+    flex: 1 1 auto;
+    height: auto;
+    position: static;
+}
+
 .editor-preview-active {
    display: block
 }
--- a/src/js/easymde.js
+++ b/src/js/easymde.js
@ -332,6 +332,27 @@ function toggleFullScreen(editor) {
    }


+    // Hide side by side if needed
+    var sidebyside = cm.getWrapperElement().nextSibling;
+    if (/editor-preview-active-side/.test(sidebyside.className))
+        toggleSideBySide(editor);
+
+    if (editor.options.onToggleFullScreen) {
+        editor.options.onToggleFullScreen(cm.getOption('fullScreen') || false);
+    }
+
+    // Remove or set maxHeight
+    if (typeof editor.options.maxHeight !== 'undefined') {
+        if (cm.getOption('fullScreen')) {
+            cm.getScrollerElement().style.removeProperty('height');
+            sidebyside.style.removeProperty('height');
+        } else {
+            cm.getScrollerElement().style.height = editor.options.maxHeight;
+            editor.setPreviewMaxHeight();
+        }
+    }
+
+
    // Update toolbar class
    if (!/fullscreen/.test(editor.toolbar_div.className)) {
        editor.toolbar_div.className += ' fullscreen';
@ -350,16 +371,6 @@ function toggleFullScreen(editor) {
            toolbarButton.className = toolbarButton.className.replace(/\s*active\s*/g, '');
        }
    }
-
-
-    // Hide side by side if needed
-    var sidebyside = cm.getWrapperElement().nextSibling;
-    if (/editor-preview-active-side/.test(sidebyside.className))
-        toggleSideBySide(editor);
-
-    if (editor.options.onToggleFullScreen) {
-        editor.options.onToggleFullScreen(cm.getOption('fullScreen') || false);
-    }
 }


@ -857,7 +868,32 @@ function toggleSideBySide(editor) {
    var preview = wrapper.nextSibling;
    var toolbarButton = editor.toolbarElements && editor.toolbarElements['side-by-side'];
    var useSideBySideListener = false;
+
+    var noFullscreenItems = [
+        wrapper.parentNode, // easyMDEContainer
+        editor.gui.toolbar,
+        wrapper,
+        preview,
+        editor.gui.statusbar,
+    ];
+
+    function addNoFullscreenClass(el) {
+        el.className += ' sided--no-fullscreen';
+    }
+
+    function removeNoFullscreenClass(el) {
+        el.className = el.className.replace(
+            /\s*sided--no-fullscreen\s*/g, ''
+        );
+    }
+
    if (/editor-preview-active-side/.test(preview.className)) {
+        if (cm.getOption('sideBySideNoFullscreen')) {
+            cm.setOption('sideBySideNoFullscreen', false);
+            noFullscreenItems.forEach(function (el) {
+                removeNoFullscreenClass(el);
+            });
+        }
        preview.className = preview.className.replace(
            /\s*editor-preview-active-side\s*/g, ''
        );
@ -868,8 +904,16 @@ function toggleSideBySide(editor) {
        // give some time for the transition from editor.css to fire and the view to slide from right to left,
        // instead of just appearing.
        setTimeout(function () {
-            if (!cm.getOption('fullScreen'))
-                toggleFullScreen(editor);
+            if (!cm.getOption('fullScreen')) {
+                if (editor.options.sideBySideFullscreen === false) {
+                    cm.setOption('sideBySideNoFullscreen', true);
+                    noFullscreenItems.forEach(function(el) {
+                        addNoFullscreenClass(el);
+                    });
+                } else {
+                    toggleFullScreen(editor);
+                }
+            }
            preview.className += ' editor-preview-active-side';
        }, 1);
        if (toolbarButton) toolbarButton.className += ' active';
@ -924,6 +968,12 @@ function togglePreview(editor) {
    var toolbar_div = editor.toolbar_div;
    var toolbar = editor.options.toolbar ? editor.toolbarElements.preview : false;
    var preview = wrapper.lastChild;
+
+    // Turn off side by side if needed
+    var sidebyside = cm.getWrapperElement().nextSibling;
+    if (/editor-preview-active-side/.test(sidebyside.className))
+        toggleSideBySide(editor);
+
    if (!preview || !/editor-preview-full/.test(preview.className)) {

        preview = document.createElement('div');
@ -943,6 +993,7 @@ function togglePreview(editor) {

        wrapper.appendChild(preview);
    }
+
    if (/editor-preview-active/.test(preview.className)) {
        preview.className = preview.className.replace(
            /\s*editor-preview-active\s*/g, ''
@ -965,10 +1016,6 @@ function togglePreview(editor) {
    }
    preview.innerHTML = editor.options.previewRender(editor.value(), preview);

-    // Turn off side by side if needed
-    var sidebyside = cm.getWrapperElement().nextSibling;
-    if (/editor-preview-active-side/.test(sidebyside.className))
-        toggleSideBySide(editor);
 }

 function _replaceSelection(cm, active, startEnd, url) {
@ -1694,6 +1741,7 @@ function EasyMDE(options) {
    options.shortcuts = extend({}, shortcuts, options.shortcuts || {});

    options.minHeight = options.minHeight || '300px';
+    options.maxHeight = options.maxHeight || undefined;

    options.errorCallback = options.errorCallback || function (errorMessage) {
        alert(errorMessage);
@ -1860,8 +1908,12 @@ EasyMDE.prototype.markdown = function (text) {

            /* Check if HLJS loaded */
            if (hljs) {
-                markedOptions.highlight = function (code) {
+                markedOptions.highlight = function (code, language) {
+                    if (language && hljs.getLanguage(language)) {
+                      return hljs.highlight(language, code).value;
+                    } else {
                    return hljs.highlightAuto(code).value;
+                    }
                };
            }
        }
@ -1981,6 +2033,10 @@ EasyMDE.prototype.render = function (el) {

    this.codemirror.getScrollerElement().style.minHeight = options.minHeight;

+    if (typeof options.maxHeight !== 'undefined') {
+        this.codemirror.getScrollerElement().style.height = options.maxHeight;
+    }
+
    if (options.forceSync === true) {
        var cm = this.codemirror;
        cm.on('change', function () {
@ -1990,6 +2046,14 @@ EasyMDE.prototype.render = function (el) {

    this.gui = {};

+    // Wrap Codemirror with container before create toolbar, etc,
+    // to use with sideBySideFullscreen option.
+    var easyMDEContainer = document.createElement('div');
+    easyMDEContainer.classList.add('EasyMDEContainer');
+    var cmWrapper = this.codemirror.getWrapperElement();
+    cmWrapper.parentNode.insertBefore(easyMDEContainer, cmWrapper);
+    easyMDEContainer.appendChild(cmWrapper);
+
    if (options.toolbar !== false) {
        this.gui.toolbar = this.createToolbar();
    }
@ -1997,7 +2061,13 @@ EasyMDE.prototype.render = function (el) {
        this.gui.statusbar = this.createStatusbar();
    }
    if (options.autosave != undefined && options.autosave.enabled === true) {
-        this.autosave();
+        this.autosave(); // use to load localstorage content
+        this.codemirror.on('change', function () {
+            clearTimeout(self._autosave_timeout);
+            self._autosave_timeout = setTimeout(function () {
+                self.autosave();
+            }, self.options.autosave.submit_delay || self.options.autosave.delay || 1000);
+        });
    }

    this.gui.sideBySide = this.createSideBySide();
@ -2044,11 +2114,6 @@ EasyMDE.prototype.autosave = function () {
                    easyMDE.autosaveTimeoutId = undefined;

                    localStorage.removeItem('smde_' + easyMDE.options.autosave.uniqueId);
-
-                    // Restart autosaving in case the submit will be cancelled down the line
-                    setTimeout(function () {
-                        easyMDE.autosave();
-                    }, easyMDE.options.autosave.submit_delay || easyMDE.options.autosave.delay || 10000);
                });
            }

@ -2079,10 +2144,6 @@ EasyMDE.prototype.autosave = function () {

            el.innerHTML = save + dd;
        }
-
-        this.autosaveTimeoutId = setTimeout(function () {
-            easyMDE.autosave();
-        }, this.options.autosave.delay || 10000);
    } else {
        console.log('EasyMDE: localStorage not available, cannot autosave');
    }
@ -2251,6 +2312,21 @@ EasyMDE.prototype.uploadImageUsingCustomFunction = function(imageUploadFunction,
    imageUploadFunction(file, onSuccess, onError);
 };

+EasyMDE.prototype.setPreviewMaxHeight = function () {
+    var cm = this.codemirror;
+    var wrapper = cm.getWrapperElement();
+    var preview = wrapper.nextSibling;
+
+    // Calc preview max height
+    var paddingTop = parseInt(window.getComputedStyle(wrapper).paddingTop);
+    var borderTopWidth = parseInt(window.getComputedStyle(wrapper).borderTopWidth);
+    var optionsMaxHeight = parseInt(this.options.maxHeight);
+    var wrapperMaxHeight = optionsMaxHeight + paddingTop * 2 + borderTopWidth * 2;
+    var previewMaxHeight = wrapperMaxHeight.toString() + 'px';
+
+    preview.style.height =  previewMaxHeight;
+};
+
 EasyMDE.prototype.createSideBySide = function () {
    var cm = this.codemirror;
    var wrapper = cm.getWrapperElement();
@ -2275,6 +2351,10 @@ EasyMDE.prototype.createSideBySide = function () {
        wrapper.parentNode.insertBefore(preview, wrapper.nextSibling);
    }

+    if (typeof this.options.maxHeight !== 'undefined') {
+        this.setPreviewMaxHeight();
+    }
+
    if (this.options.syncSideBySidePreviewScroll === false) return preview;
    // Syncs scroll  editor -> preview
    var cScroll = false;
--- a/types/easymde-test.ts
+++ b/types/easymde-test.ts
@ -164,6 +164,7 @@ const editorImagesCustom = new EasyMDE({
 });

 new EasyMDE({
+    sideBySideFullscreen: true,
    autosave: {
        enabled: true,
        delay: 2000,
@ -180,6 +181,8 @@ new EasyMDE({
 });

 new EasyMDE({
+    sideBySideFullscreen: false,
+    maxHeight: '500px',
    toolbar: [
        'bold',
        'italic',
--- a/types/easymde.d.ts
+++ b/types/easymde.d.ts
@ -172,6 +172,7 @@ declare namespace EasyMDE {
        insertTexts?: InsertTextOptions;
        lineWrapping?: boolean;
        minHeight?: string;
+        maxHeight?: string;
        parsingConfig?: ParsingOptions;
        placeholder?: string;
        previewClass?: string | ReadonlyArray<string>;
@ -183,6 +184,7 @@ declare namespace EasyMDE {
        spellChecker?: boolean;
        inputStyle?: 'textarea' | 'contenteditable';
        nativeSpellcheck?: boolean;
+        sideBySideFullscreen?: boolean;
        status?: boolean | ReadonlyArray<string | StatusBarItem>;
        styleSelectedText?: boolean;
        tabSize?: number;