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

Address comments.

Browse Source
This commit is contained in:
polesye
2013-12-16 14:42:57 +02:00
parent 887eea30c9
commit 335a36f17c
2 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
common/lib/xmodule/xmodule/js/fixtures/imageinput.html
View File

@@ -2,7 +2,7 @@
<!-- ${width} = 300 --> <!-- ${width} = 300 -->
<!-- ${height} = 400 --> <!-- ${height} = 400 -->
<span> <div class="imageinput capa_inputtype" id="inputtype_12345">
<input <input
type="hidden" type="hidden"
class="imageinput" class="imageinput"
@@ -12,13 +12,17 @@
value="" value=""
/> />
<div <div style="position:relative;">
id="imageinput_12345" <div
style="width: 300px; height: 400px; position: relative; left: 0; top: 0; visibility: hidden;" id="imageinput_12345"
> style="width: 300px; height: 400px; position: relative; left: 0; top: 0; visibility: hidden;"
<!-- image will go here --> >
<!-- image will go here -->
</div>
<div id="answer_12345" data-width="100" data-height="100"></div>
</div> </div>
<!-- status == 'unsubmitted' --> <!-- status == 'unsubmitted' -->
<span <span
class="unanswered" class="unanswered"
@@ -28,4 +32,4 @@
> >
<span class="sr">Status: unanswered</span> <span class="sr">Status: unanswered</span>
</span> </span>
</span> </div>

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

@@ -304,17 +304,7 @@ describe 'Problem', ->
expect($('input#1_2_1').attr('disabled')).not.toEqual('disabled') expect($('input#1_2_1').attr('disabled')).not.toEqual('disabled')
describe 'imageinput', -> describe 'imageinput', ->
imageinput_html=''' imageinput_html = readFixtures('imageinput.html')
<section class="problem">
<div class="imageinput capa_inputtype" id="inputtype_1_2_1">
<input class="imageinput" type="hidden" name="input_1_2_1" id="input_1_2_1">
<div style="position:relative;">
<div id="imageinput_1_2_1">test</div>
<div id="answer_1_2_1" data-width="100" data-height="100"></div>
</div>
</div>
</section>
'''
states = [ states = [
{ {
desc: 'rectangle is drawn correctly', desc: 'rectangle is drawn correctly',
@@ -342,7 +332,7 @@ describe 'Problem', ->
stubRequest = (data) => stubRequest = (data) =>
spyOn($, 'postWithPrefix').andCallFake (url, callback) -> spyOn($, 'postWithPrefix').andCallFake (url, callback) ->
callback answers: "1_2_1": data callback answers: "12345": data
getImage = (coords, c_width, c_height) => getImage = (coords, c_width, c_height) =>
types = types =