Commit 4dab8f07 by Vik Paruchuri

fix mocking issue

parent d0e8965a
...@@ -106,7 +106,7 @@ describe 'OpenEndedMarkdownEditingDescriptor', -> ...@@ -106,7 +106,7 @@ describe 'OpenEndedMarkdownEditingDescriptor', ->
data = OpenEndedMarkdownEditingDescriptor.markdownToXml("""[tasks] data = OpenEndedMarkdownEditingDescriptor.markdownToXml("""[tasks]
(Self), ({1-2}AI), ({1-4}AI), ({1-2}Peer (Self), ({1-2}AI), ({1-4}AI), ({1-2}Peer
[tasks] [tasks]
""", true) """)
data = data.replace(/[\t\n\s]/gmi,'') data = data.replace(/[\t\n\s]/gmi,'')
equality_list = """ equality_list = """
<combinedopenended> <combinedopenended>
......
...@@ -576,4 +576,4 @@ class @CombinedOpenEnded ...@@ -576,4 +576,4 @@ class @CombinedOpenEnded
$('.file-upload-preview')[0].width = width_px/scale_factor $('.file-upload-preview')[0].width = width_px/scale_factor
$('.file-upload-preview')[0].height = height_px/scale_factor $('.file-upload-preview')[0].height = height_px/scale_factor
$('.file-upload-preview').show() $('.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
...@@ -140,8 +140,8 @@ class @OpenEndedMarkdownEditingDescriptor extends XModule.Descriptor ...@@ -140,8 +140,8 @@ class @OpenEndedMarkdownEditingDescriptor extends XModule.Descriptor
else else
return template return template
@markdownToXml: (markdown, mock=false)-> @markdownToXml: (markdown)->
toXml = `function(markdown, mock) { toXml = `function(markdown) {
function template(template_html,data){ function template(template_html,data){
return template_html.replace(/%(\w*)%/g,function(m,key){return data.hasOwnProperty(key)?data[key]:"";}); return template_html.replace(/%(\w*)%/g,function(m,key){return data.hasOwnProperty(key)?data[key]:"";});
...@@ -183,10 +183,9 @@ class @OpenEndedMarkdownEditingDescriptor extends XModule.Descriptor ...@@ -183,10 +183,9 @@ class @OpenEndedMarkdownEditingDescriptor extends XModule.Descriptor
// group tasks // group tasks
xml = xml.replace(/\[tasks\]\n?([^\]]*)\[\/?tasks\]/gmi, function(match, p) { xml = xml.replace(/\[tasks\]\n?([^\]]*)\[\/?tasks\]/gmi, function(match, p) {
if(mock == false){ var open_ended_template = $('#open-ended-template').html();
var open_ended_template = $('#open-ended-template').html(); if(open_ended_template == null) {
} else { open_ended_template = "<openended %min_max_string%>%grading_config%</openended>";
var open_ended_template = "<openended %min_max_string%>%grading_config%</openended>";
} }
var groupString = ''; var groupString = '';
var options = p.split(","); var options = p.split(",");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment