Skip to content

Commit 896b40b

Browse files
committed
removed marked & added some features
1 parent a6f8dbd commit 896b40b

File tree

18 files changed

+1137
-478
lines changed

18 files changed

+1137
-478
lines changed

README.rst

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ Features
2828
* Integrated with `Semantic-UI`_
2929
* Live Preview
3030
* Upload Image to imgur.com `(via API)`
31-
* Emoji ``:emoji_name:``
32-
* Direct Mention users `(not yet)` - ``@[username]``
31+
* Emoji ``:emoji_name:`` + Cheat sheet
32+
* Direct Mention users ``@[username]`` - `(require user to logged in)`
3333
* Highlight ``pre``
3434
* Django Admin support
3535
* Toolbar Buttons
@@ -76,6 +76,7 @@ Configurations
7676

7777
# Markdownify
7878
DRACEDITOR_MARKDOWNIFY_FUNCTION = 'draceditor.utils.markdownify' # default
79+
DRACEDITOR_MARKDOWNIFY_URL = '/draceditor/markdownify/' # default
7980

8081
# Markdown extensions (default)
8182
DRACEDITOR_MARKDOWN_EXTENSIONS = [
@@ -94,23 +95,13 @@ Configurations
9495
DRACEDITOR_MARKDOWN_EXTENSION_CONFIGS = {}
9596

9697
# Markdown urls
97-
DRACEDITOR_UPLOAD_URLS_PATH = '/draceditor/uploader/' # default
98-
DRACEDITOR_SEARCH_USERS_URLS_PATH = '/draceditor/search-user/' # default
98+
DRACEDITOR_UPLOAD_URL = '/draceditor/uploader/' # default
99+
DRACEDITOR_SEARCH_USERS_URL = '/draceditor/search-user/' # default
99100

100101
# Markdown Extensions
101102
DRACEDITOR_MARKDOWN_BASE_EMOJI_URL = 'https://assets-cdn.github.com/images/icons/emoji/' # default
102103
DRACEDITOR_MARKDOWN_BASE_MENTION_URL = 'https://forum.dracos-linux.org/profile/' # default (change this)
103104

104-
# Editor Options (please use default for now)
105-
DRACEDITOR_EDITOR_OPTIONS = {
106-
'markdown': 'true',
107-
'toolbar': [
108-
'bold', 'italic', 'strike',
109-
'link', 'image', 'blockquote',
110-
'listUl', 'listOl', 'upload',
111-
]
112-
}
113-
114105
Usage
115106
------------------------------
116107

18 KB
Loading
190 KB
Loading

draceditor/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: utf-8 -*-
22

3-
__VERSION__ = '1.0.3'
3+
__VERSION__ = '1.0.4'
44
__AUTHOR__ = 'Agus Makmun (Summon Agus)'
55
__AUTHOR_EMAIL__ = '[email protected]'

draceditor/extensions/emoji.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
>>> import markdown
66
>>> md = markdown.Markdown(extensions=['draceditor.utils.extensions.emoji'])
77
>>> md.convert(':smile:')
8-
'<p><img class="direct-emoji-img" src="https://assets-cdn.github.com/images/icons/emoji/smile.png" /></p>'
8+
'<p><img class="marked-emoji" src="https://assets-cdn.github.com/images/icons/emoji/smile.png" /></p>'
99
>>>
1010
"""
1111

@@ -128,7 +128,7 @@ def handleMatch(self, m):
128128
)
129129
el = markdown.util.etree.Element('img')
130130
el.set('src', url)
131-
el.set('class', 'direct-emoji-img')
131+
el.set('class', 'marked-emoji')
132132
el.text = markdown.util.AtomicString(emoji)
133133
return el
134134

draceditor/settings.py

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
DRACEDITOR_MARKDOWNIFY_FUNCTION = getattr(
1818
settings, 'DRACEDITOR_MARKDOWNIFY_FUNCTION', 'draceditor.utils.markdownify'
1919
)
20+
DRACEDITOR_MARKDOWNIFY_URL = getattr(
21+
settings, 'DRACEDITOR_MARKDOWNIFY_URL', '/draceditor/markdownify/'
22+
)
2023

2124
# Markdown extensions
2225
DRACEDITOR_MARKDOWN_EXTENSIONS = getattr(
@@ -27,9 +30,9 @@
2730
'markdown.extensions.fenced_code',
2831

2932
# Custom markdown extensions.
30-
'draceditor.utils.extensions.urlize',
31-
'draceditor.utils.extensions.mention',
32-
'draceditor.utils.extensions.emoji',
33+
'draceditor.extensions.urlize',
34+
'draceditor.extensions.mention',
35+
'draceditor.extensions.emoji',
3336
]
3437
)
3538

@@ -39,11 +42,11 @@
3942
)
4043

4144
# Markdown urls
42-
DRACEDITOR_UPLOAD_URLS_PATH = getattr(
43-
settings, 'DRACEDITOR_UPLOAD_URLS_PATH', '/draceditor/uploader/'
45+
DRACEDITOR_UPLOAD_URL = getattr(
46+
settings, 'DRACEDITOR_UPLOAD_URL', '/draceditor/uploader/'
4447
)
45-
DRACEDITOR_SEARCH_USERS_URLS_PATH = getattr(
46-
settings, 'DRACEDITOR_SEARCH_USERS_URLS_PATH', '/draceditor/search-user/'
48+
DRACEDITOR_SEARCH_USERS_URL = getattr(
49+
settings, 'DRACEDITOR_SEARCH_USERS_URL', '/draceditor/search-user/'
4750
)
4851

4952
# Markdown Extensions
@@ -53,14 +56,3 @@
5356
DRACEDITOR_MARKDOWN_BASE_MENTION_URL = getattr(
5457
settings, 'DRACEDITOR_MARKDOWN_BASE_MENTION_URL', 'https://forum.dracos-linux.org/profile/'
5558
)
56-
57-
DRACEDITOR_EDITOR_OPTIONS = getattr(
58-
settings, 'DRACEDITOR_EDITOR_OPTIONS', {
59-
'markdown': 'true',
60-
'toolbar': [
61-
'bold', 'italic', 'strike',
62-
'link', 'image', 'blockquote',
63-
'listUl', 'listOl', 'upload',
64-
]
65-
}
66-
)

draceditor/static/css/draceditor.css

Lines changed: 121 additions & 120 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)