torchbox · Oct 22, 2019 · Oct 30, 2019 · Jan 2, 2020 · Jan 2, 2020 · May 12, 2020
diff --git a/README.md b/README.md
@@ -22,8 +22,16 @@ extensions to make it actually useful in Wagtail:
 * Inline Markdown preview using [SimpleMDE](http://nextstepwebs.github.io/simplemde-markdown-editor/)
 
 These are implemented using the `python-markdown` extension interface.
-Currently, adding new extensions isn't possible without modifying the code, but
-that shouldn't be difficult to implement (patches welcome).
+
+You can configure wagtail-markdown to use additional Markdown extensions by via the `WAGTAILMARKDOWN_EXTENSIONS` setting.
+config.
+
+For example, to enable the [Table of
+Contents](https://python-markdown.github.io/extensions/toc/) and [Sane
+Lists](https://python-markdown.github.io/extensions/sane_lists/) extensions:
+```python
+WAGTAILMARKDOWN_EXTENSIONS = ["toc", "sane_lists"]
+```
 
 ### Installation
 Alpha release is available on Pypi - https://pypi.org/project/wagtail-markdown/ - installable via `pip install wagtail-markdown`. It's not a production ready release.

diff --git a/setup.py b/setup.py
@@ -30,9 +30,9 @@ def get_git_revision_hash():
 
 
 INSTALL_REQUIRES = [
-    'Markdown>=2.6,<2.7',
-    'bleach>=1.4.2,<2.2',
-    'Wagtail>=2.0',
+    'Markdown>=3.1',
+    'bleach>=3.0',
+    'Wagtail>=2.6',
 ]
 
 

diff --git a/wagtailmarkdown/blocks.py b/wagtailmarkdown/blocks.py
@@ -32,11 +32,11 @@ def media(self):
         return forms.Media(
             css={
                 'all': (
-                    'wagtailmarkdown/css/simplemde.min.css',
+                    'wagtailmarkdown/css/easymde.min.css',
                 )
             },
             js=(
-                'wagtailmarkdown/js/simplemde.min.js',
-                'wagtailmarkdown/js/simplemde.attach.js',
+                'wagtailmarkdown/js/easymde.min.js',
+                'wagtailmarkdown/js/easymde.attach.js',
             )
         )
diff --git a/wagtailmarkdown/static/wagtailmarkdown/css/easymde.min.css b/wagtailmarkdown/static/wagtailmarkdown/css/easymde.min.css
diff --git a/wagtailmarkdown/static/wagtailmarkdown/css/simplemde.min.css b/wagtailmarkdown/static/wagtailmarkdown/css/simplemde.min.css
diff --git a/...ic/wagtailmarkdown/js/simplemde.attach.js → ...atic/wagtailmarkdown/js/easymde.attach.js b/...ic/wagtailmarkdown/js/simplemde.attach.js → ...atic/wagtailmarkdown/js/easymde.attach.js
@@ -10,10 +10,10 @@
  */
 
 /*
- * Used to initialize Simple MDE when Markdown blocks are used in StreamFields
+ * Used to initialize Easy MDE when Markdown blocks are used in StreamFields
  */
-function simplemdeAttach(id) {
-        var mde = new SimpleMDE({
+function easymdeAttach(id) {
+        var mde = new EasyMDE({
             element: document.getElementById(id),
             autofocus: false,
         });
@@ -25,11 +25,11 @@ function simplemdeAttach(id) {
 }
 
 /*
- * Used to initialize Simple MDE when MarkdownFields are used on a page.
+ * Used to initialize Easy MDE when MarkdownFields are used on a page.
  */
 $(document).ready(function() {
     $(".object.markdown textarea").each(function(index, elem) {
-        simplemdeAttach(elem.id);
+        easymdeAttach(elem.id);
     });
 });
 

diff --git a/wagtailmarkdown/static/wagtailmarkdown/js/easymde.min.js b/wagtailmarkdown/static/wagtailmarkdown/js/easymde.min.js
diff --git a/wagtailmarkdown/static/wagtailmarkdown/js/simplemde.min.js b/wagtailmarkdown/static/wagtailmarkdown/js/simplemde.min.js
diff --git a/wagtailmarkdown/utils.py b/wagtailmarkdown/utils.py
@@ -9,6 +9,7 @@
 #
 import warnings
 
+from django.conf import settings
 from django.utils.encoding import smart_text
 from django.utils.safestring import mark_safe
 
@@ -143,6 +144,10 @@ def _get_markdown_kwargs():
              'doc:': 'wagtailmarkdown.mdx.linkers.document',
          })
     ]
+
+    if hasattr(settings, 'WAGTAILMARKDOWN_EXTENSIONS'):
+        markdown_kwargs['extensions'] += settings.WAGTAILMARKDOWN_EXTENSIONS
+
     markdown_kwargs['extension_configs'] = {
         'codehilite': [
             ('guess_lang', False),

diff --git a/wagtailmarkdown/widgets.py b/wagtailmarkdown/widgets.py
@@ -17,18 +17,18 @@ def __init__(self, **kwargs):
         super(MarkdownTextarea, self).__init__(**kwargs)
 
     def render_js_init(self, id_, name, value):
-        return 'simplemdeAttach("{0}");'.format(id_)
+        return 'easymdeAttach("{0}");'.format(id_)
 
     @property
     def media(self):
         return forms.Media(
             css={
                 'all': (
-                    'wagtailmarkdown/css/simplemde.min.css',
+                    'wagtailmarkdown/css/easymde.min.css',
                 )
             },
             js=(
-                'wagtailmarkdown/js/simplemde.min.js',
-                'wagtailmarkdown/js/simplemde.attach.js',
+                'wagtailmarkdown/js/easymde.min.js',
+                'wagtailmarkdown/js/easymde.attach.js',
             )
         )