Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-04 03:21:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

added filter:image.size

Browse Source 
fix uploading of gifs if imagemagick plugin is installed but no image
upload plugins are present.
This commit is contained in:
barisusakli
2016-05-09 22:25:51 +03:00
parent bc0359475c
commit acc030e6da
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/controllers/uploads.js
View File

@@ -83,7 +83,7 @@ function resizeImage(fileObj, callback) {
function(next) {
fullPath = path.join(nconf.get('base_dir'), nconf.get('upload_path'), '..', fileObj.url);
image.load(fullPath, next);
image.size(fullPath, next);
},
function (imageData, next) {
if (imageData.width < parseInt(meta.config.maximumImageWidth, 10) || 760) {

18
src/image.js
View File

@@ -94,11 +94,19 @@ image.normalise = function(path, extension, callback) {
}
};
image.load = function(path, callback) {
new Jimp(path, function(err, data) {
callback(err, data ? data.bitmap : null);
});
};
image.size = function(path, callback) {
if (plugins.hasListeners('filter:image.size')) {
plugins.fireHook('filter:image.size', {
path: path,
}, function(err, image) {
callback(err, image);
});
} else {
new Jimp(path, function(err, data) {
callback(err, data ? data.bitmap : null);
});
}
}
image.convertImageToBase64 = function(path, callback) {
fs.readFile(path, function(err, data) {