self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-29 22:48:10 +02:00
Code Issues Releases Activity

Merge branch 'clipper'

Browse Source
This commit is contained in:
Laurent Cozic
2018-05-25 13:31:15 +01:00
parent 4b376ec5c2 e15f84716a
commit f81dce3321
114 changed files with 25697 additions and 1180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ReactNativeClient/lib/models/BaseItem.js
View File

@@ -6,7 +6,7 @@ const { time } = require('lib/time-utils.js');
const { sprintf } = require('sprintf-js');
const { _ } = require('lib/locale.js');
const moment = require('moment');
const { markdownUtils } = require('lib/markdown-utils.js');
const markdownUtils = require('lib/markdownUtils');
class BaseItem extends BaseModel {

6
ReactNativeClient/lib/models/Resource.js
View File

@@ -7,7 +7,7 @@ const pathUtils = require('lib/path-utils.js');
const { mime } = require('lib/mime-utils.js');
const { filename } = require('lib/path-utils.js');
const { FsDriverDummy } = require('lib/fs-driver-dummy.js');
const { markdownUtils } = require('lib/markdown-utils.js');
const markdownUtils = require('lib/markdownUtils');
const JoplinError = require('lib/JoplinError');
class Resource extends BaseItem {
@@ -135,6 +135,10 @@ class Resource extends BaseItem {
return lines.join('');
}
static internalUrl(resource) {
return ':/' + resource.id;
}
static pathToId(path) {
return filename(path);
}

1
ReactNativeClient/lib/models/Setting.js
View File

@@ -102,6 +102,7 @@ class Setting extends BaseModel {
'style.zoom': {value: "100", type: Setting.TYPE_INT, public: true, appTypes: ['desktop'], label: () => _('Global zoom percentage'), minimum: "50", maximum: "500", step: "10"},
'style.editor.fontFamily': {value: "", type: Setting.TYPE_STRING, public: true, appTypes: ['desktop'], label: () => _('Editor font family'), description: () => _('This must be *monospace* font or it will not work properly. If the font is incorrect or empty, it will default to a generic monospace font.')},
'autoUpdateEnabled': { value: true, type: Setting.TYPE_BOOL, public: true, appTypes: ['desktop'], label: () => _('Automatically update the application') },
'clipperServer.autoStart': { value: false, type: Setting.TYPE_BOOL, public: false },
'sync.interval': { value: 300, type: Setting.TYPE_INT, isEnum: true, public: true, label: () => _('Synchronisation interval'), options: () => {
return {
0: _('Disabled'),