self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-11-24 08:12:24 +02:00
Code Issues Releases Activity

CliClient: Fixed regression following recent PR

Browse Source
This commit is contained in:
Laurent Cozic 2019-12-14 10:55:42 +00:00
parent 1b31525773
commit 03522b48a5
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CliClient/package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "joplin", "name": "joplin",
"version": "1.0.149", "version": "1.0.150",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
@ -2226,7 +2226,7 @@
"dependencies": { "dependencies": {
"minimist": { "minimist": {
"version": "1.2.0", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
} }
} }

5
ElectronClient/app/app.js
View File

@ -1177,6 +1177,11 @@ class Application extends BaseApplication {
argv = await super.start(argv); argv = await super.start(argv);
// Loads app-wide styles. (Markdown preview-specific styles loaded in app.js)
const dir = Setting.value('profileDir');
const filename = Setting.custom_css_files.JOPLIN_APP;
await CssUtils.injectCustomStyles(`${dir}/${filename}`);
AlarmService.setDriver(new AlarmServiceDriverNode({ appName: packageInfo.build.appId })); AlarmService.setDriver(new AlarmServiceDriverNode({ appName: packageInfo.build.appId }));
AlarmService.setLogger(reg.logger()); AlarmService.setLogger(reg.logger());

6
ReactNativeClient/lib/BaseApplication.js
View File

@ -39,7 +39,6 @@ const BaseService = require('lib/services/BaseService');
const SearchEngine = require('lib/services/SearchEngine'); const SearchEngine = require('lib/services/SearchEngine');
const KvStore = require('lib/services/KvStore'); const KvStore = require('lib/services/KvStore');
const MigrationService = require('lib/services/MigrationService'); const MigrationService = require('lib/services/MigrationService');
const CssUtils = require('lib/CssUtils');
SyncTargetRegistry.addClass(SyncTargetFilesystem); SyncTargetRegistry.addClass(SyncTargetFilesystem);
SyncTargetRegistry.addClass(SyncTargetOneDrive); SyncTargetRegistry.addClass(SyncTargetOneDrive);
@ -610,11 +609,6 @@ class BaseApplication {
await Setting.load(); await Setting.load();
// Loads app-wide styles. (Markdown preview-specific styles loaded in app.js)
const dir = Setting.value('profileDir');
const filename = Setting.custom_css_files.JOPLIN_APP;
await CssUtils.injectCustomStyles(`${dir}/${filename}`);
if (!Setting.value('clientId')) Setting.setValue('clientId', uuid.create()); if (!Setting.value('clientId')) Setting.setValue('clientId', uuid.create());
if (Setting.value('firstStart')) { if (Setting.value('firstStart')) {