Require and Webpack can eat the same files

This commit is contained in:
Brian Jacobel
2017-05-08 17:07:35 -04:00
parent 480a3ca60b
commit 9c6d94ada0
10 changed files with 264 additions and 251 deletions

View File

@@ -8,7 +8,7 @@
'underscore.string',
'backbone',
'gettext',
'../../../../common/static/common/js/components/views/feedback_notification',
'../../common/js/components/views/feedback_notification',
'jquery.cookie'
], function(domReady, $, str, Backbone, gettext, NotificationView) {
var main, sendJSON;

View File

@@ -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
}
}
});