Skip to content

Commit 3f384d4

Browse files
authored
Merge pull request #138 from NottingHack/js-mainfest
JS: need to server the manifest file when using extract
2 parents 94bc5ee + aa14809 commit 3f384d4

File tree

5 files changed

+7
-3
lines changed

5 files changed

+7
-3
lines changed

resources/assets/js/app.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,7 @@ require('./bootstrap');
55
// Initialise Foundation plugins
66
$(() => {
77
$(document).foundation();
8+
if ($('#flash-overlay-modal').lenght) {
9+
$('#flash-overlay-modal').foundation('open');
10+
}
811
});

resources/assets/js/bootstrap.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ window._ = require('lodash');
1010
try {
1111
window.$ = window.jQuery = require('jquery');
1212
require('foundation-sites');
13+
require('motion-ui');
1314
} catch (e) {}
1415

1516
/**

resources/views/layouts/app.blade.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,8 @@
144144

145145

146146
<!-- Scripts -->
147-
<script src="{{ mix('js/vendor.js')}}"></script>
147+
<script src="{{ mix('/js/manifest.js') }}"></script>
148+
<script src="{{ mix('js/vendor.js') }}"></script>
148149
<script src="{{ mix('js/app.js') }}"></script>
149150

150151
@stack('scripts')

resources/views/partials/flashModal.blade.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<!-- TODO: fix JS for this -->
21
<div id="flash-overlay-modal" class="reveal" data-reveal aria-labelledby="flash-overlay-modalTitle" aria-hidden="true" role="dialog">
32
<h2 id="flash-overlay-modalTitle">{{ $title }}</h2>
43

webpack.mix.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ const { mix } = require('laravel-mix');
1212
*/
1313

1414
mix.js('resources/assets/js/app.js', 'public/js')
15-
.extract(['lodash', 'jquery', 'axios', 'foundation-sites', 'select2'])
15+
.extract(['lodash', 'jquery', 'axios', 'select2'])
1616
.sass('resources/assets/sass/app.scss', 'public/css')
1717
.version();

0 commit comments

Comments
 (0)