mirror of
https://github.com/laurent22/joplin.git
synced 2024-12-24 10:27:10 +02:00
cb3e1cf1e9
commit2fb6cee901
Merge:4e303be85f
db509955f6
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 16:24:07 2020 +0100 Merge branch 'dev' into rn_63 commit4e303be85f
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 16:14:39 2020 +0100 Clean up commite3a37ec2d6
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 15:57:55 2020 +0100 Use different script for pre-commit and manual start commitbd236648fc
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 15:56:45 2020 +0100 Removed RN eslint config commite7feda41c9
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 15:27:08 2020 +0100 Revert "Disable git hook for now" This reverts commit89263ac742
. commitcfd63fe46f
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 13:02:32 2020 +0100 Ask permission to use geo-location commit66059939a3
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 12:26:20 2020 +0100 Fixed WebView race condition commit1e0d2b7b86
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 11:56:21 2020 +0100 Fixed webview issues commitf537d22d7f
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 11:08:29 2020 +0100 Improve resource file watching commiteec32cf70a
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 18:40:13 2020 +0100 Removed cache package dependency and implemented one more suitable for React Native commitefa346fea4
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 14:57:21 2020 +0100 iOS: Added fonts to Info.plist although it was working without it commit572b647bc0
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 14:56:49 2020 +0100 Specify content-type header for OneDrive to prevent network error commitbcedf6c7f0
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 12:45:01 2020 +0100 iOS: Disable long press menu since it is already built-in commit7359dd61d1
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 12:37:40 2020 +0100 Removed unused react-native-device-info commit2d63ab36d3
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 12:35:54 2020 +0100 iOS: Fixed taking a picture commit8e2875a91c
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 12:11:13 2020 +0100 iOS: Restored camera roll functionality commit75f5edf2ad
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 11:40:13 2020 +0100 iOS: Fixed build settings commitb220c98419
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 11:40:03 2020 +0100 iOS: Got images to work with WebKit commitc34b43e841
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 10:24:52 2020 +0100 iOS: Restore more settings commit32997611e6
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 10:15:14 2020 +0100 iOS: Added back icons and other properties commitb5811d7f7c
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 23:53:14 2020 +0100 Got iOS build to work commitdc6d7c00e0
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 18:40:06 2020 +0100 Imported old settings in gradle build commitdff59f5603
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 18:20:00 2020 +0100 Restored sharing commit0bdb449e72
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 17:25:40 2020 +0100 Updated NoteBodyViewer commit0c0d228815
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 16:54:42 2020 +0100 Fixed networking commit6ff45ce485
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 13:11:00 2020 +0100 Fixed document picker commitcc889182b6
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 12:56:27 2020 +0100 Added back support for alarms commit040261abfa
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 22:04:49 2020 +0100 Fixed Clipboard and remove image-picker package commit1077ad8f16
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 21:54:52 2020 +0100 Fixed Select Alarm dialog and PoorManIntervals class commit8296676fd5
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 21:32:52 2020 +0100 Fixed icons and warnings commit3b0e3f6f43
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 17:02:59 2020 +0100 Got app to build again commit89263ac742
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 15:41:17 2020 +0100 Disable git hook for now commitd6da162f67
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 15:39:12 2020 +0100 Restored back all RN packages commit7f8ce3732c
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 15:13:12 2020 +0100 Restored base packages commitea59726eb3
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 15:05:17 2020 +0100 Started over from scratch
126 lines
3.3 KiB
JavaScript
126 lines
3.3 KiB
JavaScript
const htmlUtils = require('./htmlUtils');
|
|
const utils = require('./utils');
|
|
const noteStyle = require('./noteStyle');
|
|
const Setting = require('lib/models/Setting').default;
|
|
const { themeStyle } = require('lib/theme');
|
|
const InMemoryCache = require('lib/InMemoryCache').default;
|
|
const md5 = require('md5');
|
|
|
|
// Renderered notes can potentially be quite large (for example
|
|
// when they come from the clipper) so keep the cache size
|
|
// relatively small.
|
|
const inMemoryCache = new InMemoryCache(10);
|
|
|
|
class HtmlToHtml {
|
|
constructor(options) {
|
|
if (!options) options = {};
|
|
this.resourceBaseUrl_ = 'resourceBaseUrl' in options ? options.resourceBaseUrl : null;
|
|
this.ResourceModel_ = options.ResourceModel;
|
|
this.cache_ = inMemoryCache;
|
|
this.fsDriver_ = {
|
|
writeFile: (/* path, content, encoding = 'base64'*/) => { throw new Error('writeFile not set'); },
|
|
exists: (/* path*/) => { throw new Error('exists not set'); },
|
|
cacheCssToFile: (/* cssStrings*/) => { throw new Error('cacheCssToFile not set'); },
|
|
};
|
|
|
|
if (options.fsDriver) {
|
|
if (options.fsDriver.writeFile) this.fsDriver_.writeFile = options.fsDriver.writeFile;
|
|
if (options.fsDriver.exists) this.fsDriver_.exists = options.fsDriver.exists;
|
|
if (options.fsDriver.cacheCssToFile) this.fsDriver_.cacheCssToFile = options.fsDriver.cacheCssToFile;
|
|
}
|
|
}
|
|
|
|
fsDriver() {
|
|
return this.fsDriver_;
|
|
}
|
|
|
|
splitHtml(html) {
|
|
const trimmedHtml = html.trimStart();
|
|
if (trimmedHtml.indexOf('<style>') !== 0) return { html: html, css: '' };
|
|
|
|
const closingIndex = trimmedHtml.indexOf('</style>');
|
|
if (closingIndex < 0) return { html: html, css: '' };
|
|
|
|
return {
|
|
html: trimmedHtml.substr(closingIndex + 8),
|
|
css: trimmedHtml.substr(7, closingIndex),
|
|
};
|
|
}
|
|
|
|
async allAssets(/* theme*/) {
|
|
return []; // TODO
|
|
}
|
|
|
|
// Note: the "theme" variable is ignored and instead the light theme is
|
|
// always used for HTML notes.
|
|
// See: https://github.com/laurent22/joplin/issues/3698
|
|
async render(markup, _theme, options) {
|
|
options = Object.assign({}, {
|
|
splitted: false,
|
|
}, options);
|
|
|
|
const cacheKey = md5(escape(markup));
|
|
let html = this.cache_.value(cacheKey);
|
|
|
|
if (!html) {
|
|
html = htmlUtils.sanitizeHtml(markup);
|
|
|
|
html = htmlUtils.processImageTags(html, data => {
|
|
if (!data.src) return null;
|
|
|
|
const r = utils.imageReplacement(this.ResourceModel_, data.src, options.resources, this.resourceBaseUrl_);
|
|
if (!r) return null;
|
|
|
|
if (typeof r === 'string') {
|
|
return {
|
|
type: 'replaceElement',
|
|
html: r,
|
|
};
|
|
} else {
|
|
return {
|
|
type: 'setAttributes',
|
|
attrs: r,
|
|
};
|
|
}
|
|
});
|
|
}
|
|
|
|
this.cache_.setValue(cacheKey, html, 1000 * 60 * 10);
|
|
|
|
if (options.bodyOnly) {
|
|
return {
|
|
html: html,
|
|
pluginAssets: [],
|
|
};
|
|
}
|
|
|
|
const lightTheme = themeStyle(Setting.THEME_LIGHT);
|
|
let cssStrings = noteStyle(lightTheme);
|
|
|
|
if (options.splitted) {
|
|
const splitted = this.splitHtml(html);
|
|
cssStrings = [splitted.css].concat(cssStrings);
|
|
|
|
const output = {
|
|
html: splitted.html,
|
|
pluginAssets: [],
|
|
};
|
|
|
|
if (options.externalAssetsOnly) {
|
|
output.pluginAssets.push(await this.fsDriver().cacheCssToFile(cssStrings));
|
|
}
|
|
|
|
return output;
|
|
}
|
|
|
|
const styleHtml = `<style>${cssStrings.join('\n')}</style>`;
|
|
|
|
return {
|
|
html: styleHtml + html,
|
|
pluginAssets: [],
|
|
};
|
|
}
|
|
}
|
|
|
|
module.exports = HtmlToHtml;
|