Merge pull request #131 from KayleeTheMech/master

Alternative Version of Semantic and JQuery

Author: agusmakmun

README.rst

@@ -169,6 +169,12 @@ to get ``IMGUR_CLIENT_ID`` and ``IMGUR_API_KEY``.
     MARTOR_MARKDOWN_BASE_EMOJI_URL = 'https://github.githubassets.com/images/icons/emoji/'                  # default from github
     MARTOR_MARKDOWN_BASE_MENTION_URL = 'https://python.web.id/author/'                                      # please change this to your domain
 
+    # If you need to use your own themed semantic ui dependency
+    # replace the values with the file in your static files dir
+    MARTOR_ALTERNATIVE_SEMANTIC_JS_FILE = "semantic-themed/semantic.min.js"
+    MARTOR_ALTERNATIVE_SEMANTIC_CSS_FILE = "semantic-themed/semantic.min.css"
+    MARTOR_ALTERNATIVE_JQUERY_JS_FILE = "jquery/dist/jquery.js"
+
 Check this setting is not set else csrf will not be sent over ajax calls:
 
 ::

martor/settings.py

@@ -11,6 +11,7 @@
         'living': 'false',      # to enable/disable live updates in preview
         'spellcheck': 'false',  # to enable/disable spellcheck in form textareas
         'hljs': 'true',         # to enable/disable hljs highlighting in preview
+        'semantic': 'true',    # to enable/disable using packaged semantic version
     }
 )
 
@@ -29,6 +30,16 @@
     settings, 'MARTOR_ENABLE_LABEL', False
 )
 
+MARTOR_ALTERNATIVE_SEMANTIC_JS_FILE = getattr(
+    settings, 'MARTOR_ALTERNATIVE_SEMANTIC_JS_FILE', None
+)
+MARTOR_ALTERNATIVE_SEMANTIC_CSS_FILE = getattr(
+    settings, 'MARTOR_ALTERNATIVE_SEMANTIC_CSS_FILE', None
+)
+MARTOR_ALTERNATIVE_JQUERY_JS_FILE = getattr(
+    settings, 'MARTOR_ALTERNATIVE_JQUERY_JS_FILE', None
+)
+
 # Imgur API Keys
 MARTOR_IMGUR_CLIENT_ID = getattr(
     settings, 'MARTOR_IMGUR_CLIENT_ID', ''

martor/widgets.py

@@ -8,7 +8,10 @@
     MARTOR_MARKDOWNIFY_URL,
     MARTOR_SEARCH_USERS_URL,
     MARTOR_MARKDOWN_BASE_EMOJI_URL,
-    MARTOR_TOOLBAR_BUTTONS
+    MARTOR_TOOLBAR_BUTTONS,
+    MARTOR_ALTERNATIVE_SEMANTIC_JS_FILE,
+    MARTOR_ALTERNATIVE_SEMANTIC_CSS_FILE,
+    MARTOR_ALTERNATIVE_JQUERY_JS_FILE
 )
 
 
@@ -56,15 +59,13 @@ class Media:
         css = {
             'all': (
                 'plugins/css/ace.min.css',
-                'plugins/css/semantic.min.css',
                 'plugins/css/resizable.min.css',
                 'martor/css/martor.min.css',
                 'martor/css/martor-admin.min.css'
             )
         }
         js = (
             'plugins/js/ace.js',
-            'plugins/js/semantic.min.js',
             'plugins/js/mode-markdown.js',
             'plugins/js/ext-language_tools.js',
             'plugins/js/theme-github.js',
@@ -74,12 +75,24 @@ class Media:
             'martor/js/martor.min.js',
         )
 
+        if MARTOR_ALTERNATIVE_SEMANTIC_CSS_FILE is None:
+            css["all"] = ('plugins/css/semantic.min.css',).__add__(css.get('all'))
+        else:
+            css["all"] = (MARTOR_ALTERNATIVE_SEMANTIC_CSS_FILE,).__add__(css.get('all'))
+
         if MARTOR_ENABLE_CONFIGS.get('spellcheck') == 'true':
             # Adding the following scripts to the end of the tuple in case it affects behaviour
             js = ('plugins/js/typo.js', 'plugins/js/spellcheck.js').__add__(js)
 
+        if MARTOR_ALTERNATIVE_SEMANTIC_JS_FILE is None:
+            js = ('plugins/js/semantic.min.js',).__add__(js)
+        else:
+            js = (MARTOR_ALTERNATIVE_SEMANTIC_JS_FILE,).__add__(js)
+
         if MARTOR_ENABLE_CONFIGS.get('jquery') == 'true':
             js = ('plugins/js/jquery.min.js',).__add__(js)
+        elif MARTOR_ALTERNATIVE_JQUERY_JS_FILE:
+            js = (MARTOR_ALTERNATIVE_JQUERY_JS_FILE,).__add__(js)
 
 
 class AdminMartorWidget(MartorWidget, widgets.AdminTextareaWidget):