|
@@ -2329,7 +2329,7 @@
|
|
content = self._generatePreviewTemplate(cat, iData, fname, file.type, previewId, false, size);
|
|
content = self._generatePreviewTemplate(cat, iData, fname, file.type, previewId, false, size);
|
|
self._clearDefaultPreview();
|
|
self._clearDefaultPreview();
|
|
$preview.append("\n" + content);
|
|
$preview.append("\n" + content);
|
|
- self._validateImage(previewId, caption, file.type);
|
|
|
|
|
|
+ self._validateImage(previewId, caption, file.type, file.size);
|
|
} else {
|
|
} else {
|
|
self._previewDefault(file, previewId);
|
|
self._previewDefault(file, previewId);
|
|
}
|
|
}
|
|
@@ -2704,7 +2704,7 @@
|
|
self._showUploadError(msg, params);
|
|
self._showUploadError(msg, params);
|
|
self._setPreviewError($thumb, i, null);
|
|
self._setPreviewError($thumb, i, null);
|
|
},
|
|
},
|
|
- _validateImage: function (previewId, fname, ftype) {
|
|
|
|
|
|
+ _validateImage: function (previewId, fname, ftype, fsize) {
|
|
var self = this, $preview = self.$preview, params, w1, w2, $thumb = $preview.find("#" + previewId),
|
|
var self = this, $preview = self.$preview, params, w1, w2, $thumb = $preview.find("#" + previewId),
|
|
i = $thumb.attr('data-fileindex'), $img = $thumb.find('img');
|
|
i = $thumb.attr('data-fileindex'), $img = $thumb.find('img');
|
|
fname = fname || 'Untitled';
|
|
fname = fname || 'Untitled';
|
|
@@ -2726,12 +2726,21 @@
|
|
self._checkDimensions(i, 'Large', $img, $thumb, fname, 'Height', params);
|
|
self._checkDimensions(i, 'Large', $img, $thumb, fname, 'Height', params);
|
|
}
|
|
}
|
|
self._raise('fileimageloaded', [previewId]);
|
|
self._raise('fileimageloaded', [previewId]);
|
|
- self.loadedImages.push({ind: i, img: $img, thumb: $thumb, pid: previewId, typ: ftype});
|
|
|
|
|
|
+ self.loadedImages.push({
|
|
|
|
+ ind: i,
|
|
|
|
+ img: $img,
|
|
|
|
+ thumb: $thumb,
|
|
|
|
+ pid: previewId,
|
|
|
|
+ typ: ftype,
|
|
|
|
+ siz: fsize,
|
|
|
|
+ validated: false
|
|
|
|
+ });
|
|
self._validateAllImages();
|
|
self._validateAllImages();
|
|
});
|
|
});
|
|
},
|
|
},
|
|
_validateAllImages: function () {
|
|
_validateAllImages: function () {
|
|
- var self = this, i, counter = {val: 0}, numImgs = self.loadedImages.length;
|
|
|
|
|
|
+ var self = this, i, counter = {val: 0}, numImgs = self.loadedImages.length, config,
|
|
|
|
+ fsize, minSize = self.resizeIfSizeMoreThan;
|
|
if (numImgs !== self.totalImagesCount) {
|
|
if (numImgs !== self.totalImagesCount) {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
@@ -2740,7 +2749,15 @@
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
for (i = 0; i < self.loadedImages.length; i++) {
|
|
for (i = 0; i < self.loadedImages.length; i++) {
|
|
- self._getResizedImage(self.loadedImages[i], counter, numImgs);
|
|
|
|
|
|
+ config = self.loadedImages[i];
|
|
|
|
+ if (config.validated) {
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
|
|
+ fsize = config.siz;
|
|
|
|
+ if (fsize && minSize && fsize > minSize * 1000) {
|
|
|
|
+ self._getResizedImage(config, counter, numImgs);
|
|
|
|
+ }
|
|
|
|
+ self.loadedImages[i].validated = true;
|
|
}
|
|
}
|
|
},
|
|
},
|
|
_getResizedImage: function (config, counter, numImgs) {
|
|
_getResizedImage: function (config, counter, numImgs) {
|
|
@@ -2748,14 +2765,14 @@
|
|
ratio = 1, maxWidth = self.maxImageWidth || width, maxHeight = self.maxImageHeight || height,
|
|
ratio = 1, maxWidth = self.maxImageWidth || width, maxHeight = self.maxImageHeight || height,
|
|
isValidImage = !!(width && height), chkWidth, chkHeight, canvas = self.imageCanvas,
|
|
isValidImage = !!(width && height), chkWidth, chkHeight, canvas = self.imageCanvas,
|
|
context = self.imageCanvasContext, type = config.typ, pid = config.pid, ind = config.ind,
|
|
context = self.imageCanvasContext, type = config.typ, pid = config.pid, ind = config.ind,
|
|
- thumb = config.thumb, throwError, msg;
|
|
|
|
|
|
+ $thumb = config.thumb, throwError, msg;
|
|
throwError = function (msg, params, ev) {
|
|
throwError = function (msg, params, ev) {
|
|
if (self.isUploadable) {
|
|
if (self.isUploadable) {
|
|
self._showUploadError(msg, params, ev);
|
|
self._showUploadError(msg, params, ev);
|
|
} else {
|
|
} else {
|
|
self._showError(msg, params, ev);
|
|
self._showError(msg, params, ev);
|
|
}
|
|
}
|
|
- self._setPreviewError(thumb, ind);
|
|
|
|
|
|
+ self._setPreviewError($thumb, ind);
|
|
};
|
|
};
|
|
if (!self.filestack[ind] || !isValidImage || (width <= maxWidth && height <= maxHeight)) {
|
|
if (!self.filestack[ind] || !isValidImage || (width <= maxWidth && height <= maxHeight)) {
|
|
if (isValidImage && self.filestack[ind]) {
|
|
if (isValidImage && self.filestack[ind]) {
|
|
@@ -3516,6 +3533,7 @@
|
|
resizePreference: 'width',
|
|
resizePreference: 'width',
|
|
resizeQuality: 0.92,
|
|
resizeQuality: 0.92,
|
|
resizeDefaultImageType: 'image/jpeg',
|
|
resizeDefaultImageType: 'image/jpeg',
|
|
|
|
+ resizeIfSizeMoreThan: 0, // in KB
|
|
minFileSize: 0,
|
|
minFileSize: 0,
|
|
maxFileSize: 0,
|
|
maxFileSize: 0,
|
|
maxFilePreviewSize: 25600, // 25 MB
|
|
maxFilePreviewSize: 25600, // 25 MB
|