Skip to content

Commit 93117c7

Browse files
WaitSpringQWWaitSpringQW
authored
fix: remove deprecated mw.Uri
* fix: remove deprecated mw.Uri
1 parent a3facc6 commit 93117c7

File tree

8 files changed

+1046
-17
lines changed

8 files changed

+1046
-17
lines changed

‎dist/AdvancedSiteNotices/AdvancedSiteNotices.js‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/MarkBlocked/MarkBlocked.js‎

Lines changed: 1031 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/definition.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656

5757
== compatibility ==
5858
* AccessKeyCheatsheet[ResourceLoader|dependencies=ext.gadget.i18n,ext.gadget.React,ext.gadget.Util,oojs-ui-windows|requiresES6]|AccessKeyCheatsheet.js
59-
* AdvancedSiteNotices[ResourceLoader|actions=view|default|dependencies=ext.gadget.i18n,ext.gadget.React,ext.gadget.Tippy,ext.gadget.Util,mediawiki.api,mediawiki.storage,mediawiki.Uri|peers=AdvancedSiteNotices-pagestyles|requiresES6]|AdvancedSiteNotices.js
59+
* AdvancedSiteNotices[ResourceLoader|actions=view|default|dependencies=ext.gadget.i18n,ext.gadget.React,ext.gadget.Tippy,ext.gadget.Util,mediawiki.api,mediawiki.storage|peers=AdvancedSiteNotices-pagestyles|requiresES6]|AdvancedSiteNotices.js
6060
* AdvancedSiteNotices-pagestyles[ResourceLoader|hidden|requiresES6]|AdvancedSiteNotices-pagestyles.css
6161
* ChineseDays[ResourceLoader|hidden|requiresES6]|ChineseDays.js
6262
* Clipboard[ResourceLoader|hidden|requiresES6]|Clipboard.js
@@ -132,7 +132,7 @@
132132
* HRTProtectLink[ResourceLoader|dependencies=ext.gadget.i18n,ext.gadget.Util,mediawiki.util|rights=protect|requiresES6]|HRTProtectLink.js
133133
* ListUsersLastActive[ResourceLoader|dependencies=ext.gadget.i18n,ext.gadget.Util,mediawiki.api|rights=protect|requiresES6]|ListUsersLastActive.js
134134
* LogFilter[ResourceLoader|dependencies=ext.gadget.React,ext.gadget.Util,mediawiki.util|rights=edit|requiresES6]|LogFilter.js|LogFilter.css
135-
* MarkBlocked[ResourceLoader|dependencies=ext.gadget.i18n,ext.gadget.Util,mediawiki.api,mediawiki.Uri,mediawiki.util|requiresES6]|MarkBlocked.js|MarkBlocked.css
135+
* MarkBlocked[ResourceLoader|dependencies=ext.gadget.i18n,ext.gadget.Util,mediawiki.api,mediawiki.util|requiresES6]|MarkBlocked.js|MarkBlocked.css
136136
* MarkRights[ResourceLoader|dependencies=ext.gadget.i18n,ext.gadget.Util,mediawiki.api,mediawiki.util|peers=MarkRights-pagestyles|requiresES6]|MarkRights.js
137137
* MarkRights-pagestyles[ResourceLoader|hidden|requiresES6]|MarkRights-pagestyles.css
138138
* MarkRights-Userpage[ResourceLoader|dependencies=ext.gadget.i18n,ext.gadget.MarkRights,ext.gadget.React,ext.gadget.Util,mediawiki.api,mediawiki.Title|peers=MarkRights-Userpage-pagestyles|requiresES6]|MarkRights-Userpage.js

‎src/AdvancedSiteNotices/definition.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
"ext.gadget.Tippy",
1212
"ext.gadget.Util",
1313
"mediawiki.api",
14-
"mediawiki.storage",
15-
"mediawiki.Uri"
14+
"mediawiki.storage"
1615
],
1716
"peers": ["AdvancedSiteNotices-pagestyles"]
1817
}

‎src/AdvancedSiteNotices/modules/showNotice.tsx‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,14 @@ const showNotices = ($mountPoint: JQuery, index: number, remoteNotices?: RemoteN
6767
}
6868

6969
if (typeof $notice.data('asn-html') === 'string') {
70-
$notice.data('asn-html-raw', mw.Uri.decode($notice.data('asn-html') as string));
70+
$notice.data('asn-html-raw', decodeURIComponent($notice.data('asn-html') as string).replaceAll('+', ''));
7171
$notice.data('asn-html', null);
7272
}
7373
if (typeof $notice.data('asn-style') === 'string') {
7474
$notice.data('asn-style-id', noticeStyles.length);
75-
const style: HTMLStyleElement = mw.loader.addStyleTag(mw.Uri.decode($notice.data('asn-style') as string));
75+
const style: HTMLStyleElement = mw.loader.addStyleTag(
76+
decodeURIComponent($notice.data('asn-style') as string).replaceAll('+', '')
77+
);
7678
style.disabled = true;
7779
noticeStyles[noticeStyles.length] = style; // Replace `[].push()` to avoid polyfilling core-js
7880
$notice.data('asn-style', null);

‎src/AdvancedSiteNotices/modules/util/matchCriteria.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const matchCriteria = ($notice: JQuery): boolean => {
3232
const criteriaData: string = (($notice.data('asn-criteria') as string | undefined) ?? '').trim();
3333
if (criteriaData) {
3434
try {
35-
result = testCriteria(mw.Uri.decode(criteriaData));
35+
result = testCriteria(decodeURIComponent(criteriaData).replaceAll('+', ''));
3636
} catch {
3737
result = true;
3838
}

‎src/MarkBlocked/definition.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"enable": true,
33
"description": "<span id=\"Gadget-MarkBlocked\"></span> 用删除线标识被封禁用户的用户页链接（含用户讨论页、贡献页）",
44
"section": "sysop",
5-
"dependencies": ["ext.gadget.i18n", "ext.gadget.Util", "mediawiki.api", "mediawiki.Uri", "mediawiki.util"]
5+
"dependencies": ["ext.gadget.i18n", "ext.gadget.Util", "mediawiki.api", "mediawiki.util"]
66
}

‎src/MarkBlocked/modules/util/generateUserLinks.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ const generateUserLinks = ($content: JQuery): Record<string, JQuery[]> => {
3838
continue;
3939
}
4040
try {
41-
if (new mw.Uri(href).host !== location.host) {
41+
if (new URL(href).host !== location.host) {
4242
continue;
4343
}
4444
} catch {
4545
try {
46-
if (new mw.Uri(location.href + href).host !== location.host) {
46+
if (new URL(location.href + href).host !== location.host) {
4747
continue;
4848
}
4949
} catch {

0 commit comments

Comments
 (0)