diff --git a/CliClient/package-lock.json b/CliClient/package-lock.json index 0adb13310e..32f0f98021 100644 --- a/CliClient/package-lock.json +++ b/CliClient/package-lock.json @@ -1,6 +1,6 @@ { "name": "joplin", - "version": "1.0.149", + "version": "1.0.150", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -2226,7 +2226,7 @@ "dependencies": { "minimist": { "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=" } } diff --git a/ElectronClient/app/app.js b/ElectronClient/app/app.js index 69e7822d1c..5f74b9e7e4 100644 --- a/ElectronClient/app/app.js +++ b/ElectronClient/app/app.js @@ -1177,6 +1177,11 @@ class Application extends BaseApplication { 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.setLogger(reg.logger()); diff --git a/ReactNativeClient/lib/BaseApplication.js b/ReactNativeClient/lib/BaseApplication.js index 2ac0ebcce4..e59682fc6b 100644 --- a/ReactNativeClient/lib/BaseApplication.js +++ b/ReactNativeClient/lib/BaseApplication.js @@ -39,7 +39,6 @@ const BaseService = require('lib/services/BaseService'); const SearchEngine = require('lib/services/SearchEngine'); const KvStore = require('lib/services/KvStore'); const MigrationService = require('lib/services/MigrationService'); -const CssUtils = require('lib/CssUtils'); SyncTargetRegistry.addClass(SyncTargetFilesystem); SyncTargetRegistry.addClass(SyncTargetOneDrive); @@ -610,11 +609,6 @@ class BaseApplication { 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('firstStart')) {