From 94696786c02f8070b58d2ef4cdb473d916bfc574 Mon Sep 17 00:00:00 2001 From: cahrens Date: Tue, 8 Jan 2013 14:57:15 -0500 Subject: [PATCH] Merge in Don's change. --- .../lib/xmodule/xmodule/js/src/problem/edit.coffee | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/common/lib/xmodule/xmodule/js/src/problem/edit.coffee b/common/lib/xmodule/xmodule/js/src/problem/edit.coffee index 486d080a1e..465bd33f86 100644 --- a/common/lib/xmodule/xmodule/js/src/problem/edit.coffee +++ b/common/lib/xmodule/xmodule/js/src/problem/edit.coffee @@ -70,9 +70,17 @@ class @MarkdownEditingDescriptor extends XModule.Descriptor save: -> $body.off('click', '.editor-tabs .tab', @changeEditor) - $body.off('click', '.editor-bar a', @onToolbarButton); - $body.off('click', '.cheatsheet-toggle', @toggleCheatsheet); - data: @xml_editor.getValue() + $body.off('click', '.editor-bar a', @onToolbarButton) + $body.off('click', '.cheatsheet-toggle', @toggleCheatsheet) + # TODO when logic is in place to remove the markdown if xml is edited, ensure this doesn't overwrite that + if @current_editor == @markdown_editor + { + data: MarkdownEditingDescriptor.markdownToXml(@markdown_editor.getValue()) + metadata: + markdown: @markdown_editor.getValue() + } + else + data: @xml_editor.getValue() @insertMultipleChoice: (selectedText) -> return MarkdownEditingDescriptor.insertGenericChoice(selectedText, '(', ')', MarkdownEditingDescriptor.multipleChoiceTemplate)