Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ class @VideoPlayerAlpha extends SubviewAlpha
@video.log 'load_video'
if @video.videoType is 'html5'
@player.setPlaybackRate @video.speed
unless onTouchBasedDevice()
if not onTouchBasedDevice() and $('.video:first').data('autoplay') is 'True'

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rocha Refactored the double negative.

$('.video-load-complete:first').data('video').player.play()

onStateChange: (event) =>
Expand Down
4 changes: 3 additions & 1 deletion common/lib/xmodule/xmodule/videoalpha_module.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from pkg_resources import resource_string, resource_listdir

from django.http import Http404
from django.conf import settings

from xmodule.x_module import XModule
from xmodule.raw_module import RawDescriptor
Expand Down Expand Up @@ -147,7 +148,8 @@ def get_html(self):
'caption_asset_path': caption_asset_path,
'show_captions': self.show_captions,
'start': self.start_time,
'end': self.end_time
'end': self.end_time,
'autoplay': settings.MITX_FEATURES.get('AUTOPLAY_VIDEOS', True)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rocha Removed templates access from settings. made it so that it does not throw an exception if the setting is not defined.

})


Expand Down
6 changes: 6 additions & 0 deletions lms/djangoapps/courseware/features/videoalpha.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Feature: Video Alpha component
As a student, I want to view course videos in LMS.

Scenario: Autoplay is enabled in LMS
Given the course has a Video component
Then when I view the video it has autoplay enabled
36 changes: 36 additions & 0 deletions lms/djangoapps/courseware/features/videoalpha.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
#pylint: disable=C0111
#pylint: disable=W0613
#pylint: disable=W0621

from lettuce import world, step
from lettuce.django import django_url
from common import TEST_COURSE_NAME, TEST_SECTION_NAME, i_am_registered_for_the_course, section_location

############### ACTIONS ####################


@step('when I view the video it has autoplay enabled')
def does_autoplay(step):
assert(world.css_find('.videoalpha')[0]['data-autoplay'] == 'True')


@step('the course has a Video component')
def view_videoalpha(step):
coursename = TEST_COURSE_NAME.replace(' ', '_')
i_am_registered_for_the_course(step, coursename)

# Make sure we have a videoalpha
add_videoalpha_to_course(coursename)
chapter_name = TEST_SECTION_NAME.replace(" ", "_")
section_name = chapter_name
url = django_url('/courses/edx/Test_Course/Test_Course/courseware/%s/%s' %
(chapter_name, section_name))

world.browser.visit(url)


def add_videoalpha_to_course(course):
template_name = 'i4x://edx/templates/videoalpha/default'
world.ItemFactory.create(parent_location=section_location(course),
template=template_name,
display_name='Video Alpha 1')
1 change: 1 addition & 0 deletions lms/templates/videoalpha.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ <h2> ${display_name} </h2>
data-start="${start}"
data-end="${end}"
data-caption-asset-path="${caption_asset_path}"
data-autoplay="${autoplay}"

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rocha The value was moved outside the template.

>
<div class="tc-wrapper">
<article class="video-wrapper">
Expand Down