allow application.js to require other scripts which start with application*

ae1d69c2 · Mike Greiling · dbcf24c2 · ae1d69c2
Commit ae1d69c2 authored Feb 02, 2017 by Mike Greiling
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

application.js app/assets/javascripts/application.js +1 -1

No files found.
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -55,7 +55,7 @@ requireAll(require.context('./extensions', false, /^\.\/.*\.(js|es6)$/));
 requireAll(require.context('./lib/utils',  false, /^\.\/.*\.(js|es6)$/));
 requireAll(require.context('./u2f',        false, /^\.\/.*\.(js|es6)$/));
 requireAll(require.context('./droplab',    false, /^\.\/.*\.(js|es6)$/));
-requireAll(require.context('.',            false, /^\.\/(?!application).*\.(js|es6)$/));
+requireAll(require.context('.',            false, /^\.\/(?!application\.js).*\.(js|es6)$/));
 require('vendor/fuzzaldrin-plus');
 window.ES6Promise = require('vendor/es6-promise.auto');
 window.ES6Promise.polyfill();