From 8543043f861cc110e4322ff695daf72068b404e5 Mon Sep 17 00:00:00 2001
From: Peter Fogg <pfogg@edx.org>
Date: Tue, 11 Jun 2013 13:39:15 -0400
Subject: [PATCH] Make video captions respect course author's setting.

---
 common/lib/xmodule/xmodule/js/src/video/display.coffee | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/video/display.coffee b/common/lib/xmodule/xmodule/js/src/video/display.coffee
index aadafbc8d0..2bd39ce91a 100644
--- a/common/lib/xmodule/xmodule/js/src/video/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/video/display.coffee
@@ -5,7 +5,7 @@ class @Video
     @start = @el.data('start')
     @end = @el.data('end')
     @caption_asset_path = @el.data('caption-asset-path')
-    @show_captions = @el.data('show-captions') == "true"
+    @show_captions = !!@el.data('show-captions')
     window.player = null
     @el = $("#video_#{@id}")
     @parseVideos @el.data('streams')
@@ -13,7 +13,7 @@ class @Video
     @parseSpeed()
     $("#video_#{@id}").data('video', this).addClass('video-load-complete')
 
-    @hide_captions = $.cookie('hide_captions') == 'true'
+    @hide_captions = $.cookie('hide_captions') == 'true' or (not @show_captions)
 
     if YT.Player
       @embed()