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

twinkle: Put TW menu back on the right side of the More menu #1887

Merged
merged 5 commits into from
Nov 23, 2023
Merged

twinkle: Put TW menu back on the right side of the More menu #1887

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
84aad5d
twinkle: Put TW menu back on the right side of the More menu
NovemLinguae Nov 4, 2023
f79e211
use var instead of let
NovemLinguae Nov 10, 2023
b817b9f
comment
NovemLinguae Nov 10, 2023
37326b7
fix double element bug
NovemLinguae Nov 10, 2023
fd156cb
log, fix bug
NovemLinguae Nov 10, 2023
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
18 changes: 17 additions & 1 deletion twinkle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,11 +262,27 @@ Twinkle.addPortlet = function(navigation, id, text, type, nextnodeid) {
}
return null;
}

if (type === 'menu') {
// In order to get mw.util.addPortlet to generate a dropdown menu in vector and vector-2022, the nextnodeid must be p-cactions. Any other nextnodeid will generate a non-dropdown portlet instead.
nextnodeid = 'p-cactions';
}
return mw.util.addPortlet(id, text, '#' + nextnodeid);

var portlet = mw.util.addPortlet(id, text, '#' + nextnodeid);

// The Twinkle dropdown menu has been added to the left of p-cactions. Move it to the right.
if (mw.config.get('skin') === 'vector') {
$('#p-twinkle').insertAfter('#p-cactions');
NovemLinguae marked this conversation as resolved.
Show resolved Hide resolved
} else if (mw.config.get('skin') === 'vector-2022') {
$('#p-twinkle-dropdown').appendTo('.vector-page-tools-landmark');

// .vector-page-tools-landmark is unstable and could change. If so, log it to console, to hopefully get someone's attention.
if (!document.querySelector('.vector-page-tools-landmark')) {
mw.log.warn('Unexpected change in DOM');
}
}

return portlet;
};

/**
Expand Down
Loading