Fix subtle anchor bug

- webview was moving itself when scrolling to bottom anchors

ElectronClient/app/gui/note-viewer/index.html

@@ -106,15 +106,13 @@
 
 		let previousContentHeight = contentElement.scrollHeight;
 		let startTime = Date.now();
-		ignoreNextScrollEvent = true;
 		restorePercentScroll();
 
 		if (!checkScrollIID_) {
 			checkScrollIID_ = setInterval(() => {
 				const h = contentElement.scrollHeight;
 				if (h !== previousContentHeight) {
 					previousContentHeight = h;
-					ignoreNextScrollEvent = true;
 					restorePercentScroll();
 				}
 				if (Date.now() - startTime >= 1000) {

ElectronClient/app/gui/note-viewer/preload.js

@@ -24,6 +24,14 @@ window.addEventListener('message', (event) => {
 	const callName = event.data.name;
 	const args = event.data.args;
 
+	// HACK 
+	// For some reason anchors at the bottom cause the webview to move itself
+	// so that the content is aligned with the top of the screen
+	// This basically refreshes the scroll view so that is returns to a normal
+	// position, the scroll positions stays correct though
+	if (callName === "percentScroll" && args[0] === 1)
+		location.hash = location.hash.split('#')[0]
+
 	if (args.length === 0) {
 		ipcRenderer.sendToHost(callName);
 	} else if (args.length === 1) {

ElectronClient/app/package.json

@@ -118,7 +118,7 @@
     "markdown-it-multimd-table": "^3.1.3",
     "markdown-it-sub": "^1.0.0",
     "markdown-it-sup": "^1.0.0",
-    "markdown-it-toc-done-right": "^2.1.0",
+    "markdown-it-toc-done-right": "^3.0.1",
     "md5": "^2.2.1",
     "mime": "^2.3.1",
     "moment": "^2.22.2",

ReactNativeClient/lib/MdToHtml.js

@@ -129,7 +129,7 @@ class MdToHtml {
 		markdownIt.use(rules.code_inline(context, ruleOptions));
 		markdownIt.use(markdownItAnchor)
 		if (Setting.value('plugin.toc'))
-			markdownIt.use(markdownItToc, { placeholder: '[[toc]]' })
+			markdownIt.use(markdownItToc, { listType: 'ul' })
 
 		for (let key in plugins) {
 			if (Setting.value('plugin.' + key))

ReactNativeClient/lib/models/Setting.js

@@ -581,7 +581,7 @@ class Setting extends BaseModel {
 		if (name === 'sync') return _('Synchronisation');
 		if (name === 'appearance') return _('Appearance');
 		if (name === 'note') return _('Note');
-    if (name === 'plugins') return _('Plugins');
+		if (name === 'plugins') return _('Plugins');
 		if (name === 'application') return _('Application');
 		return name;
 	}