Skip to content

Commit

Permalink
Merge pull request #2571 from sandhose/npm-deps-bump
Browse files Browse the repository at this point in the history 
Bump des dépendances npm + clean du Gulpfile + fix les warnings JSHint
  • Loading branch information
@pierre-24
pierre-24 committed Apr 23, 2015
2 parents 6cd0ebc + df9d842 commit 99280c7
Show file tree
Hide file tree
Showing 6 changed files with 92 additions and 149 deletions.
132 changes: 42 additions & 90 deletions Gulpfile.js
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,21 @@
var gulp = require("gulp"),
$ = require("gulp-load-plugins")(),
browserify = require("browserify"),
watchify = require("watchify"),
source = require("vinyl-source-stream"),
sprite = require("css-sprite").stream,
path = require("path"),
del = require("del");

var sourceDir = "assets/",
destDir = "dist/",
appFile = "js/app.js"
var sourceDir = "assets",
destDir = "dist",
errorsDir = "errors",
sassDir = "scss",
imagesDir = "images",
scriptsDir = "js",
vendorsDir = "vendors",
spriteDir = "sprite",
stylesFiles = ["main.scss", "only-ie.scss"],
sassDir = "scss/",
imagesDir = "images/",
scriptsDir = "js/",
vendorsDir = "vendors/",
spriteDir = "sprite/",
vendorsCSS = ["node_modules/normalize.css/normalize.css"],
vendorsJS = ["node_modules/jquery/dist/jquery.js", "node_modules/cookies-eu-banner/dist/cookies-eu-banner.js"],
autoprefixerConfig = ["last 1 version", "> 1%", "ff >= 20", "ie >= 8", "opera >= 12", "Android >= 2.2"]
autoprefixerConfig = ["last 1 version", "> 1%", "ff >= 20", "ie >= 8", "opera >= 12", "Android >= 2.2"],
imageminConfig = { optimizationLevel: 3, progressive: true, interlaced: true };

/**
Expand All @@ -27,9 +24,9 @@ var sourceDir = "assets/",
gulp.task("clean", function(cb) {
del([
destDir,
sourceDir + "{" + scriptsDir + "," + sassDir + "}/" + vendorsDir,
sourceDir + "bower_components/",
sourceDir + sassDir + "_sprite.scss"
path.join(sourceDir, "{" + scriptsDir + "," + sassDir + "}", vendorsDir),
path.join(sourceDir, "bower_components/"),
path.join(sourceDir, sassDir, "_sprite.scss")
], cb);
});

Expand All @@ -40,145 +37,100 @@ gulp.task("clean-errors", function(cb) {
del(["errors/css/*"], cb);
});

/**
* Bundles JS files using browserify (unused yet)
*/
gulp.task("bundle", function() {
var bundler = watchify(browserify({
entries: ["./" + sourceDir + appFile],
insertGlobals: true,
cache: {},
packageCache: {},
fullpaths: true
}));

bundler.on("update", rebundle);

function rebundle() {
return bundler.bundle()
.on("error", $.notify.onError({
title: "Browserify error",
message: "<%= error.message %>"
}))
.pipe(source(appFile))
.pipe($.streamify($.size({ title: "App file" })))
.pipe(gulp.dest(destDir))
.pipe($.rename({ suffix: ".min" }))
.pipe($.streamify($.uglify().on('error', $.notify.onError({
title: "Javascript error",
message: "<%= error.message %>"
}))))
.pipe($.streamify($.size({ title: "App file (minified)" })))
.pipe(gulp.dest(destDir));
}

return rebundle();
});

/**
* Copy vendors style files (i.e. normalize.css)
*/
gulp.task("vendors-css", function() {
return gulp.src(vendorsCSS)
.pipe($.rename({ prefix: "_", extname: ".scss" }))
.pipe(gulp.dest(sourceDir + sassDir + vendorsDir));
.pipe(gulp.dest(path.join(sourceDir, sassDir, vendorsDir)));
});

/**
* Copy vendors script fules (i.e. jquery.js)
*/
gulp.task("vendors-js", function() {
return gulp.src(vendorsJS)
.pipe(gulp.dest(sourceDir + scriptsDir + vendorsDir));
.pipe(gulp.dest(path.join(sourceDir, scriptsDir, vendorsDir)));
});

