Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix mocking issue

Browse Source
This commit is contained in:
Vik Paruchuri
2013-05-20 17:29:11 -04:00
parent d0e8965a3c
commit 4dab8f07b0
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/lib/xmodule/xmodule/js/spec/combinedopenended/edit_spec.coffee
View File

@@ -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 = """
<combinedopenended>

2
common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
View File

@@ -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])

11
common/lib/xmodule/xmodule/js/src/combinedopenended/edit.coffee
View File

@@ -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 = "<openended %min_max_string%>%grading_config%</openended>";
var open_ended_template = $('#open-ended-template').html();
if(open_ended_template == null) {
open_ended_template = "<openended %min_max_string%>%grading_config%</openended>";
}
var groupString = '';
var options = p.split(",");