fixed issue #14 - setup the editor with label or nope

Author: agusmakmun

README.rst

@@ -107,6 +107,9 @@ to get ``IMGUR_CLIENT_ID`` and ``IMGUR_API_KEY``.
         'jquery': 'true',    # to include/revoke jquery (require for admin default django)
     }
 
+    # To setup the martor edito with label or not (default is False)
+    MARTOR_ENABLE_LABEL = False
+
     # Imgur API Keys
     MARTOR_IMGUR_CLIENT_ID = 'your-client-id'
     MARTOR_IMGUR_API_KEY   = 'your-api-key'

martor/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 
-__VERSION__ = '1.2.4'
+__VERSION__ = '1.2.5'
 __AUTHOR__ = 'Agus Makmun (Summon Agus)'
 __AUTHOR_EMAIL__ = '[email protected]'

martor/extensions/mention.py

@@ -9,10 +9,10 @@
 >>> import markdown
 >>> md = markdown.Markdown(extensions=['martor.utils.extensions.mention'])
 >>> md.convert('@[summonagus]')
-'<p><a href="https://webname.com/profile/summonagus/">summonagus</a></p>'
+'<p><a class="direct-mention-link" href="https://webname.com/profile/summonagus/">summonagus</a></p>'
 >>>
->>> md.convert('hellp @[summonagus], i mentioned you!')
-'<p>hellp <a href="https://webname.com/profile/summonagus/">summonagus</a>, i mentioned you!</p>'
+>>> md.convert('hello @[summonagus], i mentioned you!')
+'<p>hello <a class="direct-mention-link" href="https://webname.com/profile/summonagus/">summonagus</a>, i mentioned you!</p>'
 >>>
 """
 
@@ -24,9 +24,9 @@ class MentionPattern(markdown.inlinepatterns.Pattern):
     def handleMatch(self, m):
         username = self.unescape(m.group(2))
 
-        """Makesure `username` is registered."""
+        """Makesure `username` is registered and actived."""
         if MARTOR_ENABLE_CONFIGS['mention'] == 'true':
-            if username in [u.username for u in User.objects.all() if u.is_active]:
+            if username in [u.username for u in User.objects.exclude(is_active=False)]:
                 url = '{0}{1}/'.format(MARTOR_MARKDOWN_BASE_MENTION_URL, username)
                 el = markdown.util.etree.Element('a')
                 el.set('href', url)

martor/fields.py

@@ -1,15 +1,17 @@
 from django import forms
 
-from .widgets import (
-    MartorWidget,
-    AdminMartorWidget,
-)
+from .settings import MARTOR_ENABLE_LABEL
+from .widgets import (MartorWidget, AdminMartorWidget)
 
 
 class MartorFormField(forms.CharField):
 
     def __init__(self, *args, **kwargs):
-        kwargs['label'] = ''  # To set without label.
+
+        # to setup the editor without label
+        if not MARTOR_ENABLE_LABEL:
+            kwargs['label'] = ''
+
         super(MartorFormField, self).__init__(*args, **kwargs)
 
         if not issubclass(self.widget.__class__, MartorWidget):

martor/settings.py

@@ -10,6 +10,11 @@
     }
 )
 
+# To setup the martor edito with label or not (default is False)
+MARTOR_ENABLE_LABEL = getattr(
+    settings, 'MARTOR_ENABLE_LABEL', False
+)
+
 # Imgur API Keys
 MARTOR_IMGUR_CLIENT_ID = getattr(
     settings, 'MARTOR_IMGUR_CLIENT_ID', ''

martor/static/martor/js/martor.js

@@ -1,7 +1,7 @@
 /**
- * Name         : Martor v1.2.4
+ * Name         : Martor v1.2.5
  * Created by   : Agus Makmun (Summon Agus)
- * Release date : 18-Sep-2017
+ * Release date : 02-Dec-2017
  * License      : GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007
  * Repository   : https://github.com/agusmakmun/django-markdown-editor
 **/
@@ -117,7 +117,7 @@
             // set css `display:none` fot this textarea.
             textareaId.attr({'style': 'display:none'});
 
-            // assign all button single toolbar
+            // assign all `field_name`, uses for a per-single editor.
             $(obj).find('.martor-toolbar').find('.markdown-selector').attr({'data-field-name': field_name});
             $(obj).find('.upload-progress').attr({'data-field-name': field_name});
             $(obj).find('.modal-help-guide').attr({'data-field-name': field_name});
@@ -131,7 +131,7 @@
 
             // resize the editor using `resizable.min.js`
             $('#'+editorId).resizable({
-		            direction: 'bottom',
+                direction: 'bottom',
                 stop: function() {
                     editor.resize();
                 }
@@ -491,7 +491,12 @@
                               editor=editor,
                               imageData={name: response.name, link: response.link}
                             );
-                        }else {console.log(response)}
+                        }else if (response.status == 403) {
+                          alert(response.data.error); // invalid client id
+                        }
+                        else {
+                          console.log(response)
+                        }
                     },
                     error: function(response) {
                         console.log("error", response);
@@ -794,6 +799,6 @@ $(function() {
 
 $( document ).ready(function(){
     // Semantic UI
-    $('.ui.dropdown').dropdown();
+    $('.ui.martor-toolbar .ui.dropdown').dropdown();
     $('.ui.tab-martor-menu .item').tab();
 });