Merge github.com:azatoth/twinkle

modules/friendlywelcome.js

@@ -507,7 +507,7 @@ Twinkle.welcome.callbacks = {
 			" template to user talk page";
 		pageobj.setPageText(text);
 		pageobj.setEditSummary(summaryText + Twinkle.getPref('summaryAd'));
-		pageobj.setMinorEdit(Twinkle.getFriendlyPref('markWelcomesAsMinor'));
+		pageobj.setMinorEdit(false);
 		pageobj.setWatchlist(Twinkle.getFriendlyPref('watchWelcomes'));
 		pageobj.setCreateOption('recreate');
 		pageobj.save();

modules/twinklebatchdelete.js

@@ -282,7 +282,7 @@ Twinkle.batchdelete.callbacks = {
 			return;
 		}
 
-		var params = clone( self.params );
+		var params = $.extend({}, self.params);
 		params.current = 0;
 		params.total = total;
 		params.obj = statusIndicator;
@@ -336,7 +336,7 @@ Twinkle.batchdelete.callbacks = {
 		for ( var i = 0; i < snapshot.snapshotLength; ++i ) {
 			var title = snapshot.snapshotItem(i).value;
 			var wikipedia_page = new Wikipedia.page( title, "Unlinking on " + title );
-			var params = clone( self.params );
+			var params = $.extend( {}, self.params );
 			params.title = title;
 			params.onsuccess = onsuccess;
 			wikipedia_page.setCallbackParameters(params);

modules/twinkleconfig.js

@@ -615,11 +615,6 @@ Twinkle.config.sections = [
 			helptip: "Strongly recommended.",
 			type: "boolean"
 		},
-		{
-			name: "markWelcomesAsMinor",
-			label: "Mark welcomes as minor edits",
-			type: "boolean"
-		},
 		{
 			name: "maskTemplateInSummary",
 			label: "Omit the name of the welcome template in the edit summary",

modules/twinklespeedy.js

@@ -887,7 +887,7 @@ Twinkle.speedy.callbacks = {
 
 			Wikipedia.addCheckpoint();
 
-			var params = clone( apiobj.params );
+			var params = $.extend( {}, apiobj.params );
 			params.current = 0;
 			params.total = total;
 			params.obj = statusIndicator;
@@ -1217,7 +1217,7 @@ Twinkle.speedy.getParameters = function twinklespeedyGetParameters(value, normal
 		case 'g6':
 			switch( value ) {
 				case 'histmerge':
-					var mergetitle = prompt( 'Please enter the title to merge into:', "" );
+					var mergetitle = prompt( 'Please enter the title to be merged into this one:', "" );
 					if (mergetitle === null)
 					{
 						statelem.error( 'Aborted by user.' );

modules/twinkleunlink.js

@@ -97,7 +97,7 @@ Twinkle.unlink.callback.evaluate = function twinkleunlinkCallbackEvaluate(event)
 		var params = { reason: reason, imageusage: imageusage, globalstatus: statusIndicator, current: 0, total: total };
 		for (var i = 0; i < pages.length; ++i)
 		{
-			var myparams = clone(params);
+			var myparams = $.extend({}, params);
 			var articlepage = new Wikipedia.page(pages[i], 'Unlinking in article "' + pages[i] + '"');
 			articlepage.setCallbackParameters(myparams);
 			articlepage.load(imageusage ? Twinkle.unlink.callbacks.unlinkImageInstances : Twinkle.unlink.callbacks.unlinkBacklinks);

morebits.js

@@ -936,26 +936,6 @@ Unbinder.getCallback = function UnbinderGetCallback(self) {
 };
 
 
-/**
- * **************** clone() ****************
- * REMOVEME - global namespace pollution -> move to better name, or
- * rework the few usages using jQuery.extend
- */
-
-function clone( obj, deep ) {
-	var objectClone = new obj.constructor();
-	for ( var property in obj ) {
-		if ( !deep ) {
-			objectClone[property] = obj[property];
-		} else if ( typeof obj[property] === 'object' ) {
-			objectClone[property] = clone( obj[property], deep );
-		} else {
-			objectClone[property] = obj[property];
-		}
-	}
-	return objectClone;
-}
-
 
 /**
  * **************** Namespace ****************

twinkle.header.js

@@ -131,7 +131,6 @@ Twinkle.defaultConfig.friendly = {
 	insertHeadings: true,
 	insertUsername: true,
 	insertSignature: true,  // sign welcome templates, where appropriate
-	markWelcomesAsMinor: true,
 	quickWelcomeMode: "norm",
 	quickWelcomeTemplate: "welcome",
 	maskTemplateInSummary: true,