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 4b265d20c8..b83cda80d6 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 @@ -24,27 +24,13 @@ class @VideoPlayer extends Subview @toggleFullScreen(event) render: -> - @control = new VideoControl el: @$('.video-controls') - @caption = new VideoCaption - el: @el - youtubeId: @video.youtubeId('1.0') - currentSpeed: @currentSpeed() - captionDataDir: @video.caption_data_dir - unless onTouchBasedDevice() - @volumeControl = new VideoVolumeControl el: @$('.secondary-controls') - @speedControl = new VideoSpeedControl el: @$('.secondary-controls'), speeds: @video.speeds, currentSpeed: @currentSpeed() - @progressSlider = new VideoProgressSlider el: @$('.slider') - @player = new YT.Player @video.id, - playerVars: - controls: 0 - wmode: 'transparent' - rel: 0 - showinfo: 0 - enablejsapi: 1 - videoId: @video.youtubeId() - events: - onReady: @onReady - onStateChange: @onStateChange + params = { allowScriptAccess: "always" }; + atts = { id: @videoid }; + youtubeId = @video.youtubeId() + + swfobject.embedSWF("https://www.youtube.com/v/#{youtubeId}?enablejsapi=1&version=3&playerapiid=ytplayer&rel=0&modestbranding=1&showsearch=0&showinfo=0", + @video.id, "425", "356", "9", null, null, params, atts ) + addToolTip: -> @$('.add-fullscreen, .hide-subtitles').qtip diff --git a/lms/envs/common.py b/lms/envs/common.py index 3cfaae940d..f4e007d926 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -443,9 +443,9 @@ courseware_only_js += [ main_vendor_js = [ 'js/vendor/jquery.min.js', 'js/vendor/jquery-ui.min.js', - 'js/vendor/swfobject/swfobject.js', 'js/vendor/jquery.cookie.js', 'js/vendor/jquery.qtip.min.js', + 'js/vendor/swfobject/swfobject.js', ] discussion_js = sorted(glob2.glob(PROJECT_ROOT / 'static/coffee/src/discussion/*.coffee')) diff --git a/lms/templates/video.html b/lms/templates/video.html index bd3ec77fbe..25652e51fa 100644 --- a/lms/templates/video.html +++ b/lms/templates/video.html @@ -2,6 +2,8 @@