diff --git a/modules/friendlywelcome.js b/modules/friendlywelcome.js index b76fc5fac..808d2c6e9 100644 --- a/modules/friendlywelcome.js +++ b/modules/friendlywelcome.js @@ -41,9 +41,9 @@ Twinkle.welcome = function friendlywelcome() { Twinkle.welcome.auto = function () { // Use wgArticleId to check if the page exists - if (mw.config.get('wgArticleId') !== 0) { + /* if (mw.config.get('wgArticleId') !== 0) { return; - } + } */ Twinkle.welcome.welcomeUser(); }; @@ -59,10 +59,10 @@ Twinkle.welcome.normal = function () { const $oldDiffUsernameLine = $('#mw-diff-otitle2'); const $newDiffUsernameLine = $('#mw-diff-ntitle2'); const $oldDiffHasRedlinkedTalkPage = $oldDiffUsernameLine - .find('span.mw-usertoollinks a.new:contains(overleg)') + .find('span.mw-usertoollinks a:contains(overleg)') .first(); const $newDiffHasRedlinkedTalkPage = $newDiffUsernameLine - .find('span.mw-usertoollinks a.new:contains(overleg)') + .find('span.mw-usertoollinks a:contains(overleg)') .first(); if ( @@ -168,6 +168,11 @@ Twinkle.welcome.welcomeUser = function welcomeUser() { mode: 'auto' }; + // If the page exists, force top placement + if (mw.config.get('wgArticleId') !== 0) { + params.top = true; + } + var userTalkPage = mw.config.get('wgFormattedNamespaces')[3] + ':' + @@ -509,14 +514,14 @@ Twinkle.welcome.callbacks = { var text = pageobj.getPageText(); // abort if mode is auto and form is not empty - if (pageobj.exists() && params.mode === 'auto') { + /* if (pageobj.exists() && params.mode === 'auto') { Morebits.status.info( 'Waarschuwing', 'Overlegpagina is niet leeg, sjabloon plaatsen afgebroken' ); Morebits.wiki.actionCompleted.event(); return; - } + } */ var welcomeText = Twinkle.welcome.getTemplateWikitext( params.type, @@ -524,7 +529,7 @@ Twinkle.welcome.callbacks = { params.article ); - if (Twinkle.getPref('topWelcomes')) { + if (Twinkle.getPref('topWelcomes') || params.top) { text = welcomeText + '\n\n' + text; } else { text += '\n' + welcomeText; diff --git a/modules/twinkleconfig.js b/modules/twinkleconfig.js index c364c951c..b4d30948d 100644 --- a/modules/twinkleconfig.js +++ b/modules/twinkleconfig.js @@ -649,7 +649,7 @@ Twinkle.config.sections = [ { name: 'quickWelcomeTemplate', label: 'Sjabloon dat gebruikt wordt bij automatische verwelkoming', - helptip: 'Geef de sjabloonpaginanaam, zonder accolades. Een link naar de pagina zal automatisch toegevoegd worden.', + helptip: 'Geef de sjabloonpaginanaam, zonder accolades. Een link naar de pagina zal automatisch toegevoegd worden. Als het sjabloon gesubstitueerd moet worden, plaatst er dan subst: voor.', type: 'string' }, { diff --git a/modules/twinklespeedy.js b/modules/twinklespeedy.js index 8b53d782e..29d9a3363 100644 --- a/modules/twinklespeedy.js +++ b/modules/twinklespeedy.js @@ -1290,9 +1290,7 @@ Twinkle.speedy.callback.evaluateSysop = function twinklespeedyCallbackEvaluateSy } }); - var warnusertalk = form.warnusertalk.checked && normalizeds.some(function (norm) { - return Twinkle.getPref('warnUserOnSpeedyDelete').indexOf(norm) !== -1; - }); + var warnusertalk = form.warnusertalk.checked; var welcomeuser = warnusertalk && normalizeds.some(function (norm) { return Twinkle.getPref('welcomeUserOnSpeedyDeletionNotification').indexOf(norm) !== -1; @@ -1353,9 +1351,7 @@ Twinkle.speedy.callback.evaluateUser = function twinklespeedyCallbackEvaluateUse return Twinkle.getPref('watchSpeedyPages').indexOf(csdCriteria) !== -1; }) && Twinkle.getPref('watchSpeedyExpiry'); - var notifyuser = form.notify.checked && normalizeds.some(function(norm) { - return Twinkle.getPref('notifyUserOnSpeedyDeletionNomination').indexOf(norm) !== -1; - }); + var notifyuser = form.notify.checked; var welcomeuser = notifyuser && normalizeds.some(function(norm) { return Twinkle.getPref('welcomeUserOnSpeedyDeletionNotification').indexOf(norm) !== -1; }); diff --git a/modules/twinklexfd.js b/modules/twinklexfd.js index 6994c555d..918e509a9 100644 --- a/modules/twinklexfd.js +++ b/modules/twinklexfd.js @@ -707,6 +707,7 @@ Twinkle.xfd.callback.evaluate = function(e) { var form = e.target; var params = Morebits.quickForm.getInputData(form); + params.notifycreator = form.notifycreator.checked; Morebits.simpleWindow.setButtonsEnabled(false); Morebits.status.init(form);