Merge cbb3917 into 22b5bdd

klen · Oct 15, 2014 · ed91c0b · ed91c0b
2 parents 22b5bdd + cbb3917
commit ed91c0b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/django_markdown/views.py b/django_markdown/views.py
@@ -1,4 +1,5 @@
 """ Supports preview. """
+from django.core.files.storage import default_storage
 from django.shortcuts import render
 
 from . import settings
@@ -19,5 +20,5 @@ def preview(request):
     return render(
         request, settings.MARKDOWN_PREVIEW_TEMPLATE, dict(
             content=request.REQUEST.get('data', 'No content posted'),
-            css=settings.STATIC_URL + settings.MARKDOWN_STYLE,
+            css=default_storage.url(settings.MARKDOWN_STYLE)
         ))
diff --git a/django_markdown/widgets.py b/django_markdown/widgets.py
@@ -1,8 +1,9 @@
 """ Widgets for django-markdown. """
-import posixpath
+import os
 
 from django import forms
 from django.contrib.admin.widgets import AdminTextareaWidget
+from django.core.files.storage import default_storage
 from django.utils.safestring import mark_safe
 
 from . import settings
@@ -35,16 +36,15 @@ def media(self):
         :returns: form's media
 
         """
-
         js = (
-            posixpath.join(settings.STATIC_URL, 'django_markdown', 'jquery.init.js'), # noqa
-            posixpath.join(settings.STATIC_URL, 'django_markdown', 'jquery.markitup.js'), # noqa
-            posixpath.join(settings.STATIC_URL, settings.MARKDOWN_SET_PATH, self.__set, 'set.js'), # noqa
+            default_storage.url(os.path.join('django_markdown', 'jquery.init.js')),
+            default_storage.url(os.path.join('django_markdown', 'jquery.markitup.js')),
+            default_storage.url(os.path.join(settings.MARKDOWN_SET_PATH, self.__set, 'set.js'))
         )
         css = {
             'screen': (
-                posixpath.join(settings.STATIC_URL, 'django_markdown', 'skins', self.__skin, 'style.css'), # noqa
-                posixpath.join(settings.STATIC_URL, settings.MARKDOWN_SET_PATH, self.__set, 'style.css'), # noqa
+                default_storage.url(os.path.join('django_markdown', 'skins', self.__skin, 'style.css')),
+                default_storage.url(os.path.join(settings.MARKDOWN_SET_PATH, self.__set, 'style.css'))
             )
         }
         return forms.Media(css=css, js=js)