diff --git a/front/src/views/rule.html b/front/src/views/rule.html index e8df0cd..1d74569 100644 --- a/front/src/views/rule.html +++ b/front/src/views/rule.html @@ -217,9 +217,12 @@
-

Current weight: {{image.original | bytes}}

-

With a lossless optimization:
{{image.lossless | bytes}} (-{{image.original - image.lossless | bytes}})

-

With a lossy optimization:
{{image.lossy | bytes}} (-{{image.original - image.lossy | bytes}})

+

Current weight: {{image.original | bytes}}

+

Current weight: {{image.original | bytes}} ({{image.afterCompression | bytes}} gzipped)

+

With a lossless optimization:
{{image.afterOptimizationAndCompression | bytes}} gzipped (-{{image.gain | bytes}} gzipped)

+

With a lossless optimization:
{{image.lossless | bytes}} (-{{image.gain | bytes}})

+

With a lossy optimization:
{{image.afterOptimizationAndCompression | bytes}} gzipped (-{{image.gain | bytes}} gzipped)

+

With a lossy optimization:
{{image.lossy | bytes}} (-{{image.gain | bytes}})

diff --git a/lib/tools/weightChecker/weightChecker.js b/lib/tools/weightChecker/weightChecker.js index 3611b15..7fb85db 100644 --- a/lib/tools/weightChecker/weightChecker.js +++ b/lib/tools/weightChecker/weightChecker.js @@ -168,19 +168,25 @@ var WeightChecker = function() { }; requests.forEach(function(req) { - if (req.weightCheck.uncompressedSize && imageOptimizer.entryTypeCanBeOptimized(req) && req.weightCheck.isOptimized === false) { - var gain = req.weightCheck.uncompressedSize - req.weightCheck.optimized; + if (req.weightCheck.bodySize > 0 && imageOptimizer.entryTypeCanBeOptimized(req) && req.weightCheck.isOptimized === false) { + var before = req.weightCheck.afterCompression || req.weightCheck.bodySize; + var after = req.weightCheck.afterOptimizationAndCompression || req.weightCheck.optimized; + var gain = before - after; - results.totalGain += gain; + if (gain > 200) { + results.totalGain += gain; - results.images.push({ - url: req.url, - original: req.weightCheck.uncompressedSize, - optimized: req.weightCheck.optimized, - lossless: req.weightCheck.lossless, - lossy: req.weightCheck.lossy, - gain: gain - }); + results.images.push({ + url: req.url, + original: req.weightCheck.bodySize, + isCompressed: req.weightCheck.isCompressed, + afterCompression: req.weightCheck.afterCompression, + afterOptimizationAndCompression: req.weightCheck.afterOptimizationAndCompression, + lossless: req.weightCheck.lossless, + lossy: req.weightCheck.lossy, + gain: gain + }); + } } }); @@ -197,7 +203,7 @@ var WeightChecker = function() { requests.forEach(function(req) { if (req.weightCheck.bodySize > 0 && fileMinifier.entryTypeCanBeMinified(req) && req.weightCheck.isOptimized === false) { var before = req.weightCheck.afterCompression || req.weightCheck.bodySize; - var after = req.weightCheck.afterOptimizationAndCompression || req.weightCheck.afterCompression; + var after = req.weightCheck.afterOptimizationAndCompression || req.weightCheck.optimized; var gain = before - after; if (gain > 200) {