Resolving the moment.js issues

TNL-1958

cms/static/cms/js/require-config.js

@@ -40,6 +40,8 @@ require.config({
         "jquery.immediateDescendents": "coffee/src/jquery.immediateDescendents",
         "datepair": "js/vendor/timepicker/datepair",
         "date": "js/vendor/date",
+        "text": 'js/vendor/requirejs/text',
+        "moment": "js/vendor/moment-with-locales.min",
         "moment": "js/vendor/moment.min",
         "moment-with-locales": "js/vendor/moment-with-locales.min",
         "text": 'js/vendor/requirejs/text',

common/lib/xmodule/xmodule/public/js/vertical_student_view.js

 /* JavaScript for Vertical Student View. */
 window.VerticalStudentView = function (runtime, element) {
 
+    'use strict';
     RequireJS.require(['js/bookmarks/views/bookmark_button'], function (BookmarkButton) {
         var $element = $(element);
         var $bookmarkButtonElement = $element.find('.bookmark-button');

lms/static/js/bookmarks/collections/bookmarks.js

 ;(function (define) {
-
+    'use strict';
     define(['backbone', 'js/bookmarks/models/bookmark'],
         function (Backbone, BookmarkModel) {
-        'use strict';
+
 
         return Backbone.Collection.extend({
             model: BookmarkModel,

lms/static/js/bookmarks/models/bookmark.js

 ;(function (define) {
-
+    'use strict';
     define(['backbone'], function (Backbone) {
-        'use strict';
 
         return Backbone.Model.extend({
             idAttribute: 'id',

lms/static/js/spec/main.js

@@ -67,6 +67,7 @@
             'mathjax_delay_renderer': 'coffee/src/mathjax_delay_renderer',
             'MathJaxProcessor': 'coffee/src/customwmd',
             'moment': 'xmodule_js/common_static/js/src/moment',
+            'moment': 'xmodule_js/common_static/js/vendor/moment-with-locales.min',
 
             // Manually specify LMS files that are not converted to RequireJS
             'history': 'js/vendor/history',
@@ -74,6 +75,7 @@
             'js/vendor/jquery.qubit': 'js/vendor/jquery.qubit',
             'js/utils/navigation': 'js/utils/navigation',
 
+
             // Backbone classes loaded explicitly until they are converted to use RequireJS
             'js/models/notification': 'js/models/notification',
             'js/views/file_uploader': 'js/views/file_uploader',

lms/static/js_test.yml

@@ -62,6 +62,7 @@ lib_paths:
     - xmodule_js/common_static/js/vendor/edxnotes/annotator-full.min.js
     - xmodule_js/common_static/js/test/i18n.js
     - xmodule_js/common_static/js/vendor/date.js
+    - xmodule_js/common_static/js/vendor/moment-with-locales.min.js
     - xmodule_js/common_static/js/vendor/moment.min.js
     - xmodule_js/common_static/js/vendor/moment-with-locales.min.js
     - xmodule_js/common_static/common/js/utils/edx.utils.validate.js