Commit 61446b05 by Calen Pennington

Make javascript for video previews work correctly

parent cb6c7640
......@@ -39,6 +39,7 @@ $ ->
$.ajaxSetup
headers : { 'X-CSRFToken': $.cookie 'csrftoken' }
dataType: 'json'
window.onTouchBasedDevice = ->
navigator.userAgent.match /iPhone|iPod|iPad/i
......
......@@ -10,7 +10,7 @@ class CMS.Views.ModuleEdit extends Backbone.View
initialize: ->
@$el.load @model.editUrl(), =>
@model.loadModule(@el)
@$el.find('.preview :first-child').each (idx, previewEl) =>
@$el.find('.preview').children().each (idx, previewEl) =>
@model.loadPreview(previewEl)
save: (event) ->
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -20,6 +20,8 @@
<%include file="widgets/header.html"/>
<script type="text/javascript" src="${static.url('js/vendor/jquery.min.js')}"></script>
<script type="text/javascript" src="${static.url('js/vendor/jquery-ui.min.js')}"></script>
<script type="text/javascript" src="${static.url('js/vendor/jquery.qtip.min.js')}"></script>
<script type="text/javascript" src="${static.url('js/vendor/json2.js')}"></script>
<script type="text/javascript" src="${static.url('js/vendor/underscore-min.js')}"></script>
<script type="text/javascript" src="${static.url('js/vendor/backbone-min.js')}"></script>
......
......@@ -7,7 +7,7 @@ class @Video
@parseVideos $(@element).data('streams')
@fetchMetadata()
@parseSpeed()
$("#video_#{@id}").data('video', this)
$("#video_#{@id}").data('video', this).addClass('video-load-complete')
if YT.Player
@embed()
......
......@@ -54,7 +54,7 @@ class @VideoPlayer extends Subview
onReady: =>
unless onTouchBasedDevice()
$('.course-content .video:first').data('video').player.play()
$('.video-load-complete:first').data('video').player.play()
onStateChange: (event) =>
switch event.data
......
......@@ -15,11 +15,11 @@ class VideoModule(XModule):
icon_class = 'video'
js = {'coffee':
[resource_string(__name__, 'js/src/video/display.coffee')] +
[resource_string(__name__, 'js/src/time.coffee'),
resource_string(__name__, 'js/src/video/display.coffee')] +
[resource_string(__name__, 'js/src/video/display/' + filename)
for filename
in sorted(resource_listdir(__name__, 'js/src/video/display'))
]}
in sorted(resource_listdir(__name__, 'js/src/video/display'))]}
js_module_name = "Video"
def __init__(self, system, location, definition, instance_state=None, shared_state=None, **kwargs):
......
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