From c49f4dd11ed77526794bac83d3ac3b7902f9e4ff Mon Sep 17 00:00:00 2001 From: tophf Date: Mon, 3 Sep 2018 20:47:45 +0300 Subject: [PATCH 1/2] don't hook auxiliary CMs fixes #491 --- edit/codemirror-editing-hooks.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/edit/codemirror-editing-hooks.js b/edit/codemirror-editing-hooks.js index 4297eb05..31d0ce5d 100644 --- a/edit/codemirror-editing-hooks.js +++ b/edit/codemirror-editing-hooks.js @@ -43,6 +43,9 @@ onDOMscriptReady('/codemirror.js').then(() => { }); CodeMirror.defineInitHook(cm => { + if (!cm.display.wrapper.closest('#sections')) { + return; + } if (prefs.get('editor.livePreview') && styleId) { cm.on('changes', updatePreview); } From 3ba92016632854487ba92dbdd22857501e70f252 Mon Sep 17 00:00:00 2001 From: tophf Date: Mon, 3 Sep 2018 20:50:13 +0300 Subject: [PATCH 2/2] hyphenate long tokens in unreachableAMO message --- popup/popup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/popup/popup.js b/popup/popup.js index 5db20042..30a3d4a1 100644 --- a/popup/popup.js +++ b/popup/popup.js @@ -129,7 +129,7 @@ function initPopup() { $('label', info).textContent = t('unreachableAMO'); const note = (FIREFOX < 59 ? t('unreachableAMOHintOldFF') : t('unreachableAMOHint')) + (FIREFOX < 60 ? '' : '\n' + t('unreachableAMOHintNewFF')); - const renderToken = s => s[0] === '<' ? $create('b', s.slice(1, -1)) : s; + const renderToken = s => s[0] === '<' ? $create('b', tWordBreak(s.slice(1, -1))) : s; const renderLine = line => $create('p', line.split(/(<.*?>)/).map(renderToken)); const noteNode = $create('fragment', note.split('\n').map(renderLine)); const target = $('p', info);