3 files changed, 1323 insertions, 40 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js
index cdba6f9d26..5b8331bdce 100644
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -12,31 +12,28 @@ var keymap = {
 };
 
 var dark = $('#darkenwrapper');
-var loadingAlert = $('#loadingalert');
+var loadingIndicator = $('#loading_indicator');
 var phpbbAlertTimer = null;
 
+var isTouch = (window && typeof window.ontouchstart !== 'undefined');
 
 /**
  * Display a loading screen
  *
- * @returns object Returns loadingAlert.
+ * @returns object Returns loadingIndicator.
  */
-phpbb.loadingAlert = function() {
-	if (dark.is(':visible')) {
-		loadingAlert.fadeIn(phpbb.alertTime);
-	} else {
-		loadingAlert.show();
-		dark.fadeIn(phpbb.alertTime, function() {
-			// Wait five seconds and display an error if nothing has been returned by then.
-			phpbbAlertTimer = setTimeout(function() {
-				if (loadingAlert.is(':visible')) {
-					phpbb.alert($('#phpbb_alert').attr('data-l-err'), $('#phpbb_alert').attr('data-l-timeout-processing-req'));
-				}
-			}, 5000);
-		});
+phpbb.loadingIndicator = function() {
+	if (!loadingIndicator.is(':visible')) {
+		loadingIndicator.fadeIn(phpbb.alertTime);
+		// Wait fifteen seconds and display an error if nothing has been returned by then.
+		phpbbAlertTimer = setTimeout(function() {
+			if (loadingIndicator.is(':visible')) {
+				phpbb.alert($('#phpbb_alert').attr('data-l-err'), $('#phpbb_alert').attr('data-l-timeout-processing-req'));
+			}
+		}, 15000);
 	}
 
-	return loadingAlert;
+	return loadingIndicator;
 };
 
 /**
@@ -66,6 +63,10 @@ phpbb.alert = function(title, msg, fadedark) {
 	div.find('.alert_title').html(title);
 	div.find('.alert_text').html(msg);
 
+	if (!dark.is(':visible')) {
+		dark.fadeIn(phpbb.alertTime);
+	}
+
 	div.bind('click', function(e) {
 		e.stopPropagation();
 	});
@@ -97,8 +98,8 @@ phpbb.alert = function(title, msg, fadedark) {
 		e.preventDefault();
 	});
 
-	if (loadingAlert.is(':visible')) {
-		loadingAlert.fadeOut(phpbb.alertTime, function() {
+	if (loadingIndicator.is(':visible')) {
+		loadingIndicator.fadeOut(phpbb.alertTime, function() {
 			dark.append(div);
 			div.fadeIn(phpbb.alertTime);
 		});
@@ -131,6 +132,10 @@ phpbb.confirm = function(msg, callback, fadedark) {
 	var div = $('#phpbb_confirm');
 	div.find('.alert_text').html(msg);
 
+	if (!dark.is(':visible')) {
+		dark.fadeIn(phpbb.alertTime);
+	}
+
 	div.bind('click', function(e) {
 		e.stopPropagation();
 	});
@@ -184,8 +189,8 @@ phpbb.confirm = function(msg, callback, fadedark) {
 		e.preventDefault();
 	});
 
-	if (loadingAlert.is(':visible')) {
-		loadingAlert.fadeOut(phpbb.alertTime, function() {
+	if (loadingIndicator.is(':visible')) {
+		loadingIndicator.fadeOut(phpbb.alertTime, function() {
 			dark.append(div);
 			div.fadeIn(phpbb.alertTime);
 		});
@@ -326,12 +331,12 @@ phpbb.ajaxify = function(options) {
 				// If confirmation is required, display a dialog to the user.
 				phpbb.confirm(res.MESSAGE_BODY, function(del) {
 					if (del) {
-						phpbb.loadingAlert();
+						phpbb.loadingIndicator();
 						data =  $('<form>' + res.S_HIDDEN_FIELDS + '</form>').serialize();
 						$.ajax({
 							url: res.S_CONFIRM_ACTION,
 							type: 'POST',
-							data: data + '&confirm=' + res.YES_VALUE,
+							data: data + '&confirm=' + res.YES_VALUE + '&' + $('#phpbb_confirm form').serialize(),
 							success: returnHandler,
 							error: errorHandler
 						});
@@ -369,16 +374,19 @@ phpbb.ajaxify = function(options) {
 		}
 
 		if (overlay && (typeof $this.attr('data-overlay') === 'undefined' || $this.attr('data-overlay') === 'true')) {
-			phpbb.loadingAlert();
+			phpbb.loadingIndicator();
 		}
 
-		$.ajax({
+		var request = $.ajax({
 			url: action,
 			type: method,
 			data: data,
 			success: returnHandler,
 			error: errorHandler
 		});
+		request.always(function() {
+			loadingIndicator.fadeOut(phpbb.alertTime);
+		});
 
 		event.preventDefault();
 	});
@@ -510,11 +518,11 @@ $('#notification_list_button').click(function(e) {
 	e.preventDefault();
 });
 $('#phpbb').click(function(e) {
-    var target = $(e.target);
+	var target = $(e.target);
 
-    if (!target.is('#notification_list') && !target.is('#notification_list_button') && !target.parents().is('#notification_list')) {
-        $('#notification_list').hide();
-    }
+	if (!target.is('#notification_list, #notification_list_button') && !target.parents().is('#notification_list, #notification_list_button')) {
+		$('#notification_list').hide();
+	}
 });
 
 phpbb.ajaxCallbacks = {};
@@ -616,16 +624,16 @@ phpbb.resizeTextArea = function(items, options) {
 		resetCallback: function(item) { }
 	};
 
-	if (arguments.length > 1)
-	{
+	if (isTouch) return;
+
+	if (arguments.length > 1) {
 		configuration = $.extend(configuration, options);
 	}
 
 	function resetAutoResize(item) 
 	{
 		var $item = $(item);
-		if ($item.hasClass('auto-resized'))
-		{
+		if ($item.hasClass('auto-resized')) {
 			$(item).css({height: '', resize: ''}).removeClass('auto-resized');
 			configuration.resetCallback.call(item, $item);
 		}
@@ -635,14 +643,14 @@ phpbb.resizeTextArea = function(items, options) {
 	{
 		function setHeight(height)
 		{
+			height += parseInt($item.css('height')) - $item.height();
 			$item.css({height: height + 'px', resize: 'none'}).addClass('auto-resized');
 			configuration.resizeCallback.call(item, $item);
 		}
 
 		var windowHeight = $(window).height();
 
-		if (windowHeight < configuration.minWindowHeight)
-		{
+		if (windowHeight < configuration.minWindowHeight) {
 			resetAutoResize(item);
 			return;
 		}
@@ -652,12 +660,14 @@ phpbb.resizeTextArea = function(items, options) {
 			height = parseInt($item.height()),
 			scrollHeight = (item.scrollHeight) ? item.scrollHeight : 0;
 
-		if (height > maxHeight)
-		{
+		if (height < 0) {
+			return;
+		}
+
+		if (height > maxHeight) {
 			setHeight(maxHeight);
 		}
-		else if (scrollHeight > (height + 5))
-		{
+		else if (scrollHeight > (height + 5)) {
 			setHeight(Math.min(maxHeight, scrollHeight));
 		}
 	}
@@ -670,8 +680,7 @@ phpbb.resizeTextArea = function(items, options) {
 
 	$(window).resize(function() {
 		items.each(function() {
-			if ($(this).hasClass('auto-resized'))
-			{
+			if ($(this).hasClass('auto-resized')) {
 				autoResize(this);
 			}
 		});
@@ -830,12 +839,246 @@ phpbb.applyCodeEditor = function(textarea) {
 };
 
 /**
+* List of classes that toggle dropdown menu,
+* list of classes that contain visible dropdown menu
+*
+* Add your own classes to strings with comma (probably you
+* will never need to do that)
+*/
+phpbb.dropdownHandles = '.dropdown-container.dropdown-visible .dropdown-toggle';
+phpbb.dropdownVisibleContainers = '.dropdown-container.dropdown-visible';
+
+/**
+* Dropdown toggle event handler
+* This handler is used by phpBB.registerDropdown() and other functions
+*/
+phpbb.toggleDropdown = function() {
+	var $this = $(this),
+		options = $this.data('dropdown-options'),
+		parent = options.parent,
+		visible = parent.hasClass('dropdown-visible');
+
+	if (!visible) {
+		// Hide other dropdown menus
+		$(phpbb.dropdownHandles).each(phpbb.toggleDropdown);
+
+		// Figure out direction of dropdown
+		var direction = options.direction,
+			verticalDirection = options.verticalDirection,
+			offset = $this.offset();
+
+		if (direction == 'auto') {
+			if (($(window).width() - $this.outerWidth(true)) / 2 > offset.left) {
+				direction = 'right';
+			}
+			else {
+				direction = 'left';
+			}
+		}
+		parent.toggleClass(options.leftClass, direction == 'left').toggleClass(options.rightClass, direction == 'right');
+
+		if (verticalDirection == 'auto') {
+			var height = $(window).height(),
+				top = offset.top - $(window).scrollTop();
+
+			if (top < height * 0.7) {
+				verticalDirection = 'down';
+			}
+			else {
+				verticalDirection = 'up';
+			}
+		}
+		parent.toggleClass(options.upClass, verticalDirection == 'up').toggleClass(options.downClass, verticalDirection == 'down');
+	}
+
+	options.dropdown.toggle();
+	parent.toggleClass(options.visibleClass, !visible).toggleClass('dropdown-visible', !visible);
+
+	// Check dimensions when showing dropdown
+	// !visible because variable shows state of dropdown before it was toggled
+	if (!visible) {
+		options.dropdown.find('.dropdown-contents').each(function() {
+			var $this = $(this),
+				windowWidth = $(window).width();
+
+			$this.css({
+				marginLeft: 0,
+				left: 0,
+				maxWidth: (windowWidth - 4) + 'px'
+			});
+
+			var offset = $this.offset().left,
+				width = $this.outerWidth(true);
+
+			if (offset < 2) {
+				$this.css('left', (2 - offset) + 'px');
+			}
+			else if ((offset + width + 2) > windowWidth) {
+				$this.css('margin-left', (windowWidth - offset - width - 2) + 'px');
+			}
+		});
+	}
+
+	// Prevent event propagation
+	if (arguments.length > 0) {
+		try {
+			var e = arguments[0];
+			e.preventDefault();
+			e.stopPropagation();
+		}
+		catch (error) { }
+	}
+	return false;
+};
+
+/**
+* Toggle dropdown submenu
+*/
+phpbb.toggleSubmenu = function(e) {
+	$(this).siblings('.dropdown-submenu').toggle();
+	e.preventDefault();
+}
+
+/**
+* Register dropdown menu
+* Shows/hides dropdown, decides which side to open to
+*
+* @param {jQuery} toggle Link that toggles dropdown.
+* @param {jQuery} dropdown Dropdown menu.
+* @param {Object} options List of options. Optional.
+*/
+phpbb.registerDropdown = function(toggle, dropdown, options)
+{
+	var ops = {
+			parent: toggle.parent(), // Parent item to add classes to
+			direction: 'auto', // Direction of dropdown menu. Possible values: auto, left, right
+			verticalDirection: 'auto', // Vertical direction. Possible values: auto, up, down
+			visibleClass: 'visible', // Class to add to parent item when dropdown is visible
+			leftClass: 'dropdown-left', // Class to add to parent item when dropdown opens to left side
+			rightClass: 'dropdown-right', // Class to add to parent item when dropdown opens to right side
+			upClass: 'dropdown-up', // Class to add to parent item when dropdown opens above menu item
+			downClass: 'dropdown-down' // Class to add to parent item when dropdown opens below menu item
+		};
+	if (options) {
+		ops = $.extend(ops, options);
+	}
+	ops.dropdown = dropdown;
+
+	ops.parent.addClass('dropdown-container');
+	toggle.addClass('dropdown-toggle');
+
+	toggle.data('dropdown-options', ops);
+
+	toggle.click(phpbb.toggleDropdown);
+	$('.dropdown-toggle-submenu', ops.parent).click(phpbb.toggleSubmenu);
+};
+
+/**
+* Get the HTML for a color palette table.
+*
+* @param string dir Palette direction - either v or h
+* @param int width Palette cell width.
+* @param int height Palette cell height.
+*/
+phpbb.colorPalette = function(dir, width, height) {
+	var r = 0, 
+		g = 0, 
+		b = 0,
+		numberList = new Array(6),
+		color = '',
+		html = '';
+
+	numberList[0] = '00';
+	numberList[1] = '40';
+	numberList[2] = '80';
+	numberList[3] = 'BF';
+	numberList[4] = 'FF';
+
+	html += '<table style="width: auto;">';
+
+	for (r = 0; r < 5; r++) {
+		if (dir == 'h') {
+			html += '<tr>';
+		}
+
+		for (g = 0; g < 5; g++) {
+			if (dir == 'v') {
+				html += '<tr>';
+			}
+
+			for (b = 0; b < 5; b++) {
+				color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
+				html += '<td style="background-color: #' + color + '; width: ' + width + 'px; height: ' + height + 'px;">';
+				html += '<a href="#" data-color="' + color + '" style="display: block; width: ' + width + 'px; height: ' + height + 'px; " alt="#' + color + '" title="#' + color + '"></a>';
+				html += '</td>';
+			}
+
+			if (dir == 'v') {
+				html += '</tr>';
+			}
+		}
+
+		if (dir == 'h') {
+			html += '</tr>';
+		}
+	}
+	html += '</table>';
+	return html;
+}
+
+/**
+* Register a color palette.
+*
+* @param object el jQuery object for the palette container.
+*/
+phpbb.registerPalette = function(el) {
+	var	orientation	= el.attr('data-orientation'),
+		height		= el.attr('data-height'),
+		width		= el.attr('data-width'),
+		target		= el.attr('data-target'),
+		bbcode		= el.attr('data-bbcode');
+
+	// Insert the palette HTML into the container.
+	el.html(phpbb.colorPalette(orientation, width, height));
+
+	// Add toggle control.
+	$('#color_palette_toggle').click(function(e) {
+		el.toggle();
+		e.preventDefault();
+	});
+
+	// Attach event handler when a palette cell is clicked.
+	$(el).on('click', 'a', function(e) {
+		var color = $(this).attr('data-color');
+
+		if (bbcode) {
+			bbfontstyle('[color=#' + color + ']', '[/color]');
+		} else {
+			$(target).val(color);
+		}
+		e.preventDefault();
+	});
+}
+
+/**
 * Apply code editor to all textarea elements with data-bbcode attribute
 */
 $(document).ready(function() {
 	$('textarea[data-bbcode]').each(function() {
 		phpbb.applyCodeEditor(this);
 	});
+
+	// Hide active dropdowns when click event happens outside
+	$('body').click(function(e) {
+		var parents = $(e.target).parents();
+		if (!parents.is(phpbb.dropdownVisibleContainers)) {
+			$(phpbb.dropdownHandles).each(phpbb.toggleDropdown);
+		}
+	});
+
+	$('#color_palette_placeholder').each(function() {
+		phpbb.registerPalette($(this));
+	});
 });
 
 })(jQuery); // Avoid conflicts with other libraries
