@bhsd/codemirror-mediawiki 2.3.3 → 2.3.5

package/mw/openLinks.ts

@@ -1,16 +1,13 @@
-const {vendor, userAgent, maxTouchPoints, platform} = navigator,
-	modKey = vendor.includes('Apple Computer') && (userAgent.includes('Mobile/') || maxTouchPoints > 2)
-	|| platform.includes('Mac')
-		? 'metaKey'
-		: 'ctrlKey';
+import {isMac} from './msg';
 
-export const pageSelector = '.cm-mw-template-name, .cm-mw-link-pagename';
+const modKey = isMac ? 'metaKey' : 'ctrlKey',
+	pageSelector = '.cm-mw-template-name, .cm-mw-link-pagename';
 
 /**
  * 点击时在新页面打开链接、模板等
  * @param e 点击事件
  */
-export const openLinks = function(this: HTMLElement, e: JQuery.ClickEvent): void {
+const handler = function(this: HTMLElement, e: JQuery.ClickEvent): void {
 	if (!e[modKey]) {
 		return;
 	}
@@ -37,3 +34,17 @@ export const openLinks = function(this: HTMLElement, e: JQuery.ClickEvent): void
 	}
 	open(new mw.Title(page, this.classList.contains('cm-mw-template-name') ? 10 : 0).getUrl(undefined), '_blank');
 };
+
+/**
+ * 添加或移除打开链接的事件
+ * @param ele 编辑器DOM
+ * @param on 是否添加
+ */
+export const openLinks = (ele: HTMLElement, on?: boolean): void => {
+	if (on) {
+		mw.loader.load('mediawiki.Title');
+		$(ele).on('click', pageSelector, handler).css('--codemirror-cursor', 'pointer');
+	} else if (on === false) {
+		$(ele).off('click', pageSelector, handler).css('--codemirror-cursor', '');
+	}
+};

package/mw/preference.ts

@@ -1,8 +1,9 @@
 import {msg} from './msg';
 import type {CodeMirror} from './base';
 
-export const storageKey = 'codemirror-mediawiki-addons',
-	indentKey = 'codemirror-mediawiki-indent';
+const storageKey = 'codemirror-mediawiki-addons';
+export const indentKey = 'codemirror-mediawiki-indent',
+	prefs = new Set<string>(JSON.parse(localStorage.getItem(storageKey)!) as string[] | null);
 
 const options = [
 	'allowMultipleSelections',
@@ -28,13 +29,12 @@ let dialog: OO.ui.MessageDialog | undefined,
 
 /**
  * 打开设置对话框
- * @param addons 预设的扩展
  * @param editors CodeMirror实例
  */
-export const openPreference = async (addons: Set<string>, editors: (CodeMirror | undefined)[]): Promise<void> => {
+export const openPreference = async (editors: (CodeMirror | undefined)[]): Promise<void> => {
 	await mw.loader.using(['oojs-ui-windows', 'oojs-ui.styles.icons-content']);
 	if (dialog) {
-		widget.setValue([...addons] as unknown as string);
+		widget.setValue([...prefs] as unknown as string);
 		indentWidget.setValue(indent);
 	} else {
 		dialog = new OO.ui.MessageDialog();
@@ -43,13 +43,13 @@ export const openPreference = async (addons: Set<string>, editors: (CodeMirror |
 		windowManager.addWindows([dialog]);
 		widget = new OO.ui.CheckboxMultiselectInputWidget({
 			options: options.map(option => ({data: option, label: $($.parseHTML(msg(`addon-${option}`)))})),
-			value: [...addons] as unknown as string,
+			value: [...prefs] as unknown as string,
 		});
 		field = new OO.ui.FieldLayout(widget, {
 			label: msg('label'),
 			align: 'top',
 		});
-		indentWidget = new OO.ui.TextInputWidget({placeholder: '\\t'});
+		indentWidget = new OO.ui.TextInputWidget({value: indent, placeholder: '\\t'});
 		indentField = new OO.ui.FieldLayout(indentWidget, {label: msg('addon-indent')});
 	}
 
@@ -65,9 +65,9 @@ export const openPreference = async (addons: Set<string>, editors: (CodeMirror |
 	if (typeof data === 'object' && data.action === 'accept') {
 		const value = widget.getValue() as unknown as string[];
 		indent = indentWidget.getValue(); // eslint-disable-line require-atomic-updates
-		addons.clear();
+		prefs.clear();
 		for (const option of value) {
-			addons.add(option);
+			prefs.add(option);
 		}
 		for (const cm of editors) {
 			cm?.prefer(value);

package/mw/textSelection.ts

@@ -2,6 +2,10 @@ import type {CodeMirror} from './base';
 
 export const instances = new WeakMap<HTMLTextAreaElement, CodeMirror>();
 
+/**
+ * 获取CodeMirror实例
+ * @param $ele textarea元素的jQuery对象
+ */
 const getInstance = ($ele: JQuery<HTMLTextAreaElement>): CodeMirror => instances.get($ele[0]!)!;
 
 function getCaretPosition(this: JQuery<HTMLTextAreaElement>, option: {startAndEnd: true}): [number, number];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@bhsd/codemirror-mediawiki",
-	"version": "2.3.3",
+	"version": "2.3.5",
 	"description": "Modified CodeMirror mode based on wikimedia/mediawiki-extensions-CodeMirror",
 	"keywords": [
 		"mediawiki",