npm - wikiplus-highlight - Versions diffs - 3.0.8 → 3.1.0 - Mend

wikiplus-highlight 3.0.8 → 3.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (2) hide show

package/dist/main.js +85 -53
package/package.json +2 -1

package/dist/main.js CHANGED Viewed

@@ -9,19 +9,23 @@
     if (wphl === null || wphl === void 0 ? void 0 : wphl.version) {
         return;
     }
-    const version = '3.0.8';
-    libs.wphl = { version, cmVersion: '2.9', ...wphl }; // 开始加载
+    const version = '3.1.0';
+    libs.wphl = { version, cmVersion: '2.9', monacoVersion: '0.2.2', ...wphl }; // 开始加载
     // 路径
-    const CDN = '//testingcf.jsdelivr.net', MW_CDN = `npm/@bhsd/codemirror-mediawiki@${libs.wphl.cmVersion || 'latest'}/dist/mw.min.js`, REPO_CDN = 'npm/wikiplus-highlight';
-    window.CodeMirror6 || (window.CodeMirror6 = new Promise(resolve => {
-        const script = document.createElement('script');
-        script.addEventListener('load', () => {
-            resolve(CodeMirror6);
-        });
-        script.type = 'module';
-        script.src = `${CDN}/${MW_CDN}`;
-        document.head.appendChild(script);
-    }));
+    const CDN = '//testingcf.jsdelivr.net', MW_CDN = `npm/@bhsd/codemirror-mediawiki@${libs.wphl.cmVersion || 'latest'}/dist/mw.min.js`, MONACO_CDN = `npm/monaco-wiki@${libs.wphl.monacoVersion || 'latest'}/dist/mw.min.js`, REPO_CDN = 'npm/wikiplus-highlight';
+    const useMonaco = wphl === null || wphl === void 0 ? void 0 : wphl.useMonaco;
+    if (useMonaco) {
+        window.MonacoWikiEditor || (window.MonacoWikiEditor = (async () => {
+            await $.ajax(`${CDN}/${MONACO_CDN}`, { dataType: 'script', scriptAttrs: { type: 'module' } });
+            return MonacoWikiEditor;
+        })());
+    }
+    else {
+        window.CodeMirror6 || (window.CodeMirror6 = (async () => {
+            await $.ajax(`${CDN}/${MW_CDN}`, { dataType: 'script', scriptAttrs: { type: 'module' } });
+            return CodeMirror6;
+        })());
+    }
     const { wgPageName: page, wgNamespaceNumber: ns, wgPageContentModel: contentmodel, } = mw.config.get();
     const CONTENTMODELS = {
         'sanitized-css': 'css',
@@ -89,56 +93,84 @@
         }
         return [ns === 274 ? 'html' : 'lua'];
     };