diff --git a/phpBB/assets/javascript/editor.js b/phpBB/assets/javascript/editor.js
new file mode 100644
index 0000000000..5222de9fee
--- /dev/null
+++ b/phpBB/assets/javascript/editor.js
@@ -0,0 +1,365 @@
+/**
+* bbCode control by subBlue design [ www.subBlue.com ]
+* Includes unixsafe colour palette selector by SHS`
+*/
+
+// Startup variables
+var imageTag = false;
+var theSelection = false;
+var bbcodeEnabled = true;
+
+// Check for Browser & Platform for PC & IE specific bits
+// More details from: http://www.mozilla.org/docs/web-developer/sniffer/browser_type.html
+var clientPC = navigator.userAgent.toLowerCase(); // Get client info
+var clientVer = parseInt(navigator.appVersion, 10); // Get browser version
+
+var is_ie = ((clientPC.indexOf('msie') !== -1) && (clientPC.indexOf('opera') === -1));
+var is_win = ((clientPC.indexOf('win') !== -1) || (clientPC.indexOf('16bit') !== -1));
+var baseHeight;
+
+/**
+* Shows the help messages in the helpline window
+*/
+function helpline(help) {
+	document.forms[form_name].helpbox.value = help_line[help];
+}
+
+/**
+* Fix a bug involving the TextRange object. From
+* http://www.frostjedi.com/terra/scripts/demo/caretBug.html
+*/ 
+function initInsertions() {
+	var doc;
+
+	if (document.forms[form_name]) {
+		doc = document;
+	} else {
+		doc = opener.document;
+	}
+
+	var textarea = doc.forms[form_name].elements[text_name];
+
+	if (is_ie && typeof(baseHeight) !== 'number') {
+		textarea.focus();
+		baseHeight = doc.selection.createRange().duplicate().boundingHeight;
+
+		if (!document.forms[form_name]) {
+			document.body.focus();
+		}
+	}
+}
+
+/**
+* bbstyle
+*/
+function bbstyle(bbnumber) {
+	if (bbnumber !== -1) {
+		bbfontstyle(bbtags[bbnumber], bbtags[bbnumber+1]);
+	} else {
+		insert_text('[*]');
+		document.forms[form_name].elements[text_name].focus();
+	}
+}
+
+/**
+* Apply bbcodes
+*/
+function bbfontstyle(bbopen, bbclose) {
+	theSelection = false;
+
+	var textarea = document.forms[form_name].elements[text_name];
+
+	textarea.focus();
+
+	if ((clientVer >= 4) && is_ie && is_win) {
+		// Get text selection
+		theSelection = document.selection.createRange().text;
+
+		if (theSelection) {
+			// Add tags around selection
+			document.selection.createRange().text = bbopen + theSelection + bbclose;
+			document.forms[form_name].elements[text_name].focus();
+			theSelection = '';
+			return;
+		}
+	} else if (document.forms[form_name].elements[text_name].selectionEnd
+			&& (document.forms[form_name].elements[text_name].selectionEnd - document.forms[form_name].elements[text_name].selectionStart > 0)) {
+		mozWrap(document.forms[form_name].elements[text_name], bbopen, bbclose);
+		document.forms[form_name].elements[text_name].focus();
+		theSelection = '';
+		return;
+	}
+
+	//The new position for the cursor after adding the bbcode
+	var caret_pos = getCaretPosition(textarea).start;
+	var new_pos = caret_pos + bbopen.length;
+
+	// Open tag
+	insert_text(bbopen + bbclose);
+
+	// Center the cursor when we don't have a selection
+	// Gecko and proper browsers
+	if (!isNaN(textarea.selectionStart)) {
+		textarea.selectionStart = new_pos;
+		textarea.selectionEnd = new_pos;
+	}
+	// IE
+	else if (document.selection) {
+		var range = textarea.createTextRange(); 
+		range.move("character", new_pos); 
+		range.select();
+		storeCaret(textarea);
+	}
+
+	textarea.focus();
+	return;
+}
+
+/**
+* Insert text at position
+*/
+function insert_text(text, spaces, popup) {
+	var textarea;
+
+	if (!popup) {
+		textarea = document.forms[form_name].elements[text_name];
+	} else {
+		textarea = opener.document.forms[form_name].elements[text_name];
+	}
+
+	if (spaces) {
+		text = ' ' + text + ' ';
+	}
+
+	// Since IE9, IE also has textarea.selectionStart, but it still needs to be treated the old way.
+	// Therefore we simply add a !is_ie here until IE fixes the text-selection completely.
+	if (!isNaN(textarea.selectionStart) && !is_ie) {
+		var sel_start = textarea.selectionStart;
+		var sel_end = textarea.selectionEnd;
+
+		mozWrap(textarea, text, '');
+		textarea.selectionStart = sel_start + text.length;
+		textarea.selectionEnd = sel_end + text.length;
+	} else if (textarea.createTextRange && textarea.caretPos) {
+		if (baseHeight !== textarea.caretPos.boundingHeight) {
+			textarea.focus();
+			storeCaret(textarea);
+		}
+
+		var caret_pos = textarea.caretPos;
+		caret_pos.text = caret_pos.text.charAt(caret_pos.text.length - 1) === ' ' ? caret_pos.text + text + ' ' : caret_pos.text + text;
+	} else {
+		textarea.value = textarea.value + text;
+	}
+
+	if (!popup) {
+		textarea.focus();
+	}
+}
+
+/**
+* Add inline attachment at position
+*/
+function attach_inline(index, filename) {
+	insert_text('[attachment=' + index + ']' + filename + '[/attachment]');
+	document.forms[form_name].elements[text_name].focus();
+}
+
+/**
+* Add quote text to message
+*/
+function addquote(post_id, username, l_wrote) {
+	var message_name = 'message_' + post_id;
+	var theSelection = '';
+	var divarea = false;
+	var i;
+
+	if (l_wrote === undefined) {
+		// Backwards compatibility
+		l_wrote = 'wrote';
+	}
+
+	if (document.all) {
+		divarea = document.all[message_name];
+	} else {
+		divarea = document.getElementById(message_name);
+	}
+
+	// Get text selection - not only the post content :(
+	// IE9 must use the document.selection method but has the *.getSelection so we just force no IE
+	if (window.getSelection && !is_ie && !window.opera) {
+		theSelection = window.getSelection().toString();
+	} else if (document.getSelection && !is_ie) {
+		theSelection = document.getSelection();
+	} else if (document.selection) {
+		theSelection = document.selection.createRange().text;
+	}
+
+	if (theSelection === '' || typeof theSelection === 'undefined' || theSelection === null) {
+		if (divarea.innerHTML) {
+			theSelection = divarea.innerHTML.replace(/<br>/ig, '\n');
+			theSelection = theSelection.replace(/<br\/>/ig, '\n');
+			theSelection = theSelection.replace(/&lt\;/ig, '<');
+			theSelection = theSelection.replace(/&gt\;/ig, '>');
+			theSelection = theSelection.replace(/&amp\;/ig, '&');
+			theSelection = theSelection.replace(/&nbsp\;/ig, ' ');
+		} else if (document.all) {
+			theSelection = divarea.innerText;
+		} else if (divarea.textContent) {
+			theSelection = divarea.textContent;
+		} else if (divarea.firstChild.nodeValue) {
+			theSelection = divarea.firstChild.nodeValue;
+		}
+	}
+
+	if (theSelection) {
+		if (bbcodeEnabled) {
+			insert_text('[quote="' + username + '"]' + theSelection + '[/quote]');
+		} else {
+			insert_text(username + ' ' + l_wrote + ':' + '\n');
+			var lines = split_lines(theSelection);
+			for (i = 0; i < lines.length; i++) {
+				insert_text('> ' + lines[i] + '\n');
+			}
+		}
+	}
+
+	return;
+}
+
+function split_lines(text) {
+	var lines = text.split('\n');
+	var splitLines = new Array();
+	var j = 0;
+	var i;
+
+	for(i = 0; i < lines.length; i++) {
+		if (lines[i].length <= 80) {
+			splitLines[j] = lines[i];
+			j++;
+		} else {
+			var line = lines[i];
+			var splitAt;
+			do {
+				splitAt = line.indexOf(' ', 80);
+
+				if (splitAt === -1) {
+					splitLines[j] = line;
+					j++;
+				} else {
+					splitLines[j] = line.substring(0, splitAt);
+					line = line.substring(splitAt);
+					j++;
+				}
+			}
+			while(splitAt !== -1);
+		}
+	}
+	return splitLines;
+}
+
+/**
+* From http://www.massless.org/mozedit/
+*/
+function mozWrap(txtarea, open, close) {
+	var selLength = (typeof(txtarea.textLength) === 'undefined') ? txtarea.value.length : txtarea.textLength;
+	var selStart = txtarea.selectionStart;
+	var selEnd = txtarea.selectionEnd;
+	var scrollTop = txtarea.scrollTop;
+
+	if (selEnd === 1 || selEnd === 2) {
+		selEnd = selLength;
+	}
+
+	var s1 = (txtarea.value).substring(0,selStart);
+	var s2 = (txtarea.value).substring(selStart, selEnd);
+	var s3 = (txtarea.value).substring(selEnd, selLength);
+
+	txtarea.value = s1 + open + s2 + close + s3;
+	txtarea.selectionStart = selStart + open.length;
+	txtarea.selectionEnd = selEnd + open.length;
+	txtarea.focus();
+	txtarea.scrollTop = scrollTop;
+
+	return;
+}
+
+/**
+* Insert at Caret position. Code from
+* http://www.faqts.com/knowledge_base/view.phtml/aid/1052/fid/130
+*/
+function storeCaret(textEl) {
+	if (textEl.createTextRange) {
+		textEl.caretPos = document.selection.createRange().duplicate();
+	}
+}
+
+/**
+* Caret Position object
+*/
+function caretPosition() {
+	var start = null;
+	var end = null;
+}
+
+/**
+* Get the caret position in an textarea
+*/
+function getCaretPosition(txtarea) {
+	var caretPos = new caretPosition();
+
+	// simple Gecko/Opera way
+	if (txtarea.selectionStart || txtarea.selectionStart === 0) {
+		caretPos.start = txtarea.selectionStart;
+		caretPos.end = txtarea.selectionEnd;
+	}
+	// dirty and slow IE way
+	else if (document.selection) {
+		// get current selection
+		var range = document.selection.createRange();
+
+		// a new selection of the whole textarea
+		var range_all = document.body.createTextRange();
+		range_all.moveToElementText(txtarea);
+
+		// calculate selection start point by moving beginning of range_all to beginning of range
+		var sel_start;
+		for (sel_start = 0; range_all.compareEndPoints('StartToStart', range) < 0; sel_start++) {
+			range_all.moveStart('character', 1);
+		}
+
+		txtarea.sel_start = sel_start;
+
+		// we ignore the end value for IE, this is already dirty enough and we don't need it
+		caretPos.start = txtarea.sel_start;
+		caretPos.end = txtarea.sel_start;
+	}
+
+	return caretPos;
+}
+
+/**
+* Allow to use tab character when typing code
+* Keep indentation of last line of code when typing code
+*/
+(function($) {
+	$(document).ready(function() {
+		var doc, textarea;
+
+		// find textarea, make sure browser supports necessary functions
+		if (document.forms[form_name]) {
+			doc = document;
+		} else {
+			doc = opener.document;
+		}
+
+		if (!doc.forms[form_name]) {
+			return;
+		}
+
+		textarea = doc.forms[form_name].elements[text_name];
+
+		phpbb.applyCodeEditor(textarea);
+	});
+})(jQuery);
+
diff --git a/phpBB/assets/javascript/plupload.js b/phpBB/assets/javascript/plupload.js
new file mode 100644
index 0000000000..6b37b009a4
--- /dev/null
+++ b/phpBB/assets/javascript/plupload.js
@@ -0,0 +1,675 @@
+plupload.addI18n(phpbb.plupload.i18n);
+phpbb.plupload.ids = [];
+
+(function($) {  // Avoid conflicts with other libraries
+
+"use strict";
+
+/**
+ * Set up the uploader.
+ *
+ * @return undefined
+ */
+phpbb.plupload.initialize = function() {
+	phpbb.plupload.form = $(phpbb.plupload.config.form_hook)[0],
+	phpbb.plupload.rowTpl = $('#attach-row-tpl')[0].outerHTML;
+
+	// Hide the basic upload panel and remove the attach row template.
+	$('#attach-row-tpl, #attach-panel-basic').remove();
+	// Show multi-file upload options.
+	$('#attach-panel-multi').show();
+
+	// Set attachment data.
+	phpbb.plupload.setData(phpbb.plupload.data);
+	phpbb.plupload.updateMultipartParams(phpbb.plupload.getSerializedData());
+
+	// Initialize the Plupload uploader.
+	uploader.init();
+
+	// Point out the drag-and-drop zone if it's supported.
+	if (!uploader.features.dragdrop) {
+		$('#drag-n-drop-message').show();
+	}
+};
+
+/**
+ * Unsets all elements in the object uploader.settings.multipart_params whose keys
+ * begin with 'attachment_data['
+ *
+ * @return undefined
+ */
+phpbb.plupload.clearParams = function() {
+	var obj = uploader.settings.multipart_params;
+	for (var key in obj) {
+		if (!obj.hasOwnProperty(key) || key.indexOf('attachment_data[') !== 0) {
+			continue;
+		}
+
+		delete uploader.settings.multipart_params[key];
+	}
+};
+
+/**
+ * Update uploader.settings.multipart_params object with new data.
+ *
+ * @param object obj
+ * @return undefined
+ */
+phpbb.plupload.updateMultipartParams = function(obj) {
+	uploader.settings.multipart_params = $.extend(
+		uploader.settings.multipart_params,
+		obj
+	);
+};
+
+/**
+ * Convert the array of attachment objects into an object that PHP would expect as POST data.
+ *
+ * @return object An object in the form 'attachment_data[i][key]': value as
+ * 	expected by the server
+ */
+phpbb.plupload.getSerializedData = function() {
+	var obj = {};
+	for (var i = 0; i < phpbb.plupload.data.length; i++) {
+		var datum = phpbb.plupload.data[i];
+		for (var key in datum) {
+			if (!datum.hasOwnProperty(key)) {
+				continue;
+			}
+
+			obj['attachment_data[' + i + '][' + key + ']'] = datum[key];
+		}
+	}
+	return obj;
+};
+
+/**
+ * Get the index from the phpbb.plupload.data array where the given
+ * attachment id appears.
+ *
+ * @param int attach_id The attachment id of the file.
+ * @return bool	Returns false if the id cannot be found.
+ * @return int	Returns the index of the file if it exists.
+ */
+phpbb.plupload.getIndex = function(attach_id) {
+	var index = phpbb.plupload.ids.indexOf(Number(attach_id));
+	return (index !== -1) ? index : false;
+};
+
+/**
+ * Set the data in phpbb.plupload.data and phpbb.plupload.ids arrays.
+ * 
+ * @param array data	Array containing the new data to use. In the form of 
+ * array(index => object(property: value). Requires attach_id to be one of the object properties.
+ *
+ * @return undefined
+ */
+phpbb.plupload.setData = function(data) {
+	// Make sure that the array keys are reset.
+	phpbb.plupload.ids = phpbb.plupload.data = [];
+	phpbb.plupload.data = data;
+
+	for (var i = 0; i < data.length; i++) {
+		phpbb.plupload.ids.push(Number(data[i].attach_id));
+	}
+};
+
+/**
+ * Update the attachment data in the HTML and the phpbb & phpbb.plupload objects.
+ * 
+ * @param array data		Array containing the new data to use.
+ * @param string action		The action that required the update. Used to update the inline attachment bbcodes.
+ * @param int index			The index from phpbb.plupload_ids that was affected by the action.
+ * @param array downloadUrl	Optional array of download urls to update.
+ * @return undefined
+ */
+phpbb.plupload.update = function(data, action, index, downloadUrl) {
+
+	phpbb.plupload.updateBbcode(action, index);
+	phpbb.plupload.setData(data);
+	phpbb.plupload.updateRows(downloadUrl);
+	phpbb.plupload.clearParams();
+	phpbb.plupload.updateMultipartParams(phpbb.plupload.getSerializedData());
+};
+
+/**
+ * Update the relevant elements and hidden data for all attachments.
+ * 
+ * @param array downloadUrl	Optional array of download urls to update.
+ * @return undefined
+ */
+phpbb.plupload.updateRows = function(downloadUrl) {
+	for (var i = 0; i < phpbb.plupload.ids.length; i++) {
+		phpbb.plupload.updateRow(i, downloadUrl);
+	}
+};
+
+/**
+ * Insert a row for a new attachment. This expects an HTML snippet in the HTML
+ * using the id "attach-row-tpl" to be present. This snippet is cloned and the
+ * data for the file inserted into it. The row is then appended or prepended to
+ * #file-list based on the attach_order setting.
+ * 
+ * @param object file	Plupload file object for the new attachment.
+ * @return undefined
+ */
+phpbb.plupload.insertRow = function(file) {
+	var row = $(phpbb.plupload.rowTpl);
+
+	row.attr('id', file.id);
+	row.find('.file-name').html(file.name);
+	row.find('.file-size').html(plupload.formatSize(file.size));
+
+	if (phpbb.plupload.order == 'desc') {
+		$('#file-list').prepend(row);
+	} else {
+		$('#file-list').append(row);
+	}
+};
+
+/**
+ * Update the relevant elements and hidden data for an attachment.
+ * 
+ * @param int index	The index from phpbb.plupload.ids of the attachment to edit.
+ * @param array downloadUrl	Optional array of download urls to update. 
+ * @return undefined
+ */
+phpbb.plupload.updateRow = function(index, downloadUrl) {
+	var attach = phpbb.plupload.data[index],
+		row = $('[data-attach-id="' + attach.attach_id + '"]');
+
+	// Add the link to the file
+	if (typeof downloadUrl !== 'undefined' && typeof downloadUrl[index] !== 'undefined') {
+		var url = downloadUrl[index].replace('&amp;', '&'),
+			link = $('<a></a>');
+
+		link.attr('href', url).html(attach.real_filename);
+		row.find('.file-name').html(link)	
+	}
+
+	row.find('textarea').attr('name', 'comment_list[' + index + ']');
+	phpbb.plupload.updateHiddenData(row, attach, index);
+};
+
+/**
+ * Update hidden input data for an attachment.
+ *
+ * @param object row	jQuery object for the attachment row.
+ * @param object attach	Attachment data object from phpbb.plupload.data
+ * @param int index		Attachment index from phpbb.plupload.ids
+ * @return undefined
+ */
+phpbb.plupload.updateHiddenData = function(row, attach, index) {
+	row.find('input[type="hidden"]').remove();
+
+	for (var key in attach) {
+		var input = $('<input />')
+			.attr('type', 'hidden')
+			.attr('name', 'attachment_data[' + index + '][' + key +']')
+			.attr('value', attach[key]);
+		$('textarea', row).after(input);
+	}
+};
+
+/**
+ * Deleting a file removes it from the queue and fires an AJAX event to the
+ * server to tell it to remove the temporary attachment. The server
+ * responds with the updated attachment data list so that any future
+ * uploads can maintain state with the server
+ *
+ * @param object row	jQuery object for the attachment row.
+ * @param int attachId	Attachment id of the file to be removed.
+ *
+ * @return undefined
+ */
+phpbb.plupload.deleteFile = function(row, attachId) {
+	// If there's no attach id, then the file hasn't been uploaded. Simply delete the row.
+	if (typeof attachId === 'undefined') {
+		row.slideUp(100, function() {
+			row.remove();
+			phpbb.plupload.hideEmptyList();
+		});
+	}
+
+	var index = phpbb.plupload.getIndex(attachId);
+	row.find('.file-status').toggleClass('file-uploaded file-working');
+
+	if (index === false) {
+		return;
+	}
+	var fields = {};
+	fields['delete_file[' + index + ']'] = 1;
+
+	var always = function() {
+		row.find('.file-status').removeClass('file-working');
+	};
+
+	var done = function(response) {
+		var json = {};
+		try {
+			json = $.parseJSON(response);
+		} catch (e) {
+			return;
+		}
+
+		// trigger_error() was called which likely means a permission error was encountered.
+		if (typeof response.title !== 'undefined') {
+			uploader.trigger('Error', {message: response.message});
+			// We will have to assume that the deletion failed. So leave the file status as uploaded.
+			row.find('.file-status').toggleClass('file-uploaded');
+
+			return;
+		}
+		phpbb.plupload.update(response, 'removal', index);
+		// Check if the user can upload files now if he had reached the max files limit.
+		phpbb.plupload.handleMaxFilesReached();
+
+		if (row.attr('id')) {
+			var file = uploader.getFile(row.attr('id'));
+			uploader.removeFile(file);
+		}
+		row.slideUp(100, function() {
+			row.remove();
+			// Hide the file list if it's empty now.
+			phpbb.plupload.hideEmptyList();
+		});
+		uploader.trigger('FilesRemoved');
+	};
+
+	$.ajax(phpbb.plupload.config.url, {
+		type: 'POST',
+		data: $.extend(fields, phpbb.plupload.getSerializedData()),
+		headers: {'X-PHPBB-USING-PLUPLOAD': '1', 'X-Requested-With': 'XMLHttpRequest'}
+	})
+	.always(always)
+	.done(done);
+};
+
+/**
+ * Check the attachment list and hide its container if it's empty.
+ *
+ * @return undefined
+ */
+phpbb.plupload.hideEmptyList = function() {
+	if (!$('#file-list').children().length) {
+		$('#file-list-container').slideUp(100);
+	}
+}
+
+/**
+ * Update the indices used in inline attachment bbcodes. This ensures that the bbcodes
+ * correspond to the correct file after a file is added or removed. This should be called 
+ * before the phpbb.plupload,data and phpbb.plupload.ids arrays are updated, otherwise it will
+ * not work correctly.
+ *
+ * @param string action	The action that occurred -- either "addition" or "removal"
+ * @param int index		The index of the attachment from phpbb.plupload.ids that was affected.
+ *
+ * @return undefined
+ */
+phpbb.plupload.updateBbcode = function(action, index) {
+	var	textarea = $(phpbb.plupload.form).find('textarea[name="message"]'),
+		text = textarea.val(),
+		removal = (action === 'removal');
+
+	// Return if the bbcode isn't used at all.
+	if (text.indexOf('[attachment=') === -1) {
+		return;
+	}
+
+	// Private function used to replace the bbcode.
+	var updateBbcode = function(match, fileName) {
+		// Remove the bbcode if the file was removed.
+		if (removal && index === i) {
+			return '';
+		}
+		var newIndex = i + ((removal) ? -1 : 1);
+		return '[attachment=' + newIndex +']' + fileName + '[/attachment]';
+	};
+
+	// Private function used to generate search regexp
+	var searchRegexp = function(index) {
+		return new RegExp('\\[attachment=' + index + '\\](.*?)\\[\\/attachment\\]', 'g');
+	}
+	// The update order of the indices is based on the action taken to ensure that we don't corrupt
+	// the bbcode index by updating it several times as we move through the loop.
+	// Removal loop starts at the removed index and moves to the end of the array.
+	// Addition loop starts at the end of the array and moves to the added index at 0.
+	var searchLoop = function() {
+		if (typeof i === 'undefined') {
+			i = (removal) ? index : phpbb.plupload.ids.length - 1;
+		}
+		return (removal) ? (i < phpbb.plupload.ids.length): (i >= index);
+	}
+	var i;
+
+	while (searchLoop()) {
+		text = text.replace(searchRegexp(i), updateBbcode);
+		(removal) ? i++ : i--;
+	}
+	textarea.val(text);
+};
+
+/**
+ * Get Plupload file objects based on their upload status.
+ *
+ * @param int status Plupload status - plupload.DONE, plupload.FAILED, plupload.QUEUED,
+ * plupload.STARTED, plupload.STOPPED
+ *
+ * @return Returns an array of the Plupload file objects matching the status.
+ */
+phpbb.plupload.getFilesByStatus = function(status) {
+	var files = [];
+
+	$.each(uploader.files, function(i, file) {
+		if (file.status === status) {
+			files.push(file);
+		}
+	});
+	return files;
+}
+
+/**
+ * Check whether the user has reached the maximun number of files that he's allowed
+ * to upload. If so, disables the uploader and marks the queued files as failed. Otherwise
+ * makes sure that the uploader is enabled.
+ *
+ * @return bool Returns true if the limit has been reached. False if otherwise.
+ */
+phpbb.plupload.handleMaxFilesReached = function() {
+	// If there is no limit, the user is an admin or moderator.
+	if (!phpbb.plupload.maxFiles) {
+		return false;
+	}
+
+	if (phpbb.plupload.maxFiles <= phpbb.plupload.ids.length) {
+		// Fail the rest of the queue.
+		phpbb.plupload.markQueuedFailed(phpbb.plupload.lang.TOO_MANY_ATTACHMENTS);
+		// Disable the uploader.
+		phpbb.plupload.disableUploader();
+		uploader.trigger('Error', {message: phpbb.plupload.lang.TOO_MANY_ATTACHMENTS});
+
+		return true;
+	} else if(phpbb.plupload.maxFiles > phpbb.plupload.ids.length) {
+		// Enable the uploader if the user is under the limit
+		phpbb.plupload.enableUploader();
+	}
+	return false;
+}
+
+/**
+ * Disable the uploader
+ *
+ * @return undefined
+ */
+phpbb.plupload.disableUploader = function() {
+	$('#add_files').addClass('disabled');
+	uploader.disableBrowse();
+}
+
+/**
+ * Enable the uploader
+ *
+ * @return undefined
+ */
+phpbb.plupload.enableUploader = function() {
+	$('#add_files').removeClass('disabled');
+	uploader.disableBrowse(false);
+}
+
+/**
+ * Mark all queued files as failed.
+ *
+ * @param string error Error message to present to the user.
+ * @return undefined
+ */
+phpbb.plupload.markQueuedFailed = function(error) {
+	var files = phpbb.plupload.getFilesByStatus(plupload.QUEUED);
+
+	$.each(files, function(i, file) {
+		$('#' + file.id).find('.file-progress').hide();
+		phpbb.plupload.fileError(file, error);
+	});
+}
+
+/**
+ * Marks a file as failed and sets the error message for it.
+ *
+ * @param object file	Plupload file object that failed.
+ * @param string error	Error message to present to the user.
+ * @return undefined
+ */
+phpbb.plupload.fileError = function(file, error) {
+	file.status = plupload.FAILED;
+	file.error = error;
+	$('#' + file.id).find('.file-status').addClass('file-error').attr({'data-error-title': phpbb.plupload.lang.ERROR, 'data-error-message': error});
+}
+
+
+
+
+/**
+ * Set up the Plupload object and get some basic data.
+ */
+var	uploader = new plupload.Uploader(phpbb.plupload.config);
+phpbb.plupload.initialize();
+
+
+
+
+/**
+ * Insert inline attachment bbcode.
+ */
+ $('#file-list').on('click', '.file-inline-bbcode', function(e) {
+	var attachId = $(this).parents('.attach-row').attr('data-attach-id'),
+		index = phpbb.plupload.getIndex(attachId);
+
+	attach_inline(index, phpbb.plupload.data[index].real_filename);	
+	e.preventDefault();
+});
+
+/**
+ * Delete a file.
+ */
+$('#file-list').on('click', '.file-delete', function(e) {
+	var row = $(this).parents('.attach-row'),
+		attachId = row.attr('data-attach-id');
+
+	phpbb.plupload.deleteFile(row, attachId);
+	e.preventDefault();
+});
+
+/**
+ * Display the error message for a particular file when the error icon is clicked.
+ */
+$('#file-list').on('click', '.file-error', function(e) {
+	phpbb.alert($(this).attr('data-error-title'), $(this).attr('data-error-message'));
+	e.preventDefault();
+});
+
+/**
+ * Fires when an error occurs.
+ */
+uploader.bind('Error', function(up, error) {
+	// The error message that Plupload provides for these is vague, so we'll be more specific.
+	if (error.code === plupload.FILE_EXTENSION_ERROR) {
+		error.message = plupload.translate('Invalid file extension:') + ' ' + error.file.name;
+	} else if (error.code === plupload.FILE_SIZE_ERROR) {
+		error.message = plupload.translate('File too large:') + ' ' + error.file.name;
+	}
+	phpbb.alert(phpbb.plupload.lang.ERROR, error.message);
+});
+
+/**
+ * Fires before a given file is about to be uploaded. This allows us to
+ * send the real filename along with the chunk. This is necessary because
+ * for some reason the filename is set to 'blob' whenever a file is chunked
+ *
+ * @param object up		The plupload.Uploader object
+ * @param object file	The plupload.File object that is about to be
+ * 	uploaded
+ *
+ * @return undefined
+ */
+uploader.bind('BeforeUpload', function(up, file) {
+	if (phpbb.plupload.handleMaxFilesReached()) {
+		return;
+	}
+
+	phpbb.plupload.updateMultipartParams({'real_filename': file.name});
+});
+
+/**
+ * Fired when a single chunk of any given file is uploaded. This parses the
+ * response from the server and checks for an error. If an error occurs it
+ * is reported to the user and the upload of this particular file is halted
+ *
+ * @param object up			The plupload.Uploader object
+ * @param object file		The plupload.File object whose chunk has just
+ * 	been uploaded
+ * @param object response	The response object from the server
+ *
+ * @return undefined
+ */
+uploader.bind('ChunkUploaded', function(up, file, response) {
+	if (response.chunk >= response.chunks - 1) {
+		return;
+	}
+
+	var json = {};
+	try {
+		json = $.parseJSON(response.response);
+	} catch (e) {
+		file.status = plupload.FAILED;
+		up.trigger('FileUploaded', file, {
+			response: JSON.stringify({
+				error: {
+					message: 'Error parsing server response.'
+				}
+			})
+		});
+	}
+
+	// If trigger_error() was called, then a permission error likely occurred.
+	if (typeof json.title !== 'undefined') {
+		json.error = {message: json.message};
+	}
+
+	if (json.error) {
+		file.status = plupload.FAILED;
+		up.trigger('FileUploaded', file, {
+			response: JSON.stringify({
+				error: {
+					message: json.error.message
+				}
+			})
+		});
+	}
+});
+
+/**
+ * Fires when files are added to the queue.
+ *
+ * @return undefined
+ */
+uploader.bind('FilesAdded', function(up, files) {
+	// Prevent unnecessary requests to the server if the user already uploaded
+	// the maximum number of files allowed.
+	if (phpbb.plupload.handleMaxFilesReached()) {
+		return;
+	}
+
+	// Show the file list if there aren't any files currently.
+	if (!$('#file-list-container').is(':visible')) {
+		$('#file-list-container').show(100);
+	}
+
+	$.each(files, function(i, file) {
+		phpbb.plupload.insertRow(file);
+	});
+
+	up.bind('UploadProgress', function(up, file) {
+		$('#' + file.id + " .file-progress-bar").css('width', file.percent + '%');
+		$('#file-total-progress-bar').css('width', up.total.percent + '%');
+	});
+
+	// Do not allow more files to be added to the running queue.
+	phpbb.plupload.disableUploader();
+
+	// Start uploading the files once the user has selected them.
+	up.start();
+});
+
+
+/**
+ * Fires when an entire file has been uploaded. It checks for errors
+ * returned by the server otherwise parses the list of attachment data and
+ * appends it to the next file upload so that the server can maintain state
+ * with regards to the attachments in a given post
+ *
+ * @param object up			The plupload.Uploader object
+ * @param object file		The plupload.File object that has just been
+ * 	uploaded
+ * @param string response	The response string from the server
+ *
+ * @return undefined
+ */
+uploader.bind('FileUploaded', function(up, file, response) {
+	var json = {},
+		row = $('#' + file.id),
+		error;
+
+	// Hide the progress indicator.
+	row.find('.file-progress').hide();
+
+	try {
+		json = $.parseJSON(response.response);
+	} catch (e) {
+		error = 'Error parsing server response.';
+	}
+
+	// If trigger_error() was called, then a permission error likely occurred.
+	if (typeof json.title !== 'undefined') {
+		error = json.message;
+		up.trigger('Error', {message: error});
+
+		// The rest of the queue will fail.
+		phpbb.plupload.markQueuedFailed(error);
+	} else if (json.error) {
+		error = json.error.message;
+	}
+
+	if (typeof error !== 'undefined') {
+		phpbb.plupload.fileError(file, error);
+	} else if (file.status === plupload.DONE) {
+		file.attachment_data = json['data'][0];
+
+		row.attr('data-attach-id', file.attachment_data.attach_id);
+		row.find('.file-inline-bbcode').show();
+		row.find('.file-status').addClass('file-uploaded');
+		phpbb.plupload.update(json['data'], 'addition', 0, [json['download_url']]);
+	}
+});
+
+/**
+ * Fires when the entire queue of files have been uploaded. 
+ *
+ * @param object up		The plupload.Uploader object
+ * @param array files	An array of plupload.File objects that have just
+ * 	been uploaded as part of a queue
+ *
+ * @return undefined
+ */
+uploader.bind('UploadComplete', function(up, files) {
+	// Hide the progress bar
+	setTimeout(function() {
+		$('#file-total-progress-bar').fadeOut(500, function() {
+			$(this).css('width', 0).show();
+		});
+	}, 2000);
+
+	// Re-enable the uploader
+	phpbb.plupload.enableUploader();
+});
+
+})(jQuery); // Avoid conflicts with other libraries