Skip to content

Commit 332bfdd

Browse files
committed
js concat and minified
1 parent 27e8378 commit 332bfdd

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

gulpfile.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,11 @@ gulp.task('jshint', function() {
7676
// jquery.js, modernizr.js, bootstrap.js
7777
gulp.task('scripts', ['jshint'],function()
7878
{
79-
return gulp.src(['src/scripts/main.js'])
79+
return gulp.src(['src/scripts/**/*.js'])
80+
.pipe(sourcemaps.init())
81+
.pipe(concat("main.js"))
8082
.pipe(uglify())
83+
.pipe(sourcemaps.write("./"))
8184
.pipe(gulp.dest('dist/scripts'));
8285
});
8386

index.html

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,15 @@
5151
</div>
5252
</nav>
5353

54+
<p>If you click on the "Hide" button, I will disappear.</p>
55+
56+
<button id="hide">Hide</button>
57+
<button id="show">Show</button>
58+
59+
60+
<p>If you click on me, I will disappear.</p>
61+
<p>Click me away!</p>
62+
<p>Click me too!</p>
5463
<!-- Main jumbotron for a primary marketing message or call to action -->
5564
<div class="jumbotron">
5665
<div class="container">

0 commit comments

Comments
 (0)