diff --git a/js/common.js b/js/common.js
index a69da7962..03f6f2506 100644
--- a/js/common.js
+++ b/js/common.js
@@ -160,10 +160,10 @@ $.fn.extend(
 		}));
 	},
 
-	enableSysMenu: function()
-	{
-		return(this.on("contextmenu",function(e) { e.stopImmediatePropagation(); }).
-			on("selectstart",function(e) { e.stopImmediatePropagation(); return(true); }));
+	enableSysMenu: function() {
+		return this
+			.on("contextmenu", (e) => e.stopImmediatePropagation())
+			.on("selectstart", (e) => {e.stopImmediatePropagation(); return true;});
 	},
 
 	setCursorPosition: function(pos)
@@ -246,16 +246,19 @@ function escapeHTML(str)
 	return( String(str).split('&').join('&amp;').split('<').join('&lt;').split('>').join('&gt;') );
 }
 
-function askYesNo( title, content, funcYesName )
-{
-	$("#yesnoDlg-header").html(title);
-	$("#yesnoDlg-content").html(content);
-	$("#yesnoOK").off('click');
-	$("#yesnoOK").on('click', function()
-	{
-		typeof(funcYesName)==="function" ? funcYesName() : eval(funcYesName);
+/**
+ * Confirm again before taking action.
+ * @param {string} title Title of the dialog.
+ * @param {string} content Hint of the action to be confirmed.
+ * @param {Function | string} funcYesName Function to be executed if confirmed.
+ */
+function askYesNo(title, content, funcYesName) {
+	$("#yesnoDlg-header").text(title);
+	$("#yesnoDlg-content").text(content);
+	$("#yesnoOK").off('click').on('click', () => {
+		$type(funcYesName) === "function" ? funcYesName() : eval(funcYesName);
 		theDialogManager.hide("yesnoDlg");
-		return(false);
+		return false;
 	});
 	theDialogManager.show("yesnoDlg");
 }
diff --git a/js/objects.js b/js/objects.js
index df1993d10..5729b0a4f 100644
--- a/js/objects.js
+++ b/js/objects.js
@@ -337,8 +337,7 @@ var theContextMenu =
 		});
 		return(ret);
 	},
