Use conditional blocks for webpack specific code edits

ucsd-ets · May 29, 2018 · f7da1ba · f7da1ba
1 parent 8a2201d
commit f7da1ba
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/common/static/common/js/components/utils/view_utils.js b/common/static/common/js/components/utils/view_utils.js
@@ -4,9 +4,17 @@
 (function(define, require) {
     'use strict';
 
+    /* RequireJS */
     define(['jquery', 'underscore', 'gettext', 'common/js/components/views/feedback_notification',
         'common/js/components/views/feedback_prompt'],
         function($, _, gettext, NotificationView, PromptView) {
+    /* End RequireJS */
+    /* Webpack
+    define(['jquery', 'underscore', 'gettext', 'common/js/components/views/feedback_notification',
+        'common/js/components/views/feedback_prompt', 'scriptjs'],
+        function($, _, gettext, NotificationView, PromptView, $script) {
+    /* End Webpack */
+
             var toggleExpandCollapse, showLoadingIndicator, hideLoadingIndicator, confirmThenRunOperation,
                 runOperationShowingMessage, withDisabledElement, disableElementWhileRunning,
                 getScrollOffset, setScrollOffset, setScrollTop, redirect, reload, hasChangedAttributes,
@@ -259,13 +267,20 @@
              */
             loadJavaScript = function(url) {
                 var deferred = $.Deferred();
+                /* RequireJS */
                 require([url],
                     function() {
                         deferred.resolve();
                     },
                     function() {
                         deferred.reject();
                     });
+                /* End RequireJS */
+                /* Webpack
+                $script(url, url, function () {
+                    deferred.resolve();
+                });
+                /* End Webpack */
                 return deferred.promise();
             };