From f7da1ba62107f45f87064a132785f3d45bf0e087 Mon Sep 17 00:00:00 2001
From: Calen Pennington <cale@edx.org>
Date: Wed, 14 Feb 2018 13:13:29 -0500
Subject: [PATCH] Use conditional blocks for webpack specific code edits

---
 .../common/js/components/utils/view_utils.js      | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/common/static/common/js/components/utils/view_utils.js b/common/static/common/js/components/utils/view_utils.js
index fd48b835bf..13a0d8b0f8 100644
--- 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,6 +267,7 @@
              */
             loadJavaScript = function(url) {
                 var deferred = $.Deferred();
+                /* RequireJS */
                 require([url],
                     function() {
                         deferred.resolve();
@@ -266,6 +275,12 @@
                     function() {
                         deferred.reject();
                     });
+                /* End RequireJS */
+                /* Webpack
+                $script(url, url, function () {
+                    deferred.resolve();
+                });
+                /* End Webpack */
                 return deferred.promise();
             };