diff --git a/common/lib/xmodule/xmodule/js/spec/combinedopenended/edit_spec.coffee b/common/lib/xmodule/xmodule/js/spec/combinedopenended/edit_spec.coffee index 688c9eb63f..aa077da450 100644 --- a/common/lib/xmodule/xmodule/js/spec/combinedopenended/edit_spec.coffee +++ b/common/lib/xmodule/xmodule/js/spec/combinedopenended/edit_spec.coffee @@ -106,7 +106,7 @@ describe 'OpenEndedMarkdownEditingDescriptor', -> data = OpenEndedMarkdownEditingDescriptor.markdownToXml("""[tasks] (Self), ({1-2}AI), ({1-4}AI), ({1-2}Peer [tasks] - """, true) + """) data = data.replace(/[\t\n\s]/gmi,'') equality_list = """ diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee index d4c2ff00ae..bbd05e7f59 100644 --- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee +++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee @@ -576,4 +576,4 @@ class @CombinedOpenEnded $('.file-upload-preview')[0].width = width_px/scale_factor $('.file-upload-preview')[0].height = height_px/scale_factor $('.file-upload-preview').show() - reader.readAsDataURL($('.file-upload-box')[0].files[0]) + reader.readAsDataURL($('.file-upload-box')[0].files[0]) \ No newline at end of file diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/edit.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/edit.coffee index bfac8a298b..7c6257004a 100644 --- a/common/lib/xmodule/xmodule/js/src/combinedopenended/edit.coffee +++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/edit.coffee @@ -140,8 +140,8 @@ class @OpenEndedMarkdownEditingDescriptor extends XModule.Descriptor else return template - @markdownToXml: (markdown, mock=false)-> - toXml = `function(markdown, mock) { + @markdownToXml: (markdown)-> + toXml = `function(markdown) { function template(template_html,data){ return template_html.replace(/%(\w*)%/g,function(m,key){return data.hasOwnProperty(key)?data[key]:"";}); @@ -183,10 +183,9 @@ class @OpenEndedMarkdownEditingDescriptor extends XModule.Descriptor // group tasks xml = xml.replace(/\[tasks\]\n?([^\]]*)\[\/?tasks\]/gmi, function(match, p) { - if(mock == false){ - var open_ended_template = $('#open-ended-template').html(); - } else { - var open_ended_template = "%grading_config%"; + var open_ended_template = $('#open-ended-template').html(); + if(open_ended_template == null) { + open_ended_template = "%grading_config%"; } var groupString = ''; var options = p.split(",");