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

Merge pull request #2107 from edx/anton/fix-image-response

Browse Source 
Fix show answer button for ImageResponse.
This commit is contained in:
Anton Stupak
2014-01-10 04:13:19 -08:00
parent 9363dba535 95a88823b9
commit 54eaabce3f
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/lib/xmodule/xmodule/js/spec/capa/display_spec.coffee
View File

@@ -308,11 +308,17 @@ describe 'Problem', ->
states = [ states = [
{ {
desc: 'rectangle is drawn correctly', desc: 'rectangle is drawn correctly',
data: {'rectangle': '(10,10)-(30,30)'} data: {
'rectangle': '(10,10)-(30,30)',
'regions': null
}
}, },
{ {
desc: 'region is drawn correctly', desc: 'region is drawn correctly',
data: {'regions': '[[10,10],[30,30],[70,30],[20,30]]'} data: {
'rectangle': null,
'regions': '[[10,10],[30,30],[70,30],[20,30]]'
}
}, },
{ {
desc: 'mixed shapes are drawn correctly', desc: 'mixed shapes are drawn correctly',
@@ -387,7 +393,7 @@ describe 'Problem', ->
ctx.lineWidth = "2"; ctx.lineWidth = "2";
$.each coords, (key, value) => $.each coords, (key, value) =>
types[key](value) if types[key]? types[key](value) if types[key]? and value
return canvas return canvas

4
common/lib/xmodule/xmodule/js/src/capa/display.coffee
View File

@@ -260,7 +260,7 @@ class @Problem
check: => check: =>
if not @check_save_waitfor(@check_internal) if not @check_save_waitfor(@check_internal)
@check_internal() @check_internal()
check_internal: => check_internal: =>
Logger.log 'problem_check', @answers Logger.log 'problem_check', @answers
@@ -570,7 +570,7 @@ class @Problem
$.each answers, (key, answer) => $.each answers, (key, answer) =>
$.each answer, (key, value) => $.each answer, (key, value) =>
types[key](value) if types[key]? types[key](value) if types[key]? and value
container.html(canvas) container.html(canvas)