self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-06-15 23:00:36 +02:00
Code Issues Releases Activity

All: Fixes #557: Handle ENEX am-pm date format

Browse Source
This commit is contained in:
Laurent Cozic
2018-06-10 01:19:24 +01:00
parent f47610e6fd
commit b0e57a5990
3 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ReactNativeClient/lib/shim-init-node.js
View File

@ -6,6 +6,8 @@ const { time } = require('lib/time-utils.js');
const { setLocale, defaultLocale, closestSupportedLocale } = require('lib/locale.js');
const { FsDriverNode } = require('lib/fs-driver-node.js');
const mimeUtils = require('lib/mime-utils.js').mime;
const Note = require('lib/models/Note.js');
const Resource = require('lib/models/Resource.js');
const urlValidator = require('valid-url');
function shimInit() {
@ -82,7 +84,6 @@ function shimInit() {
await shim.writeImageToFile(image, mime, targetPath);
} else { // For the CLI tool
const sharp = require('sharp');
const Resource = require('lib/models/Resource.js');
return new Promise((resolve, reject) => {
sharp(filePath)
@ -104,11 +105,9 @@ function shimInit() {
const readChunk = require('read-chunk');
const imageType = require('image-type');
const Resource = require('lib/models/Resource.js');
const { uuid } = require('lib/uuid.js');
const { basename, fileExtension, safeFileExtension } = require('lib/path-utils.js');
const mime = require('mime/lite');
const Note = require('lib/models/Note.js');
if (!(await fs.pathExists(filePath))) throw new Error(_('Cannot access %s', filePath));