Skip to content

E
edx-ora2
Commit 84ace36e by Will Daly
Options

Merge pull request #204 from edx/will/studio-js-cleanup 

Studio JS cleanup
parents 82346853 13035f9e
Showing with 4 additions and 8 deletions
apps/openassessment/xblock/static/js/src/oa_edit.js
...@@ -74,10 +74,8 @@ OpenAssessment.StudioUI.prototype = { ...@@ -74,10 +74,8 @@ OpenAssessment.StudioUI.prototype = {
else { ui.updateXml(); } else { ui.updateXml(); }
} }
).fail(function(errMsg) { ).fail(function(errMsg) {
// TODO: error message in the UI ui.showError(msg);
console.log(errMsg); });
}
);
}, },
/** /**
......
apps/openassessment/xblock/studio_mixin.py
...@@ -32,8 +32,7 @@ class StudioMixin(object): ...@@ -32,8 +32,7 @@ class StudioMixin(object):
""" """
rendered_template = get_template('openassessmentblock/oa_edit.html').render(Context({})) rendered_template = get_template('openassessmentblock/oa_edit.html').render(Context({}))
frag = Fragment(rendered_template) frag = Fragment(rendered_template)
frag.add_javascript(pkg_resources.resource_string(__name__, "static/js/src/oa_server.js")) frag.add_javascript(pkg_resources.resource_string(__name__, "static/js/openassessment.min.js"))
frag.add_javascript(pkg_resources.resource_string(__name__, "static/js/src/oa_edit.js"))
frag.initialize_js('OpenAssessmentEditor') frag.initialize_js('OpenAssessmentEditor')
return frag return frag
...@@ -113,4 +112,4 @@ class StudioMixin(object): ...@@ -113,4 +112,4 @@ class StudioMixin(object):
return { return {
'success': True, 'msg': u'', 'success': True, 'msg': u'',
'is_released': self.is_released() 'is_released': self.is_released()
} }
\ No newline at end of file
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