Commit c29b43d5 by Prem Sichanugrist Committed by Matthew Mongeau

Add video volume control to video player

parent e2613a35
...@@ -433,3 +433,17 @@ describe 'VideoPlayer', -> ...@@ -433,3 +433,17 @@ describe 'VideoPlayer', ->
it 'delegate to the video', -> it 'delegate to the video', ->
expect(@player.currentSpeed()).toEqual '3.0' expect(@player.currentSpeed()).toEqual '3.0'
describe 'volume', ->
beforeEach ->
@player = new VideoPlayer @video
@player.player.getVolume.andReturn 42
describe 'without value', ->
it 'return current volume', ->
expect(@player.volume()).toEqual 42
describe 'with value', ->
it 'set player volume', ->
@player.volume(60)
expect(@player.player.setVolume).toHaveBeenCalledWith(60)
...@@ -150,3 +150,9 @@ class @VideoPlayer extends Subview ...@@ -150,3 +150,9 @@ class @VideoPlayer extends Subview
currentSpeed: -> currentSpeed: ->
@video.speed @video.speed
volume: (value) ->
if value != undefined
@player.setVolume value
else
@player.getVolume()
...@@ -334,9 +334,9 @@ section.course-content { ...@@ -334,9 +334,9 @@ section.course-content {
display: none; display: none;
opacity: 0; opacity: 0;
position: absolute; position: absolute;
width: 45px; width: 35px;
height: 125px; height: 125px;
margin-left: -1px; margin-left: 5px;
z-index: 10; z-index: 10;
.volume-slider { .volume-slider {
...@@ -344,9 +344,6 @@ section.course-content { ...@@ -344,9 +344,6 @@ section.course-content {
border: 0; border: 0;
width: 5px; width: 5px;
margin: 14px auto; margin: 14px auto;
background: #666;
border: 1px solid #000;
@include box-shadow(0 1px 0 #333);
a.ui-slider-handle { a.ui-slider-handle {
background: $mit-red url(../images/slider-handle.png) center center no-repeat; background: $mit-red url(../images/slider-handle.png) center center no-repeat;
...@@ -362,7 +359,7 @@ section.course-content { ...@@ -362,7 +359,7 @@ section.course-content {
} }
.ui-slider-range { .ui-slider-range {
background: #ddd; background: #666;
} }
} }
} }
......
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