2 files changed, 634 insertions, 26 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js
index ab0891e70c..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();
 	});
@@ -616,8 +624,9 @@ phpbb.resizeTextArea = function(items, options) {
 		resetCallback: function(item) { }
 	};
 
-	if (arguments.length > 1)
-	{
+	if (isTouch) return;
+
+	if (arguments.length > 1) {
 		configuration = $.extend(configuration, options);
 	}
 
@@ -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);
+