/**
* Copy, concat and minify vendors files
*/
gulp.task("vendors", ["vendors-js", "vendors-css"], function() {
return gulp.src(sourceDir + scriptsDir + vendorsDir + "*.js")
return gulp.src(path.join(sourceDir, scriptsDir, vendorsDir, "*.js"))
.pipe($.concat("vendors.js"))
.pipe($.size({ title: "Scripts (vendors)" }))
.pipe(gulp.dest(destDir + scriptsDir))
.pipe(gulp.dest(path.join(destDir, scriptsDir)))
.pipe($.rename({ suffix: ".min" }))
.pipe($.size({ title: "Scripts (vendors, minified)" }))
.pipe($.uglify().on('error', $.notify.onError({
title: "Javascript error",
message: "<%= error.message %>"
})))
.pipe(gulp.dest(destDir + scriptsDir));
.pipe(gulp.dest(path.join(destDir, scriptsDir)));
});

/**
* Compiles SASS files
*/
gulp.task("stylesheet", ["sprite", "vendors"], function() {
var files = [];
for (var i = 0; i < stylesFiles.length; i++) {
files.push(sourceDir + sassDir + stylesFiles[i]);
}
var files = stylesFiles.map(function(filename) {
return path.join(sourceDir, sassDir, filename);
});
return gulp.src(files)
.pipe($.sass({
sass: sourceDir + sassDir,
imagePath: sourceDir + imagesDir
}))
.pipe($.sass())
.on("error", $.notify.onError({
title: "SASS Error",
message: "<%= error.message %>"
}))
.on("error", function() { this.emit("end"); })
.pipe($.autoprefixer(autoprefixerConfig, { cascade: true }))
.pipe($.size({ title: "Stylesheet" }))
.pipe(gulp.dest(destDir + "css/"))
.pipe(gulp.dest(path.join(destDir, "css/")))
.pipe($.rename({ suffix: ".min" }))
.pipe($.minifyCss())
.pipe($.size({ title: "Stylesheet (minified)" }))
.pipe(gulp.dest(destDir + "css/"));
.pipe(gulp.dest(path.join(destDir, "css/")));
});

/**
* Error-pages stylesheet
*/
gulp.task("errors", ["clean-errors"], function() {
var files = [];
for (var i = 0; i < stylesFiles.length; i++) {
files.push(sourceDir + sassDir + stylesFiles[i]);
}
return gulp.src(files)
return gulp.src(path.join(errorsDir, sassDir, "main.scss"))
.pipe($.sass({
sass: errorsDir + sassDir,
imagePath: errorsDir + imagesDir,
includePaths: [sourceDir + imagesDir]
includePaths: [path.join(sourceDir, sassDir)]
}))
.pipe($.autoprefixer(autoprefixerConfig, { cascade: true }))
.pipe(gulp.dest(errorsDir + "css/"))
.pipe(gulp.dest(path.join(errorsDir, "css/")))
.pipe($.rename({ suffix: ".min" }))
.pipe($.minifyCss())
.pipe(gulp.dest(errorsDir + "css/"));
.pipe(gulp.dest(path.join(errorsDir, "css/")));
});

/**
* Generates Sprite files (SASS + image)
*/
gulp.task("sprite", function() {
return gulp.src(sourceDir + imagesDir + spriteDir + "*")
return gulp.src(path.join(sourceDir, imagesDir, spriteDir, "*"))
.pipe(sprite({
name: "sprite",
style: "_sprite.scss",
cssPath: "../" + imagesDir,
cssPath: "../" + imagesDir + "/",
retina: true,
prefix: "sprite-icon",
processor: "scss",
template: sourceDir + sassDir + "sprite-template.mustache"
template: path.join(sourceDir, sassDir, "sprite-template.mustache")
}))
.pipe($.if("*.png", gulp.dest(destDir + imagesDir), gulp.dest(sourceDir + sassDir)));
.pipe($.if("*.png", gulp.dest(path.join(destDir, imagesDir)), gulp.dest(path.join(sourceDir, sassDir))));
});

