5 files changed, 146 insertions, 92 deletions
diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index d6c06bf6d8..77fc9b2cb9 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -152,7 +152,7 @@
 	</dl>
 	<dl>
 		<dt><label for="forum_desc">{L_FORUM_DESC}{L_COLON}</label><br /><span>{L_FORUM_DESC_EXPLAIN}</span></dt>
-		<dd><textarea id="forum_desc" name="forum_desc" rows="5" cols="45">{FORUM_DESC}</textarea></dd>
+		<dd><textarea id="forum_desc" name="forum_desc" rows="5" cols="45" data-bbcode="true">{FORUM_DESC}</textarea></dd>
 		<dd><label><input type="checkbox" class="radio" name="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label>
 			<label><input type="checkbox" class="radio" name="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label>
 			<label><input type="checkbox" class="radio" name="desc_parse_urls"<!-- IF S_DESC_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd>
@@ -316,7 +316,7 @@
 	<!-- ENDIF -->
 		<dl>
 			<dt><label for="forum_rules">{L_FORUM_RULES}{L_COLON}</label><br /><span>{L_FORUM_RULES_EXPLAIN}</span></dt>
-			<dd><textarea id="forum_rules" name="forum_rules" rows="4" cols="70">{FORUM_RULES_PLAIN}</textarea></dd>
+			<dd><textarea id="forum_rules" name="forum_rules" rows="4" cols="70" data-bbcode="true">{FORUM_RULES_PLAIN}</textarea></dd>
 			<dd><label><input type="checkbox" class="radio" name="rules_parse_bbcode"<!-- IF S_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label>
 				<label><input type="checkbox" class="radio" name="rules_parse_smilies"<!-- IF S_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label>
 				<label><input type="checkbox" class="radio" name="rules_parse_urls"<!-- IF S_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd>
diff --git a/phpBB/adm/style/acp_users_signature.html b/phpBB/adm/style/acp_users_signature.html
index c9cc053eec..2b4964803e 100644
--- a/phpBB/adm/style/acp_users_signature.html
+++ b/phpBB/adm/style/acp_users_signature.html
@@ -92,7 +92,7 @@
 				// ]]>
 				</script>
 			</dt>
-			<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 90px;"><textarea name="signature" rows="10" cols="60" style="width: 95%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();">{SIGNATURE}</textarea></dd>
+			<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 90px;"><textarea name="signature" rows="10" cols="60" style="width: 95%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" data-bbcode="true">{SIGNATURE}</textarea></dd>
 			<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 90px; margin-top: 5px;">
 			<!-- IF S_BBCODE_ALLOWED -->
 				<label><input type="checkbox" class="radio" name="disable_bbcode"{S_BBCODE_CHECKED} /> {L_DISABLE_BBCODE}</label>
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js
index e3f1f9f55b..ba76ba8c10 100644
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -663,5 +663,145 @@ phpbb.resizeTextArea = function(items, options) {
 	});
 };
 
+/**
+* Adjust textarea to manage code bbcode
+*
+* This function allows to use tab characters when typing code
+* and keeps indentation of previous line of code when adding new
+* line while typing code.
+*
+* Editor's functionality is changed only when cursor is between
+* [code] and [/code] bbcode tags.
+*
+* @param {object} textarea Textarea DOM object to apply editor to
+*/
+phpbb.applyCodeEditor = function(textarea) {
+	// list of allowed start and end bbcode code tags, in lower case
+	var startTags = ['[code]', '[code='],
+		startTagsEnd = ']',
+		endTags = ['[/code]'];
+
+	if ($(textarea).data('code-editor') === true) {
+		return;
+	}
+
+	/**
+	* Check if cursor is currently inside code tag
+	*
+	* @return {boolean} True if cursor is in code tag
+	*/
+	function inTag() {
+		var start = textarea.selectionStart,
+			lastEnd = -1,
+			lastStart = -1,
+			i, index, value;
+
+		value = textarea.value.toLowerCase();
+
+		for (i = 0; i < startTags.length; i++) {
+			var tagLength = startTags[i].length;
+			if (start >= tagLength) {
+				index = value.lastIndexOf(startTags[i], start - tagLength);
+				lastStart = Math.max(lastStart, index);
+			}
+		}
+		if (lastStart == -1) return false;
+
+		if (start > 0) {
+			for (i = 0; i < endTags.length; i++) {
+				index = value.lastIndexOf(endTags[i], start - 1);
+				lastEnd = Math.max(lastEnd, index);
+			}
+		}
+
+		return (lastEnd < lastStart);
+	}
+
+	/**
+	* Get line of text before cursor
+	*
+	* @param {boolean} stripCodeStart If true, only part of line
+	*		after [code] tag will be returned.
+	*
+	* @return {string} Line of text
+	*/
+	function getLastLine(stripCodeStart) {
+		var start = textarea.selectionStart,
+			value = textarea.value,
+			index = value.lastIndexOf("\n", start - 1);
+
+		value = value.substring(index + 1, start);
+
+		if (stripCodeStart) {
+			for (var i = 0; i < startTags.length; i++) {
+				index = value.lastIndexOf(startTags[i]);
+				if (index >= 0) {
+					var tagLength = startTags[i].length;
+
+					value = value.substring(index + tagLength);
+					if (startTags[i].lastIndexOf(startTagsEnd) != tagLength) {
+						index = value.indexOf(startTagsEnd);
+
+						if (index >= 0) {
+							value = value.substr(index + 1);
+						}
+					}
+				}
+			}
+		}
+
+		return value;
+	}
+
+	/**
+	* Append text at cursor position
+	*
+	* @param {string} Text Text to append
+	*/
+	function appendText(text) {
+		var start = textarea.selectionStart,
+			end = textarea.selectionEnd,
+			value = textarea.value;
+
+		textarea.value = value.substr(0, start) + text + value.substr(end);
+		textarea.selectionStart = textarea.selectionEnd = start + text.length;
+	}
+
+	$(textarea).data('code-editor', true).on('keydown', function(event) {
+		var key = event.keyCode || event.which;
+
+		// intercept tabs
+		if (key == 9) {
+			if (inTag()) {
+				appendText("\t");
+				event.preventDefault();
+				return;
+			}
+		}
+
+		// intercept new line characters
+		if (key == 13) {
+			if (inTag()) {
+				var lastLine = getLastLine(true),
+					code = '' + /^\s*/g.exec(lastLine);
+
+				if (code.length > 0) {
+					appendText("\n" + code);
+					event.preventDefault();
+					return;
+				}
+			}
+		}
+	});
+};
+
+/**
+* Apply code editor to all textarea elements with data-bbcode attribute
+*/
+$(document).ready(function() {
+	$('textarea[data-bbcode]').each(function() {
+		phpbb.applyCodeEditor(this);
+	});
+});
 
 })(jQuery); // Avoid conflicts with other libraries
