Tweaked discussion xblocks to get rid of local overrides

common/lib/xblock/discussion/discussion_forum/static/js/discussion_course.js

 var $$course_id = "{{course_id}}";
 
 function DiscussionCourseBlock(runtime, element) {
-  var el = $(element).find('section.discussion');
+    var el = $(element).find('section.discussion');
 
-  var testUrl = runtime.handlerUrl(element, 'test');
-  if (testUrl.match(/^(http|https):\/\//)) {
-    var hostname = testUrl.match(/^(.*:\/\/[a-z0-9:\-.]+)\//)[1];
-    DiscussionUtil.setBaseUrl(hostname);
-  }
+    var testUrl = runtime.handlerUrl(element, 'test');
+    if (testUrl.match(/^(http|https):\/\//)) {
+        var hostname = testUrl.match(/^(.*:\/\/[a-z0-9:\-.]+)\//)[1];
+        DiscussionUtil.setBaseUrl(hostname);
+    }
 
-  if (runtime.local_overrides && runtime.local_overrides.discussion) {
-      runtime.local_overrides.discussion(element, DiscussionUtil);
-  }
-
-  DiscussionApp.start(el);
+    DiscussionUtil.force_async = true;
+    DiscussionApp.start(el);
 }

common/lib/xblock/discussion/discussion_forum/static/js/discussion_inline.js

 var $$course_id = "{{course_id}}";
 
 function DiscussionInlineBlock(runtime, element) {
-  var el = $(element).find('.discussion-module');
+    var el = $(element).find('.discussion-module');
 
-  var testUrl = runtime.handlerUrl(element, 'test');
-  if (testUrl.match(/^(http|https):\/\//)) {
-    var hostname = testUrl.match(/^(.*:\/\/[a-z0-9:\-.]+)\//)[1];
-    DiscussionUtil.setBaseUrl(hostname);
-  }
+    var testUrl = runtime.handlerUrl(element, 'test');
+    if (testUrl.match(/^(http|https):\/\//)) {
+        var hostname = testUrl.match(/^(.*:\/\/[a-z0-9:\-.]+)\//)[1];
+        DiscussionUtil.setBaseUrl(hostname);
+    }
 
-  if (runtime.local_overrides && runtime.local_overrides.discussion) {
-      runtime.local_overrides.discussion(element, DiscussionUtil);
-  }
-
-  new DiscussionModuleView({ el: el });
+    DiscussionUtil.force_async = true;
+    new DiscussionModuleView({ el: el });
 }

common/static/coffee/src/discussion/main.coffee

@@ -16,6 +16,9 @@ if Backbone?
       Content.loadContentInfos(content_info)
       discussion = new Discussion(threads, {pages: thread_pages, sort: sort_preference})
       course_settings = new DiscussionCourseSettings(element.data("course-settings"))
+      if Backbone.History.started
+        # TODO: hardcoded route - replace with relative path based on current URL and existing history.root
+        DiscussionUtil.route_prefix = "courses/#{$$course_id}/discussion"
       new DiscussionRouter({discussion: discussion, course_settings: course_settings})
       if !Backbone.History.started
         Backbone.history.start({pushState: true, root: "/courses/#{$$course_id}/discussion/forum/"})