From 02c615a08ce7c38c0fe43c895173645f76910fdb Mon Sep 17 00:00:00 2001 From: David Taylor Date: Sat, 2 Apr 2016 02:42:37 +0100 Subject: [PATCH] Fixed for event items. Will probably fail tests because selenium can't type in simpleMDE :( --- RIGS/static/js/interaction.js | 10 ++++++++++ RIGS/templates/RIGS/event_form.html | 14 ++++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/RIGS/static/js/interaction.js b/RIGS/static/js/interaction.js index dffcf6bc..bc329724 100644 --- a/RIGS/static/js/interaction.js +++ b/RIGS/static/js/interaction.js @@ -36,6 +36,16 @@ function updatePrices() { $('#total').text(parseFloat(sum + vat).toFixed(2)); } +function setupMDE(selector) { + editor = new SimpleMDE({ + element: $(selector)[0], + forceSync: true, + toolbar: ["bold", "italic", "strikethrough", "|", "unordered-list", "ordered-list", "|", "link", "|", "preview", "guide"], + status: true, + }); + $(selector).data('mde_editor',editor); +} + $('#item-table').on('click', '.item-delete', function () { delete objectitems[$(this).data('pk')] $('#item-' + $(this).data('pk')).remove(); diff --git a/RIGS/templates/RIGS/event_form.html b/RIGS/templates/RIGS/event_form.html index 28e6be28..2ea1a931 100644 --- a/RIGS/templates/RIGS/event_form.html +++ b/RIGS/templates/RIGS/event_form.html @@ -43,12 +43,14 @@ $(document).ready(function () { - $(".md-enabled").each(function(index){ - editor = new SimpleMDE({ - element: $(".md-enabled")[index], - toolbar: ["bold", "italic", "strikethrough", "|", "unordered-list", "ordered-list", "|", "link", "|", "preview", "guide"], - status: false, - }); + setupMDE('#id_description'); + setupMDE('#id_notes'); + setupMDE('#item_description'); + + $('#itemModal').on('shown.bs.modal', function (e) { + $('#item_description').data('mde_editor').value( + $('#item_description').val() + ); }); {% if not object.pk and not form.errors %}