Require and Webpack can eat the same files

2017-05-08 17:07:35 -04:00
parent 480a3ca60b
commit 9c6d94ada0
10 changed files with 264 additions and 251 deletions
--- a/cms/static/js/features/import/factories/import.js
+++ b/cms/static/js/features/import/factories/import.js
@@ -116,7 +116,7 @@ define([
                                        Import.reset();
                                        onComplete();

-                                        alert(gettext('Your import has failed.') + '\n\n' + errMsg);
+                                        alert(gettext('Your import has failed.') + '\n\n' + errMsg);  // eslint-disable-line max-len, no-alert
                                    }
                                }
                            });