Merge branch 'master' into preview-on-change

Author: agusmakmun

martor/settings.py

@@ -8,7 +8,8 @@
         '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 
+        'spellcheck': 'true',  # to enable/disable spellcheck in form textareas
+        'hljs': 'true',       # to enable/disable hljs highlighting in preview
     }
 )
 

martor/static/martor/js/martor.js

@@ -162,10 +162,12 @@
                     contentType: false,
                     success: function(response) {
                         if (response) {
-                            currentTab.html(response);
-                            $('pre').each(function (i, block) {
-                                hljs.highlightBlock(block);
-                            });
+                            currentTab.html(response).removeClass('martor-preview-stale');
+                            if (editorConfig.hljs == 'true') {
+                                $('pre').each(function (i, block) {
+                                    hljs.highlightBlock(block);
+                                });
+                            }
                             needsRefresh = false;
                         } else {
                             currentTab.html('<p>Nothing to preview</p>');