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

Studio JS cleanup

apps/openassessment/xblock/static/js/src/oa_edit.js

@@ -74,10 +74,8 @@ OpenAssessment.StudioUI.prototype = {
                 else { ui.updateXml(); }
             }
         ).fail(function(errMsg) {
-                // TODO: error message in the UI
-                console.log(errMsg);
-            }
-        );
+            ui.showError(msg);
+        });
     },
 
     /**

apps/openassessment/xblock/studio_mixin.py

@@ -32,8 +32,7 @@ class StudioMixin(object):
         """
         rendered_template = get_template('openassessmentblock/oa_edit.html').render(Context({}))
         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/src/oa_edit.js"))
+        frag.add_javascript(pkg_resources.resource_string(__name__, "static/js/openassessment.min.js"))
         frag.initialize_js('OpenAssessmentEditor')
         return frag
 
@@ -113,4 +112,4 @@ class StudioMixin(object):
         return {
             'success': True, 'msg': u'',
             'is_released': self.is_released()
-        }
\ No newline at end of file
+        }