Fix bug #163 (button disappear)

agusmakmun · Jul 15, 2021 · ae80bfd · ae80bfd
1 parent 41e907c
commit ae80bfd
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 52 deletions.
diff --git a/martor/__init__.py b/martor/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 
-__VERSION__ = '1.6.3'
+__VERSION__ = '1.6.4'
 __AUTHOR__ = 'Agus Makmun (Summon Agus)'
 __AUTHOR_EMAIL__ = 'summon.agus@gmail.com'
diff --git a/martor/static/martor/css/martor-admin.min.css b/martor/static/martor/css/martor-admin.min.css
diff --git a/martor/static/martor/css/martor.bootstrap.min.css b/martor/static/martor/css/martor.bootstrap.min.css
diff --git a/martor/static/martor/css/martor.semantic.min.css b/martor/static/martor/css/martor.semantic.min.css
diff --git a/martor/static/martor/js/martor.bootstrap.js b/martor/static/martor/js/martor.bootstrap.js
@@ -1,7 +1,7 @@
 /**
- * Name         : Martor v1.6.3
+ * Name         : Martor v1.6.4
  * Created by   : Agus Makmun (Summon Agus)
- * Release date : 13-Jun-2021
+ * Release date : 15-Jul-2021
  * License      : GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007
  * Repository   : https://github.com/agusmakmun/django-markdown-editor
 **/
@@ -748,33 +748,26 @@
             });
 
             // Custom decission for toolbar buttons.
-            var btnMention = $('.markdown-direct-mention[data-field-name='+field_name+']'); // To Direct Mention
-            var btnUpload = $('.markdown-image-upload[data-field-name='+field_name+']'); // To Upload Image
-            if (editorConfig.mention === 'true' && editorConfig.imgur === 'true') {
-                btnMention.click(function(){
-                    markdownToMention(editor);
-                });
-                btnUpload.on('change', function(evt){
-                    evt.preventDefault();
-                    markdownToUploadImage(editor);
-                });
-            }else if (editorConfig.mention === 'true' && editorConfig.imgur === 'false') {
+            var btnMention = $('.markdown-direct-mention[data-field-name='+field_name+']');  // To Direct Mention
+            var btnUpload = $('.markdown-image-upload[data-field-name='+field_name+']');     // To Upload Image
+
+            if (editorConfig.mention == 'true') {
                 btnMention.click(function(){
                     markdownToMention(editor);
                 });
-                btnUpload.remove();
-            }else if (editorConfig.mention === 'false' && editorConfig.imgur === 'true') {
+            }else {
                 btnMention.remove();
+                // Disable help of `mention`
+                $('.markdown-reference tbody tr')[1].remove();
+            }
+
+            if (editorConfig.imgur == 'true') {
                 btnUpload.on('change', function(evt){
                     evt.preventDefault();
                     markdownToUploadImage(editor);
                 });
-            }
-            else {
-                btnMention.remove();
+            }else {
                 btnUpload.remove();
-                // Disable help of `mention`
-                $('.markdown-reference tbody tr')[1].remove();
             }
 
             // Modal Popup for Help Guide & Emoji Cheat Sheet

diff --git a/martor/static/martor/js/martor.bootstrap.min.js b/martor/static/martor/js/martor.bootstrap.min.js
diff --git a/martor/static/martor/js/martor.semantic.js b/martor/static/martor/js/martor.semantic.js
@@ -1,7 +1,7 @@
 /**
- * Name         : Martor v1.6.3
+ * Name         : Martor v1.6.4
  * Created by   : Agus Makmun (Summon Agus)
- * Release date : 13-Jun-2021
+ * Release date : 15-Jul-2021
  * License      : GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007
  * Repository   : https://github.com/agusmakmun/django-markdown-editor
 **/
@@ -744,32 +744,25 @@
 
             // Custom decission for toolbar buttons.
             var btnMention = $('.markdown-direct-mention[data-field-name='+field_name+']'); // To Direct Mention
-            var btnUpload = $('.markdown-image-upload[data-field-name='+field_name+']'); // To Upload Image
-            if (editorConfig.mention === 'true' && editorConfig.imgur === 'true') {
-                btnMention.click(function(){
-                    markdownToMention(editor);
-                });
-                btnUpload.on('change', function(evt){
-                    evt.preventDefault();
-                    markdownToUploadImage(editor);
-                });
-            }else if (editorConfig.mention === 'true' && editorConfig.imgur === 'false') {
+            var btnUpload = $('.markdown-image-upload[data-field-name='+field_name+']');    // To Upload Image
+
+            if (editorConfig.mention === 'true') {
                 btnMention.click(function(){
                     markdownToMention(editor);
                 });
-                btnUpload.remove();
-            }else if (editorConfig.mention === 'false' && editorConfig.imgur === 'true') {
+            }else {
                 btnMention.remove();
+                // Disable help of `mention`
+                $('.markdown-reference tbody tr')[1].remove();
+            }
+
+            if (editorConfig.imgur === 'true') {
                 btnUpload.on('change', function(evt){
                     evt.preventDefault();
                     markdownToUploadImage(editor);
                 });
-            }
-            else {
-                btnMention.remove();
+            } else {
                 btnUpload.remove();
-                // Disable help of `mention`
-                $('.markdown-reference tbody tr')[1].remove();
             }
 
             // Modal Popup for Help Guide & Emoji Cheat Sheet