/**
* Process images files
*/
gulp.task("images", ["stylesheet"], function() {
return gulp.src([sourceDir + "{" + imagesDir + ",smileys/}" + "*.{png,gif}"])
return gulp.src(path.join(sourceDir, "{" + imagesDir + ",smileys}", "*.{png,gif}"))
.pipe($.imagemin(imageminConfig))
.pipe($.size({ title: "Images" }))
.pipe(gulp.dest(destDir));
Expand All @@ -188,24 +140,24 @@ gulp.task("images", ["stylesheet"], function() {
* Scripts concat and minify
*/
gulp.task("scripts", function() {
return gulp.src(sourceDir + scriptsDir + "*.js")
return gulp.src(path.join(sourceDir, scriptsDir, "*.js"))
.pipe($.concat("main.js", { newLine: "\r\n\r\n" }))
.pipe($.size({ title: "Scripts" }))
.pipe(gulp.dest(destDir + scriptsDir))
.pipe(gulp.dest(path.join(destDir, scriptsDir)))
.pipe($.rename({ suffix: ".min" }))
.pipe($.uglify().on('error', $.notify.onError({
title: "Javascript error",
message: "<%= error.message %>"
})))
.pipe($.size({ title: "Scripts (minified)" }))
.pipe(gulp.dest(destDir + scriptsDir));
.pipe(gulp.dest(path.join(destDir, scriptsDir)));
});

/**
* Check JS code style and syntax using JSHint
*/
gulp.task("jshint", function() {
return gulp.src([sourceDir + scriptsDir + "*.js", "!" + sourceDir + scriptsDir + "_custom.modernizr.js"])
return gulp.src([path.join(sourceDir, scriptsDir, "*.js"), "!" + path.join(sourceDir, scriptsDir, "_custom.modernizr.js")])
.pipe($.jshint())
.pipe($.jshint.reporter("jshint-stylish"));
});
Expand All @@ -214,26 +166,26 @@ gulp.task("jshint", function() {
* Merge vendors and app scripts
*/
gulp.task("merge-scripts", ["vendors", "scripts"], function() {
return gulp.src([destDir + scriptsDir + "vendors.js", destDir + scriptsDir + "main.js"])
return gulp.src(path.join(destDir, scriptsDir, "{vendors,main}.js"))
.pipe($.concat("all.js"))
.pipe($.size({ title: "Scripts (all)" }))
.pipe(gulp.dest(destDir + scriptsDir))
.pipe(gulp.dest(path.join(destDir, scriptsDir)))
.pipe($.rename({ suffix: ".min" }))
.pipe($.uglify().on('error', $.notify.onError({
title: "Javascript error",
message: "<%= error.message %>"
})))
.pipe($.size({ title: "Scripts (all, minified)" }))
.pipe(gulp.dest(destDir + scriptsDir));
.pipe(gulp.dest(path.join(destDir, scriptsDir)));
});

/**
* Watch for files changes, then recompiles and livereloads
*/
gulp.task("watch", function() {
gulp.watch(sourceDir + scriptsDir + "*.js", ["jshint", "scripts"]);
gulp.watch([sourceDir + imagesDir + "*.png", sourceDir + "smileys/*"], ["images"]);
gulp.watch([sourceDir + sassDir + "**/*.scss", "!" + sourceDir + sassDir + "_sprite.scss"], ["stylesheet"]);
gulp.watch(path.join(sourceDir, scriptsDir, "*.js"), ["jshint", "scripts"]);
gulp.watch([path.join(sourceDir, imagesDir, "*.png"), path.join(sourceDir, "smileys/*")], ["images"]);
gulp.watch([path.join(sourceDir, sassDir, "**/*.scss"), "!" + path.join(sourceDir, sassDir, "_sprite.scss")], ["stylesheet"]);

gulp.watch("dist/*/**", function(file) {
var filePath = path.join("static/", path.relative(path.join(__dirname, "dist/"), file.path)); // Pour que le chemin ressemble à static/.../...
Expand Down
3 changes: 2 additions & 1 deletion assets/js/ajax-actions.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

/**
* Toggle the text of the element by the text of an attribute
*
*
* @param {string} dataAttribute
*/
$.fn.toggleText = function(dataAttribute){
Expand Down Expand Up @@ -285,6 +285,7 @@

$(data).insertAfter($form);

/* global MathJax */
if ($(data).find("mathjax").length > 0)
MathJax.Hub.Queue(["Typeset", MathJax.Hub]);
}
Expand Down
8 changes: 4 additions & 4 deletions assets/js/forgot-password.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/
(function($, undefined){
"use strict";
if ($("#id_email").val() == '')
if ($("#id_email").val() === "")
$("#form-email").addClass("hidden");
else
$("#form-email").removeClass("hidden");
Expand All @@ -12,12 +12,12 @@
$("#form-email").toggleClass("hidden");
$("#form-username").addClass("hidden");

$("#id_username").val('');
$("#id_username").val("");

e.preventDefault();
});

if ($("#id_username").val() == '')
if ($("#id_username").val() === "")
$("#form-username").addClass("hidden");
else
$("#form-username").removeClass("hidden");
Expand All @@ -26,7 +26,7 @@
$("#form-username").toggleClass("hidden");
$("#form-email").addClass("hidden");

$("#id_email").val('');
$("#id_email").val("");

e.preventDefault();
});
Expand Down
Loading

0 comments on commit 99280c7

Please sign in to comment.