Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge master

Browse Source
This commit is contained in:
Piotr Mitros
2012-05-31 13:47:50 -04:00
parent 34dc32e5aa 585e4c8d52
commit 97c6a26c2b
81 changed files with 3632 additions and 1657 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
djangoapps/courseware/modules/vertical_module.py
View File

@@ -21,17 +21,8 @@ class Module(XModule):
def get_html(self):
return render_to_string('vert_module.html',{'items':self.contents})
def get_init_js(self):
return self.init_js_text
def get_destroy_js(self):
return self.destroy_js_text
def __init__(self, system, xml, item_id, state=None):
XModule.__init__(self, system, xml, item_id, state)
xmltree=etree.fromstring(xml)
self.contents=[(e.get("name"),self.render_function(e)) \
for e in xmltree]
self.init_js_text="".join([e[1]['init_js'] for e in self.contents if 'init_js' in e[1]])
self.destroy_js_text="".join([e[1]['destroy_js'] for e in self.contents if 'destroy_js' in e[1]])