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
47b1c809
Commit
47b1c809
authored
Sep 13, 2012
by
David Ormsbee
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #686 from MITx/rocha/hotfixes
Reverting to original video player
parents
1597bdf4
5ce16738
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
10 deletions
+26
-10
common/lib/xmodule/xmodule/js/src/video/display.coffee
+5
-1
common/lib/xmodule/xmodule/js/src/video/display/video_player.coffee
+21
-7
lms/templates/video.html
+0
-2
No files found.
common/lib/xmodule/xmodule/js/src/video/display.coffee
View file @
47b1c809
...
...
@@ -33,7 +33,11 @@ class @Video
@
speeds
=
(
$
.
map
@
videos
,
(
url
,
speed
)
->
speed
).
sort
()
setSpeed
:
(
newSpeed
)
->
@
speed
=
'1.0'
if
@
videos
[
newSpeed
]
!=
undefined
@
speed
=
newSpeed
$
.
cookie
(
'video_speed'
,
"
#{
newSpeed
}
"
,
expires
:
3650
,
path
:
'/'
)
else
@
speed
=
'1.0'
embed
:
->
@
player
=
new
VideoPlayer
video
:
this
...
...
common/lib/xmodule/xmodule/js/src/video/display/video_player.coffee
View file @
47b1c809
...
...
@@ -24,13 +24,27 @@ class @VideoPlayer extends Subview
@
toggleFullScreen
(
event
)
render
:
->
params
=
{
allowScriptAccess
:
"always"
};
atts
=
{
id
:
@
videoid
};
youtubeId
=
@
video
.
youtubeId
()
swfobject
.
embedSWF
(
"https://www.youtube.com/v/
#{
youtubeId
}
?enablejsapi=1&version=3&playerapiid=ytplayer&rel=0&modestbranding=1&showsearch=0&showinfo=0"
,
@
video
.
id
,
"425"
,
"356"
,
"9"
,
null
,
null
,
params
,
atts
)
@
control
=
new
VideoControl
el
:
@
$
(
'.video-controls'
)
@
caption
=
new
VideoCaption
el
:
@
el
youtubeId
:
@
video
.
youtubeId
(
'1.0'
)
currentSpeed
:
@
currentSpeed
()
captionDataDir
:
@
video
.
caption_data_dir
unless
onTouchBasedDevice
()
@
volumeControl
=
new
VideoVolumeControl
el
:
@
$
(
'.secondary-controls'
)
@
speedControl
=
new
VideoSpeedControl
el
:
@
$
(
'.secondary-controls'
),
speeds
:
@
video
.
speeds
,
currentSpeed
:
@
currentSpeed
()
@
progressSlider
=
new
VideoProgressSlider
el
:
@
$
(
'.slider'
)
@
player
=
new
YT
.
Player
@
video
.
id
,
playerVars
:
controls
:
0
wmode
:
'transparent'
rel
:
0
showinfo
:
0
enablejsapi
:
1
videoId
:
@
video
.
youtubeId
()
events
:
onReady
:
@
onReady
onStateChange
:
@
onStateChange
addToolTip
:
->
@
$
(
'.add-fullscreen, .hide-subtitles'
).
qtip
...
...
lms/templates/video.html
View file @
47b1c809
...
...
@@ -2,8 +2,6 @@
<h2>
${display_name}
</h2>
% endif
<script
type=
"text/javascript"
src=
"/static/js/vendor/swfobject/swfobject.js"
></script>
<div
id=
"video_${id}"
class=
"video"
data-streams=
"${streams}"
data-caption-data-dir=
"${data_dir}"
data-show-captions=
"${show_captions}"
>
<div
class=
"tc-wrapper"
>
<article
class=
"video-wrapper"
>
...
...
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