diff --git a/src/method/initQueryData.js b/src/method/initQueryData.js index 6537770..dee4a49 100644 --- a/src/method/initQueryData.js +++ b/src/method/initQueryData.js @@ -1,4 +1,4 @@ -import { useMwApi } from '../utils/mw' +import { mwConfig, useMwApi } from '../utils/mw' export async function initQueryData() { // Init @@ -10,7 +10,7 @@ export async function initQueryData() { query: { users, userinfo, specialpagealiases }, } = await useMwApi().get({ action: 'query', - ususers: mw.config.get('wgUserName'), + ususers: mwConfig.wgUserName, meta: ['userinfo', 'siteinfo'], list: ['users'], uiprop: ['rights'], diff --git a/src/method/syncI18nData.js b/src/method/syncI18nData.js index f95fde3..260f973 100644 --- a/src/method/syncI18nData.js +++ b/src/method/syncI18nData.js @@ -1,6 +1,5 @@ import { resolvePath } from './_dir' - -const config = mw.config.get() +import { mwConfig } from '../utils/mw' // 设置 const cacheTime = 2 * 60 * 60 * 1000 @@ -20,7 +19,7 @@ const localCacheTime = 'i18n-cache-' + funcName + '-timestamp' export async function syncI18nData(noCache) { const now = new Date().getTime() // 如果语言为 qqx,不返回任何东西 - if (config.wgUserLanguage === 'qqx') { + if (mwConfig.wgUserLanguage === 'qqx') { console.warn('[InPageEdit] User language is qqx') return true } diff --git a/src/module/_msg.js b/src/module/_msg.js index 442cc6d..9d64e97 100644 --- a/src/module/_msg.js +++ b/src/module/_msg.js @@ -1,5 +1,7 @@ +import { mwConfig } from '../utils/mw' + const funcName = 'InPageEdit' -const userLang = mw.config.get('wgUserLanguage') +const userLang = mwConfig.wgUserLanguage const fallbacks = { ab: 'ru', ace: 'id', diff --git a/src/module/articleLink.js b/src/module/articleLink.js index 9c87baa..86a20cf 100644 --- a/src/module/articleLink.js +++ b/src/module/articleLink.js @@ -1,8 +1,7 @@ import { _msg } from './_msg' import { preference } from './preference' import { quickEdit } from './quickEdit' - -const config = mw.config.get() +import { mwConfig } from '../utils/mw' /** * @module articleLink 获取段落编辑以及编辑链接 @@ -27,10 +26,10 @@ export function articleLink(elements) { // 缓存wiki相关变量 const href = anchor.href, - articlePath = config.wgArticlePath.replace('$1', ''), - wikiBaseURL = `${location.protocol}//${config.wgServer.split('//')[1]}`, + articlePath = mwConfig.wgArticlePath.replace('$1', ''), + wikiBaseURL = `${location.protocol}//${mwConfig.wgServer.split('//')[1]}`, wikiArticleBaseURL = `${wikiBaseURL}${articlePath}`, - wikiScriptBaseURL = `${wikiBaseURL}${config.wgScriptPath}` + wikiScriptBaseURL = `${wikiBaseURL}${mwConfig.wgScriptPath}` // 链接指向的既不是本wiki的 canonicalurl 也不是 permalink if ( @@ -82,7 +81,7 @@ export function articleLink(elements) { } else if (section !== null) { options.section = section } - if (!config.wgIsArticle) { + if (!mwConfig.wgIsArticle) { options.reload = false } quickEdit(options) diff --git a/src/module/preference.js b/src/module/preference.js index 766c8b6..bfd6fa3 100644 --- a/src/module/preference.js +++ b/src/module/preference.js @@ -11,9 +11,9 @@ import { import version from './version' import { pluginStore } from './pluginStore' import { _analytics, getSiteID } from './_analytics' +import { mwConfig } from '../utils/mw' const InPageEdit = window.InPageEdit || {} -const config = mw.config.get() /** * @module preference 个人设置模块 @@ -517,7 +517,7 @@ export const preference = { } // 获取Analysis数据 - const userName = config.wgUserName + const userName = mwConfig.wgUserName $.get(`${analyticsApi}/query/user`, { userName, siteUrl: getSiteID(), diff --git a/src/utils/hasRight.js b/src/utils/hasRight.js index 262f750..d1611dd 100644 --- a/src/utils/hasRight.js +++ b/src/utils/hasRight.js @@ -4,7 +4,7 @@ * @return {boolean} */ export const hasRight = function (right) { - const conf = window.mw.config.get() + const conf = mw.config.get() // Get the latest configuration (may have been called `mw.config.set()` before) console.info( '[InPageEdit] _hasRight', right,