merge

klen · Dec 14, 2014 · 93af609 · 93af609
2 parents 2ed5c65 + b06b2ec
commit 93af609
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 28 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,6 +1,6 @@
 [bumpversion]
 commit = True
-current_version = 0.8.1
+current_version = 0.8.2
 files = django_markdown/__init__.py
 tag = True
 tag_name = {new_version}

diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,8 @@
 language: python
 
-python: "2.7"
+python:
+    - "2.7"
+    - "3.4"
 
 env:
     - TOXENV=py27-d15

diff --git a/Changelog b/Changelog
@@ -1,3 +1,7 @@
+2014-12-08  wldcordeiro
+	* Fixing the static loading issue properly.
+	* version 0.8.2
+
 2014-12-04  wldcordeiro
 
 	* Removed static_url setting from package settings due to collision with user setting.

diff --git a/django_markdown/templates/django_markdown/preview.html b/django_markdown/templates/django_markdown/preview.html
@@ -1,12 +1,12 @@
-{% load django_markdown %}
+{% load  django_markdown django_markdown_static %}
 
 <!DOCTYPE html>
 <html>
 <head>
 <base target="_blank">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <title>markItUp! preview</title>
-<link rel="stylesheet" type="text/css" href="{{ css }}" />
+<link rel="stylesheet" type="text/css" href="{% static css %}" />
 </head>
 <body>
 {{ content|markdown }}

diff --git a/django_markdown/views.py b/django_markdown/views.py
@@ -20,5 +20,5 @@ def preview(request):
     return render(
         request, settings.MARKDOWN_PREVIEW_TEMPLATE, dict(
             content=request.REQUEST.get('data', 'No content posted'),
-            css=default_storage.url(settings.MARKDOWN_STYLE)
+            css=settings.MARKDOWN_STYLE
         ))
diff --git a/django_markdown/widgets.py b/django_markdown/widgets.py
@@ -24,31 +24,9 @@ class MarkdownWidget(forms.Textarea):
 
     """
 
-    def __init__(self, attrs=None, markdown_set_name=None, markdown_skin=None):
-        self.__set = markdown_set_name or settings.MARKDOWN_SET_NAME
-        self.__skin = markdown_skin or settings.MARKDOWN_EDITOR_SKIN
+    def __init__(self, attrs=None):
         super(MarkdownWidget, self).__init__(attrs)
 
-    @property
-    def media(self):
-        """ Prepare media files.
-
-        :returns: form's media
-
-        """
-        js = (
-            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': (
-                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)
-
     def render(self, name, value, attrs=None):
         """ Render widget.
 
@@ -60,6 +38,20 @@ def render(self, name, value, attrs=None):
         html += editor_js_initialization("#%s" % attrs['id'])
         return mark_safe(html)
 
+    class Media:
+        css = {
+            'screen': (
+                os.path.join('django_markdown', 'skins', settings.MARKDOWN_EDITOR_SKIN, 'style.css'),
+                os.path.join(settings.MARKDOWN_SET_PATH, settings.MARKDOWN_SET_NAME, 'style.css')
+            )
+        }
+
+        js = (
+            os.path.join('django_markdown', 'jquery.init.js'),
+            os.path.join('django_markdown', 'jquery.markitup.js'),
+            os.path.join(settings.MARKDOWN_SET_PATH, settings.MARKDOWN_SET_NAME, 'set.js')
+        )
+
 
 class AdminMarkdownWidget(MarkdownWidget, AdminTextareaWidget):