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
db213bf3
Commit
db213bf3
authored
May 27, 2014
by
polesye
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BLD-967: Fix regExp.
parent
926ce567
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
78 additions
and
104 deletions
+78
-104
CHANGELOG.rst
+2
-0
cms/static/js/spec/video/transcripts/utils_spec.js
+8
-6
cms/static/js/views/video/transcripts/utils.js
+67
-98
common/lib/xmodule/xmodule/video_module/video_module.py
+1
-0
No files found.
CHANGELOG.rst
View file @
db213bf3
...
...
@@ -5,6 +5,8 @@ These are notable changes in edx-platform. This is a rolling list of changes,
in roughly chronological order, most recent first. Add your entries at or near
the top. Include a label indicating the component affected.
Blades: Fix Youtube regular expression in video player editor. BLD-967.
Blades: Fix displaying transcripts on touch devices. BLD-1033.
Blades: Tolerance expressed in percentage now computes correctly. BLD-522.
...
...
cms/static/js/spec/video/transcripts/utils_spec.js
View file @
db213bf3
define
(
[
"jquery"
,
"underscore"
,
"js/views/video/transcripts/utils"
,
"underscore.string"
,
"xmodule"
,
"jasmine-jquery"
'jquery'
,
'underscore'
,
'js/views/video/transcripts/utils'
,
'underscore.string'
,
'xmodule'
,
'jasmine-jquery'
],
function
(
$
,
_
,
Utils
,
_str
)
{
describe
(
'Transcripts.Utils'
,
function
()
{
'use strict'
;
describe
(
'Transcripts.Utils'
,
function
()
{
var
videoId
=
'OEoXaMPEzfM'
,
ytLinksList
=
(
function
(
id
)
{
var
links
=
[
...
...
@@ -33,6 +34,7 @@ function ($, _, Utils, _str) {
'http://somelink.com/%s.%s'
,
'ftp://somelink.com/%s.%s'
,
'https://somelink.com/%s.%s'
,
'http://cdn.somecdn.net/v/%s.%s'
,
'somelink.com/%s.%s'
,
'%s.%s'
],
...
...
@@ -214,7 +216,7 @@ function ($, _, Utils, _str) {
describe
(
'Method: parseLink'
,
function
()
{
var
resultDataDict
=
{
'html5'
:
{
link
:
html5LinksList
[
'mp4'
]
[
0
],
link
:
html5LinksList
.
mp4
[
0
],
resp
:
{
mode
:
'html5'
,
video
:
html5FileName
,
...
...
@@ -260,5 +262,5 @@ function ($, _, Utils, _str) {
});
});
});
});
});
});
cms/static/js/views/video/transcripts/utils.js
View file @
db213bf3
This diff is collapsed.
Click to expand it.
common/lib/xmodule/xmodule/video_module/video_module.py
View file @
db213bf3
...
...
@@ -37,6 +37,7 @@ from .video_handlers import VideoStudentViewHandlers, VideoStudioViewHandlers
from
urlparse
import
urlparse
def
get_ext
(
filename
):
# Prevent incorrectly parsing urls like 'http://abc.com/path/video.mp4?xxxx'.
path
=
urlparse
(
filename
)
.
path
...
...
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