-	add: function()
-	{
+	add: function() {
 		var args = new Array();
 		$.each(arguments, function(ndx,val) { args.push(val); });
         	var aft = null;
@@ -355,55 +354,61 @@ var theContextMenu =
 			args.splice(0, 1);		
 		}
 		var self = this;
-		$.each(args, function(ndx,val) 
-		{
-		        if($type(val))
-			{
-				var li = $("<li>").addClass("menuitem");
-				if(val[0] == CMENU_SEP)
+		$.each(args, function(ndx,val) {
+			if ($type(val)) {
+				const li = $("<li>").addClass("menuitem");
+				if (val[0] == CMENU_SEP)
 					li.append($("<hr>").addClass("menu-line"));
-				else
-				if(val[0] == CMENU_CHILD)
-				{
-					li.append( $("<a></a>").addClass("exp").text(val[1]) );
+				else if(val[0] == CMENU_CHILD) {
+					li.append( $("<a>").addClass("exp").text(val[1]) );
 					var ul = $("<ul>").addClass("CMenu");
-					for(var j = 0, len = val[2].length; j < len; j++) 
-					{
+					for (var j = 0, len = val[2].length; j < len; j++) {
 						self.add(ul, val[2][j]);
 					}
 					li.append(ul);
-				}
-				else
-			       	if(val[0] == CMENU_SEL) 
-		 		{
-		 	        	var a = $("<a></a>").addClass("sel menu-cmd").text(val[1]);
-			 	        switch($type(val[2]))
-			 	        {
-						case "string": a.attr("href","javascript://void();").on('click', function() { eval(val[2]) } ); break;
-						case "function": a.attr("href","javascript://void();").on('click', val[2]); break;
+				} else if(val[0] == CMENU_SEL) {
+					const a = $("<a>").addClass("sel menu-cmd").attr({href: "#"}).text(val[1]);
+					switch ($type(val[2])) {
+						case "string": {
+							a.on('click', () => eval(val[2]));
+							break;
+						}
+						case "function": {
+							a.on('click', val[2]);
+							break;
+						}
+						default: {
+							return;
+						}
 					}
-					li.append(a.on('focus', function() { this.blur(); } ));
-				}
-				else
-				{
-					if($type(val[0]))
-					{
-						var a = $("<a></a>").addClass("menu-cmd").text(val[0]);
-						switch($type(val[1]))
-						{
-				 	        	case false: a.addClass("dis"); break;
-							case "string": a.attr("href","javascript://void();").on('click', function() { eval(val[1]) } ); break;
-							case "function": a.attr("href","javascript://void();").on('click', val[1]); break;
+					li.append(
+						a.on('focus', (ev) => ev.target.blur()),
+					);
+				} else {
+					if ($type(val[0])) {
+						const a = $("<a>").addClass("menu-cmd").text(val[0]);
+						switch ($type(val[1])) {
+							case false: {
+								a.addClass("dis");
+								break;
+							}
+							case "string": {
+								a.attr({href:"#"}).on('click', () => eval(val[1]));
+								break;
+							}
+							case "function": {
+								a.attr({href:"#"}).on('click', val[1]);
+								break;
+							}
 						}
-						li.append(a.on('focus', function() { this.blur(); } ));
+						li.append(
+							a.on('focus', (ev) => ev.target.blur()),
+						);
 					}
 				}
-				if(aft)
-					aft.after(li);
-				else
-					o.append(li);
+				aft ? aft.after(li) : o.append(li);
 			}
-                });
+		});
 	},
 	clear: function()
 	{
diff --git a/js/stable.js b/js/stable.js
index 68e0e18a6..f1e1f5466 100644
--- a/js/stable.js
+++ b/js/stable.js
@@ -1006,14 +1006,11 @@ dxSTable.prototype.keyEvents = function(e)
 	if(!e.fromTextCtrl && !theDialogManager.isModalState())
 	{
 		var c = e.which;
-		if((browser.isKonqueror && c == 127) || (c == 46))
-		{
-			if($type(self.ondelete) == "function") 
+		if((browser.isKonqueror && c == 127) || (c == 46)) {
+			// Delete key
+			if ($type(self.ondelete) === "function") 
 				self.ondelete();
-		}
-		else 
-		if(e.metaKey)
-		{
+		} else if (e.metaKey) {
 			switch(c)
 			{
 				case 65:
diff --git a/js/webui.js b/js/webui.js
index e8dd453d1..a640e8476 100644
--- a/js/webui.js
+++ b/js/webui.js
@@ -3,20 +3,16 @@
  *
  */
 
-var theWebUI =
-{
-  	version: "5.1.0",
-	tables:
-	{
-		trt:
-		{
+var theWebUI = {
+	version: "5.1.0",
+	tables: {
+		trt: {
 			obj: new dxSTable(),
-			columns:
-			[
+			columns: [
 				{ text: theUILang.Name, 		width: "200px", id: "name",		type: TYPE_STRING },
-		      		{ text: theUILang.Status, 		width: "100px",	id: "status",		type: TYPE_STRING },
-		   		{ text: theUILang.Size, 		width: "70px",	id: "size", 		type: TYPE_NUMBER },
-	   			{ text: theUILang.Done, 		width: "100px",	id: "done",		type: TYPE_PROGRESS },
+				{ text: theUILang.Status, 		width: "100px",	id: "status",		type: TYPE_STRING },
+				{ text: theUILang.Size, 		width: "70px",	id: "size", 		type: TYPE_NUMBER },
+				{ text: theUILang.Done, 		width: "100px",	id: "done",		type: TYPE_PROGRESS },
 				{ text: theUILang.Downloaded, 		width: "100px",	id: "downloaded",	type: TYPE_NUMBER },
 				{ text: theUILang.Uploaded, 		width: "100px",	id: "uploaded",		type: TYPE_NUMBER },
 				{ text: theUILang.Ratio, 		width: "60px",	id: "ratio",		type: TYPE_NUMBER },
@@ -33,15 +29,13 @@ var theWebUI =
 			],
 			container:	"List",
 			format:		theFormatter.torrents,
-			ondelete:	function() { theWebUI.remove(); },
-  	                onselect:	function(e,id) { theWebUI.trtSelect(e,id) },
-			ondblclick:	function(obj) { theWebUI.showDetails(obj.id); return(false); }
+			ondelete:	function() { theWebUI.removeTorrent(); },
+			onselect:	function(e,id) { theWebUI.trtSelect(e,id) },
+			ondblclick:	function(obj) { theWebUI.showDetails(obj.id); return false; },
 		},
-		fls:
-		{
+		fls: {
 			obj: new dxSTable(),
-			columns:
-			[
+			columns: [
 				{ text: theUILang.Name, 		width: "200px",	id: "name",		type: TYPE_STRING },
 				{ text: theUILang.Size, 		width: "70px", 	id: "size",		type: TYPE_NUMBER,	"align" : ALIGN_RIGHT},
 				{ text: theUILang.Done, 		width: "100px", id: "done",		type: TYPE_NUMBER },
@@ -51,26 +45,21 @@ var theWebUI =
 			container:	"FileList",
 			format:		theFormatter.files,
 			onselect:	function(e,id) { theWebUI.flsSelect(e,id) },
-			ondblclick:	function(obj)
-			{
-				if(!theWebUI.settings["webui.fls.view"] && (theWebUI.dID!=""))
-				{
+			ondblclick:	function(obj) {
+				if (!theWebUI.settings["webui.fls.view"] && (theWebUI.dID!="")) {
 					var lnk = this.getAttr(obj.id, "link");
-		                	if(lnk!=null)
-		                	{
-		                		theWebUI.dirs[theWebUI.dID].setDirectory(lnk);
+					if(lnk!=null) {
+						theWebUI.dirs[theWebUI.dID].setDirectory(lnk);
 						this.clearRows();
-				    		theWebUI.redrawFiles(theWebUI.dID);
+						theWebUI.redrawFiles(theWebUI.dID);
 					}
 				}
-				return(false);
+				return false;
 			}
 		},
-		trk:
-		{
+		trk: {
 			obj: new dxSTable(),
-			columns:
-			[
+			columns: [
 				{ text: theUILang.Name,			width: "200px", id: "name",		type: TYPE_STRING },
 				{ text: theUILang.Type, 		width: "60px", 	id: "type",		type: TYPE_STRING, 	"align" : ALIGN_RIGHT},
 				{ text: theUILang.Enabled, 		width: "60px", 	id: "enabled",		type: TYPE_STRING, 	"align" : ALIGN_RIGHT},
@@ -82,16 +71,13 @@ var theWebUI =
 				{ text: theUILang.trkInterval,		width: "80px", 	id: "interval",		type: TYPE_NUMBER },
 				{ text: theUILang.trkPrivate, 		width: "60px", 	id: "private",		type: TYPE_STRING, 	"align" : ALIGN_RIGHT}
 			],
-
 			container:	"TrackerList",
 			format:		theFormatter.trackers,
 			onselect:	function(e,id) { theWebUI.trkSelect(e,id) }
 		},
-		prs:
-		{
+		prs: {
 			obj: new dxSTable(),
-			columns:
-			[
+			columns: [
 				{ text: theUILang.Address,		width: "100px", id: "name",		type: TYPE_STRING },
 				{ text: theUILang.ClientVersion,	width: "120px", id: "version",		type: TYPE_STRING },
 				{ text: theUILang.Flags, 		width: "60px", 	id: "flags",		type: TYPE_STRING, 	"align" : ALIGN_RIGHT},
@@ -100,25 +86,22 @@ var theWebUI =
 				{ text: theUILang.Uploaded, 		width: "100px", id: "uploaded",		type: TYPE_NUMBER },
 				{ text: theUILang.DL, 			width: "70px", 	id: "dl",		type: TYPE_NUMBER },
 				{ text: theUILang.UL, 			width: "70px", 	id: "ul",		type: TYPE_NUMBER },
-                                { text: theUILang.PeerDL, 		width: "70px", 	id: "peerdl",		type: TYPE_NUMBER },
-                                { text: theUILang.PeerDownloaded, 	width: "100px", id: "peerdownloaded",	type: TYPE_NUMBER }
+				{ text: theUILang.PeerDL, 		width: "70px", 	id: "peerdl",		type: TYPE_NUMBER },
+				{ text: theUILang.PeerDownloaded, 	width: "100px", id: "peerdownloaded",	type: TYPE_NUMBER }
 			],
 			container:	"PeerList",
 			format:		theFormatter.peers,
 			onselect:	function(e,id) { theWebUI.prsSelect(e,id) },
-			ondblclick:	function(obj)
-			{
+			ondblclick:	function(obj) {
 				const queryUrl = theWebUI.getPeerIpQueryUrl(obj.id);
 				if (queryUrl !== '#')
 					window.open(queryUrl, "_blank");
-				return(false);
+				return false;
 			}
 		},
-		plg:
-		{
+		plg: {
 			obj: new dxSTable(),
-			columns:
-			[
+			columns: [
 				{ text: theUILang.plgName,		width: "150px", id: "name",		type: TYPE_STRING },
 				{ text: theUILang.plgVersion,		width: "60px",	id: "version",		type: TYPE_NUMBER },
 				{ text: theUILang.plgStatus, 		width: "80px", 	id: "status",		type: TYPE_STRING, 	"align" : ALIGN_RIGHT},
@@ -128,11 +111,10 @@ var theWebUI =
 			],
 			container:	"PluginList",
 			format:		theFormatter.plugins,
-			onselect:	function(e,id) { theWebUI.plgSelect(e,id) }
+			onselect:	function(e,id) { theWebUI.plgSelect(e,id) },
 		}
 	},
-	settings:
-	{
+	settings: {
 		"webui.fls.view":		0,
 		"webui.show_cats":		1,
 		"webui.show_dets":		1,
@@ -196,8 +178,7 @@ var theWebUI =
 		})(),
 	},
 	showFlags: 0,
-	total:
-	{
+	total: {
 		rateDL: 	0,
 		rateUL: 	0,
 		speedDL: 	0,
@@ -205,8 +186,7 @@ var theWebUI =
 		DL: 		0,
 		UL: 		0
 	},
-	stopen:
-	{
+	stopen: {
 		http: 	-1,
 		sock: 	-1,
 		fd: 	-1,
@@ -241,14 +221,12 @@ var theWebUI =
 // init
 //
 
-	init: function()
-	{
-       		log("WebUI started.");
+	init: function() {
+		log("WebUI started.");
 		this.setStatusUpdate();
-		if(browser.isOldIE)
+		if (browser.isOldIE)
 			this.msg(theUILang.Doesnt_support);
-		else
-		{
+		else {
 			this.catchErrors(false);
 			this.getUISettings();
 			this.getPlugins();
@@ -258,7 +236,7 @@ var theWebUI =
 	assignEvents: function() {
 		window.addEventListener("resize", () => theWebUI.resize());
 		window.addEventListener("orientationchange", () => theWebUI.resize());
-		$(document).on("dragstart", function(e) { return(false); } );
+		$(document).on("dragstart", function(e) { return false; } );
 		$(document).on("selectstart", function(e) { return(e.fromTextCtrl); });
 		$(document).on("contextmenu", function(e) {
 			if (e.fromTextCtrl)
@@ -395,14 +373,11 @@ var theWebUI =
 			this.speedGraph.create(speedTab);
 	},
 
-	config: function()
-	{
-		$.each(this.tables, function(ndx,table)
-		{
-		        var width = theWebUI.settings["webui."+ndx+".colwidth"];
-		        var enabled = theWebUI.settings["webui."+ndx+".colenabled"];
-			$.each(table.columns, function(i,col)
-			{
+	config: function() {
+		$.each(this.tables, function(ndx,table) {
+			var width = theWebUI.settings["webui."+ndx+".colwidth"];
+			var enabled = theWebUI.settings["webui."+ndx+".colenabled"];
+			$.each(table.columns, function(i,col) {
 				if(width && i<width.length && width[i]>4)
 					col.width = width[i];
 				if(enabled && i<enabled.length)
@@ -427,13 +402,14 @@ var theWebUI =
 				table.obj.secRev = iv(theWebUI.settings["webui."+ndx+".rev2"]);
 			if($type(theWebUI.settings["webui."+ndx+".colorder"]))
 				table.obj.colOrder = theWebUI.settings["webui."+ndx+".colorder"];
-			table.obj.onsort = function()
-			{
-				if( (this.sortId != theWebUI.settings["webui."+this.prefix+".sindex"]) ||
+			table.obj.onsort = function() {
+				if (
+					(this.sortId != theWebUI.settings["webui."+this.prefix+".sindex"]) ||
 					(this.reverse != theWebUI.settings["webui."+this.prefix+".rev"]) ||
 					(this.sortId2 != theWebUI.settings["webui."+this.prefix+".sindex2"]) ||
-					(this.secRev != theWebUI.settings["webui."+this.prefix+".rev2"]))
-						theWebUI.save();
+					(this.secRev != theWebUI.settings["webui."+this.prefix+".rev2"])
+				)
+					theWebUI.save();
 			}
 		});
 		var table = this.getTable("fls");
@@ -1390,7 +1366,7 @@ var theWebUI =
 		this.getTable("trt").clearSelection();
 	},
 
-   	createMenu: function(e, id)
+	createMenu: function(e, id)
 	{
    		var table = this.getTable("trt");
    		theContextMenu.clear();
@@ -1440,15 +1416,12 @@ var theWebUI =
    		theContextMenu.add([CMENU_CHILD, theUILang.Labels, _bf]);
    		theContextMenu.add([CMENU_SEP]);
    		var _c0 = [];
-		if(table.selCount > 1)
-		{
+		if (table.selCount > 1) {
 			_c0.push([theUILang.High_priority, "theWebUI.perform('dsetprio&v=3')"]);
 			_c0.push([theUILang.Normal_priority, "theWebUI.perform('dsetprio&v=2')"]);
 			_c0.push([theUILang.Low_priority,  "theWebUI.perform('dsetprio&v=1')"]);
 			_c0.push([theUILang.Dont_download,  "theWebUI.perform('dsetprio&v=0')"]);
-		}
-		else
-		{
+		} else {
 			var p = this.torrents[id].priority;
 			_c0.push([theUILang.High_priority, (p==3) || !this.isTorrentCommandEnabled("dsetprio",id) ? null : "theWebUI.perform('dsetprio&v=3')"]);
 			_c0.push([theUILang.Normal_priority, (p==2 || !this.isTorrentCommandEnabled("dsetprio",id)) ? null : "theWebUI.perform('dsetprio&v=2')"]);
@@ -1456,87 +1429,84 @@ var theWebUI =
 			_c0.push([theUILang.Dont_download, (p==0) || !this.isTorrentCommandEnabled("dsetprio",id) ? null : "theWebUI.perform('dsetprio&v=0')"]);
 		}
 		theContextMenu.add([CMENU_CHILD, theUILang.Priority, _c0]);
-   		theContextMenu.add([CMENU_SEP]);
-   		theContextMenu.add([theUILang.Remove, (table.selCount > 1) || this.isTorrentCommandEnabled("remove",id) ? "theWebUI.remove()" : null]);
-   		theContextMenu.add([CMENU_SEP]);
-   		theContextMenu.add([theUILang.Details, "theWebUI.showDetails('" + id + "')"]);
-   		if((table.selCount > 1) || !this.isTorrentCommandEnabled("setprops",id))
-      			theContextMenu.add([theUILang.Properties]);
-   		else
-      			theContextMenu.add([theUILang.Properties, "theWebUI.showProperties('" + id + "')"]);
+		theContextMenu.add([CMENU_SEP]);
+		theContextMenu.add([
+			theUILang.Remove,
+			(table.selCount > 1) || this.isTorrentCommandEnabled("remove", id)
+				? () => theWebUI.removeTorrent()
+				: null,
+		]);
+		theContextMenu.add([CMENU_SEP]);
+		theContextMenu.add([theUILang.Details, "theWebUI.showDetails('" + id + "')"]);
+		if ((table.selCount > 1) || !this.isTorrentCommandEnabled("setprops",id))
+			theContextMenu.add([theUILang.Properties]);
+		else
+			theContextMenu.add([theUILang.Properties, "theWebUI.showProperties('" + id + "')"]);
 	},
 
-   	perform: function(cmd)
-	{
-		if(cmd == "pause")
-		{
+	/**
+	 * Perform a command on the backend.
+	 * @param {string} cmd Command to be performed.
+	 */
+	perform: function(cmd) {
+		if (cmd === "pause") {
 			var hp = this.getHashes("unpause");
-			if(hp != "")
+			if (hp != "")
 				this.request("?action=unpause" + hp);
 		}
 		var h = this.getHashes(cmd);
-		if(h != "")
-		{
-			if((cmd.indexOf("remove")==0) && (h.indexOf(this.dID) >- 1))
-			{
+		if (h !== "") {
+			if ((cmd.indexOf("remove") === 0) && (h.indexOf(this.dID) > -1)) {
 				this.dID = "";
 				this.clearDetails();
 			}
 			this.getTorrents(cmd + h + "&list=1");
 		}
-   	},
+	},
 
 	/**
-	 * @param {string} act
-	 * @param {string} hash
+	 * Check if an action is enabled to be performed on 
+	 * a torrent specified by the torrent's hash.
+	 * @param {string} act Action to be checked.
+	 * @param {string} hash Hash of the torrent to be checked.
 	 * @returns {boolean}
 	 */
-	isTorrentCommandEnabled: function(act,hash)
-	{
-		var ret = true;
-   		var status = this.torrents[hash].state;
-		switch(act)
-		{
-			case "start" :
-			{
-				ret = (!(status & dStatus.started) || (status & dStatus.paused) && !(status & dStatus.checking) && !(status & dStatus.hashing));
-				break;
+	isTorrentCommandEnabled: function(act, hash) {
+		const status = this.torrents[hash].state;
+		switch (act) {
+			case "start": {
+				return (!(status & dStatus.started) || (status & dStatus.paused) && !(status & dStatus.checking) && !(status & dStatus.hashing));
 			}
-			case "pause" :
-			{
-				ret = ((status & dStatus.started) && !(status & dStatus.paused) && !(status & dStatus.checking) && !(status & dStatus.hashing));
-				break;
+			case "pause": {
+				return ((status & dStatus.started) && !(status & dStatus.paused) && !(status & dStatus.checking) && !(status & dStatus.hashing));
 			}
-			case "unpause" :
-			{
-				ret = ((status & dStatus.paused) && !(status & dStatus.checking) && !(status & dStatus.hashing));
-				break;
+			case "unpause": {
+				return ((status & dStatus.paused) && !(status & dStatus.checking) && !(status & dStatus.hashing));
 			}
-			case "stop" :
-			{
-				ret = ((status & dStatus.started) || (status & dStatus.hashing) || (status & dStatus.checking));
-				break;
+			case "stop": {
+				return ((status & dStatus.started) || (status & dStatus.hashing) || (status & dStatus.checking));
 			}
-			case "recheck" :
-			{
-				ret = !(status & dStatus.checking) && !(status & dStatus.hashing);
-				break;
+			case "recheck": {
+				return !(status & dStatus.checking) && !(status & dStatus.hashing);
+			}
+			default: {
+				return true;
 			}
 		}
-		return(ret);
 	},
 
-	getHashes: function(act)
-	{
-		var h = "";
-		var pos = act.indexOf('&');
-		if(pos>=0)
-			act = act.substring(0,pos);
-		var sr = this.getTable("trt").rowSel;
-		for(var k in sr)
-			if((sr[k] == true) && this.isTorrentCommandEnabled(act,k))
-				h += "&hash=" + k;
-		return(h);
+	/**
+	 * 
+	 * @param {string} act 
+	 * @returns {string} Query string of hashes of selected torrents.
+	 */
+	getHashes: function(act) {
+		const pos = act.indexOf('&');
+		if (pos >= 0)
+			act = act.substring(0, pos);
+		return Object.entries(this.getTable("trt").rowSel)
+			.filter(([hash, isSelected]) => (isSelected && this.isTorrentCommandEnabled(act, hash)))
+			.reduce((acc, curr) => (acc + "&hash=" + curr[0]), "");
 	},
 
 	start: function()
@@ -1559,31 +1529,35 @@ var theWebUI =
    		this.perform("updateTracker");
    	},
 
-	remove: function()
-	{		
+	/**
+	 * Remove selected torrent(s), **without** confirmation.
+	 */
+	remove: function() {		
 		this.perform("remove");
 	},
 
-	removeTorrent: function()
-	{
-		var table = this.getTable("trt");
-		if((table.selCount>1) ||
-			((table.selCount==1) &&	this.isTorrentCommandEnabled("remove",table.getFirstSelected())))
-		{
-			if(this.settings["webui.confirm_when_deleting"])
-			{
-				this.delmode = "remove";
-				askYesNo( theUILang.Remove_torrents, theUILang.Rem_torrents_prompt, "theWebUI.doRemove()" );
-	      	}
-			else
+	/**
+	 * Remove selected torrent(s). Will confirm before taking action
+	 * if the option is enabled in the settings.
+	 */
+	removeTorrent: function() {
+		const table = this.getTable("trt");
+		if ((table.selCount > 1) ||
+			((table.selCount === 1) && this.isTorrentCommandEnabled("remove", table.getFirstSelected()))) {
+			if (this.settings["webui.confirm_when_deleting"]) {
+				askYesNo(
+					theUILang.Remove_torrents,
+					theUILang.Rem_torrents_prompt,
+					() => this.perform("remove"),
+				);
+			} else
 				this.perform("remove");
 		}
 	},
 
-	doRemove: function()
-	{
+	doRemove: function() {
 		this.perform(this.delmode);
-   	},
+	},
 
 	recheck: function()
 	{
@@ -2417,28 +2391,24 @@ var theWebUI =
 		this.updTimer = window.setTimeout(this.update, this.interval);
    	},
 
-   	setActiveView: function(id)
-	{
+	setActiveView: function(id) {
 		$("#tooltip").remove();
-		this.activeView=id;
+		this.activeView = id;
 		if (this.settings['webui.selected_tab.keep'])
 			this.save();
 	},
 
-	request: function(qs, onComplite, isASync)
-	{
+	request: function(qs, onComplite, isASync) {
 		this.requestWithTimeout(qs, onComplite, this.timeout, this.error, isASync);
 	},
 
-	requestWithTimeout: function(qs, onComplite, onTimeout, onError, isASync)
-	{
+	requestWithTimeout: function(qs, onComplite, onTimeout, onError, isASync) {
 		Ajax(this.url + qs, isASync, onComplite, onTimeout, onError, this.settings["webui.reqtimeout"]);
-   	},
+	},
 
-	requestWithoutTimeout: function(qs, onComplite, isASync)
-	{
+	requestWithoutTimeout: function(qs, onComplite, isASync) {
 		Ajax(this.url + qs, isASync, onComplite, null, this.error, -1);
-   	},
+	},
 
 	show: function()
 	{