Merge pull request #142 from agusmakmun/development

development

Author: agusmakmun

.travis.yml

@@ -42,7 +42,9 @@ matrix:
     - python: 3.6
       env: DJANGO="==2.2.*"
     - python: 3.6
-      env: DJANGO=">=3.0a1,<3.1"
+      env: DJANGO="==3.0.*"
+    - python: 3.6
+      env: DJANGO="==3.1.*"
 
     - python: 3.7
       env: DJANGO="==2.0.*"
@@ -51,11 +53,13 @@ matrix:
     - python: 3.7
       env: DJANGO="==2.2.*"
     - python: 3.7
-      env: DJANGO=">=3.0a1,<3.1"
+      env: DJANGO="==3.0.*"
+    - python: 3.7
+      env: DJANGO="==3.1.*"
 
     - os: osx
       language: generic
-      env: DJANGO="==1.10.*"
+      env: DJANGO="==3.1.*"
 
 # Perform the manual steps on OSX to install Python3 and activate venv:
 # Since Python versions have been tested on Linux and it is only a matter of

README.md

@@ -40,14 +40,14 @@
 
 Martor is available directly from [PyPI][2]:
 
-1. Installing the package.
+**1.** Installing the package.
 
 ```
 $ pip install martor
 ```
 
 
-2. Don't forget to add `'martor'` to your `'INSTALLED_APPS'` setting _(without migrations)_.
+**2.** Don't forget to add `'martor'` to your `'INSTALLED_APPS'` setting _(without migrations)_.
 
 ```
 # settings.py
@@ -58,7 +58,7 @@ INSTALLED_APPS = [
 ```
 
 
-3. Add url pattern to your `urls.py.`
+**3.** Add url pattern to your `urls.py.`
 
 ```
 # urls.py
@@ -76,15 +76,14 @@ urlpatterns = [
 ```
 
 
-4. Collect martor's static files in your `STATIC_ROOT` folder.
+**4.** Collect martor's static files in your `STATIC_ROOT` folder.
 
 ```
 ./manage.py collectstatic
 ```
 
 
-Setting Configurations `settings.py`
----------------------------------------
+### Setting Configurations `settings.py`
 
 Please register your application at https://api.imgur.com/oauth2/addclient
 to get `IMGUR_CLIENT_ID` and `IMGUR_API_KEY`.

martor/__init__.py

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

martor/static/martor/css/martor-admin.min.css

@@ -120,6 +120,7 @@ div.martor-preview-stale {
   position: absolute;
   bottom: -8px;
   right: 8px;
+  z-index: 100;
 }
 .no-border {
   border: none!important;

martor/static/martor/css/martor.bootstrap.css

@@ -1,7 +1,7 @@
 /**
- * Name         : Martor v1.5.6
+ * Name         : Martor v1.5.8
  * Created by   : Agus Makmun (Summon Agus)
- * Release date : 16-Sep-2020
+ * Release date : 05-Oct-2020
  * License      : GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007
  * Repository   : https://github.com/agusmakmun/django-markdown-editor
 **/
@@ -145,7 +145,18 @@
 
             // update the preview if this menu is clicked
             var currentTab = $('.tab-pane#nav-preview-'+field_name);
+            var editorTabButton = $('.nav-link#nav-editor-tab-'+field_name);
             var previewTabButton = $('.nav-link#nav-preview-tab-'+field_name);
+            var toolbarButtons = $(this).closest('.tab-martor-menu').find('.martor-toolbar')
+
+            editorTabButton.click(function(){
+                // show the `.martor-toolbar` for this current editor if under preview.
+                $(this).closest('.tab-martor-menu').find('.martor-toolbar').show();
+            });
+            previewTabButton.click(function() {
+                $(this).closest('.tab-martor-menu').find('.martor-toolbar').hide();
+            });
+
             var refreshPreview = function() {
                 var value = textareaId.val();
                 var form = new FormData();
@@ -194,12 +205,6 @@
               editor.on('change', refreshPreview);
             }
 
-            var editorTabButton = $('.nav-link#nav-preview-tab-'+field_name);
-            editorTabButton.click(function(){
-                // show the `.martor-toolbar` for this current editor if under preview.
-                $(this).closest('.tab-martor-menu').find('.martor-toolbar').show();
-            });
-
             if (editorConfig.spellcheck == 'true') {
               try {
                 enable_spellcheck(editorId);

martor/static/martor/css/martor.bootstrap.min.css

@@ -1,7 +1,7 @@
 /**
- * Name         : Martor v1.5.6
+ * Name         : Martor v1.5.8
  * Created by   : Agus Makmun (Summon Agus)
- * Release date : 16-Sep-2020
+ * Release date : 05-Oct-2020
  * License      : GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007
  * Repository   : https://github.com/agusmakmun/django-markdown-editor
 **/