1
0
mirror of https://github.com/laurent22/joplin.git synced 2025-06-15 23:00:36 +02:00

All: Add support for application plugins (#3257)

This commit is contained in:
Laurent
2020-10-09 18:35:46 +01:00
committed by GitHub
parent 833fb1264f
commit fe41d37f8f
804 changed files with 95622 additions and 5307 deletions

View File

@ -1,10 +1,10 @@
const { uuid } = require('lib/uuid.js');
const uuid = require('lib/uuid').default;
const moment = require('moment');
const BaseModel = require('lib/BaseModel.js');
const Note = require('lib/models/Note.js');
const Tag = require('lib/models/Tag.js');
const Resource = require('lib/models/Resource.js');
const Setting = require('lib/models/Setting.js');
const Setting = require('lib/models/Setting').default;
const { MarkupToHtml } = require('lib/joplin-renderer');
const { enexXmlToMd } = require('./import-enex-md-gen.js');
const { enexXmlToHtml } = require('./import-enex-html-gen.js');
@ -13,6 +13,7 @@ const Levenshtein = require('levenshtein');
const md5 = require('md5');
const { Base64Decode } = require('base64-stream');
const md5File = require('md5-file');
const shim = require('lib/shim').default;
// const Promise = require('promise');
const fs = require('fs-extra');
@ -484,10 +485,10 @@ function importEnex(parentFolderId, filePath, importOptions = null) {
saxStream.on('end', function() {
// Wait till there is no more notes to process.
const iid = setInterval(() => {
const iid = shim.setInterval(() => {
processNotes().then(allDone => {
if (allDone) {
clearTimeout(iid);
shim.clearTimeout(iid);
resolve();
}
});