self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-17 18:44:45 +02:00
Code Issues Releases Activity

Tools: Fixed tests

Browse Source
This commit is contained in:
Laurent Cozic 2022-02-11 19:53:42 +00:00
parent 064891d097
commit b79270990b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/lib/shim-init-node.js
View File

@ -18,7 +18,6 @@ const timers = require('timers');
const zlib = require('zlib'); const zlib = require('zlib');
const dgram = require('dgram'); const dgram = require('dgram');
const { basename, fileExtension, safeFileExtension } = require('./path-utils'); const { basename, fileExtension, safeFileExtension } = require('./path-utils');
const nativeImage = require('electron').nativeImage;
function fileExists(filePath) { function fileExists(filePath) {
try { try {
@ -160,6 +159,7 @@ function shimInit(options = null) {
if (shim.isElectron()) { if (shim.isElectron()) {
// For Electron // For Electron
const nativeImage = require('electron').nativeImage;
let image = nativeImage.createFromPath(filePath); let image = nativeImage.createFromPath(filePath);
if (image.isEmpty()) throw new Error(`Image is invalid or does not exist: ${filePath}`); if (image.isEmpty()) throw new Error(`Image is invalid or does not exist: ${filePath}`);
@ -332,6 +332,7 @@ function shimInit(options = null) {
shim.imageToDataUrl = async (filePath, maxSize) => { shim.imageToDataUrl = async (filePath, maxSize) => {
if (shim.isElectron()) { if (shim.isElectron()) {
const nativeImage = require('electron').nativeImage;
let image = nativeImage.createFromPath(filePath); let image = nativeImage.createFromPath(filePath);
if (!image) throw new Error(`Could not load image: ${filePath}`); if (!image) throw new Error(`Could not load image: ${filePath}`);
@ -365,6 +366,7 @@ function shimInit(options = null) {
if (options === null) options = {}; if (options === null) options = {};
if (shim.isElectron()) { if (shim.isElectron()) {
const nativeImage = require('electron').nativeImage;
let image = nativeImage.createFromDataURL(imageDataUrl); let image = nativeImage.createFromDataURL(imageDataUrl);
if (image.isEmpty()) throw new Error('Could not convert data URL to image - perhaps the format is not supported (eg. image/gif)'); // Would throw for example if the image format is no supported (eg. image/gif) if (image.isEmpty()) throw new Error('Could not convert data URL to image - perhaps the format is not supported (eg. image/gif)'); // Would throw for example if the image format is no supported (eg. image/gif)
if (options.cropRect) { if (options.cropRect) {