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
8f12fdf6
Commit
8f12fdf6
authored
Aug 20, 2015
by
Waheed Ahmed
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed duration not display on youtube player.
TNL-3056
parent
f80720d0
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
5 deletions
+20
-5
common/lib/xmodule/xmodule/js/js_test.yml
+1
-0
common/lib/xmodule/xmodule/js/spec/main_requirejs.js
+11
-0
common/lib/xmodule/xmodule/js/src/video/01_initialize.js
+3
-4
lms/envs/common.py
+1
-0
lms/static/lms/js/require-config.js
+4
-1
No files found.
common/lib/xmodule/xmodule/js/js_test.yml
View file @
8f12fdf6
...
...
@@ -60,6 +60,7 @@ lib_paths:
-
public/js/split_test_staff.js
-
common_static/js/src/accessibility_tools.js
-
common_static/js/vendor/moment.min.js
-
spec/main_requirejs.js
# Paths to spec (test) JavaScript files
spec_paths
:
...
...
common/lib/xmodule/xmodule/js/spec/main_requirejs.js
0 → 100644
View file @
8f12fdf6
(
function
(
requirejs
)
{
requirejs
.
config
({
paths
:
{
"moment"
:
"xmodule/include/common_static/js/vendor/moment.min"
},
"moment"
:
{
exports
:
"moment"
}
});
}).
call
(
this
,
RequireJS
.
requirejs
);
common/lib/xmodule/xmodule/js/src/video/01_initialize.js
View file @
8f12fdf6
...
...
@@ -14,10 +14,9 @@
define
(
'video/01_initialize.js'
,
[
'video/03_video_player.js'
,
'video/00_i18n.js'
],
function
(
VideoPlayer
,
i18n
)
{
var
moment
=
window
.
moment
;
[
'video/03_video_player.js'
,
'video/00_i18n.js'
,
'moment'
],
function
(
VideoPlayer
,
i18n
,
moment
)
{
var
moment
=
moment
||
window
.
moment
;
/**
* @function
*
...
...
lms/envs/common.py
View file @
8f12fdf6
...
...
@@ -1515,6 +1515,7 @@ PIPELINE_JS = {
'source_filenames'
:
[
'js/xblock/core.js'
]
+
sorted
(
common_js
)
+
sorted
(
project_js
)
+
base_application_js
+
[
'js/sticky_filter.js'
,
'js/query-params.js'
,
'js/vendor/moment.min.js'
,
],
'output_filename'
:
'js/lms-application.js'
,
},
...
...
lms/static/lms/js/require-config.js
View file @
8f12fdf6
...
...
@@ -185,8 +185,11 @@
},
"tinymce"
:
{
exports
:
"tinymce"
}
}
,
// End of needed by OVA
"moment"
:
{
exports
:
"moment"
}
}
});
}).
call
(
this
,
require
||
RequireJS
.
require
,
define
||
RequireJS
.
define
);
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