From 335a36f17cfff207c002fbdadca694a21bd69cbc Mon Sep 17 00:00:00 2001
From: polesye <s2pak.anton@gmail.com>
Date: Mon, 16 Dec 2013 14:42:57 +0200
Subject: [PATCH] Address comments.

---
 .../xmodule/js/fixtures/imageinput.html        | 18 +++++++++++-------
 .../xmodule/js/spec/capa/display_spec.coffee   | 14 ++------------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/fixtures/imageinput.html b/common/lib/xmodule/xmodule/js/fixtures/imageinput.html
index 00a1094733..d308b8219c 100644
--- a/common/lib/xmodule/xmodule/js/fixtures/imageinput.html
+++ b/common/lib/xmodule/xmodule/js/fixtures/imageinput.html
@@ -2,7 +2,7 @@
 <!-- ${width}  = 300   -->
 <!-- ${height} = 400   -->
 
-<span>
+<div class="imageinput capa_inputtype" id="inputtype_12345">
     <input
         type="hidden"
         class="imageinput"
@@ -12,13 +12,17 @@
         value=""
     />
 
-    <div
-        id="imageinput_12345"
-        style="width: 300px; height: 400px; position: relative; left: 0; top: 0; visibility: hidden;"
-    >
-        <!-- image will go here -->
+    <div style="position:relative;">
+        <div
+            id="imageinput_12345"
+            style="width: 300px; height: 400px; position: relative; left: 0; top: 0; visibility: hidden;"
+        >
+            <!-- image will go here -->
+        </div>
+        <div id="answer_12345" data-width="100" data-height="100"></div>
     </div>
 
+
     <!-- status == 'unsubmitted' -->
         <span
             class="unanswered"
@@ -28,4 +32,4 @@
         >
             <span class="sr">Status: unanswered</span>
         </span>
-</span>
+</div>
diff --git a/common/lib/xmodule/xmodule/js/spec/capa/display_spec.coffee b/common/lib/xmodule/xmodule/js/spec/capa/display_spec.coffee
index c1d21f69df..ea1e185f65 100644
--- a/common/lib/xmodule/xmodule/js/spec/capa/display_spec.coffee
+++ b/common/lib/xmodule/xmodule/js/spec/capa/display_spec.coffee
@@ -304,17 +304,7 @@ describe 'Problem', ->
           expect($('input#1_2_1').attr('disabled')).not.toEqual('disabled')
 
       describe 'imageinput', ->
-        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>
-  '''
+        imageinput_html = readFixtures('imageinput.html')
         states = [
           {
             desc: 'rectangle is drawn correctly',
@@ -342,7 +332,7 @@ describe 'Problem', ->
 
         stubRequest = (data) =>
           spyOn($, 'postWithPrefix').andCallFake (url, callback) ->
-              callback answers: "1_2_1": data
+              callback answers: "12345": data
 
         getImage = (coords, c_width, c_height) =>
           types =