From 5d6bed863a22ee06305ed3f37dc62cef8c9b21f7 Mon Sep 17 00:00:00 2001 From: Arjun Singh Date: Wed, 29 Aug 2012 16:41:01 -0700 Subject: [PATCH] Fix discussions in xmodules --- common/lib/xmodule/xmodule/discussion_module.py | 6 ++++++ common/lib/xmodule/xmodule/js/src/discussion/display.coffee | 4 ++++ lms/static/coffee/src/discussion/main.coffee | 3 --- 3 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 common/lib/xmodule/xmodule/js/src/discussion/display.coffee diff --git a/common/lib/xmodule/xmodule/discussion_module.py b/common/lib/xmodule/xmodule/discussion_module.py index c029d95098..4bfaeee183 100644 --- a/common/lib/xmodule/xmodule/discussion_module.py +++ b/common/lib/xmodule/xmodule/discussion_module.py @@ -1,4 +1,5 @@ from lxml import etree +from pkg_resources import resource_string, resource_listdir from xmodule.x_module import XModule from xmodule.raw_module import RawDescriptor @@ -6,6 +7,11 @@ from xmodule.raw_module import RawDescriptor import json class DiscussionModule(XModule): + js = {'coffee': + [resource_string(__name__, 'js/src/time.coffee'), + resource_string(__name__, 'js/src/discussion/display.coffee')] + } + js_module_name = "InlineDiscussion" def get_html(self): context = { 'discussion_id': self.discussion_id, diff --git a/common/lib/xmodule/xmodule/js/src/discussion/display.coffee b/common/lib/xmodule/xmodule/js/src/discussion/display.coffee new file mode 100644 index 0000000000..27a67f5aab --- /dev/null +++ b/common/lib/xmodule/xmodule/js/src/discussion/display.coffee @@ -0,0 +1,4 @@ +class @InlineDiscussion + constructor: (element) -> + @el = $(element).find('.discussion-module') + @view = new DiscussionModuleView(el: @el) diff --git a/lms/static/coffee/src/discussion/main.coffee b/lms/static/coffee/src/discussion/main.coffee index 023345c5da..2c6f4090cc 100644 --- a/lms/static/coffee/src/discussion/main.coffee +++ b/lms/static/coffee/src/discussion/main.coffee @@ -3,9 +3,6 @@ $ -> window.$$contents = {} window.$$discussions = {} - $(".discussion-module").each (index, elem) -> - view = new DiscussionModuleView(el: elem) - $("section.discussion").each (index, elem) -> discussionData = DiscussionUtil.getDiscussionData($(elem).attr("_id")) discussion = new Discussion()