Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
98ed7384
Commit
98ed7384
authored
Jun 13, 2012
by
Prem Sichanugrist
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make sure we don't show volume control on iOS
parent
7924e5c8
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
5 deletions
+31
-5
lms/static/coffee/spec/helper.coffee
+3
-2
lms/static/coffee/spec/modules/video/video_player_spec.coffee
+27
-2
lms/static/coffee/src/modules/video/video_player.coffee
+1
-1
No files found.
lms/static/coffee/spec/helper.coffee
View file @
98ed7384
...
...
@@ -33,14 +33,14 @@ jasmine.stubYoutubePlayer = ->
'getCurrentTime'
,
'getPlayerState'
,
'getVolume'
,
'setVolume'
,
'loadVideoById'
,
'playVideo'
,
'pauseVideo'
,
'seekTo'
]
jasmine
.
stubVideoPlayer
=
(
context
,
enableParts
)
->
jasmine
.
stubVideoPlayer
=
(
context
,
enableParts
,
createPlayer
=
true
)
->
enableParts
=
[
enableParts
]
unless
$
.
isArray
(
enableParts
)
suite
=
context
.
suite
currentPartName
=
suite
.
description
while
suite
=
suite
.
parentSuite
enableParts
.
push
currentPartName
for
part
in
[
'VideoCaption'
,
'VideoSpeedControl'
,
'VideoProgressSlider'
]
for
part
in
[
'VideoCaption'
,
'VideoSpeedControl'
,
'Video
VolumeControl'
,
'Video
ProgressSlider'
]
unless
$
.
inArray
(
part
,
enableParts
)
>=
0
spyOn
window
,
part
...
...
@@ -49,6 +49,7 @@ jasmine.stubVideoPlayer = (context, enableParts) ->
YT
.
Player
=
undefined
context
.
video
=
new
Video
'example'
,
'.75:abc123,1.0:def456'
jasmine
.
stubYoutubePlayer
()
if
createPlayer
return
new
VideoPlayer
context
.
video
spyOn
(
window
,
'onunload'
)
...
...
lms/static/coffee/spec/modules/video/video_player_spec.coffee
View file @
98ed7384
describe
'VideoPlayer'
,
->
beforeEach
->
jasmine
.
stubVideoPlayer
@
jasmine
.
stubVideoPlayer
@
,
[],
false
afterEach
->
YT
.
Player
=
undefined
...
...
@@ -11,7 +11,10 @@ describe 'VideoPlayer', ->
spyOn
YT
,
'Player'
$
.
fn
.
qtip
.
andCallFake
->
$
(
this
).
data
(
'qtip'
,
true
)
$
(
'.video'
).
append
$
(
'<div class="hide-subtitles" />'
)
$
(
'.video'
).
append
$
(
'<div class="add-fullscreen" /><div class="hide-subtitles" />'
)
describe
'always'
,
->
beforeEach
->
@
player
=
new
VideoPlayer
@
video
it
'instanticate current time to zero'
,
->
...
...
@@ -67,13 +70,35 @@ describe 'VideoPlayer', ->
expect
(
$
(
document
)).
toHandleWith
'keyup'
,
@
player
.
bindExitFullScreen
it
'bind to fullscreen switching button'
,
->
console
.
debug
$
(
'.add-fullscreen'
)
expect
(
$
(
'.add-fullscreen'
)).
toHandleWith
'click'
,
@
player
.
toggleFullScreen
describe
'when not on a touch based device'
,
->
beforeEach
->
spyOn
(
window
,
'onTouchBasedDevice'
).
andReturn
false
$
(
'.add-fullscreen, .hide-subtitles'
).
removeData
'qtip'
@
player
=
new
VideoPlayer
@
video
it
'add the tooltip to fullscreen and subtitle button'
,
->
expect
(
$
(
'.add-fullscreen'
)).
toHaveData
'qtip'
expect
(
$
(
'.hide-subtitles'
)).
toHaveData
'qtip'
it
'create video volume control'
,
->
expect
(
window
.
VideoVolumeControl
).
toHaveBeenCalledWith
@
player
describe
'when on a touch based device'
,
->
beforeEach
->
spyOn
(
window
,
'onTouchBasedDevice'
).
andReturn
true
$
(
'.add-fullscreen, .hide-subtitles'
).
removeData
'qtip'
@
player
=
new
VideoPlayer
@
video
it
'does not add the tooltip to fullscreen and subtitle button'
,
->
expect
(
$
(
'.add-fullscreen'
)).
not
.
toHaveData
'qtip'
expect
(
$
(
'.hide-subtitles'
)).
not
.
toHaveData
'qtip'
it
'does not create video volume control'
,
->
expect
(
window
.
VideoVolumeControl
).
not
.
toHaveBeenCalled
()
describe
'onReady'
,
->
beforeEach
->
@
video
.
embed
()
...
...
lms/static/coffee/src/modules/video/video_player.coffee
View file @
98ed7384
...
...
@@ -30,7 +30,7 @@ class @VideoPlayer
render
:
->
new
VideoControl
@
new
VideoCaption
@
,
@
video
.
youtubeId
(
'1.0'
)
new
VideoVolumeControl
@
new
VideoVolumeControl
@
unless
onTouchBasedDevice
()
new
VideoSpeedControl
@
,
@
video
.
speeds
new
VideoProgressSlider
@
@
player
=
new
YT
.
Player
@
video
.
id
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment