From 844fb03377aa9f70789e261184f1282bcfcf8a3b Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 11:35:27 -0500
Subject: [PATCH] javascript transitions okay, can integrate open ended
 response now

---
 .../js/src/combinedopenended/display.coffee        | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index 34b9b0c472..08c7aafa4d 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -64,10 +64,10 @@ class @CombinedOpenEnded
         @next_problem_button.show()
       else
         @next_problem_button.hide()
-        if @allow_reset
-          @reset_button.show()
-        else
-          @reset_button.hide()
+        #if @allow_reset
+        @reset_button.show()
+        #else
+        #  @reset_button.hide()
 
 
   find_assessment_elements: ->
@@ -132,8 +132,7 @@ class @CombinedOpenEnded
 
   reset: (event) =>
     event.preventDefault()
-    @errors_area.html('Problem state got out of sync.  Try reloading the page.')
-    if @state == 'done'
+    if @child_state == 'done'
       $.postWithPrefix "#{@ajax_url}/reset", {}, (response) =>
         if response.success
           @answer_area.val('')
@@ -151,7 +150,6 @@ class @CombinedOpenEnded
 
   next_problem: (event) =>
     event.preventDefault()
-    @errors_area.html('Problem state got out of sync.  Try reloading the page.')
     if @child_state == 'done'
       $.postWithPrefix "#{@ajax_url}/next_problem", {}, (response) =>
         if response.success
@@ -161,7 +159,7 @@ class @CombinedOpenEnded
           @message_wrapper.html('')
           @child_state = 'initial'
           @rebind()
-          @reset_button.hide()
+          @next_problem_button.hide()
           location.reload()
         else
           @errors_area.html(response.error)