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

Fixed regressions following fix for #1425

Browse Source
This commit is contained in:
Laurent Cozic
2019-05-11 12:08:28 +01:00
parent b702b0b40c
commit afb375955e
3 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -124,7 +124,10 @@ class BaseItem extends BaseModel {
static pathToId(path) {
let p = path.split('/');
let s = p[p.length - 1].split('.');
return s[0];
let name = s[0];
if (!name) return name;
name.split('-');
return name[name.length - 1];
}
static loadItemByPath(path) {

4
ReactNativeClient/lib/models/Note.js
View File

@@ -178,14 +178,14 @@ class Note extends BaseItem {
const resource = await Resource.load(id);
if (!resource) continue;
const resourcePath = Resource.relativePath(resource)
body = body.replace(new RegExp(':/' + id, 'gi'), resourcePath); //toFileProtocolPath(Resource.fullPath(resource)));
body = body.replace(new RegExp(':/' + id, 'gi'), resourcePath);
}
return body;
}
static async replaceResourceExternalToInternalLinks(body) {
const reString = pregQuote(toFileProtocolPath(Resource.baseRelativeDirectoryPath() + '/')) + '[a-zA-Z0-9\.]+';
const reString = pregQuote(Resource.baseRelativeDirectoryPath() + '/') + '[a-zA-Z0-9\.]+';
const re = new RegExp(reString, 'gi');
body = body.replace(re, (match) => {
const id = Resource.pathToId(match);