diff --git a/phpBB/styles/prosilver/template/editor.js b/phpBB/styles/prosilver/template/editor.js
index 311c1957ba..6eb8c1e0c4 100644
--- a/phpBB/styles/prosilver/template/editor.js
+++ b/phpBB/styles/prosilver/template/editor.js
@@ -401,7 +401,7 @@ function getCaretPosition(txtarea) {
 */
 (function($) {
 	$(document).ready(function() {
-		var doc, textarea, startTags, startTagsEnd, endTags;
+		var doc, textarea;
 
 		// find textarea, make sure browser supports necessary functions
 		if (document.forms[form_name]) {
@@ -419,94 +419,7 @@ function getCaretPosition(txtarea) {
 			return;
 		}
 
-		// list of allowed start and end bbcode code tags, in lower case
-		startTags = ['[code]', '[code='];
-		startTagsEnd = ']';
-		endTags = ['[/code]'];
-
-		function inTag() {
-			var start = textarea.selectionStart,
-				lastEnd = -1,
-				lastStart = -1,
-				i, index, value;
-
-			value = textarea.value.toLowerCase();
-
-			for (i = 0; i < startTags.length; i++) {
-				var tagLength = startTags[i].length;
-				if (start >= tagLength) {
-					index = value.lastIndexOf(startTags[i], start - tagLength);
-					lastStart = Math.max(lastStart, index);
-				}
-			}
-			if (lastStart == -1) return false;
-
-			if (start > 0) {
-				for (i = 0; i < endTags.length; i++) {
-					index = value.lastIndexOf(endTags[i], start - 1);
-					lastEnd = Math.max(lastEnd, index);
-				}
-			}
-
-			return (lastEnd < lastStart);
-		}
-
-		function getLastLine(stripCodeTags) {
-			var start = textarea.selectionStart,
-				value = textarea.value,
-				index = value.lastIndexOf("\n", start - 1);
-			value = value.substring(index + 1, start);
-			if (stripCodeTags) {
-				for (var i = 0; i < startTags.length; i++) {
-					index = value.lastIndexOf(startTags[i]);
-					if (index >= 0) {
-						var tagLength = startTags[i].length;
-						value = value.substring(index + tagLength);
-						if (startTags[i].lastIndexOf(startTagsEnd) != tagLength) {
-							index = value.indexOf(startTagsEnd);
-							if (index >= 0) {
-								value = value.substr(index + 1);
-							}
-						}
-					}
-				}
-			}
-			return value;
-		}
-
-		function appendCode(code) {
-			var start = textarea.selectionStart,
-				end = textarea.selectionEnd,
-				value = textarea.value;
-			textarea.value = value.substr(0, start) + code + value.substr(end);
-			textarea.selectionStart = textarea.selectionEnd = start + code.length;
-		}
-
-		$(textarea).on('keydown', function(event) {
-			var key = event.keyCode || event.which;
-
-			// intercept tabs
-			if (key == 9) {
-				if (inTag()) {
-					appendCode("\t");
-					event.preventDefault();
-					return;
-				}
-			}
-
-			// intercept new line characters
-			if (key == 13) {
-				if (inTag()) {
-					var lastLine = getLastLine(true),
-						code = '' + /^\s*/g.exec(lastLine);
-					if (code.length > 0) {
-						appendCode("\n" + code);
-						event.preventDefault();
-						return;
-					}
-				}
-			}
-		});
+		phpbb.applyCodeEditor(textarea);
 	});
 })(jQuery);
 
diff --git a/phpBB/styles/subsilver2/template/editor.js b/phpBB/styles/subsilver2/template/editor.js
index 93506b8d4a..6cf616e180 100644
--- a/phpBB/styles/subsilver2/template/editor.js
+++ b/phpBB/styles/subsilver2/template/editor.js
@@ -38,6 +38,7 @@ function initInsertions() {
 	}
 
 	var textarea = doc.forms[form_name].elements[text_name];
+	phpbb.applyCodeEditor(textarea);
 
 	if (is_ie && typeof(baseHeight) !== 'number') {
 		textarea.focus();