Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2025-11-10 23:36:04 +01:00
Code Issues Packages Projects Releases Activity

Fixed unnecessary closing bracket cuasing JS error (fixes #2079)

Browse Source
This commit is contained in:
Djamil Legato
2021-02-22 09:24:33 -08:00
parent b7271bc424
commit 8d80d0f75e
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -5,6 +5,7 @@
* Flex pages admin better uses available space [#2075](https://github.com/getgrav/grav/issues/2075) * Flex pages admin better uses available space [#2075](https://github.com/getgrav/grav/issues/2075)
1. [](#bugfix) 1. [](#bugfix)
* Regression: Fixed enabling/disabling plugin or theme corrupting configuration * Regression: Fixed enabling/disabling plugin or theme corrupting configuration
* Fixed unnecessary closing bracket cuasing JS error [#2079](https://github.com/getgrav/grav-plugin-admin/issues/2079)
# v1.10.5 # v1.10.5
## 02/18/2021 ## 02/18/2021

4
themes/grav/app/forms/fields/files.js
View File

@@ -87,7 +87,7 @@ const ACCEPT_FUNC = function(file, done, settings) {
image.src = event.target.result; image.src = event.target.result;
image.onerror = function() { image.onerror = function() {
done(translations.PLUGIN_ADMIN.FILE_ERROR_UPLOAD); done(translations.PLUGIN_ADMIN.FILE_ERROR_UPLOAD);
}); };
image.onload = function() { image.onload = function() {
if (resolution.min) { if (resolution.min) {
Object.keys(resolution.min).forEach((attr) => { Object.keys(resolution.min).forEach((attr) => {
@@ -106,7 +106,7 @@ const ACCEPT_FUNC = function(file, done, settings) {
}); });
} }
} }
URL.revokeObjectURL(image.src); // release memory URL.revokeObjectURL(image.src); // release memory
return error ? done(error) : done(); return error ? done(error) : done();
}; };

7
themes/grav/js/admin.min.js vendored
View File

@@ -2725,6 +2725,10 @@ var ACCEPT_FUNC = function ACCEPT_FUNC(file, done, settings) {
var image = new Image(); var image = new Image();
image.src = event.target.result; image.src = event.target.result;
image.onerror = function () {
done(external_GravAdmin_namespaceObject.translations.PLUGIN_ADMIN.FILE_ERROR_UPLOAD);
};
image.onload = function () { image.onload = function () {
var _this = this; var _this = this;
@@ -2746,6 +2750,8 @@ var ACCEPT_FUNC = function ACCEPT_FUNC(file, done, settings) {
} }
} }
URL.revokeObjectURL(image.src); // release memory
return error ? done(error) : done(); return error ? done(error) : done();
}; };
}; };
@@ -3068,6 +3074,7 @@ var addNode = function addNode(container) {
resizeWidth: settings.resizeWidth || null, resizeWidth: settings.resizeWidth || null,
resizeHeight: settings.resizeHeight || null, resizeHeight: settings.resizeHeight || null,
resizeQuality: settings.resizeQuality || null, resizeQuality: settings.resizeQuality || null,
resolution: settings.resolution || null,
accept: function accept(file, done) { accept: function accept(file, done) {
ACCEPT_FUNC(file, done, settings); ACCEPT_FUNC(file, done, settings);
} }