From 112753ff174dd1b9c7d060096e9f5e2dae4d678e Mon Sep 17 00:00:00 2001 From: NishikawaKoharu Date: Tue, 10 Nov 2026 09:23:04 +0900 Subject: [PATCH] =?UTF-8?q?Wiki=E6=AF=94=E8=BC=83=E3=83=91=E3=83=8D?= =?UTF-8?q?=E3=83=AB=E3=81=AE=E5=88=9D=E6=9C=9F=E8=A1=A8=E7=A4=BA=E4=B8=8D?= =?UTF-8?q?=E4=B8=80=E8=87=B4=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/wiki/static/wikiPageMilkdown.js | 46 +++++++++++++++-------- website/static/js/pages/wiki-edit-page.js | 3 +- 2 files changed, 32 insertions(+), 17 deletions(-) diff --git a/addons/wiki/static/wikiPageMilkdown.js b/addons/wiki/static/wikiPageMilkdown.js index 6edfab6..c9890a2 100644 --- a/addons/wiki/static/wikiPageMilkdown.js +++ b/addons/wiki/static/wikiPageMilkdown.js @@ -396,13 +396,8 @@ async function createMEditor(editor, vm, template) { uploader, enableHtmlFileUploader, })); - const debouncedMarkdownUpdated = $osf.debounce(async (ctx, markdown, prevMarkdown) => { - const compareWidgetElement = document.getElementById('compareWidget'); - - if (compareWidgetElement && compareWidgetElement.style.display !== 'none') { - vm.viewVM.displaySource(markdown); - } + const debouncedUndoButtonUpdate = $osf.debounce(async (ctx) => { const view = ctx.get(mCore.editorViewCtx); const state = view.state; const undoElement = document.getElementById('undoWiki'); @@ -413,7 +408,10 @@ async function createMEditor(editor, vm, template) { } }, 300); ctx.get(mListener.listenerCtx).markdownUpdated((ctx, markdown, prevMarkdown) => { - debouncedMarkdownUpdated(ctx, markdown, prevMarkdown); + // Keep the live editor body in displaySource even while Compare is + // closed, so opening Compare after edits diffs against the edits. + vm.viewVM.displaySource(markdown); + debouncedUndoButtonUpdate(ctx); }); ctx.update(mCore.editorViewOptionsCtx, (prev) => ({ ...prev, @@ -658,7 +656,7 @@ var defaultOptions = { menuVisible: true, canEdit: true, viewVersion: 'current', - compareVersion: 'previous', + compareVersion: 'current', urls: { content: '', draft: '', @@ -667,6 +665,27 @@ var defaultOptions = { metadata: {} }; +// Normalize compare target to a dropdown option value. +// Default / empty -> current (edit vs latest saved). Explicit previous -> prior version number. +function resolveCompareVersion(compareVersion) { + if (!compareVersion) { + return 'current'; + } + if (compareVersion !== 'previous') { + return String(compareVersion); + } + var select = document.getElementById('compareVersionSelect'); + if (select) { + for (var i = 0; i < select.options.length; i++) { + var val = select.options[i].value; + if (val && val !== 'current') { + return val; + } + } + } + return 'current'; +} + function ViewModel(options){ var self = this; // enabled? @@ -696,7 +715,7 @@ function ViewModel(options){ self.status = ko.observable('connecting'); self.throttledStatus = ko.observable(self.status()); - self.compareVersion = ko.observable(options.compareVersion); + self.compareVersion = ko.observable(resolveCompareVersion(options.compareVersion)); self.viewVersion = ko.observable(options.viewVersion); self.draftURL = options.urls.draft; self.contentURL = options.urls.content; @@ -881,13 +900,8 @@ function ViewModel(options){ if (panel === 'compare') { if(display && self.compareVis()){ self.viewVersion('preview'); - var toMarkdown = ''; - mEdit.action((ctx) => { - const view = ctx.get(mCore.editorViewCtx); - const serializer = ctx.get(mCore.serializerCtx); - toMarkdown = serializer(view.state.doc); - }); - self.viewVM.displaySource(toMarkdown); + // Always use the live editor body as the "after" side of the diff. + self.viewVM.displaySource(getEditorMarkdown()); } } diff --git a/website/static/js/pages/wiki-edit-page.js b/website/static/js/pages/wiki-edit-page.js index ab95380..465b072 100644 --- a/website/static/js/pages/wiki-edit-page.js +++ b/website/static/js/pages/wiki-edit-page.js @@ -31,7 +31,8 @@ var comparable = (ctx.panelsUsed.indexOf('compare') !== -1); var menuVisible = (ctx.panelsUsed.indexOf('menu') !== -1); var viewVersion = ctx.versionSettings.view || (editable ? 'preview' : 'current'); -var compareVersion = ctx.versionSettings.compare || 'previous'; +// Default Current = editing body vs latest saved. Explicit previous is remapped server-side. +var compareVersion = ctx.versionSettings.compare || 'current'; var wikiPageOptions = { editVisible: editable,