Optimize finish_auth_factory.

TNL-2602

lms/envs/common.py

@@ -1275,9 +1275,6 @@ student_account_js = [
     'js/src/accessibility_tools.js',
     'js/src/ie_shim.js',
     'js/src/string_utils.js',
-    'js/student_account/enrollment.js',
-    'js/student_account/emailoptin.js',
-    'js/student_account/shoppingcart.js',
     'js/student_account/models/LoginModel.js',
     'js/student_account/models/RegisterModel.js',
     'js/student_account/models/PasswordResetModel.js',

lms/static/js/spec/main.js

@@ -373,18 +373,6 @@
                     'js/models/notification', 'jquery.fileupload'
                 ]
             },
-            'js/student_account/enrollment': {
-                exports: 'edx.student.account.EnrollmentInterface',
-                deps: ['jquery', 'jquery.cookie']
-            },
-            'js/student_account/emailoptin': {
-                exports: 'edx.student.account.EmailOptInInterface',
-                deps: ['jquery', 'jquery.cookie']
-            },
-            'js/student_account/shoppingcart': {
-                exports: 'edx.student.account.ShoppingCartInterface',
-                deps: ['jquery', 'jquery.cookie', 'underscore']
-            },
             // Student account registration/login
             // Loaded explicitly until these are converted to RequireJS
             'js/student_account/views/FormView': {

lms/static/js/spec/student_account/emailoptin_spec.js

@@ -2,7 +2,7 @@ define(['common/js/spec_helpers/ajax_helpers', 'js/student_account/emailoptin'],
     function( AjaxHelpers, EmailOptInInterface ) {
         'use strict';
 
-        describe( 'edx.student.account.EmailOptInInterface', function() {
+        describe( 'EmailOptInInterface', function() {
 
             var COURSE_KEY = 'edX/DemoX/Fall',
                 EMAIL_OPT_IN = 'True',

lms/static/js/spec/student_account/enrollment_spec.js

@@ -2,7 +2,7 @@ define(['common/js/spec_helpers/ajax_helpers', 'js/student_account/enrollment'],
     function( AjaxHelpers, EnrollmentInterface ) {
         'use strict';
 
-        describe( 'edx.student.account.EnrollmentInterface', function() {
+        describe( 'EnrollmentInterface', function() {
 
             var COURSE_KEY = 'edX/DemoX/Fall',
                 ENROLL_URL = '/api/commerce/v0/baskets/',

lms/static/js/spec/student_account/shoppingcart_spec.js

@@ -2,7 +2,7 @@ define(['common/js/spec_helpers/ajax_helpers', 'js/student_account/shoppingcart'
     function(AjaxHelpers, ShoppingCartInterface) {
         'use strict';
 
-        describe( 'edx.student.account.ShoppingCartInterface', function() {
+        describe( 'ShoppingCartInterface', function() {
 
             var COURSE_KEY = "edX/DemoX/Fall",
                 ADD_COURSE_URL = "/shoppingcart/add/course/edX/DemoX/Fall/",

lms/static/js/student_account/emailoptin.js

-var edx = edx || {};
-
-(function($) {
+;(function (define) {
     'use strict';
+    define(['jquery', 'jquery.cookie'], function($) {
 
-    edx.student = edx.student || {};
-    edx.student.account = edx.student.account || {};
-
-    edx.student.account.EmailOptInInterface = {
+        var EmailOptInInterface = {
 
             urls: {
                 emailOptInUrl: '/user_api/v1/preferences/email_opt_in/'
@@ -31,4 +27,7 @@ var edx = edx || {};
                 });
             }
         };
-})(jQuery);
+
+        return EmailOptInInterface;
+    });
+}).call(this, define || RequireJS.define);

lms/static/js/student_account/enrollment.js

-var edx = edx || {};
-
-(function($) {
+;(function (define) {
     'use strict';
+    define(['jquery', 'jquery.cookie'], function($) {
 
-    edx.student = edx.student || {};
-    edx.student.account = edx.student.account || {};
-
-    edx.student.account.EnrollmentInterface = {
+        var EnrollmentInterface = {
 
             urls: {
                 baskets: '/api/commerce/v0/baskets/',
@@ -32,8 +28,7 @@ var edx = edx || {};
                     data: data,
                     headers: this.headers,
                     context: this
-            })
-            .fail(function( jqXHR ) {
+                }).fail(function( jqXHR ) {
                     var responseData = JSON.parse(jqXHR.responseText);
                     if ( jqXHR.status === 403 && responseData.user_message_url ) {
                         // Check if we've been blocked from the course
@@ -47,8 +42,7 @@ var edx = edx || {};
                             this.redirect( redirectUrl );
                         }
                     }
-            })
-            .done(function() {
+                }).done(function() {
                     // If we successfully enrolled, redirect the user
                     // to the next page (usually the student dashboard or payment flow)
                     if ( redirectUrl ) {
@@ -65,4 +59,7 @@ var edx = edx || {};
                 window.location.href = url;
             }
         };
-})(jQuery);
+
+        return EnrollmentInterface;
+    });
+}).call(this, define || RequireJS.define);

lms/static/js/student_account/shoppingcart.js

 /**
-* Use the shopping cart to purchase courses.
-*/
-
-var edx = edx || {};
-
-(function($) {
+ * Use the shopping cart to purchase courses.
+ */
+;(function (define) {
     'use strict';
+    define(['jquery', 'jquery.cookie'], function($) {
 
-    edx.student = edx.student || {};
-    edx.student.account = edx.student.account || {};
-
-    edx.student.account.ShoppingCartInterface = {
-
+        var ShoppingCartInterface = {
             urls: {
                 viewCart: "/shoppingcart/",
                 addCourse: "/shoppingcart/add/course/"
@@ -46,4 +40,6 @@ var edx = edx || {};
             }
         };
 
-})(jQuery);
+        return ShoppingCartInterface;
+    });
+}).call(this, define || RequireJS.define);

lms/static/js/student_account/views/FinishAuthView.js

@@ -26,18 +26,14 @@
 ;(function (define, undefined) {
     'use strict';
     define([
+        'jquery',
         'underscore',
         'backbone',
         'gettext',
         'js/student_account/emailoptin',
         'js/student_account/enrollment',
         'js/student_account/shoppingcart'
-    ], function (_, Backbone, gettext, emailOptInInterface, enrollmentInterface, shoppingCartInterface) {
-        // These are not yet converted to requireJS:
-        var edx = window.edx || {};
-        emailOptInInterface = emailOptInInterface || edx.student.account.EmailOptInInterface;
-        enrollmentInterface = enrollmentInterface || edx.student.account.EnrollmentInterface;
-        shoppingCartInterface = shoppingCartInterface || edx.student.account.ShoppingCartInterface;
+    ], function ($, _, Backbone, gettext, emailOptInInterface, enrollmentInterface, shoppingCartInterface) {
 
         var FinishAuthView = Backbone.View.extend({
             el: '#finish-auth-status',

lms/static/js/student_account/views/finish_auth_factory.js

+(function (define) {
+    'use strict';
+    define("js/student_account/views/finish_auth_factory",
+        ['jquery', 'underscore', 'backbone', 'js/student_account/views/FinishAuthView', 'utility'],
+        function ($, _, Backbone, FinishAuthView) {
+            return function() {
+                var view = new FinishAuthView({});
+                view.render();
+            };
+        }
+    );
+}).call(this, define || RequireJS.define);

lms/static/lms/js/build.js

@@ -18,9 +18,10 @@
          * done.
          */
         modules: getModulesList([
-            'teams/js/teams_tab_factory',
+            'js/student_account/views/account_settings_factory',
+            'js/student_account/views/finish_auth_factory',
             'js/student_profile/views/learner_profile_factory',
-            'js/student_account/views/account_settings_factory'
+            'teams/js/teams_tab_factory'
         ]),
 
         /**

lms/templates/student_account/finish_auth.html

@@ -5,32 +5,9 @@
 <%block name="pagetitle">${_("Please Wait")}</%block>
 
 <%block name="headextra">
-
-    <script>
-        (function (require, define) {
-            'use strict';
-            define("js/student_account/views/finish_auth_factory",
-                [
-                    'jquery', 'underscore', 'backbone',
-                    'js/student_account/views/FinishAuthView'
-                ],
-                function ($, _, Backbone, FinishAuthView) {
-                    return function() {
-                        var view = new FinishAuthView({});
-                        view.render();
-                    };
-                }
-            );
-
-            require(["js/student_account/views/finish_auth_factory"],
-                function (factory) {
-                    factory();
-                }
-            );
-
-        }).call(this, require || RequireJS.require, define || RequireJS.define);
-    </script>
-
+<%static:require_module module_name="js/student_account/views/finish_auth_factory" class_name="FinishAuthFactory">
+    FinishAuthFactory();
+</%static:require_module>
 </%block>
 
 <div class="finish-auth">