Merge pull request #46 from nhsuk/simplemde-cleanup

Remove md spell checker, preview and placeholder
nhsuk · Jan 27, 2017 · 12f40bf · 12f40bf
2 parents a9b9868 + 0d35813
commit 12f40bf
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/nhsuk/settings/base.py b/nhsuk/settings/base.py
@@ -166,7 +166,17 @@
 
 WAGTAILADMIN_RICH_TEXT_EDITORS = {
     'default': {
-        'WIDGET': 'wagtailmarkdown.rich_text.SimpleMDETextArea'
+        'WIDGET': 'wagtailmarkdown.rich_text.SimpleMDETextArea',
+        'OPTIONS': {
+            'spellChecker': False,
+            'placeholder': ' ',
+            'toolbar': [
+                "bold", "italic", "heading", "|",
+                "quote", "unordered-list", "ordered-list", "|",
+                "link", "|",
+                "guide"
+            ],
+        }
     },
 }
 

diff --git a/wagtailmarkdown/rich_text.py b/wagtailmarkdown/rich_text.py
@@ -52,12 +52,11 @@ def getDefaultArgs(cls):
 
     def __init__(self, attrs=None, **kwargs):
         super(SimpleMDETextArea, self).__init__(attrs)
-        self.kwargs = dict(self.getDefaultArgs())
-        if kwargs is not None:
-            self.kwargs.update(kwargs)
+        self.options = dict(self.getDefaultArgs())
+        self.options.update(kwargs.get('options', {}))
 
     def get_panel(self):
         return RichTextFieldPanel
 
     def render_js_init(self, id_, name, value):
-        return "initSimpleMDE({0}, {1});".format(json.dumps(id_), json.dumps(self.kwargs))
+        return "initSimpleMDE({0}, {1});".format(json.dumps(id_), json.dumps(self.options))