Merge pull request #7825 from edx/alex/video_bumper
Alex/video bumper
Showing
- cms/djangoapps/models/settings/course_metadata.py 3 additions, 0 deletionscms/djangoapps/models/settings/course_metadata.py
- cms/envs/bok_choy.py 3 additions, 0 deletionscms/envs/bok_choy.py
- cms/envs/common.py 9 additions, 0 deletionscms/envs/common.py
- common/lib/xmodule/xmodule/css/video/accessible_menu.scss 1 addition, 1 deletioncommon/lib/xmodule/xmodule/css/video/accessible_menu.scss
- common/lib/xmodule/xmodule/css/video/display.scss 89 additions, 41 deletionscommon/lib/xmodule/xmodule/css/video/display.scss
- common/lib/xmodule/xmodule/js/fixtures/poster.jpg 0 additions, 0 deletionscommon/lib/xmodule/xmodule/js/fixtures/poster.jpg
- common/lib/xmodule/xmodule/js/fixtures/video.html 3 additions, 42 deletionscommon/lib/xmodule/xmodule/js/fixtures/video.html
- common/lib/xmodule/xmodule/js/fixtures/video_all.html 3 additions, 43 deletionscommon/lib/xmodule/xmodule/js/fixtures/video_all.html
- common/lib/xmodule/xmodule/js/fixtures/video_html5.html 1 addition, 19 deletionscommon/lib/xmodule/xmodule/js/fixtures/video_html5.html
- common/lib/xmodule/xmodule/js/fixtures/video_no_captions.html 1 addition, 16 deletions...on/lib/xmodule/xmodule/js/fixtures/video_no_captions.html
- common/lib/xmodule/xmodule/js/fixtures/video_with_bumper.html 36 additions, 0 deletions...on/lib/xmodule/xmodule/js/fixtures/video_with_bumper.html
- common/lib/xmodule/xmodule/js/fixtures/video_yt_multiple.html 7 additions, 94 deletions...on/lib/xmodule/xmodule/js/fixtures/video_yt_multiple.html
- common/lib/xmodule/xmodule/js/spec/helper.js 6 additions, 4 deletionscommon/lib/xmodule/xmodule/js/spec/helper.js
- common/lib/xmodule/xmodule/js/spec/video/general_spec.js 20 additions, 52 deletionscommon/lib/xmodule/xmodule/js/spec/video/general_spec.js
- common/lib/xmodule/xmodule/js/spec/video/html5_video_spec.js 1 addition, 1 deletioncommon/lib/xmodule/xmodule/js/spec/video/html5_video_spec.js
- common/lib/xmodule/xmodule/js/spec/video/initialize_spec.js 2 additions, 162 deletionscommon/lib/xmodule/xmodule/js/spec/video/initialize_spec.js
- common/lib/xmodule/xmodule/js/spec/video/video_accessible_menu_spec.js 1 addition, 18 deletions...odule/xmodule/js/spec/video/video_accessible_menu_spec.js
- common/lib/xmodule/xmodule/js/spec/video/video_bumper_spec.js 109 additions, 0 deletions...on/lib/xmodule/xmodule/js/spec/video/video_bumper_spec.js
- common/lib/xmodule/xmodule/js/spec/video/video_caption_spec.js 27 additions, 31 deletions...n/lib/xmodule/xmodule/js/spec/video/video_caption_spec.js
- common/lib/xmodule/xmodule/js/spec/video/video_context_menu_spec.js 4 additions, 2 deletions.../xmodule/xmodule/js/spec/video/video_context_menu_spec.js
Loading
Please register or sign in to comment