From cede3e75dbe4e5dcb200117788e746f0c4429143 Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Mon, 17 Sep 2018 13:47:03 +0200 Subject: [PATCH] Remove more Markdown references --- src/scripts/tutti/2_comments.js | 9 ----- src/templates/nodes/edit_embed.pug | 56 ++++++++++++++---------------- 2 files changed, 26 insertions(+), 39 deletions(-) diff --git a/src/scripts/tutti/2_comments.js b/src/scripts/tutti/2_comments.js index d53fcaab..40d9340a 100644 --- a/src/scripts/tutti/2_comments.js +++ b/src/scripts/tutti/2_comments.js @@ -40,11 +40,6 @@ $(document).on('click','body .comment-action-reply',function(e){ parentDiv.after(commentForm); // document.getElementById('comment_field').focus(); $(commentField).focus(); - - // Convert Markdown - var convert = new Markdown.getSanitizingConverter().makeHtml; - var preview = $('.comment-reply-preview-md'); - preview.html(convert($(commentField).val())); $('.comment-reply-field').addClass('filled'); }); @@ -59,10 +54,6 @@ $(document).on('click','body .comment-action-cancel',function(e){ delete commentField.dataset.originalParentId; $(commentField).val(''); - // Convert Markdown - var convert = new Markdown.getSanitizingConverter().makeHtml; - var preview = $('.comment-reply-preview-md'); - preview.html(convert($(commentField).val())); $('.comment-reply-field').removeClass('filled'); $('.comment-container').removeClass('is-replying'); diff --git a/src/templates/nodes/edit_embed.pug b/src/templates/nodes/edit_embed.pug index c94d2f56..6f06c00a 100644 --- a/src/templates/nodes/edit_embed.pug +++ b/src/templates/nodes/edit_embed.pug @@ -101,41 +101,37 @@ script(type="text/javascript"). var page_title = 'Edit: {{ node.name }} - {{ project.name }} — Blender Cloud'; DocumentTitleAPI.set_page_title(page_title); - /* Build the markdown preview when typing in textarea */ - var convert = new Markdown.getSanitizingConverter(); - Markdown.Extra.init(convert); - convert = convert.makeHtml; + var $contentField = $('.form-group.description textarea'), + $contentPreview = $('
').insertAfter($contentField); - var $textarea = $('.form-group.description textarea'), - $loader = $('
').insertAfter($textarea), - $preview = $('
').insertAfter($loader); + function parseDescriptionContent(content) { - $loader.hide(); + $.ajax({ + url: "{{ url_for('nodes.preview_markdown')}}", + type: 'post', + data: {content: content}, + headers: {"X-CSRFToken": csrf_token}, + headers: {}, + dataType: 'json' + }) + .done(function (data) { + $contentPreview.html(data.content); + }) + .fail(function (err) { + toastr.error(xhrErrorResponseMessage(err), 'Parsing failed'); + }); + } - // Delay function to not start converting heavy posts immediately - var delay = (function(){ - var timer = 0; - return function(callback, ms){ - clearTimeout (timer); - timer = setTimeout(callback, ms); - }; - })(); + var options = { + callback: parseDescriptionContent, + wait: 750, + highlight: false, + allowSubmit: false, + captureLength: 2 + } - $textarea.keyup(function() { - /* If there's an iframe (YouTube embed), delay markdown convert 1.5s */ - if (/iframe/i.test($textarea.val())) { - $loader.show(); + $contentField.typeWatch(options); - delay(function(){ - // Convert markdown - $preview.html(convert($textarea.val())); - $loader.hide(); - }, 1500 ); - } else { - // Convert markdown - $preview.html(convert($textarea.val())); - } - }).trigger('keyup'); $('input, textarea').keypress(function () { // Unused: save status of the page as 'edited'