From 35efcd882b15e9c603a3489e812817113f004a25 Mon Sep 17 00:00:00 2001 From: NovemLinguae <79697282+NovemLinguae@users.noreply.github.com> Date: Wed, 20 Nov 2024 21:46:35 -0800 Subject: [PATCH] rename modules/friendlyX.js to modules/twinkleX.js (#2055) --- .github/labels.yml | 6 +- CONTRIBUTING.md | 2 +- DEVELOPER.md | 60 +++++++++---------- gadget.txt | 2 +- .../{friendlyshared.js => twinkleshared.js} | 12 ++-- modules/{friendlytag.js => twinkletag.js} | 18 +++--- ...friendlytalkback.js => twinkletalkback.js} | 9 ++- modules/twinklewarn.js | 2 +- .../{friendlywelcome.js => twinklewelcome.js} | 18 +++--- scripts/deploy.pl | 10 ++-- twinkle.js | 3 - 11 files changed, 69 insertions(+), 73 deletions(-) rename modules/{friendlyshared.js => twinkleshared.js} (95%) rename modules/{friendlytag.js => twinkletag.js} (99%) rename modules/{friendlytalkback.js => twinkletalkback.js} (97%) rename modules/{friendlywelcome.js => twinklewelcome.js} (98%) diff --git a/.github/labels.yml b/.github/labels.yml index eae6ef199..00e9e4183 100644 --- a/.github/labels.yml +++ b/.github/labels.yml @@ -28,15 +28,15 @@ - modules/twinklespeedy.js - modules/twinkleimage.js "Module: tag": - - modules/friendlytag.js + - modules/twinkletag.js "Module: talkback": - - modules/friendlytalkback.js + - modules/twinkletalkback.js "Module: unlink": - modules/twinkleunlink.js "Module: warn": - modules/twinklewarn.js "Module: welcome": - - modules/friendlywelcome.js + - modules/twinklewelcome.js "Module: xfd": - modules/twinklexfd.js Tests: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index da2a1084d..3da3bc564 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -58,7 +58,7 @@ Specifically, the following pages on enwiki may be helpful: Some things to watch out for: - The `twinkleconfig` pseudo-module holds the code to save and determine user preferences, while `twinkle.js` holds the defaults. -- There is some variety in how the individual modules are written, in particular among the `friendly` family as well as with `twinkleconfig.js`. +- There is some variety in how the individual modules are written, in particular among the four Twinkle modules that used to be the `friendly` userscript (shared, tag, talkback, welcome), as well as with `twinkleconfig.js`. As Twinkle is used many thousands of times a day, changes to how Twinkle works may be confusing or disruptive to editors. Significant or major changes to workflow, design, or functionality should gain some modicum of consensus before being worked on, through discussion at [Wikipedia talk:Twinkle][] or a GitHub issue. diff --git a/DEVELOPER.md b/DEVELOPER.md index 31e359fc6..3a13932dd 100644 --- a/DEVELOPER.md +++ b/DEVELOPER.md @@ -30,26 +30,26 @@ Each Twinkle module and dependency lives on the wiki as a separate file. The lis - `morebits.css` → [MediaWiki:Gadget-morebits.css][] - `select2.min.js` → [MediaWiki:Gadget-select2.min.js][] - `select2.min.css` → [MediaWiki:Gadget-select2.min.css][] -- `modules/twinkleprod.js` → [MediaWiki:Gadget-twinkleprod.js][] -- `modules/twinkleimage.js` → [MediaWiki:Gadget-twinkleimage.js][] -- `modules/twinklebatchundelete.js` → [MediaWiki:Gadget-twinklebatchundelete.js][] -- `modules/twinklewarn.js` → [MediaWiki:Gadget-twinklewarn.js][] -- `modules/twinklespeedy.js` → [MediaWiki:Gadget-twinklespeedy.js][] -- `modules/friendlyshared.js` → [MediaWiki:Gadget-friendlyshared.js][] -- `modules/twinklediff.js` → [MediaWiki:Gadget-twinklediff.js][] -- `modules/twinkleunlink.js` → [MediaWiki:Gadget-twinkleunlink.js][] -- `modules/friendlytag.js` → [MediaWiki:Gadget-friendlytag.js][] -- `modules/twinkledeprod.js` → [MediaWiki:Gadget-twinkledeprod.js][] -- `modules/friendlywelcome.js` → [MediaWiki:Gadget-friendlywelcome.js][] -- `modules/twinklexfd.js` → [MediaWiki:Gadget-twinklexfd.js][] +- `modules/twinklearv.js` → [MediaWiki:Gadget-twinklearv.js][] - `modules/twinklebatchdelete.js` → [MediaWiki:Gadget-twinklebatchdelete.js][] - `modules/twinklebatchprotect.js` → [MediaWiki:Gadget-twinklebatchprotect.js][] +- `modules/twinklebatchundelete.js` → [MediaWiki:Gadget-twinklebatchundelete.js][] +- `modules/twinkleblock.js` → [MediaWiki:Gadget-twinkleblock.js][] - `modules/twinkleconfig.js` → [MediaWiki:Gadget-twinkleconfig.js][] +- `modules/twinkledeprod.js` → [MediaWiki:Gadget-twinkledeprod.js][] +- `modules/twinklediff.js` → [MediaWiki:Gadget-twinklediff.js][] - `modules/twinklefluff.js` → [MediaWiki:Gadget-twinklefluff.js][] +- `modules/twinkleimage.js` → [MediaWiki:Gadget-twinkleimage.js][] +- `modules/twinkleprod.js` → [MediaWiki:Gadget-twinkleprod.js][] - `modules/twinkleprotect.js` → [MediaWiki:Gadget-twinkleprotect.js][] -- `modules/twinklearv.js` → [MediaWiki:Gadget-twinklearv.js][] -- `modules/friendlytalkback.js` → [MediaWiki:Gadget-friendlytalkback.js][] -- `modules/twinkleblock.js` → [MediaWiki:Gadget-twinkleblock.js][] +- `modules/twinkleshared.js` → [MediaWiki:Gadget-twinkleshared.js][] +- `modules/twinklespeedy.js` → [MediaWiki:Gadget-twinklespeedy.js][] +- `modules/twinkletag.js` → [MediaWiki:Gadget-twinkletag.js][] +- `modules/twinkletalkback.js` → [MediaWiki:Gadget-twinkletalkback.js][] +- `modules/twinkleunlink.js` → [MediaWiki:Gadget-twinkleunlink.js][] +- `modules/twinklewarn.js` → [MediaWiki:Gadget-twinklewarn.js][] +- `modules/twinklewelcome.js` → [MediaWiki:Gadget-twinklewelcome.js][] +- `modules/twinklexfd.js` → [MediaWiki:Gadget-twinklexfd.js][] ### Synchronization using `deploy.pl` @@ -105,26 +105,26 @@ The `--base` flag operates as a *prefix*; note the presence of the trailing `/`. [MediaWiki:Gadget-morebits.css]: https://en.wikipedia.org/wiki/MediaWiki:Gadget-morebits.css [MediaWiki:Gadget-select2.min.js]: https://en.wikipedia.org/wiki/MediaWiki:Gadget-select2.min.js [MediaWiki:Gadget-select2.min.css]: https://en.wikipedia.org/wiki/MediaWiki:Gadget-select2.min.css -[MediaWiki:Gadget-twinkleprod.js]: https://en.wikipedia.org/wiki/MediaWiki:Gadget-twinkleprod.js -[MediaWiki:Gadget-twinkleimage.js]: https://en.wikipedia.org/wiki/MediaWiki:Gadget-twinkleimage.js -[MediaWiki:Gadget-twinklebatchundelete.js]: https://en.wikipedia.org/wiki/MediaWiki:Gadget-twinklebatchundelete.js -[MediaWiki:Gadget-twinklewarn.js]: https://en.wikipedia.org/wiki/MediaWiki:Gadget-twinklewarn.js -[MediaWiki:Gadget-twinklespeedy.js]: https://en.wikipedia.org/wiki/MediaWiki:Gadget-twinklespeedy.js -[MediaWiki:Gadget-friendlyshared.js]: https://en.wikipedia.org/wiki/MediaWiki:Gadget-friendlyshared.js -[MediaWiki:Gadget-twinklediff.js]: https://en.wikipedia.org/wiki/MediaWiki:Gadget-twinklediff.js -[MediaWiki:Gadget-twinkleunlink.js]: https://en.wikipedia.org/wiki/MediaWiki:Gadget-twinkleunlink.js -[MediaWiki:Gadget-friendlytag.js]: https://en.wikipedia.org/wiki/MediaWiki:Gadget-friendlytag.js -[MediaWiki:Gadget-twinkledeprod.js]: https://en.wikipedia.org/wiki/MediaWiki:Gadget-twinkledeprod.js -[MediaWiki:Gadget-friendlywelcome.js]: https://en.wikipedia.org/wiki/MediaWiki:Gadget-friendlywelcome.js -[MediaWiki:Gadget-twinklexfd.js]: https://en.wikipedia.org/wiki/MediaWiki:Gadget-twinklexfd.js +[MediaWiki:Gadget-twinklearv.js]: https://en.wikipedia.org/wiki/MediaWiki:Gadget-twinklearv.js [MediaWiki:Gadget-twinklebatchdelete.js]: https://en.wikipedia.org/wiki/MediaWiki:Gadget-twinklebatchdelete.js [MediaWiki:Gadget-twinklebatchprotect.js]: https://en.wikipedia.org/wiki/MediaWiki:Gadget-twinklebatchprotect.js +[MediaWiki:Gadget-twinklebatchundelete.js]: https://en.wikipedia.org/wiki/MediaWiki:Gadget-twinklebatchundelete.js +[MediaWiki:Gadget-twinkleblock.js]: https://en.wikipedia.org/wiki/MediaWiki:Gadget-twinkleblock.js [MediaWiki:Gadget-twinkleconfig.js]: https://en.wikipedia.org/wiki/MediaWiki:Gadget-twinkleconfig.js +[MediaWiki:Gadget-twinkledeprod.js]: https://en.wikipedia.org/wiki/MediaWiki:Gadget-twinkledeprod.js +[MediaWiki:Gadget-twinklediff.js]: https://en.wikipedia.org/wiki/MediaWiki:Gadget-twinklediff.js [MediaWiki:Gadget-twinklefluff.js]: https://en.wikipedia.org/wiki/MediaWiki:Gadget-twinklefluff.js +[MediaWiki:Gadget-twinkleimage.js]: https://en.wikipedia.org/wiki/MediaWiki:Gadget-twinkleimage.js +[MediaWiki:Gadget-twinkleprod.js]: https://en.wikipedia.org/wiki/MediaWiki:Gadget-twinkleprod.js [MediaWiki:Gadget-twinkleprotect.js]: https://en.wikipedia.org/wiki/MediaWiki:Gadget-twinkleprotect.js -[MediaWiki:Gadget-twinklearv.js]: https://en.wikipedia.org/wiki/MediaWiki:Gadget-twinklearv.js -[MediaWiki:Gadget-friendlytalkback.js]: https://en.wikipedia.org/wiki/MediaWiki:Gadget-friendlytalkback.js -[MediaWiki:Gadget-twinkleblock.js]: https://en.wikipedia.org/wiki/MediaWiki:Gadget-twinkleblock.js +[MediaWiki:Gadget-twinkleshared.js]: https://en.wikipedia.org/wiki/MediaWiki:Gadget-twinkleshared.js +[MediaWiki:Gadget-twinklespeedy.js]: https://en.wikipedia.org/wiki/MediaWiki:Gadget-twinklespeedy.js +[MediaWiki:Gadget-twinkletag.js]: https://en.wikipedia.org/wiki/MediaWiki:Gadget-twinkletag.js +[MediaWiki:Gadget-twinkletalkback.js]: https://en.wikipedia.org/wiki/MediaWiki:Gadget-twinkletalkback.js +[MediaWiki:Gadget-twinkleunlink.js]: https://en.wikipedia.org/wiki/MediaWiki:Gadget-twinkleunlink.js +[MediaWiki:Gadget-twinklewarn.js]: https://en.wikipedia.org/wiki/MediaWiki:Gadget-twinklewarn.js +[MediaWiki:Gadget-twinklewelcome.js]: https://en.wikipedia.org/wiki/MediaWiki:Gadget-twinklewelcome.js +[MediaWiki:Gadget-twinklexfd.js]: https://en.wikipedia.org/wiki/MediaWiki:Gadget-twinklexfd.js [select2]: https://github.com/select2/select2 [MediaWiki::API]: https://metacpan.org/pod/MediaWiki::API [Git::Repository]: https://metacpan.org/pod/Git::Repository diff --git a/gadget.txt b/gadget.txt index b2c64b651..4976925d0 100644 --- a/gadget.txt +++ b/gadget.txt @@ -1,4 +1,4 @@ -* Twinkle [ResourceLoader |dependencies=ext.gadget.morebits, ext.gadget.select2, mediawiki.api, mediawiki.language |rights=autoconfirmed |type=general |peers=Twinkle-pagestyles |requiresES6] |Twinkle.js |Twinkle.css |twinklearv.js |twinklewarn.js |twinkleblock.js |friendlywelcome.js |friendlyshared.js |friendlytalkback.js |twinklespeedy.js |twinkleprod.js |twinklexfd.js |twinkleimage.js |twinkleprotect.js |friendlytag.js |twinklediff.js |twinkleunlink.js |twinklefluff.js |twinkledeprod.js |twinklebatchdelete.js |twinklebatchprotect.js |twinklebatchundelete.js |twinkleconfig.js +* Twinkle [ResourceLoader |dependencies=ext.gadget.morebits, ext.gadget.select2, mediawiki.api, mediawiki.language |rights=autoconfirmed |type=general |peers=Twinkle-pagestyles |requiresES6] |Twinkle.js |Twinkle.css |twinklearv.js |twinklewarn.js |twinkleblock.js |twinklewelcome.js |twinkleshared.js |twinkletalkback.js |twinklespeedy.js |twinkleprod.js |twinklexfd.js |twinkleimage.js |twinkleprotect.js |twinkletag.js |twinklediff.js |twinkleunlink.js |twinklefluff.js |twinkledeprod.js |twinklebatchdelete.js |twinklebatchprotect.js |twinklebatchundelete.js |twinkleconfig.js * morebits [ResourceLoader |dependencies=mediawiki.user, mediawiki.util, mediawiki.Title, jquery.ui |hidden |requiresES6] |morebits.js |morebits.css * Twinkle-pagestyles [hidden |skins=vector, vector-2022] |Twinkle-pagestyles.css * select2 [ResourceLoader |hidden] |select2.min.js |select2.min.css diff --git a/modules/friendlyshared.js b/modules/twinkleshared.js similarity index 95% rename from modules/friendlyshared.js rename to modules/twinkleshared.js index cbdd5d638..a9fa3f327 100644 --- a/modules/friendlyshared.js +++ b/modules/twinkleshared.js @@ -6,22 +6,22 @@ /* **************************************** - *** friendlyshared.js: Shared IP tagging module + *** twinkleshared.js: Shared IP tagging module **************************************** * Mode of invocation: Tab ("Shared") * Active on: IP user talk pages */ -Twinkle.shared = function friendlyshared() { +Twinkle.shared = function twinkleshared() { if (mw.config.get('wgNamespaceNumber') === 3 && mw.util.isIPAddress(mw.config.get('wgTitle'))) { var username = mw.config.get('wgRelevantUserName'); Twinkle.addPortletLink(function() { Twinkle.shared.callback(username); - }, 'Shared IP', 'friendly-shared', 'Shared IP tagging'); + }, 'Shared IP', 'twinkle-shared', 'Shared IP tagging'); } }; -Twinkle.shared.callback = function friendlysharedCallback() { +Twinkle.shared.callback = function twinklesharedCallback() { var Window = new Morebits.simpleWindow(600, 450); Window.setTitle('Shared IP address tagging'); Window.setScriptName('Twinkle'); @@ -129,7 +129,7 @@ Twinkle.shared.standardList = [ } ]; -Twinkle.shared.callback.change_shared = function friendlysharedCallbackChangeShared(e) { +Twinkle.shared.callback.change_shared = function twinklesharedCallbackChangeShared(e) { e.target.form.contact.disabled = e.target.value !== 'Shared IP edu'; // only supported by {{Shared IP edu}} e.target.form.organization.disabled = false; e.target.form.host.disabled = e.target.value === 'Whois'; // host= not supported by {{Whois}} @@ -207,7 +207,7 @@ Twinkle.shared.getTemplateWikitext = function(input) { return text; }; -Twinkle.shared.callback.evaluate = function friendlysharedCallbackEvaluate(e) { +Twinkle.shared.callback.evaluate = function twinklesharedCallbackEvaluate(e) { var params = Morebits.quickForm.getInputData(e.target); if (!params.template) { alert('You must select a shared IP address template to use!'); diff --git a/modules/friendlytag.js b/modules/twinkletag.js similarity index 99% rename from modules/friendlytag.js rename to modules/twinkletag.js index 22990abae..f513d8363 100644 --- a/modules/friendlytag.js +++ b/modules/twinkletag.js @@ -5,22 +5,22 @@ /* **************************************** - *** friendlytag.js: Tag module + *** twinkletag.js: Tag module **************************************** * Mode of invocation: Tab ("Tag") * Active on: Existing articles and drafts; file pages with a corresponding file * which is local (not on Commons); all redirects */ -Twinkle.tag = function friendlytag() { +Twinkle.tag = function twinkletag() { // redirect tagging (exclude category redirects, which are all soft redirects and so shouldn't be tagged with rcats) if (Morebits.isPageRedirect() && mw.config.get('wgNamespaceNumber') !== 14) { Twinkle.tag.mode = 'redirect'; - Twinkle.addPortletLink(Twinkle.tag.callback, 'Tag', 'friendly-tag', 'Tag redirect'); + Twinkle.addPortletLink(Twinkle.tag.callback, 'Tag', 'twinkle-tag', 'Tag redirect'); // file tagging } else if (mw.config.get('wgNamespaceNumber') === 6 && !document.getElementById('mw-sharedupload') && document.getElementById('mw-imagepage-section-filehistory')) { Twinkle.tag.mode = 'file'; - Twinkle.addPortletLink(Twinkle.tag.callback, 'Tag', 'friendly-tag', 'Add maintenance tags to file'); + Twinkle.addPortletLink(Twinkle.tag.callback, 'Tag', 'twinkle-tag', 'Add maintenance tags to file'); // article/draft article tagging } else if ([0, 118].indexOf(mw.config.get('wgNamespaceNumber')) !== -1 && mw.config.get('wgCurRevisionId')) { Twinkle.tag.mode = 'article'; @@ -29,13 +29,13 @@ Twinkle.tag = function friendlytag() { // Disabled on latest diff because the diff slider could be used to slide // away from the latest diff without causing the script to reload !mw.config.get('wgDiffNewId'); - Twinkle.addPortletLink(Twinkle.tag.callback, 'Tag', 'friendly-tag', 'Add or remove article maintenance tags'); + Twinkle.addPortletLink(Twinkle.tag.callback, 'Tag', 'twinkle-tag', 'Add or remove article maintenance tags'); } }; Twinkle.tag.checkedTags = []; -Twinkle.tag.callback = function friendlytagCallback() { +Twinkle.tag.callback = function twinkletagCallback() { var Window = new Morebits.simpleWindow(630, Twinkle.tag.mode === 'article' ? 500 : 400); Window.setScriptName('Twinkle'); // anyone got a good policy/guideline/info page/instructional page link?? @@ -1459,7 +1459,7 @@ Twinkle.tag.callbacks = { var pntPage = new Morebits.wiki.page('Wikipedia:Pages needing translation into English', 'Listing article at Wikipedia:Pages needing translation into English'); pntPage.setFollowRedirect(true); - pntPage.load(function friendlytagCallbacksTranslationListPage(pageobj) { + pntPage.load(function twinkletagCallbacksTranslationListPage(pageobj) { var old_text = pageobj.getPageText(); var lang = params.translationLanguage; @@ -1909,7 +1909,7 @@ Twinkle.tag.callbacks = { }, - file: function friendlytagCallbacksFile(pageobj) { + file: function twinkletagCallbacksFile(pageobj) { var text = pageobj.getPageText(); var params = pageobj.getCallbackParameters(); var summary = 'Adding '; @@ -2028,7 +2028,7 @@ Twinkle.tag.callbacks = { } }; -Twinkle.tag.callback.evaluate = function friendlytagCallbackEvaluate(e) { +Twinkle.tag.callback.evaluate = function twinkletagCallbackEvaluate(e) { var form = e.target; var params = Morebits.quickForm.getInputData(form); diff --git a/modules/friendlytalkback.js b/modules/twinkletalkback.js similarity index 97% rename from modules/friendlytalkback.js rename to modules/twinkletalkback.js index 639943f53..74125a815 100644 --- a/modules/friendlytalkback.js +++ b/modules/twinkletalkback.js @@ -6,18 +6,17 @@ /* **************************************** - *** friendlytalkback.js: Talkback module + *** twinkletalkback.js: Talkback module **************************************** * Mode of invocation: Tab ("TB") * Active on: Any page with relevant user name (userspace, contribs, etc.) except IP ranges - * Config directives in: FriendlyConfig */ Twinkle.talkback = function() { if (!mw.config.exists('wgRelevantUserName') || Morebits.ip.isRange(mw.config.get('wgRelevantUserName'))) { return; } - Twinkle.addPortletLink(Twinkle.talkback.callback, 'TB', 'friendly-talkback', 'Easy talkback'); + Twinkle.addPortletLink(Twinkle.talkback.callback, 'TB', 'twinkle-talkback', 'Easy talkback'); }; Twinkle.talkback.callback = function() { @@ -70,14 +69,14 @@ Twinkle.talkback.callback = function() { previewlink.style.cursor = 'pointer'; previewlink.textContent = 'Preview'; form.append({ type: 'div', id: 'talkbackpreview', label: [ previewlink ] }); - form.append({ type: 'div', id: 'friendlytalkback-previewbox', style: 'display: none' }); + form.append({ type: 'div', id: 'twinkletalkback-previewbox', style: 'display: none' }); form.append({ type: 'submit' }); var result = form.render(); Window.setContent(result); Window.display(); - result.previewer = new Morebits.wiki.preview($(result).find('div#friendlytalkback-previewbox').last()[0]); + result.previewer = new Morebits.wiki.preview($(result).find('div#twinkletalkback-previewbox').last()[0]); // We must init the var evt = document.createEvent('Event'); diff --git a/modules/twinklewarn.js b/modules/twinklewarn.js index c09b38aaa..5b3afd4df 100644 --- a/modules/twinklewarn.js +++ b/modules/twinklewarn.js @@ -21,7 +21,7 @@ Twinkle.warn = function twinklewarn() { if (Twinkle.getPref('autoMenuAfterRollback') && mw.config.get('wgNamespaceNumber') === 3 && Twinkle.getPrefill('vanarticle') && - !Twinkle.getPrefill('friendlywelcome') && + !Twinkle.getPrefill('twinklewelcome') && !Twinkle.getPrefill('noautowarn')) { Twinkle.warn.callback(); } diff --git a/modules/friendlywelcome.js b/modules/twinklewelcome.js similarity index 98% rename from modules/friendlywelcome.js rename to modules/twinklewelcome.js index cf03c44de..5a9f8734a 100644 --- a/modules/friendlywelcome.js +++ b/modules/twinklewelcome.js @@ -6,16 +6,16 @@ /* **************************************** - *** friendlywelcome.js: Welcome module + *** twinklewelcome.js: Welcome module **************************************** * Mode of invocation: Tab ("Wel"), or from links on diff pages * Active on: Any page with relevant user name (userspace, * contribs, etc.) and diff pages */ -Twinkle.welcome = function friendlywelcome() { - if (Twinkle.getPrefill('friendlywelcome')) { - if (Twinkle.getPrefill('friendlywelcome') === 'auto') { +Twinkle.welcome = function twinklewelcome() { + if (Twinkle.getPrefill('twinklewelcome')) { + if (Twinkle.getPrefill('twinklewelcome') === 'auto') { Twinkle.welcome.auto(); } else { Twinkle.welcome.semiauto(); @@ -68,7 +68,7 @@ Twinkle.welcome.normal = function() { var oWelcomeNode = welcomeNode.cloneNode(true); oWelcomeNode.firstChild.setAttribute('href', oHref + '&' + $.param({ - friendlywelcome: Twinkle.getPref('quickWelcomeMode') === 'auto' ? 'auto' : 'norm', + twinklewelcome: Twinkle.getPref('quickWelcomeMode') === 'auto' ? 'auto' : 'norm', vanarticle: Morebits.pageNameNorm })); $oldDiffHasRedlinkedTalkPage[0].parentNode.parentNode.appendChild(document.createTextNode(' ')); @@ -80,7 +80,7 @@ Twinkle.welcome.normal = function() { var nWelcomeNode = welcomeNode.cloneNode(true); nWelcomeNode.firstChild.setAttribute('href', nHref + '&' + $.param({ - friendlywelcome: Twinkle.getPref('quickWelcomeMode') === 'auto' ? 'auto' : 'norm', + twinklewelcome: Twinkle.getPref('quickWelcomeMode') === 'auto' ? 'auto' : 'norm', vanarticle: Morebits.pageNameNorm })); $newDiffHasRedlinkedTalkPage[0].parentNode.parentNode.appendChild(document.createTextNode(' ')); @@ -92,7 +92,7 @@ Twinkle.welcome.normal = function() { if (mw.config.exists('wgRelevantUserName') && !Morebits.ip.isRange(mw.config.get('wgRelevantUserName'))) { Twinkle.addPortletLink(function() { Twinkle.welcome.callback(mw.config.get('wgRelevantUserName')); - }, 'Wel', 'friendly-welcome', 'Welcome user'); + }, 'Wel', 'twinkle-welcome', 'Welcome user'); } }; @@ -116,7 +116,7 @@ Twinkle.welcome.welcomeUser = function welcomeUser() { wikipedia_page.load(Twinkle.welcome.callbacks.main); }; -Twinkle.welcome.callback = function friendlywelcomeCallback(uid) { +Twinkle.welcome.callback = function twinklewelcomeCallback(uid) { if (uid === mw.config.get('wgUserName') && !confirm('Are you really sure you want to welcome yourself?...')) { return; } @@ -732,7 +732,7 @@ Twinkle.welcome.callbacks = { } }; -Twinkle.welcome.callback.evaluate = function friendlywelcomeCallbackEvaluate(e) { +Twinkle.welcome.callback.evaluate = function twinklewelcomeCallbackEvaluate(e) { var form = e.target; var params = Morebits.quickForm.getInputData(form); // : type, template, article diff --git a/scripts/deploy.pl b/scripts/deploy.pl index 8db5df8fd..095e6e0d0 100644 --- a/scripts/deploy.pl +++ b/scripts/deploy.pl @@ -459,23 +459,23 @@ sub usage { morebits.css lib/select2.min.js lib/select2.min.css - modules/twinkleconfig.js modules/twinklearv.js modules/twinklebatchdelete.js modules/twinklebatchprotect.js modules/twinklebatchundelete.js modules/twinkleblock.js + modules/twinkleconfig.js modules/twinkledeprod.js modules/twinklediff.js modules/twinklefluff.js modules/twinkleimage.js modules/twinkleprod.js modules/twinkleprotect.js + modules/twinkleshared.js modules/twinklespeedy.js + modules/twinkletag.js + modules/twinkletalkback.js modules/twinkleunlink.js modules/twinklewarn.js + modules/twinklewelcome.js modules/twinklexfd.js - modules/friendlyshared.js - modules/friendlytag.js - modules/friendlytalkback.js - modules/friendlywelcome.js diff --git a/twinkle.js b/twinkle.js index 8c43cfcce..305d61941 100644 --- a/twinkle.js +++ b/twinkle.js @@ -44,8 +44,6 @@ Twinkle.defaultConfig = {}; * It is important that all new preferences added here, especially admin-only ones, are also added to * |Twinkle.config.sections| in twinkleconfig.js, so they are configurable via the Twinkle preferences panel. * For help on the actual preferences, see the comments in twinkleconfig.js. - * - * Formerly Twinkle.defaultConfig.twinkle and Twinkle.defaultConfig.friendly */ Twinkle.defaultConfig = { // General @@ -146,7 +144,6 @@ Twinkle.defaultConfig = { deletionSummaryAd: ' ([[WP:TW|TW]])', protectionSummaryAd: ' ([[WP:TW|TW]])', - // Formerly defaultConfig.friendly: // Tag groupByDefault: true, watchTaggedVenues: ['articles', 'drafts', 'redirects', 'files'],