Skip to content

Commit 608ba05

Browse files
WIP
1 parent dab4b78 commit 608ba05

File tree

7 files changed

+174
-20
lines changed

7 files changed

+174
-20
lines changed

src/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
"fotorama": "^4.6.4",
6363
"gulp-derequire": "^2.1.0",
6464
"jquery": "3.1.1",
65+
"jquery-browserify": "^1.8.1",
6566
"jquery-validation": "^1.17.0",
6667
"jquery.maskedinput": "^1.4.1",
6768
"material-design-lite": "^1.3.0",

src/site/html/about.ejs

-1
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,6 @@
561561
</div>
562562
</div>
563563
</nav>
564-
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
565564
<script src="bundle.min.js"></script>
566565
</body>
567566
</html>

src/site/html/contact.ejs

-1
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,6 @@
304304
</div>
305305
</div>
306306
</nav>
307-
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
308307
<script src="bundle.min.js"></script>
309308
</body>
310309
</html>

src/site/html/index.ejs

-1
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,6 @@
292292
</div>
293293
</div>
294294
</nav>
295-
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
296295
<script src="bundle.min.js"></script>
297296
</body>
298297
</html>

src/site/scripts/main.js

+10-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
'use strict';
2-
import fotorama from 'fotorama/fotorama.js'
3-
import plyr from 'plyr'
4-
import noUiSlider from 'nouislider'
5-
import material from 'material-design-lite'
6-
import mask from 'jquery.maskedinput/src/jquery.maskedinput.js'
7-
import validation from 'jquery-validation'
2+
3+
import $ from 'jquery';
4+
import jQb from 'jquery-browserify';
5+
import fotorama from 'fotorama/fotorama.js';
6+
import plyr from 'plyr';
7+
import noUiSlider from 'nouislider';
8+
import material from 'material-design-lite';
9+
import mask from 'jquery.maskedinput/src/jquery.maskedinput.js';
10+
import validation from 'jquery-validation';
811

912
var Main = {
1013
init: function(){
@@ -78,7 +81,7 @@ var Main = {
7881
},
7982

8083
initTestimonials: function(){
81-
var $fotoramaDiv = $('.fotorama').fotorama({
84+
var $fotoramaDiv = jQb('.fotorama').fotorama({
8285
autoplay: false,
8386
shadows: false,
8487
width: '100%',

src/tasks/scripts.js

-5
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,13 @@ import browserify from 'browserify';
66
import watchify from 'watchify';
77
import source from 'vinyl-source-stream';
88
import buffer from 'vinyl-buffer';
9-
import browserifyGlobal from 'browserify-global-shim';
109
import { join } from 'path';
11-
import derequire from 'derequire';
1210

1311
import browserSync from './connect';
1412
import { libraries, server, browserify as blabla } from '../config';
1513

1614
const { dest } = server
1715
const config = Object.assign({}, watchify.args, blabla);
18-
const globalShim = browserifyGlobal.configure({
19-
'jQuery': '$'
20-
})
2116
const bundler = watchify(browserify(config));
2217
const buildBundler = browserify(config);
2318

0 commit comments

Comments
 (0)