Skip to content
This repository was archived by the owner on May 16, 2019. It is now read-only.

Commit aeb2e94

Browse files
committed
Update Cropit to 5.1
Switch all images to webp to make them smaller and higher quality This will automatically allow transparent backgrounds as soon as Google updates chromium to support alpha channels in canvas.toDataURL
1 parent 9ae2fdc commit aeb2e94

File tree

6 files changed

+13
-12
lines changed

6 files changed

+13
-12
lines changed

js/views/itemEditVw.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -392,8 +392,8 @@ module.exports = baseVw.extend({
392392
canvas.height = imgH;
393393
ctx = canvas.getContext('2d');
394394
ctx.drawImage(newImage, 0, 0, imgW, imgH);
395-
dataURI = canvas.toDataURL('image/jpeg', 0.7);
396-
dataURI = dataURI.replace(/^data:image\/(png|jpeg);base64,/, "");
395+
dataURI = canvas.toDataURL('image/webp', 0.7);
396+
dataURI = dataURI.replace(/^data:image\/(png|jpeg|webp);base64,/, "");
397397
imageList.push(dataURI);
398398

399399
if (loaded === imageCount) {

js/views/itemVw.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ var __ = require('underscore'),
44
$ = require('jquery'),
55
loadTemplate = require('../utils/loadTemplate'),
66
localize = require('../utils/localize'),
7+
colorbox = require('jquery-colorbox'), // eslint-disable-line
78
RatingCl = require('../collections/ratingCl'),
89
baseVw = require('./baseVw'),
910
buyWizardVw = require('./buyWizardVw'),

js/views/onboardingModal.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ module.exports = baseModal.extend({
365365
};
366366

367367
var imageURI = this.$('#image-cropper').cropit('export', {
368-
type: 'image/jpeg',
368+
type: 'image/webp',
369369
quality: 0.75,
370370
originalSize: false
371371
});
@@ -379,7 +379,7 @@ module.exports = baseModal.extend({
379379
}
380380

381381
if (imageURI) {
382-
imageURI = imageURI.replace(/^data:image\/(png|jpeg);base64,/, '');
382+
imageURI = imageURI.replace(/^data:image\/(png|jpeg|webp);base64,/, '');
383383

384384
this.avatarUpload(imageURI).done((imgHash) => {
385385
profileFormData.append('avatar', imgHash);
@@ -520,7 +520,7 @@ module.exports = baseModal.extend({
520520
var res = event.target.result,
521521
bannerFormData = new FormData();
522522

523-
bannerFormData.append('image', res.replace(/^data:image\/(png|jpeg);base64,/, ''));
523+
bannerFormData.append('image', res.replace(/^data:image\/(png|jpeg|webp);base64,/, ''));
524524

525525
$.ajax({
526526
type: 'POST',

js/views/settingsVw.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -771,11 +771,11 @@ module.exports = Backbone.View.extend({
771771
var bannerCrop = self.$('#settings-image-cropperBanner');
772772
if (self.newBanner && bannerCrop.cropit('imageSrc')){
773773
bannerURI = bannerCrop.cropit('export', {
774-
type: 'image/jpeg',
774+
type: 'image/webp',
775775
quality: 0.75,
776776
originalSize: false
777777
});
778-
bannerURI = bannerURI.replace(/^data:image\/(png|jpeg);base64,/, "");
778+
bannerURI = bannerURI.replace(/^data:image\/(png|jpeg|webp);base64,/, "");
779779
banner64Data.image = bannerURI;
780780

781781
saveToAPI('', '', self.serverUrl + "upload_image", function (data) {
@@ -793,11 +793,11 @@ module.exports = Backbone.View.extend({
793793
//if an avatar has been set, upload it first and get the hash
794794
if (self.newAvatar && avatarCrop.cropit('imageSrc')){
795795
imageURI = avatarCrop.cropit('export', {
796-
type: 'image/jpeg',
796+
type: 'image/webp',
797797
quality: 0.75,
798798
originalSize: false
799799
});
800-
imageURI = imageURI.replace(/^data:image\/(png|jpeg);base64,/, "");
800+
imageURI = imageURI.replace(/^data:image\/(png|jpeg|webp);base64,/, "");
801801
img64Data.image = imageURI;
802802

803803
saveToAPI('', '', self.serverUrl + "upload_image", function (data) {

js/views/userPageVw.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1281,13 +1281,13 @@ module.exports = baseVw.extend({
12811281
//var formData = new FormData(this.$el.find('#userPageImageForm')[0]);
12821282
var serverUrl = self.options.userModel.get('serverUrl'),
12831283
imageURI = self.$el.find('#image-cropper').cropit('export', {
1284-
type: 'image/jpeg',
1284+
type: 'image/webp',
12851285
quality: 0.75,
12861286
originalSize: false
12871287
});
12881288

12891289
if (imageURI){
1290-
imageURI = imageURI.replace(/^data:image\/(png|jpeg);base64,/, "");
1290+
imageURI = imageURI.replace(/^data:image\/(png|jpeg|webp);base64,/, "");
12911291
var formData = new FormData();
12921292
formData.append('image', imageURI);
12931293
$.ajax({

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"backbone": ">=1.2.1",
2323
"backbone.localstorage": "^1.1.16",
2424
"chosen": "0.0.2",
25-
"cropit": "0.4.5",
25+
"cropit": "0.5.1",
2626
"ini": "^1.3.4",
2727
"is_js": "0.7.4",
2828
"jquery": "2.1.4",

0 commit comments

Comments
 (0)