radex
/
jspaint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor away single-use function 

"get array buffer" is not descriptive, it could be raw image data etc.
main
Isaiah Odhner 2021-02-06 14:40:30 -05:00
parent afe15a8817
commit 5204cb1f14
2 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/electron-injected.js
View File

@ -135,8 +135,9 @@ window.systemSetAsWallpaperCentered = c => {
wallpaperCanvas.ctx.drawImage(c, ~~x, ~~y);
}
get_array_buffer_from_canvas(wallpaperCanvas).then(array_buffer => {
const buffer = new Buffer(array_buffer);
const file_reader = new FileReader();
file_reader.onloadend = () => {
const buffer = new Buffer(file_reader.result);
fs.writeFile(imgPath, buffer, err => {
if(err){
return show_error_message("Failed to set as desktop background: couldn't write temporary image file.", err);
@ -148,5 +149,13 @@ window.systemSetAsWallpaperCentered = c => {
}
});
});
};
file_reader.onerror = () => {
throw new Error("Failed to read canvas image to array buffer");
};
wallpaperCanvas.toBlob(blob => {
sanity_check_blob(blob, () => {
file_reader.readAsArrayBuffer(blob);
});
});
};

24
src/functions.js
View File

@ -2552,30 +2552,6 @@ function set_as_wallpaper_centered(c = canvas) {
});
}
/**
* @param {HTMLElement} canvas
* @return {Promise}
*/
function get_array_buffer_from_canvas(canvas) {
return new Promise((resolve, reject) => {
const file_reader = new FileReader();
file_reader.onloadend = () => {
resolve(file_reader.result);
};
file_reader.onerror = () => {
reject(new Error("Failed to read canvas image to array buffer"));
};
canvas.toBlob(blob => {
sanity_check_blob(blob, () => {
file_reader.readAsArrayBuffer(blob);
});
});
});
}
function save_selection_to_file(){
if(selection && selection.canvas){
selection.canvas.toBlob(blob => {