Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix missing links in vector-2022 and minerva #88

Merged
merged 1 commit into from
Jul 19, 2024
Merged

fix missing links in vector-2022 and minerva #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions xfdcloser-src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,7 @@ import DiscussionView from "./Views/DiscussionView";
});
});
} else {
let heading = config.xfd.html.headlineinner.oldskin;
if ( [ "vector-2022", "minerva" ].includes ( mw.config.get( "skin" ) ) ) {
heading = config.xfd.html.headlineinner.newskin;
}
const heading = config.xfd.html.headlineinner;

// Initialise show/hide closed discussions tag, unless there is only one discussion on the page
const showHide = $("#mw-content-text " + heading).length > 1 && ShowHideTag.initialiseNewTag();
Expand Down
60 changes: 12 additions & 48 deletions xfdcloser-src/Venue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,8 @@ Venue.Mfd = () => new Venue("mfd", {
hasIndividualSubpages: true,
ns_number: null,
html: {
headlineouter: {
newskin: "h4",
oldskin: ".mw-heading.mw-heading4"
},
headlineinner: {
newskin: "h4 > .mw-headline",
oldskin: "h4"
},
headlineouter: ".mw-heading.mw-heading4",
headlineinner: "h4",
list: "dl",
listitem: "dd"
},
Expand All @@ -87,14 +81,8 @@ Venue.Cfd = () => {
path: "Wikipedia:Categories for discussion/Log/",
ns_number: [14],
html: {
headlineouter: {
newskin: "h4",
oldskin: ".mw-heading.mw-heading4"
},
headlineinner: {
newskin: "h4 > .mw-headline",
oldskin: "h4"
},
headlineouter: ".mw-heading.mw-heading4",
headlineinner: "h4",
list: "ul",
listitem: "li",
nthSpan: "2"
Expand Down Expand Up @@ -144,14 +132,8 @@ Venue.Ffd = () => new Venue("ffd", {
ns_number: [6],
ns_unlink: ["0", "10", "100", "118"], // main, Template, Portal, Draft
html: {
headlineouter: {
newskin: "h4",
oldskin: ".mw-heading.mw-heading4"
},
headlineinner: {
newskin: "h4 > .mw-headline",
oldskin: "h4"
},
headlineouter: ".mw-heading.mw-heading4",
headlineinner: "h4",
list: "dl",
listitem: "dd",
nthSpan: "1"
Expand Down Expand Up @@ -179,14 +161,8 @@ Venue.Tfd = () => {
subpagePath: "Wikipedia:Templates for discussion/",
ns_number: [10, 828],
html: {
headlineouter: {
newskin: "h4",
oldskin: ".mw-heading.mw-heading4"
},
headlineinner: {
newskin: "h4 > .mw-headline",
oldskin: "h4"
},
headlineouter: ".mw-heading.mw-heading4",
headlineinner: "h4",
list: "ul",
listitem: "li",
nthSpan: "1"
Expand Down Expand Up @@ -263,14 +239,8 @@ Venue.Rfd = () => {
path: "Wikipedia:Redirects for discussion/Log/",
ns_number: null,
html: {
headlineouter: {
newskin: "h4",
oldskin: ".mw-heading.mw-heading4"
},
headlineinner: {
newskin: "h4 > .mw-headline",
oldskin: "h4"
},
headlineouter: ".mw-heading.mw-heading4",
headlineinner: "h4",
list: "ul",
listitem: "li"
},
Expand Down Expand Up @@ -309,14 +279,8 @@ Venue.Afd = transcludedOnly => new Venue("afd", {
ns_logpages: 4, // Wikipedia
ns_unlink: ["0", "10", "100", "118"], // main, Template, Portal, Draft
html: {
headlineouter: {
newskin: "h3",
oldskin: ".mw-heading.mw-heading3"
},
headlineinner: {
newskin: "h3 > .mw-headline",
oldskin: "h3"
},
headlineouter: ".mw-heading.mw-heading3",
headlineinner: "h3",
list: "dl",
listitem: "dd",
nthSpan: "2"
Expand Down
5 changes: 1 addition & 4 deletions xfdcloser-src/Views/DiscussionView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,10 +181,7 @@ DiscussionView.newFromHeadline = function({headingIndex, context, venue, current

// Find all nodes that are part of this discussion (i.e. excluding subsequent closed discussions)
$("table.mw-collapsible").has("div.xfd-closed").addClass("xfd-closed"); // Fix for closed discussion within a collapsed table (e.g. MfD)
let headlineouter = venue.html.headlineouter.oldskin;
if ( [ "vector-2022", "minerva" ].includes ( mw.config.get( "skin" ) ) ) {
headlineouter = venue.html.headlineouter.newskin;
}
const headlineouter = venue.html.headlineouter;
const $discussionNodes = $heading.nextUntil(headlineouter + ", div.xfd-closed, table.xfd-closed");
$discussionNodes.addClass(`${id}-discussion-node`);

Expand Down
Loading