From b02a4fb3378803216201194d23a8d53a72eb3c3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=BA=E6=99=BA=E7=9A=84=E5=B0=8F=E9=B1=BC=E5=90=9B?=
 <44761872+dragon-fish@users.noreply.github.com>
Date: Thu, 4 Jan 2024 16:26:35 +0800
Subject: [PATCH] fix: drop alternative clicks (close #241) (#243)

* fix: drop alternative clicks (close #241)

* chore: rename files

* fix: edge case of Safari

---------

Co-authored-by: Dragon-Fish <xiaoyujun@aojiaogame.com>
---
 src/method/init.js                             |  2 +-
 src/module/_analytics.js                       |  2 +-
 src/module/_resolveExists.js                   |  4 ++--
 src/module/linksHere.js                        |  2 +-
 src/module/loadQuickDiff.js                    |  8 ++++----
 src/module/quickDelete.js                      |  6 +++---
 src/module/quickDiff.js                        |  2 +-
 src/module/quickEdit.js                        | 10 +++++-----
 src/module/quickPreview.js                     |  2 +-
 src/module/quickRedirect.js                    |  2 +-
 src/module/quickRename.js                      |  8 ++++----
 src/module/syncPreferences.js                  |  2 +-
 src/module/test.js                             |  3 ---
 src/{method => module}/updateNotice.js         |  8 ++++----
 src/module/version.js                          |  3 +--
 src/{module/_hasRight.js => utils/hasRight.js} |  4 +++-
 src/utils/mouseEvent.js                        | 17 +++++++++++++++++
 src/{module => utils}/mw.js                    |  2 +-
 18 files changed, 51 insertions(+), 36 deletions(-)
 delete mode 100644 src/module/test.js
 rename src/{method => module}/updateNotice.js (87%)
 rename src/{module/_hasRight.js => utils/hasRight.js} (79%)
 create mode 100644 src/utils/mouseEvent.js
 rename src/{module => utils}/mw.js (85%)

diff --git a/src/method/init.js b/src/method/init.js
index 3c3d9cc..1a668a4 100644
--- a/src/method/init.js
+++ b/src/method/init.js
@@ -3,7 +3,6 @@ import _dir from './_dir'
 import { loadScript } from './loadScript'
 import { initQueryData } from './initQueryData'
 import { loadStyles } from './loadStyles'
-import { updateNotice } from './updateNotice'
 import { syncI18nData } from './syncI18nData'
 
 import version from '../module/version'
@@ -27,6 +26,7 @@ import { quickPreview } from '../module/quickPreview'
 import { quickRedirect } from '../module/quickRedirect'
 import { quickRename } from '../module/quickRename'
 import { specialNotice } from '../module/specialNotice'
+import { updateNotice } from '../module/updateNotice'
 import { versionInfo } from '../module/versionInfo'
 
 /**
diff --git a/src/module/_analytics.js b/src/module/_analytics.js
index 6479ff6..2146829 100644
--- a/src/module/_analytics.js
+++ b/src/module/_analytics.js
@@ -1,6 +1,6 @@
 import { analyticsApi } from './endpoints'
 import { preference } from './preference'
-import { mwConfig } from './mw'
+import { mwConfig } from '../utils/mw'
 import version from './version'
 
 /**
diff --git a/src/module/_resolveExists.js b/src/module/_resolveExists.js
index fda7939..0feb7bf 100644
--- a/src/module/_resolveExists.js
+++ b/src/module/_resolveExists.js
@@ -1,5 +1,5 @@
 import { _msg } from './_msg'
-import { _hasRight } from './_hasRight'
+import { hasRight } from '../utils/hasRight'
 import { quickDelete } from './quickDelete'
 import { quickEdit } from './quickEdit'
 
@@ -11,7 +11,7 @@ import { quickEdit } from './quickEdit'
  * @param {String} reason.edit 编辑原因
  */
 export const _resolveExists = function (page, reason = {}) {
-  const canDelete = _hasRight('delete')
+  const canDelete = hasRight('delete')
 
   if (typeof reason === 'string') {
     reason = {
diff --git a/src/module/linksHere.js b/src/module/linksHere.js
index 4534f92..183b95c 100644
--- a/src/module/linksHere.js
+++ b/src/module/linksHere.js
@@ -6,7 +6,7 @@
 import { _analytics } from './_analytics'
 import { $progress, $link } from './_elements'
 import { _msg } from './_msg'
-import { mwApi, mwConfig } from './mw'
+import { mwApi, mwConfig } from '../utils/mw'
 import { quickEdit } from './quickEdit'
 
 /**
diff --git a/src/module/loadQuickDiff.js b/src/module/loadQuickDiff.js
index 1f515d2..82311a0 100644
--- a/src/module/loadQuickDiff.js
+++ b/src/module/loadQuickDiff.js
@@ -2,7 +2,8 @@ import { _msg } from './_msg'
 import { _analytics } from './_analytics'
 import { quickDiff } from './quickDiff'
 import { quickEdit } from './quickEdit'
-import { mwConfig } from './mw'
+import { mwConfig } from '../utils/mw'
+import { isPureLMBClick } from '../utils/mouseEvent'
 const { getParamValue } = mw.util
 
 function injectLinks(container) {
@@ -87,6 +88,7 @@ function injectLinks(container) {
 
       // 点击事件
       $this.on('click', function (e) {
+        if (!isPureLMBClick(e)) return
         e.preventDefault()
         _analytics('quick_diff_recentchanges')
         return quickDiff(params)
@@ -108,9 +110,7 @@ export function loadQuickDiff(container) {
       $('<button>')
         .text(_msg('quick-diff'))
         .on('click', function (e) {
-          if (e.ctrlKey || e.altKey || e.shiftKey || e.metaKey) {
-            return
-          }
+          if (!isPureLMBClick(e)) return
 
           e.preventDefault()
           _analytics('quick_diff_history_page')
diff --git a/src/module/quickDelete.js b/src/module/quickDelete.js
index 9e04705..8115ad5 100644
--- a/src/module/quickDelete.js
+++ b/src/module/quickDelete.js
@@ -1,8 +1,8 @@
 import { _analysis } from './_analytics'
 import { _msg } from './_msg'
-import { _hasRight } from './_hasRight'
+import { hasRight } from '../utils/hasRight'
 import { $br } from './_elements'
-import { mwApi, mwConfig } from './mw'
+import { mwApi, mwConfig } from '../utils/mw'
 
 /**
  * @module quickDelete 删除页面模块
@@ -36,7 +36,7 @@ export function quickDelete(page, givenReason = '') {
       )
     ),
     beforeShow: function () {
-      if (!_hasRight('delete')) {
+      if (!hasRight('delete')) {
         ssi_modal.dialog({
           title: _msg('notify-no-right'),
           content: _msg('delete-no-right'),
diff --git a/src/module/quickDiff.js b/src/module/quickDiff.js
index 150d158..48a54f9 100644
--- a/src/module/quickDiff.js
+++ b/src/module/quickDiff.js
@@ -2,7 +2,7 @@ import { _analysis } from './_analytics'
 import { _msg } from './_msg'
 import { $br, $progress } from './_elements'
 import { articleLink } from './articleLink'
-import { mwApi } from './mw'
+import { mwApi } from '../utils/mw'
 
 /**
  * @module quickDiff 快速页面差异模块
diff --git a/src/module/quickEdit.js b/src/module/quickEdit.js
index 4e78ff5..26c3a38 100644
--- a/src/module/quickEdit.js
+++ b/src/module/quickEdit.js
@@ -1,8 +1,8 @@
-import { mwApi, mwConfig } from './mw'
+import { mwApi, mwConfig } from '../utils/mw'
 
 import { _analysis } from './_analytics'
 import { _msg } from './_msg'
-import { _hasRight } from './_hasRight'
+import { hasRight } from '../utils/hasRight'
 
 import { $br, $progress } from './_elements'
 
@@ -397,7 +397,7 @@ export function quickEdit(options) {
         })
       })
       // 获取权限
-      if (!_hasRight('edit')) {
+      if (!hasRight('edit')) {
         ssi_modal.notify('dialog', {
           className: 'in-page-edit',
           position: 'center bottom',
@@ -588,7 +588,7 @@ export function quickEdit(options) {
           if (options.protection.length > 0) {
             const isEditable = (level) => {
               if (!level) return true
-              return _hasRight(
+              return hasRight(
                 level
                   .replace('sysop', 'editprotected')
                   .replace('autoconfirmed', 'editsemiprotected')
@@ -599,7 +599,7 @@ export function quickEdit(options) {
             )
             if (
               !isEditable(protectionEdit?.level) ||
-              (options.namespace === 8 && !_hasRight('editinterface'))
+              (options.namespace === 8 && !hasRight('editinterface'))
             ) {
               $modalWindow
                 .find('.save-btn')
diff --git a/src/module/quickPreview.js b/src/module/quickPreview.js
index 90fbc1b..cd643af 100644
--- a/src/module/quickPreview.js
+++ b/src/module/quickPreview.js
@@ -1,6 +1,6 @@
 import { _msg } from './_msg'
 import { $progress } from './_elements'
-import { mwApi } from './mw'
+import { mwApi } from '../utils/mw'
 
 /**
  * @module quickPreview 快速预览文章页
diff --git a/src/module/quickRedirect.js b/src/module/quickRedirect.js
index 44d7d5c..0660697 100644
--- a/src/module/quickRedirect.js
+++ b/src/module/quickRedirect.js
@@ -1,7 +1,7 @@
 import { _analysis } from './_analytics'
 import { _msg } from './_msg'
 import { $br, $progress } from './_elements'
-import { mwApi, mwConfig } from './mw'
+import { mwApi, mwConfig } from '../utils/mw'
 import { _resolveExists } from './_resolveExists'
 import { preference } from './preference'
 
diff --git a/src/module/quickRename.js b/src/module/quickRename.js
index 99ddeb3..d8f9e32 100644
--- a/src/module/quickRename.js
+++ b/src/module/quickRename.js
@@ -1,9 +1,9 @@
 import { _analysis } from './_analytics'
 import { _msg } from './_msg'
-import { _hasRight } from './_hasRight'
+import { hasRight } from '../utils/hasRight'
 import { _resolveExists } from './_resolveExists'
 import { $br } from './_elements'
-import { mwApi, mwConfig } from './mw'
+import { mwApi, mwConfig } from '../utils/mw'
 import { progress } from './progress'
 
 /**
@@ -58,7 +58,7 @@ export function quickRename(from, to) {
         $('<input>', {
           type: 'checkbox',
           id: 'noredirect',
-          disabled: !_hasRight('suppressredirect'),
+          disabled: !hasRight('suppressredirect'),
         }),
         $('<span>', { text: _msg('rename-noredirect') })
       )
@@ -150,7 +150,7 @@ export function quickRename(from, to) {
       },
     ],
     beforeShow: function () {
-      if (!_hasRight('move')) {
+      if (!hasRight('move')) {
         ssi_modal.dialog({
           title: _msg('notify-no-right'),
           content: _msg('rename-no-right'),
diff --git a/src/module/syncPreferences.js b/src/module/syncPreferences.js
index b9c173d..1c480c9 100644
--- a/src/module/syncPreferences.js
+++ b/src/module/syncPreferences.js
@@ -3,7 +3,7 @@
 // 将 IPE 的参数设置保存在数据库内，实现多端同步
 // ========================================= //
 
-import { mwApi } from './mw'
+import { mwApi } from '../utils/mw'
 
 /**
  * @param {string} name
diff --git a/src/module/test.js b/src/module/test.js
deleted file mode 100644
index 74a5007..0000000
--- a/src/module/test.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export function test() {
-  console.log('InPageEdit is runing version', window.InPageEdit.version)
-}
diff --git a/src/method/updateNotice.js b/src/module/updateNotice.js
similarity index 87%
rename from src/method/updateNotice.js
rename to src/module/updateNotice.js
index e67d01f..3122966 100644
--- a/src/method/updateNotice.js
+++ b/src/module/updateNotice.js
@@ -1,8 +1,8 @@
-import version from '../module/version'
+import version from './version'
 
-import { _msg } from '../module/_msg'
-import { versionInfo } from '../module/versionInfo'
-import { specialNotice } from '../module/specialNotice'
+import { _msg } from './_msg'
+import { versionInfo } from './versionInfo'
+import { specialNotice } from './specialNotice'
 
 export function updateNotice() {
   if (localStorage.getItem('InPageEditVersion') !== version) {
diff --git a/src/module/version.js b/src/module/version.js
index b68d6c8..9dccf4d 100644
--- a/src/module/version.js
+++ b/src/module/version.js
@@ -1,2 +1 @@
-import { version } from '../../package.json'
-export default version
+export { version as default } from '../../package.json'
diff --git a/src/module/_hasRight.js b/src/utils/hasRight.js
similarity index 79%
rename from src/module/_hasRight.js
rename to src/utils/hasRight.js
index 93d2cc5..262f750 100644
--- a/src/module/_hasRight.js
+++ b/src/utils/hasRight.js
@@ -3,7 +3,7 @@
  * @param {string} right
  * @return {boolean}
  */
-export const _hasRight = function (right) {
+export const hasRight = function (right) {
   const conf = window.mw.config.get()
   console.info(
     '[InPageEdit] _hasRight',
@@ -16,3 +16,5 @@ export const _hasRight = function (right) {
   }
   return (conf.wgUserRights || []).includes(right)
 }
+// KEEP THIS
+export { hasRight as _hasRight }
diff --git a/src/utils/mouseEvent.js b/src/utils/mouseEvent.js
new file mode 100644
index 0000000..df18706
--- /dev/null
+++ b/src/utils/mouseEvent.js
@@ -0,0 +1,17 @@
+/**
+ * @param {MouseEvent} e
+ * @returns {boolean}
+ */
+export const isAlternativeClick = (e) => {
+  const event = e.originalEvent || e
+  return event.altKey || event.ctrlKey || event.metaKey || event.shiftKey
+}
+
+/**
+ * @param {MouseEvent} e
+ * @returns {boolean}
+ */
+export const isPureLMBClick = (e) => {
+  const event = e.originalEvent || e
+  return event.button === 0 && !isAlternativeClick(e)
+}
diff --git a/src/module/mw.js b/src/utils/mw.js
similarity index 85%
rename from src/module/mw.js
rename to src/utils/mw.js
index 3cc7296..cfab657 100644
--- a/src/module/mw.js
+++ b/src/utils/mw.js
@@ -1,4 +1,4 @@
-import version from './version'
+import version from '../module/version'
 
 export const mwConfig = mw.config.get()
 export const mwApi = new mw.Api({