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
e6f16873
Commit
e6f16873
authored
Feb 13, 2013
by
Vasyl Nakvasiuk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rm `videoalpha_list` method
parent
42b332ab
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
6 deletions
+3
-6
common/lib/xmodule/xmodule/videoalpha_module.py
+2
-5
lms/templates/videoalpha.html
+1
-1
No files found.
common/lib/xmodule/xmodule/videoalpha_module.py
View file @
e6f16873
...
...
@@ -39,7 +39,7 @@ class VideoAlphaModule(XModule):
XModule
.
__init__
(
self
,
system
,
location
,
definition
,
descriptor
,
instance_state
,
shared_state
,
**
kwargs
)
xmltree
=
etree
.
fromstring
(
self
.
definition
[
'data'
])
self
.
youtube
=
xmltree
.
get
(
'youtube'
)
self
.
youtube
_streams
=
xmltree
.
get
(
'youtube'
)
self
.
sub
=
xmltree
.
get
(
'sub'
)
self
.
position
=
0
self
.
show_captions
=
xmltree
.
get
(
'show_captions'
,
'true'
)
...
...
@@ -115,9 +115,6 @@ class VideoAlphaModule(XModule):
#log.debug(u"STATE POSITION {0}".format(self.position))
return
json
.
dumps
({
'position'
:
self
.
position
})
def
videoalpha_list
(
self
):
return
self
.
youtube
def
get_html
(
self
):
if
isinstance
(
modulestore
(),
MongoModuleStore
):
caption_asset_path
=
StaticContent
.
get_base_url_path_for_course_assets
(
self
.
location
)
+
'/subs_'
...
...
@@ -127,7 +124,7 @@ class VideoAlphaModule(XModule):
caption_asset_path
=
"/static/{0}/subs/"
.
format
(
self
.
metadata
[
'data_dir'
])
return
self
.
system
.
render_template
(
'videoalpha.html'
,
{
'
streams'
:
self
.
videoalpha_list
()
,
'
youtube_streams'
:
self
.
youtube_streams
,
'id'
:
self
.
location
.
html_id
(),
'sub'
:
self
.
sub
,
'sources'
:
self
.
sources
,
...
...
lms/templates/videoalpha.html
View file @
e6f16873
...
...
@@ -8,7 +8,7 @@
<div
id=
"video_${id}"
class=
"video"
data-streams=
"${streams}"
data-streams=
"${
youtube_
streams}"
${'
data-sub=
"{}"
'.
format
(
sub
)
if
sub
else
''}
${'
data-mp4-source=
"{}"
'.
format
(
sources
.
get
('
mp4
'))
if
sources
.
get
('
mp4
')
else
''}
${'
data-webm-source=
"{}"
'.
format
(
sources
.
get
('
webm
'))
if
sources
.
get
('
webm
')
else
''}
...
...
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