Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
4dab8f07
Commit
4dab8f07
authored
May 20, 2013
by
Vik Paruchuri
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix mocking issue
parent
d0e8965a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
8 deletions
+8
-8
common/lib/xmodule/xmodule/js/spec/combinedopenended/edit_spec.coffee
+1
-1
common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+2
-1
common/lib/xmodule/xmodule/js/src/combinedopenended/edit.coffee
+5
-6
No files found.
common/lib/xmodule/xmodule/js/spec/combinedopenended/edit_spec.coffee
View file @
4dab8f07
...
@@ -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>
...
...
common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
View file @
4dab8f07
...
@@ -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
common/lib/xmodule/xmodule/js/src/combinedopenended/edit.coffee
View file @
4dab8f07
...
@@ -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
(
","
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment