Added pagedown extras

timmyomahony · Dec 11, 2015 · 5257aee · 5257aee
1 parent 63b944b
commit 5257aee
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2012, Timmy O'Mahony
+Copyright (c) 2015, Timmy O'Mahony
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/pagedown/settings.py b/pagedown/settings.py
@@ -3,4 +3,5 @@
 
 SHOW_PREVIEW = getattr(settings, 'PAGEDOWN_SHOW_PREVIEW', True)
 WIDGET_TEMPLATE = getattr(settings, 'PAGEDOWN_WIDGET_TEMPLATE', 'pagedown/widgets/default.html')
-WIDGET_CSS = getattr(settings, 'PAGEDOWN_WIDGET_CSS', ('pagedown/demo/browser/demo.css', ))
+WIDGET_CSS = getattr(settings, 'PAGEDOWN_WIDGET_CSS', ('pagedown/demo/browser/demo.css', ))
+EXTENSIONS = getattr(settings, 'PAGEDOWN_EXTENSIONS', [])
diff --git a/pagedown/static/pagedown_init.js b/pagedown/static/pagedown_init.js
@@ -43,6 +43,9 @@ DjangoPagedown = (function() {
 
     var init = function() {
         that.converter = Markdown.getSanitizingConverter();
+        Markdown.Extra.init(that.converter, {
+            extensions: "all"
+        });
         that.elements = document.getElementsByTagName("textarea");
         that.editors = {};
         for (var i = 0; i < that.elements.length; ++i){

diff --git a/pagedown/widgets.py b/pagedown/widgets.py
@@ -30,8 +30,10 @@ def _media(self):
             },
             js=(
                 compatible_staticpath("pagedown/Markdown.Converter.js"),
+                compatible_staticpath('pagedown-extra/pagedown/Markdown.Converter.js'),
                 compatible_staticpath("pagedown/Markdown.Sanitizer.js"),
                 compatible_staticpath("pagedown/Markdown.Editor.js"),
+                compatible_staticpath('pagedown-extra/Markdown.Extra.js'),
                 compatible_staticpath("pagedown_init.js"),
             ))
     media = property(_media)

diff --git a/setup.py b/setup.py
@@ -8,9 +8,9 @@
 def get_submodules():
     if path.exists('.git'):
         check_call(['rm', '-rf', 'pagedown/static/pagedown'])
+        check_call(['rm', '-rf', 'pagedown/static/pagedown-extra'])
         check_call(['git', 'reset', '--hard'])
-        check_call(['git', 'submodule', 'init'])
-        check_call(['git', 'submodule', 'update'])
+        check_call(['git', 'submodule', 'update', '--init', '--recursive'])
 
 
 class build_with_submodules(build):
@@ -27,7 +27,7 @@ def run(self):
 
 setup(
     name="django-pagedown",
-    version="0.1.0",
+    version="0.1.2",
     author="Timmy O'Mahony",
     author_email="hey@timmyomahony.com",
     url="https://github.com/timmyomahony/django-pagedown",