From 2d7f1b73d7d5b2d68ffbd003b3c111563d543da9 Mon Sep 17 00:00:00 2001 From: Chris Dodge Date: Tue, 13 Nov 2012 13:27:03 -0500 Subject: [PATCH] consolidate logic to compute caption path to server-side, we don't need to do this client-side --- .../xmodule/js/src/video/display/video_caption.coffee | 5 +---- .../xmodule/xmodule/js/src/video/display/video_player.coffee | 1 - common/lib/xmodule/xmodule/video_module.py | 5 ++++- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/common/lib/xmodule/xmodule/js/src/video/display/video_caption.coffee b/common/lib/xmodule/xmodule/js/src/video/display/video_caption.coffee index 706971409b..20d388f6c0 100644 --- a/common/lib/xmodule/xmodule/js/src/video/display/video_caption.coffee +++ b/common/lib/xmodule/xmodule/js/src/video/display/video_caption.coffee @@ -10,10 +10,7 @@ class @VideoCaption extends Subview .bind('DOMMouseScroll', @onMovement) captionURL: -> - if @captionAssetPath != '' - "#{@captionAssetPath}/#{@youtubeId}.srt.sjson" - else - "/static/#{@captionDataDir}/subs/#{@youtubeId}.srt.sjson" + "#{@captionAssetPath}/#{@youtubeId}.srt.sjson" render: -> # TODO: make it so you can have a video with no captions. diff --git a/common/lib/xmodule/xmodule/js/src/video/display/video_player.coffee b/common/lib/xmodule/xmodule/js/src/video/display/video_player.coffee index 2f2f327ffc..b7c5bd8a89 100644 --- a/common/lib/xmodule/xmodule/js/src/video/display/video_player.coffee +++ b/common/lib/xmodule/xmodule/js/src/video/display/video_player.coffee @@ -31,7 +31,6 @@ class @VideoPlayer extends Subview el: @el youtubeId: @video.youtubeId('1.0') currentSpeed: @currentSpeed() - captionDataDir: @video.caption_data_dir captionAssetPath: @video.caption_asset_path unless onTouchBasedDevice() @volumeControl = new VideoVolumeControl el: @$('.secondary-controls') diff --git a/common/lib/xmodule/xmodule/video_module.py b/common/lib/xmodule/xmodule/video_module.py index 5e0639a883..30e385f284 100644 --- a/common/lib/xmodule/xmodule/video_module.py +++ b/common/lib/xmodule/xmodule/video_module.py @@ -96,9 +96,12 @@ class VideoModule(XModule): return self.youtube def get_html(self): - caption_asset_path = '' if isinstance(modulestore(), MongoModuleStore) : caption_asset_path = StaticContent.get_base_url_path_for_course_assets(self.location) + else: + # VS[compat] + # cdodge: filesystem static content support. + caption_asset_path = "/static/{0}/subs".format(self.metadata['data_dir']) return self.system.render_template('video.html', { 'streams': self.video_list(),