+    const submit = /** 提交编辑 */ () => {
+        document.getElementById('Wikiplus-Quickedit-Submit').dispatchEvent(new MouseEvent('click'));
+        return true;
+    }, submitMinor = /** 提交小编辑 */ () => {
+        document.querySelector('#Wikiplus-Quickedit-MinorEdit').checked = true;
+        return submit();
+    }, escapeEdit = /** 按下Esc键退出编辑 */ () => {
+        document.getElementById('Wikiplus-Quickedit-Back').dispatchEvent(new MouseEvent('click'));
+        return true;
+    };
     /**
      * 渲染编辑器
      * @param $target 目标编辑框
      * @param setting 是否是Wikiplus设置（使用json语法）
      */
     const renderEditor = async ($target, setting) => {
-        const cm = await (await CodeMirror6).fromTextArea($target[0], ...setting ? ['json'] : await getPageMode($target.val()));
-        cm.view.dom.id = 'Wikiplus-CodeMirror';
-        document.querySelector('#Wikiplus-Quickedit-Jump > a').href = '#Wikiplus-CodeMirror';
-        if (!setting) { // 普通Wikiplus编辑区
-            const settings = getObject('Wikiplus_Settings'), escToExitQuickEdit = settings && (settings['esc_to_exit_quickedit'] || settings['escToExitQuickEdit']), submit = /** 提交编辑 */ () => {
-                document.getElementById('Wikiplus-Quickedit-Submit').dispatchEvent(new MouseEvent('click'));
-                return true;
-            }, submitMinor = /** 提交小编辑 */ () => {
-                document.querySelector('#Wikiplus-Quickedit-MinorEdit').checked = true;
-                return submit();
-            }, escapeEdit = /** 按下Esc键退出编辑 */ () => {
-                document.getElementById('Wikiplus-Quickedit-Back').dispatchEvent(new MouseEvent('click'));
-                return true;
-            };
-            cm.extraKeys([
-                { key: 'Mod-S', run: submit },
-                { key: 'Shift-Mod-S', run: submitMinor },
-                ...escToExitQuickEdit === true || escToExitQuickEdit === 'true'
-                    ? [{ key: 'Esc', run: escapeEdit }]
-                    : [],
-            ]);
+        const settings = getObject('Wikiplus_Settings'), escToExitQuickEdit = settings && (settings['esc_to_exit_quickedit'] || settings['escToExitQuickEdit']);
+        if (useMonaco) {
+            const lang = setting ? 'json' : (await getPageMode($target.val()))[0], { editor } = await (await MonacoWikiEditor).fromTextArea($target[0], lang);
+            editor.getDomNode().id = 'Wikiplus-CodeMirror';
+            if (!setting) { // 普通Wikiplus编辑区
+                editor.onKeyUp(e => {
+                    if (e.keyCode === 49 && (e.ctrlKey || e.metaKey)) {
+                        e.preventDefault();
+                        if (e.shiftKey) {
+                            submitMinor();
+                        }
+                        else {
+                            submit();
+                        }
+                    }
+                    else if (e.keyCode === 9
+                        && (escToExitQuickEdit === true || escToExitQuickEdit === 'true')) {
+                        e.preventDefault();
+                        escapeEdit();
+                    }
+                });
+            }
         }
-        /** @todo 以下过渡代码添加于2024-02-07，将于一段时间后弃用 */
-        const oldKey = 'Wikiplus-highlight-addons', oldPrefs = getObject(oldKey), mapping = {
-            activeLine: 'highlightActiveLine',
-            trailingspace: 'highlightTrailingWhitespace',
-            matchBrackets: 'bracketMatching',
-            closeBrackets: 'closeBrackets',
-            matchTags: 'tagMatching',
-            fold: 'codeFolding',
-            wikiEditor: 'wikiEditor',
-            escape: 'escape',
-            contextmenu: 'openLinks',
-            lint: 'lint',
-        };
-        localStorage.removeItem(oldKey);
-        if (oldPrefs) {
-            const obj = {};
-            for (const k of oldPrefs) {
-                if (k in mapping) {
-                    obj[mapping[k]] = true;
+        else {
+            const cm = await (await CodeMirror6).fromTextArea($target[0], ...setting ? ['json'] : await getPageMode($target.val()));
+            cm.view.dom.id = 'Wikiplus-CodeMirror';
+            if (!setting) { // 普通Wikiplus编辑区
+                cm.extraKeys([
+                    { key: 'Mod-S', run: submit },
+                    { key: 'Shift-Mod-S', run: submitMinor },
+                    ...escToExitQuickEdit === true || escToExitQuickEdit === 'true'
+                        ? [{ key: 'Esc', run: escapeEdit }]
+                        : [],
+                ]);
+            }
+            /** @todo 以下过渡代码添加于2024-02-07，将于一段时间后弃用 */
+            const oldKey = 'Wikiplus-highlight-addons', oldPrefs = getObject(oldKey), mapping = {
+                activeLine: 'highlightActiveLine',
+                trailingspace: 'highlightTrailingWhitespace',
+                matchBrackets: 'bracketMatching',
+                closeBrackets: 'closeBrackets',
+                matchTags: 'tagMatching',
+                fold: 'codeFolding',
+                wikiEditor: 'wikiEditor',
+                escape: 'escape',
+                contextmenu: 'openLinks',
+                lint: 'lint',
+            };
+            localStorage.removeItem(oldKey);
+            if (oldPrefs) {
+                const obj = {};
+                for (const k of oldPrefs) {
+                    if (k in mapping) {
+                        obj[mapping[k]] = true;
+                    }
                 }
+                cm.prefer(obj);
             }
-            cm.prefer(obj);
+        }
+        const jump = document.querySelector('#Wikiplus-Quickedit-Jump > a');
+        if (jump) {
+            jump.href = '#Wikiplus-CodeMirror';
         }
     };
     // 监视 Wikiplus 编辑框

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
 	"name": "wikiplus-highlight",
-	"version": "3.0.8",
+	"version": "3.1.0",
 	"description": "A plugin for the MediaWiki front-end add-on \"Wikiplus\"",
 	"keywords": [
 		"mediawiki",
@@ -44,6 +44,7 @@
 		"eslint-plugin-promise": "^6.1.1",
 		"eslint-plugin-regexp": "^2.2.0",
 		"eslint-plugin-unicorn": "^51.0.1",
+		"monaco-wiki": "^0.2.0",
 		"stylelint": "^16.1.0",
 		"stylelint-config-recommended": "^14.0.0",
 		"types-mediawiki": "^1.4.0",