From 030c5494a8679547ea14dc36e112ec331f836462 Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Fri, 14 Sep 2018 00:51:52 +0200 Subject: [PATCH] Cleanup: jQuery and Bootstrap are now part of tutti Also remove font loading from Google, we use system fonts now. --- gulpfile.js | 26 +++++++++----------------- src/templates/layout.pug | 14 +------------- 2 files changed, 10 insertions(+), 30 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 7f080380..275f3fba 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -32,6 +32,7 @@ var destination = { var source = { bootstrap: 'node_modules/bootstrap/', + jquery: 'node_modules/jquery/', popper: 'node_modules/popper.js/' } @@ -78,35 +79,26 @@ gulp.task('scripts', function() { }); -/* Collection of scripts in src/scripts/tutti/ to merge into tutti.min.js */ -/* Since it's always loaded, it's only for functions that we want site-wide */ +/* Collection of scripts in src/scripts/tutti/ to merge into tutti.min.js + * Since it's always loaded, it's only for functions that we want site-wide. + * It also includes jQuery and Bootstrap (and its dependency popper), since + * the site doesn't work without it anyway.*/ gulp.task('scripts_concat_tutti', function() { - gulp.src('src/scripts/tutti/**/*.js') - .pipe(gulpif(enabled.failCheck, plumber())) - .pipe(gulpif(enabled.maps, sourcemaps.init())) - .pipe(concat("tutti.min.js")) - .pipe(gulpif(enabled.uglify, uglify())) - .pipe(gulpif(enabled.maps, sourcemaps.write("."))) - .pipe(gulpif(enabled.chmod, chmod(644))) - .pipe(gulp.dest(destination.js)) - .pipe(gulpif(argv.livereload, livereload())); -}); - -// Combine all needed Bootstrap JavaScript into a single file. -gulp.task('scripts_concat_bootstrap', function() { toUglify = [ + source.jquery + 'dist/jquery.min.js', source.popper + 'dist/umd/popper.min.js', source.bootstrap + 'js/dist/index.js', source.bootstrap + 'js/dist/util.js', source.bootstrap + 'js/dist/tooltip.js', source.bootstrap + 'js/dist/dropdown.js', + 'src/scripts/tutti/**/*.js' ]; gulp.src(toUglify) .pipe(gulpif(enabled.failCheck, plumber())) .pipe(gulpif(enabled.maps, sourcemaps.init())) - .pipe(concat("bootstrap.min.js")) + .pipe(concat("tutti.min.js")) .pipe(gulpif(enabled.uglify, uglify())) .pipe(gulpif(enabled.maps, sourcemaps.write("."))) .pipe(gulpif(enabled.chmod, chmod(644))) @@ -128,6 +120,7 @@ gulp.task('watch',function() { gulp.watch('src/scripts/tutti/**/*.js',['scripts_concat_tutti']); }); + // Erases all generated files in output directories. gulp.task('cleanup', function() { var paths = []; @@ -150,5 +143,4 @@ gulp.task('default', tasks.concat([ 'templates', 'scripts', 'scripts_concat_tutti', - 'scripts_concat_bootstrap', ])); diff --git a/src/templates/layout.pug b/src/templates/layout.pug index e5bb9c05..b2fc6470 100644 --- a/src/templates/layout.pug +++ b/src/templates/layout.pug @@ -29,26 +29,16 @@ html(lang="en") meta(name="twitter:image", content="") | {% endblock %} - script(src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery-3.1.0.min.js')}}") + script(src="{{ url_for('static_pillar', filename='assets/js/tutti.min.js') }}") script(src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery.typeahead-0.11.1.min.js')}}") script(src="{{ url_for('static_pillar', filename='assets/js/vendor/js.cookie-2.0.3.min.js')}}") | {% if current_user.is_authenticated %} script(src="{{ url_for('static_pillar', filename='assets/js/vendor/clipboard.min.js')}}") | {% endif %} - script. - - !function(e){"use strict";e.loadCSS=function(t,n,o){var r,i=e.document,l=i.createElement("link");if(n)r=n;else{var d=(i.body||i.getElementsByTagName("head")[0]).childNodes;r=d[d.length-1]}var a=i.styleSheets;l.rel="stylesheet",l.href=t,l.media="only x",r.parentNode.insertBefore(l,n?r:r.nextSibling);var f=function(e){for(var t=l.href,n=a.length;n--;)if(a[n].href===t)return e();setTimeout(function(){f(e)})};return l.onloadcssdefined=f,f(function(){l.media=o||"all"}),l},"undefined"!=typeof module&&(module.exports=e.loadCSS)}(this); - - loadCSS( "//fonts.googleapis.com/css?family=Roboto:300,400" ); - - script(src="{{ url_for('static_pillar', filename='assets/js/tutti.min.js') }}") - link(href="{{ url_for('static', filename='assets/img/favicon.png') }}", rel="shortcut icon") link(href="{{ url_for('static', filename='assets/img/apple-touch-icon-precomposed.png') }}", rel="icon apple-touch-icon-precomposed", sizes="192x192") - link(href="{{ url_for('static_pillar', filename='assets/css/vendor/bootstrap.min.css') }}", rel="stylesheet") - | {% block head %}{% endblock %} | {% block css %} @@ -82,8 +72,6 @@ html(lang="en") | {% endblock footer %} | {% endblock footer_container%} - script(src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery.bootstrap-3.3.7.min.js') }}") - | {% if current_user.is_authenticated %} script(src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery.typewatch-3.0.0.min.js') }}") script.