Skip to content

Commit 0201306

Browse files
committed
Also enable other JQuery version
1 parent ae74b93 commit 0201306

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

martor/settings.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@
3636
MARTOR_ALTERNATIVE_SEMANTIC_CSS_FILE = getattr(
3737
settings, 'MARTOR_ALTERNATIVE_SEMANTIC_CSS_FILE', None
3838
)
39+
MARTOR_ALTERNATIVE_JQUERY_JS_FILE = getattr(
40+
settings, 'MARTOR_ALTERNATIVE_JQUERY_JS_FILE', None
41+
)
3942

4043
# Imgur API Keys
4144
MARTOR_IMGUR_CLIENT_ID = getattr(

martor/widgets.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
MARTOR_MARKDOWN_BASE_EMOJI_URL,
1111
MARTOR_TOOLBAR_BUTTONS,
1212
MARTOR_ALTERNATIVE_SEMANTIC_JS_FILE,
13-
MARTOR_ALTERNATIVE_SEMANTIC_CSS_FILE
13+
MARTOR_ALTERNATIVE_SEMANTIC_CSS_FILE,
14+
MARTOR_ALTERNATIVE_JQUERY_JS_FILE
1415
)
1516

1617

@@ -74,11 +75,6 @@ class Media:
7475
'martor/js/martor.min.js',
7576
)
7677

77-
if MARTOR_ALTERNATIVE_SEMANTIC_JS_FILE is None:
78-
js = ('plugins/js/semantic.min.js',).__add__(js)
79-
else:
80-
js = (MARTOR_ALTERNATIVE_SEMANTIC_JS_FILE,).__add__(js)
81-
8278
if MARTOR_ALTERNATIVE_SEMANTIC_CSS_FILE is None:
8379
css["all"] = ('plugins/css/semantic.min.css',).__add__(css.get('all'))
8480
else:
@@ -88,8 +84,15 @@ class Media:
8884
# Adding the following scripts to the end of the tuple in case it affects behaviour
8985
js = ('plugins/js/typo.js', 'plugins/js/spellcheck.js').__add__(js)
9086

87+
if MARTOR_ALTERNATIVE_SEMANTIC_JS_FILE is None:
88+
js = ('plugins/js/semantic.min.js',).__add__(js)
89+
else:
90+
js = (MARTOR_ALTERNATIVE_SEMANTIC_JS_FILE,).__add__(js)
91+
9192
if MARTOR_ENABLE_CONFIGS.get('jquery') == 'true':
9293
js = ('plugins/js/jquery.min.js',).__add__(js)
94+
elif MARTOR_ALTERNATIVE_JQUERY_JS_FILE:
95+
js = (MARTOR_ALTERNATIVE_JQUERY_JS_FILE,).__add__(js)
9396

9497

9598
class AdminMartorWidget(MartorWidget, widgets.AdminTextareaWidget):

0 commit comments

Comments
 (0)