build(Twinkle): remove unused var; replace null with empty string; op…

…timize logic (#1498) * build(Twinkle): remove unused var; replace null with empty string; optimize logic * build(Twinkle): remove unused var; replace null with empty string; optimize logic
qiuwenbaike · Aug 27, 2024 · 9cbb089 · 9cbb089
1 parent 8129373
commit 9cbb089
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 45 deletions.
diff --git a/dist/Twinkle/Twinkle.js b/dist/Twinkle/Twinkle.js
diff --git a/src/Twinkle/modules/twinkle.js b/src/Twinkle/modules/twinkle.js
@@ -450,11 +450,6 @@ import {api} from './api';
  /**
  * **************** General initialization code ****************
  */
- const scripturl = mw.util.getUrl(`User:${mw.config.get('wgUserName')}/twinkleoptions.js`, {
- action: 'raw',
- ctype: 'text/javascript',
- happy: 'yes',
- });
  // Retrieve the user's Twinkle preferences (window.Twinkle.prefs)
  Twinkle.prefs ||= {};
  void api
@@ -468,24 +463,19 @@ import {api} from './api';
  rvlimit: '1',
  })
  .then((response) => {
- let isSuccess;
- const content = response['query'].pages[0].revisions[0].content ?? null;
- if (content) {
- try {
- // eslint-disable-next-line no-eval
- window.eval(content);
- isSuccess = true;
- } catch {
- isSuccess = false;
+ if (!response['query'].pages[0].missing) {
+ const content = response['query'].pages[0].revisions[0].content ?? '';
+ if (content !== '') {
+ try {
+ // eslint-disable-next-line no-eval
+ window.eval(content);
+ } catch {
+ void mw.notify(window.wgULS('未能加载您的Twinkle参数设置', '未能載入您的Twinkle偏好設定'), {
+ type: 'error',
+ tag: 'twinkle',
+ });
+ }
  }
- } else {
- isSuccess = false;
- }
- if (!isSuccess) {
- void mw.notify(window.wgULS('未能加载您的Twinkle参数设置', '未能載入您的Twinkle偏好設定'), {
- type: 'error',
- tag: 'twinkle',
- });
  }
  })
  .fail(() => {