From beee7874dc61c1af726ad4a6cc8291e6c3b4694e Mon Sep 17 00:00:00 2001 From: Antonin <zepcome@gmail.com> Date: Tue, 10 May 2016 17:53:47 +0200 Subject: [PATCH] Correcting link without text (and some small refactoring) --- js/app/classic_poll.js | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/js/app/classic_poll.js b/js/app/classic_poll.js index b196822e..63cb4dcc 100644 --- a/js/app/classic_poll.js +++ b/js/app/classic_poll.js @@ -98,14 +98,19 @@ $('#md-a-imgModalLabel').text($(this).attr('title')); }); md_a_imgModal.find('.btn-primary').on('click', function () { - if (md_img.val() != '' && md_val.val() != '') { - $('#' + $(this).val()).val('[ + ')](' + md_val.val() + ')'); - } else if (md_img.val() != '') { - $('#' + $(this).val()).val(' + ')'); - } else if (md_val.val() != '') { - $('#' + $(this).val()).val('[' + md_text.val() + '](' + md_val.val() + ')'); + var text = md_text.val(); + var img = md_img.val(); + var link = md_val.val(); + var element = $('#' + $(this).val()); + + if (img != '' && link != '') { + .val('[](' + link + ')'); + } else if (img != '') { + element.val(''); + } else if (link != '') { + element.val('[' + (text?text:link) + '](' + link + ')'); } else { - $('#' + $(this).val()).val(md_text.val()); + element.val(text); } md_a_imgModal.modal('hide'); md_img.val(''); -- GitLab