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

All: Add support for application plugins (#3257)

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

7
ReactNativeClient/lib/services/synchronizer/LockHandler.ts
View File

@ -1,4 +1,5 @@
import { Dirnames } from './utils/types';
import shim from 'lib/shim';
const JoplinError = require('lib/JoplinError');
const { time } = require('lib/time-utils');
@ -277,7 +278,7 @@ export default class LockHandler {
inProgress: false,
};
this.refreshTimers_[handle].id = setInterval(async () => {
this.refreshTimers_[handle].id = shim.setInterval(async () => {
if (this.refreshTimers_[handle].inProgress) return;
const defer = () => {
@ -310,7 +311,7 @@ export default class LockHandler {
if (error) {
if (this.refreshTimers_[handle]) {
clearInterval(this.refreshTimers_[handle].id);
shim.clearInterval(this.refreshTimers_[handle].id);
delete this.refreshTimers_[handle];
}
errorHandler(error);
@ -331,7 +332,7 @@ export default class LockHandler {
return;
}
clearInterval(this.refreshTimers_[handle].id);
shim.clearInterval(this.refreshTimers_[handle].id);
delete this.refreshTimers_[handle];
}

4
ReactNativeClient/lib/services/synchronizer/MigrationHandler.ts
View File

@ -1,6 +1,6 @@
import LockHandler, { LockType } from './LockHandler';
import { Dirnames } from './utils/types';
const BaseService = require('lib/services/BaseService.js');
const BaseService = require('lib/services/BaseService').default;
// To add a new migration:
// - Add the migration logic in ./migrations/VERSION_NUM.js
@ -13,7 +13,7 @@ const migrations = [
require('./migrations/2.js').default,
];
const Setting = require('lib/models/Setting');
const Setting = require('lib/models/Setting').default;
const { sprintf } = require('sprintf-js');
const JoplinError = require('lib/JoplinError');

2
ReactNativeClient/lib/services/synchronizer/gui/useSyncTargetUpgrade.ts
View File

@ -1,6 +1,6 @@
import { useEffect, useState } from 'react';
import MigrationHandler from 'lib/services/synchronizer/MigrationHandler';
const Setting = require('lib/models/Setting');
const Setting = require('lib/models/Setting').default;
const { reg } = require('lib/registry');
export interface SyncTargetUpgradeResult {