self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-11 18:24:43 +02:00
Code Issues Releases Activity

Minor changes

Browse Source
This commit is contained in:
Laurent Cozic 2019-07-19 18:18:05 +01:00
parent 14fc73b388
commit 8ff1668c8f
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CliClient/tests/htmlUtils.js
View File

@ -45,4 +45,14 @@ describe('htmlUtils', function() {
done();
});
it('should return the head and body HTML', async (done) => {
const html = '<html><head><style>h1 { font-weight: bold; }</style></head><body><h1>Bonjour</h1></body></html>';
const dom = htmlUtils.parse(html);
const resultHtml = htmlUtils.headAndBodyHtml(dom);
expect(resultHtml).toBe('<style>h1 { font-weight: bold; }</style>\n<h1>Bonjour</h1>');
done();
});
});

2
ElectronClient/app/gui/NoteText.jsx
View File

@ -670,7 +670,7 @@ class NoteTextComponent extends React.Component {
const arg0 = args && args.length >= 1 ? args[0] : null;
const arg1 = args && args.length >= 2 ? args[1] : null;
console.info('Got ipc-message: ' + msg, args);
if (percentScroll !== 'percentScroll') console.info('Got ipc-message: ' + msg, args);
if (msg.indexOf('checkboxclick:') === 0) {
// Ugly hack because setting the body here will make the scrollbar

2
ReactNativeClient/lib/htmlUtils.js
View File

@ -15,7 +15,7 @@ class HtmlUtils {
extractImageUrls(html) {
if (!html) return [];
const dom = new JSDOM(html);
const imgs = dom.window.document.getElementsByTagName('img');
const output = [];

2
ReactNativeClient/root.js
View File

@ -422,7 +422,7 @@ async function initialize(dispatch) {
if (Setting.value('env') == 'prod') {
await db.open({ name: 'joplin.sqlite' })
} else {
await db.open({ name: 'joplin-68.sqlite' });
await db.open({ name: 'joplin-70.sqlite' });
// await db.clearForTesting();
}