From d14da1214cbe495a05a32d822f97dd12b3da21e3 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Sun, 21 May 2017 13:41:28 -0400
Subject: [PATCH] Remove special case of "url" from insertFormatting

---
 view/theme/duepuntozero/theme.php        | 12 ++----------
 view/theme/frio/js/textedit.js           | 12 ++----------
 view/theme/frost-mobile/js/theme.js      | 12 ++----------
 view/theme/frost/js/theme.js             | 12 ++----------
 view/theme/quattro/js/quattro.js         | 12 ++----------
 view/theme/smoothly/templates/bottom.tpl | 18 ++++--------------
 view/theme/smoothly/theme.php            | 12 ++----------
 view/theme/vier/theme.php                | 12 ++----------
 8 files changed, 18 insertions(+), 84 deletions(-)

diff --git a/view/theme/duepuntozero/theme.php b/view/theme/duepuntozero/theme.php
index dc8f29b2fa..efb43a9248 100644
--- a/view/theme/duepuntozero/theme.php
+++ b/view/theme/duepuntozero/theme.php
@@ -37,19 +37,11 @@ function insertFormatting(BBcode, id) {
 	if (document.selection) {
 		textarea.focus();
 		selected = document.selection.createRange();
-		if (BBcode == "url") {
-			selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
-		} else {
-			selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
-		}
+		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
 	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
 		var start = textarea.selectionStart;
 		var end = textarea.selectionEnd;
-		if (BBcode == "url") {
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-		} else {
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-		}
+		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
 	}
 
 	return true;
diff --git a/view/theme/frio/js/textedit.js b/view/theme/frio/js/textedit.js
index bbbd8fde86..2079c20cdc 100644
--- a/view/theme/frio/js/textedit.js
+++ b/view/theme/frio/js/textedit.js
@@ -15,19 +15,11 @@ function insertFormatting(BBcode, id) {
 	if (document.selection) {
 		textarea.focus();
 		selected = document.selection.createRange();
-		if (BBcode == "url") {
-			selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
-		} else {
-			selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
-		}
+		selected.text = "[" + BBcode + "]" + selected.text + "[/" + BBcode + "]";
 	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
 		var start = textarea.selectionStart;
 		var end = textarea.selectionEnd;
-		if (BBcode == "url") {
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-		} else {
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-		}
+		textarea.value = textarea.value.substring(0, start) + "[" + BBcode + "]" + textarea.value.substring(start, end) + "[/" + BBcode + "]" + textarea.value.substring(end, textarea.value.length);
 	}
 
 	$(textarea).trigger('change');
diff --git a/view/theme/frost-mobile/js/theme.js b/view/theme/frost-mobile/js/theme.js
index abb2ed7c42..09b5e4d383 100644
--- a/view/theme/frost-mobile/js/theme.js
+++ b/view/theme/frost-mobile/js/theme.js
@@ -423,19 +423,11 @@ function insertFormatting(BBcode, id) {
 	if (document.selection) {
 		textarea.focus();
 		selected = document.selection.createRange();
-		if (BBcode == "url") {
-			selected.text = "["+BBcode+"=http://]" +  selected.text + "[/"+BBcode+"]";
-		} else {
-			selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
-		}
+		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
 	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
 		var start = textarea.selectionStart;
 		var end = textarea.selectionEnd;
-		if (BBcode == "url") {
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"=http://]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-		} else {
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-		}
+		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
 	}
 
 	return true;
diff --git a/view/theme/frost/js/theme.js b/view/theme/frost/js/theme.js
index 52e181a622..bf7bdd585c 100644
--- a/view/theme/frost/js/theme.js
+++ b/view/theme/frost/js/theme.js
@@ -603,19 +603,11 @@ function insertFormatting(BBcode, id) {
 	if (document.selection) {
 		textarea.focus();
 		selected = document.selection.createRange();
-		if (BBcode == "url") {
-			selected.text = "["+BBcode+"=http://]" +  selected.text + "[/"+BBcode+"]";
-		} else {
-			selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
-		}
+		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
 	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
 		var start = textarea.selectionStart;
 		var end = textarea.selectionEnd;
-		if (BBcode == "url") {
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"=http://]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-		} else {
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-		}
+		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
 	}
 
 	return true;
diff --git a/view/theme/quattro/js/quattro.js b/view/theme/quattro/js/quattro.js
index 9ef66e220e..469a3bbc93 100644
--- a/view/theme/quattro/js/quattro.js
+++ b/view/theme/quattro/js/quattro.js
@@ -71,19 +71,11 @@ function insertFormatting(BBcode, id) {
 	if (document.selection) {
 		textarea.focus();
 		selected = document.selection.createRange();
-		if (BBcode == "url") {
-			selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
-		} else {
-			selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
-		}
+		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
 	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
 		var start = textarea.selectionStart;
 		var end = textarea.selectionEnd;
-		if (BBcode == "url") {
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-		} else {
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-		}
+		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
 	}
 
 	return true;
diff --git a/view/theme/smoothly/templates/bottom.tpl b/view/theme/smoothly/templates/bottom.tpl
index caebe37711..3b38eecb56 100644
--- a/view/theme/smoothly/templates/bottom.tpl
+++ b/view/theme/smoothly/templates/bottom.tpl
@@ -20,23 +20,13 @@ function insertFormatting(BBcode, id) {
 	if (document.selection) {
 		textarea.focus();
 		selected = document.selection.createRange();
-		if (BBcode == "url") {
-			selected.text = "["+BBcode+"]" + "http://" + selected.text + "[/"+BBcode+"]";
-		} else {
-			selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
-		}
+		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
 	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
 		var start = textarea.selectionStart;
 		var end = textarea.selectionEnd;
-		if (BBcode == "url") {
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]"
-				+ "http://" + textarea.value.substring(start, end)
-				+ "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-		} else {
-			textarea.value = textarea.value.substring(0, start)
-				+ "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]"
-				+ textarea.value.substring(end, textarea.value.length);
-		}
+		textarea.value = textarea.value.substring(0, start)
+			+ "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]"
+			+ textarea.value.substring(end, textarea.value.length);
 	}
 
 	return true;
diff --git a/view/theme/smoothly/theme.php b/view/theme/smoothly/theme.php
index 3efcf54f41..00f1147211 100644
--- a/view/theme/smoothly/theme.php
+++ b/view/theme/smoothly/theme.php
@@ -33,19 +33,11 @@ function insertFormatting(BBcode, id) {
 	if (document.selection) {
 		textarea.focus();
 		selected = document.selection.createRange();
-		if (BBcode == "url") {
-			selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
-		} else {
-			selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
-		}
+		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
 	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
 		var start = textarea.selectionStart;
 		var end = textarea.selectionEnd;
-		if (BBcode == "url") {
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-		} else {
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-		}
+		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
 	}
 
 	return true;
diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index da2c08335d..269b34460c 100644
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -50,19 +50,11 @@ function insertFormatting(BBcode, id) {
 	if (document.selection) {
 		textarea.focus();
 		selected = document.selection.createRange();
-		if (BBcode == "url") {
-			selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
-		} else {
-			selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
-		}
+		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
 	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
 		var start = textarea.selectionStart;
 		var end = textarea.selectionEnd;
-		if (BBcode == "url") {
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-		} else {
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-		}
+		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
 	}
 
 	return true;