merge many pull requests

Author: agusmakmun

martor/__init__.py

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

martor/locale/en/LC_MESSAGES/django.mo

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-06-30 05:47+0700\n"
+"POT-Creation-Date: 2020-01-21 10:54+0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"

martor/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-06-30 05:48+0700\n"
+"POT-Creation-Date: 2020-01-21 10:54+0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"

martor/locale/id/LC_MESSAGES/django.mo

@@ -4,12 +4,13 @@
 # Input: string boolean, `true/false`
 MARTOR_ENABLE_CONFIGS = getattr(
     settings, 'MARTOR_ENABLE_CONFIGS', {
-        'imgur': 'true',      # to enable/disable imgur/custom uploader.
-        'mention': 'false',   # to enable/disable mention
-        'jquery': 'true',     # to include/revoke jquery (require for admin default django)
-        'living': 'false',    # to enable/disable live updates in preview
+        'emoji': 'true',       # to enable/disable emoji icons.
+        'imgur': 'true',       # to enable/disable imgur/custom uploader.
+        'mention': 'false',    # to enable/disable mention
+        'jquery': 'true',      # to include/revoke jquery (require for admin default django)
+        'living': 'false',     # to enable/disable live updates in preview
         'spellcheck': 'true',  # to enable/disable spellcheck in form textareas
-        'hljs': 'true',       # to enable/disable hljs highlighting in preview
+        'hljs': 'true',        # to enable/disable hljs highlighting in preview
     }
 )
 

martor/locale/id/LC_MESSAGES/django.po

@@ -1,7 +1,7 @@
 /**
- * Name         : Martor v1.4.1
+ * Name         : Martor v1.4.5
  * Created by   : Agus Makmun (Summon Agus)
- * Release date : 30-Jun-2019
+ * Release date : 21-Jan-2020
  * License      : GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007
  * Repository   : https://github.com/agusmakmun/django-markdown-editor
 **/
@@ -142,12 +142,7 @@
             // update the preview if this menu is clicked
             var currentTab = $('.tab.segment[data-tab=preview-tab-'+field_name+']');
             var previewTabButton = $('.item[data-tab=preview-tab-'+field_name+']');
-            var needsRefresh = true;
             var refreshPreview = function() {
-                if (!needsRefresh) {
-                    return;
-                }
-
                 var value = textareaId.val();
                 var form = new FormData();
                 form.append('content', value);
@@ -162,13 +157,13 @@
                     contentType: false,
                     success: function(response) {
                         if (response) {
-                            currentTab.html(response).removeClass('martor-preview-stale');
                             if (editorConfig.hljs == 'true') {
                                 $('pre').each(function (i, block) {
                                     hljs.highlightBlock(block);
                                 });
                             }
-                            needsRefresh = false;
+                            currentTab.html(response).removeClass('martor-preview-stale');
+                            $(document).trigger('martor:preview', [currentTab]);
                         } else {
                             currentTab.html('<p>Nothing to preview</p>');
                         }
@@ -182,24 +177,14 @@
             // Refresh the preview unconditionally on first load.
             refreshPreview();
 
-            // Set if editor has changed.
-            editor.on('change', function (evt) {
-                var value = editor.getValue();
-                if (value !== textareaId.val()) {
-                    textareaId.val(value);
-                    needsRefresh = true;
-                    if (editorConfig.living === 'true') {
-                        refreshPreview();
-                    }
-                }
-            });
-
             if (editorConfig.living !== 'true') {
               previewTabButton.click(function(){
                   // hide the `.martor-toolbar` for this current editor if under preview.
                   $(this).closest('.tab-martor-menu').find('.martor-toolbar').hide();
                   refreshPreview();
               });
+            }else {
+              editor.on('change', refreshPreview);
             }
 
             var editorTabButton = $('.item[data-tab=editor-tab-'+field_name+']');
@@ -209,7 +194,11 @@
             });
 
             if (editorConfig.spellcheck == 'true') {
-              enable_spellcheck(editorId);
+              try {
+                enable_spellcheck(editorId);
+              }catch (e) {
+                console.log("Spellcheck lib doesn't installed.");
+              }
             }
 
             // win/linux: Ctrl+B, mac: Command+B

martor/settings.py

@@ -24,6 +24,7 @@
             <td><img class="marked-emoji" src="{% static 'plugins/images/heart.png' %}"></td>
           </tr>
         {% endif %}
+
         {% if mentions_enabled %}
           <tr>
             <td>@[username]</td>
@@ -33,9 +34,11 @@
             <td><a href="#">@username</a></td>
           </tr>
         {% endif %}
+
         {% if emoji_enabled or mentions_enabled %}
           <tr><td colspan="5"></td></tr>
         {% endif %}
+
         <tr>
           <td>*Italic*</td>
           <td>_Italic_</td>