From 8f12fdf6eb74b9616bf7e7da32bde31a83b107af Mon Sep 17 00:00:00 2001
From: Waheed Ahmed <waheed.ahmed@arbisoft.com>
Date: Thu, 20 Aug 2015 20:19:50 +0500
Subject: [PATCH] Fixed duration not display on youtube player. TNL-3056

---
 common/lib/xmodule/xmodule/js/js_test.yml             |  1 +
 common/lib/xmodule/xmodule/js/spec/main_requirejs.js  | 11 +++++++++++
 .../lib/xmodule/xmodule/js/src/video/01_initialize.js |  7 +++----
 lms/envs/common.py                                    |  1 +
 lms/static/lms/js/require-config.js                   |  5 ++++-
 5 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 common/lib/xmodule/xmodule/js/spec/main_requirejs.js

diff --git a/common/lib/xmodule/xmodule/js/js_test.yml b/common/lib/xmodule/xmodule/js/js_test.yml
index 6c72d4b649..d7816e44bc 100644
--- a/common/lib/xmodule/xmodule/js/js_test.yml
+++ b/common/lib/xmodule/xmodule/js/js_test.yml
@@ -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:
diff --git a/common/lib/xmodule/xmodule/js/spec/main_requirejs.js b/common/lib/xmodule/xmodule/js/spec/main_requirejs.js
new file mode 100644
index 0000000000..405c92801d
--- /dev/null
+++ b/common/lib/xmodule/xmodule/js/spec/main_requirejs.js
@@ -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);
diff --git a/common/lib/xmodule/xmodule/js/src/video/01_initialize.js b/common/lib/xmodule/xmodule/js/src/video/01_initialize.js
index cc43a23356..75b6602905 100644
--- a/common/lib/xmodule/xmodule/js/src/video/01_initialize.js
+++ b/common/lib/xmodule/xmodule/js/src/video/01_initialize.js
@@ -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
      *
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 86d0a47ce7..73dfd5f03c 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -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',
     },
diff --git a/lms/static/lms/js/require-config.js b/lms/static/lms/js/require-config.js
index a40ac7f362..04fd904825 100644
--- a/lms/static/lms/js/require-config.js
+++ b/lms/static/lms/js/require-config.js
@@ -185,8 +185,11 @@
             },
             "tinymce": {
                 exports: "tinymce"
-            }
+            },
             // End of needed by OVA
+            "moment": {
+                exports: "moment"
+            }
         }
     });
 }).call(this, require || RequireJS.require, define || RequireJS.define);