Skip to content

Commit e51c4ea

Browse files
author
Agus Makmun
committed
Upgrade bootstrap 5 agusmakmun#177, Django 4.0.2, implement black.
1 parent 22f6c59 commit e51c4ea

29 files changed

+117
-104
lines changed

martor/__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.6.11"
3+
__VERSION__ = "1.6.12"
44
__AUTHOR__ = "Agus Makmun (Summon Agus)"
55
__AUTHOR_EMAIL__ = "[email protected]"

martor/extensions/mdx_video.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,14 @@ def extendMarkdown(self, md, md_globals):
5555
r"([^(]|^)http://www\.veoh\.com/\S*(#watch%3D|watch/)(?P<veohid>\w+)", # noqa: E501
5656
)
5757
self.add_inline(
58-
md, "vimeo", Vimeo, r"([^(]|^)http://(www.|)vimeo\.com/(?P<vimeoid>\d+)\S*" # noqa: E501
58+
md,
59+
"vimeo",
60+
Vimeo,
61+
r"([^(]|^)http://(www.|)vimeo\.com/(?P<vimeoid>\d+)\S*", # noqa: E501
5962
)
60-
self.add_inline(md, "yahoo", Yahoo, r"([^(]|^)http://screen\.yahoo\.com/.+/?") # noqa: E501
63+
self.add_inline(
64+
md, "yahoo", Yahoo, r"([^(]|^)http://screen\.yahoo\.com/.+/?"
65+
) # noqa: E501
6166
self.add_inline(
6267
md,
6368
"youtube",
@@ -90,7 +95,9 @@ def handleMatch(self, m):
9095

9196
class Veoh(markdown.inlinepatterns.Pattern):
9297
def handleMatch(self, m):
93-
url = "//www.veoh.com/videodetails2.swf?permalinkId=%s" % m.group("veohid") # noqa: E501
98+
url = "//www.veoh.com/videodetails2.swf?permalinkId=%s" % m.group(
99+
"veohid"
100+
) # noqa: E501
94101
width = self.ext.config["veoh_width"][0]
95102
height = self.ext.config["veoh_height"][0]
96103
return flash_object(url, width, height)

martor/extensions/mention.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,16 @@
2222
class MentionPattern(markdown.inlinepatterns.Pattern):
2323
def handleMatch(self, m):
2424
username = self.unescape(m.group(2))
25-
users = get_user_model().objects.filter(username=username, is_active=True) # noqa: E501
25+
users = get_user_model().objects.filter(
26+
username=username, is_active=True
27+
) # noqa: E501
2628

2729
"""Makesure `username` is registered and actived."""
2830
if MARTOR_ENABLE_CONFIGS["mention"] == "true":
2931
if users.exists():
30-
url = "{0}{1}/".format(MARTOR_MARKDOWN_BASE_MENTION_URL, username) # noqa: E501
32+
url = "{0}{1}/".format(
33+
MARTOR_MARKDOWN_BASE_MENTION_URL, username
34+
) # noqa: E501
3135
el = markdown.util.etree.Element("a")
3236
el.set("href", url)
3337
el.set("class", "direct-mention-link")

martor/static/martor/css/martor-admin.min.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

martor/static/martor/css/martor.bootstrap.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ body.overflow {
7070
font-size: 12px;
7171
}
7272
.insert-emoji {
73-
cursor: pointer
73+
cursor: pointer;
74+
text-decoration: none;
7475
}
7576

7677
.table.markdown-reference {

martor/static/martor/css/martor.bootstrap.min.css

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

martor/static/martor/css/martor.semantic.min.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

martor/static/martor/js/martor.bootstrap.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
2-
* Name : Martor v1.6.11
2+
* Name : Martor v1.6.12
33
* Created by : Agus Makmun (Summon Agus)
4-
* Release date : 21-Feb-2022
4+
* Release date : 01-Mar-2022
55
* License : GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007
66
* Repository : https://github.com/agusmakmun/django-markdown-editor
77
**/

martor/static/martor/js/martor.bootstrap.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

martor/static/martor/js/martor.semantic.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
2-
* Name : Martor v1.6.11
2+
* Name : Martor v1.6.12
33
* Created by : Agus Makmun (Summon Agus)
4-
* Release date : 21-Feb-2022
4+
* Release date : 01-Mar-2022
55
* License : GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007
66
* Repository : https://github.com/agusmakmun/django-markdown-editor
77
**/

0 commit comments

Comments
 (0)