Commit f7c0fe30 by Mike Chen

added silentSave in edit view so that alert boxes don't pop up

parent 1389f003
......@@ -5,6 +5,7 @@ class CMS.Views.ModuleEdit extends Backbone.View
events:
'click .cancel': 'cancel'
'click .module-edit': 'editSubmodule'
'click .silent-save-update': 'silentSave'
'click .save-update': 'save'
initialize: ->
......@@ -29,6 +30,17 @@ class CMS.Views.ModuleEdit extends Backbone.View
alert("There was an error saving your changes. Please try again.")
)
silentSave: (event) ->
event.preventDefault()
@model.save().done((previews) =>
previews_section = @$el.find('.previews').empty()
$.each(previews, (idx, preview) =>
preview_wrapper = $('<section/>', class: 'preview').append preview
previews_section.append preview_wrapper
)
XModule.loadModules('display')
)
cancel: (event) ->
event.preventDefault()
CMS.popView()
......
<section class="capa-edit">
<a class="silent-save-update" />
<div class="parser-message-box" style="display:none;">Input parsed successfully.</div>
<script type="text/javascript" src="/static/grammars/xml-validator.js"></script>
<script type="text/javascript" src="/static/grammars/peg-0.7.0.min.js"></script>
<textarea name="" class="edit-box source-box" rows="8" cols="40"></textarea>
<textarea name="" class="edit-box capa-box" rows="8" cols="40">${data}</textarea>
</section>
......@@ -75,7 +75,9 @@ class CapaModule(XModule):
js = {'coffee': [resource_string(__name__, 'js/src/capa/display.coffee')],
'js': [resource_string(__name__, 'js/src/capa/imageinput.js'),
resource_string(__name__, 'js/src/capa/schematic.js')]}
resource_string(__name__, 'js/src/capa/schematic.js'),
resource_string(__name__, 'js/src/capa/peg-0.7.0.min.js'),
resource_string(__name__, 'js/src/capa/xml-validator.js')]}
js_module_name = "Problem"
css = {'scss': [resource_string(__name__, 'css/capa/display.scss')]}
......@@ -446,8 +448,6 @@ class CapaModule(XModule):
try:
old_state = self.lcp.get_state()
lcp_id = self.lcp.problem_id
import pdb
pdb.set_trace()
correct_map = self.lcp.grade_answers(answers)
except StudentInputError as inst:
# TODO (vshnayder): why is this line here?
......
......@@ -33,7 +33,7 @@ class @CapaDescriptor
@auto_save_timer = window.setTimeout(callback, 1000)
autoSave: (event) ->
$(".save-update").click();
$(".silent-save-update").click();
parse: ->
try
......
......@@ -42,10 +42,9 @@ function validateXML(txt) {
if (xmlDoc.parseError.errorCode != 0) {
txt = "Error Code: " + xmlDoc.parseError.errorCode + "\n";
txt = txt + "Error Reason: " + xmlDoc.parseError.reason;
txt = txt + "Error Line: " + xmlDoc.parseError.line;
return false;
return txt;
} else {
return true;
return xmlDoc;
}
}
// code for Mozilla, Firefox, Opera, etc.
......@@ -55,9 +54,9 @@ function validateXML(txt) {
if (xmlDoc.getElementsByTagName("parsererror").length > 0) {
checkErrorXML(xmlDoc.getElementsByTagName("parsererror")[0]);
return false;
return xt;
} else {
return true;
return xmlDoc;
}
} else {
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment