Merge pull request #9406 from edx/waheed/tnl3056-fix-duration-not-displaying-for-youtube-player

Fixed duration not display on youtube player.
This commit is contained in:
Waheed Ahmed
2015-09-03 13:12:51 +05:00
5 changed files with 20 additions and 5 deletions

View File

@@ -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:

View File

@@ -0,0 +1,11 @@
(function(requirejs) {
requirejs.config({
paths: {
"moment": "xmodule/include/common_static/js/vendor/moment.min"
},
"moment": {
exports: "moment"
}
});
}).call(this, RequireJS.requirejs);

View File

@@ -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
*

View File

@@ -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',
},

View File

@@ -185,8 +185,11 @@
},
"tinymce": {
exports: "tinymce"
}
},
// End of needed by OVA
"moment": {
exports: "moment"
}
}
});
}).call(this, require || RequireJS.require, define || RequireJS.define);