Merge pull request #10554 from edx/release

Verifying release branch for release-2015-11-09
This commit is contained in:
Cliff Dyer
2015-11-09 13:26:01 -05:00
13 changed files with 28 additions and 73 deletions

View File

@@ -538,19 +538,6 @@ describe 'Problem', ->
runs ->
expect(window.SR.readElts).toHaveBeenCalled()
it 'disables check button while posting', ->
runs ->
spyOn($, 'postWithPrefix').andCallFake (url, answers, callback) -> callback(success: 'OK')
spyOn @problem, 'enableCheckButton'
@problem.save()
expect(@problem.enableCheckButton).toHaveBeenCalledWith false
waitsFor (->
return jQuery.active == 0
), "jQuery requests finished", 1000
runs ->
expect(@problem.enableCheckButton).toHaveBeenCalledWith true
describe 'refreshMath', ->
beforeEach ->
@problem = new Problem($('.xblock-student_view'))

View File

@@ -412,13 +412,11 @@ class @Problem
@save_internal()
save_internal: =>
@enableCheckButton false
Logger.log 'problem_save', @answers
$.postWithPrefix "#{@url}/problem_save", @answers, (response) =>
saveMessage = response.msg
@gentle_alert saveMessage
@updateProgress response
@enableCheckButton true
refreshMath: (event, element) =>
element = event.target unless element