Skip to content

E
edx-platform
Commit b74c5429 by Don Mitchell
Options

Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into bug/dhm/dec12

parents 598922b4 c407012f
Showing with 7 additions and 2 deletions
common/lib/xmodule/xmodule/video_module.py
...@@ -22,7 +22,8 @@ class VideoModule(XModule): ...@@ -22,7 +22,8 @@ class VideoModule(XModule):
resource_string(__name__, 'js/src/video/display.coffee')] + resource_string(__name__, 'js/src/video/display.coffee')] +
[resource_string(__name__, 'js/src/video/display/' + filename) [resource_string(__name__, 'js/src/video/display/' + filename)
for filename for filename
in sorted(resource_listdir(__name__, 'js/src/video/display'))]} in sorted(resource_listdir(__name__, 'js/src/video/display'))
if filename.endswith('.coffee')]}
css = {'scss': [resource_string(__name__, 'css/video/display.scss')]} css = {'scss': [resource_string(__name__, 'css/video/display.scss')]}
js_module_name = "Video" js_module_name = "Video"
......
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