Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103

# By Oleg Pudeyev (37) and others # Via Oleg Pudeyev (24) and others * 'develop' of github.com:phpbb/phpbb3: (179 commits) [ticket/11323] Add tests for inclusion of defined variables [ticket/11324] Add PHP 5.5 environment to travis and allow it to fail. [ticket/11321] Recreate schema files with develop/create_schema_files.php [ticket/11320] Include functions file as we need phpbb_convert_30_dbms_to_31 [ticket/11313] Use correct object el instead of eel in alt_text callback [ticket/11301] Guidelines: Add spaces in front and after the / operator. [ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4. [ticket/11311] Include asset core.js in subsilver2 overall_footer.html [ticket/10949] Remove not needed comma [ticket/11309] phpbb_extension_interface::disable_step correct docblock. [ticket/10949] Converted missing code to new JS coding guidelines [ticket/11302] Correctly select first timezone or selected timezone [ticket/11305] Mock container for cache driver in functional create_user() [ticket/11305] Check for $cache being null before using it in db drivers. [ticket/10805] Compare phpbbAlertTimer against null [ticket/11305] Define hook finder as a service on the container. [ticket/11305] Adjust comment. [ticket/11305] Use phpbb_create_default_container. [ticket/11305] Create a normal container during final installation step. [ticket/11305] Retrieve cache driver from container rather than cache service. ... Conflicts: phpBB/install/schemas/firebird_schema.sql phpBB/install/schemas/mssql_schema.sql phpBB/install/schemas/mysql_40_schema.sql phpBB/install/schemas/mysql_41_schema.sql phpBB/install/schemas/oracle_schema.sql phpBB/install/schemas/postgres_schema.sql phpBB/install/schemas/sqlite_schema.sql phpBB/styles/subsilver2/template/overall_footer.html
author: Nathan Guse <nathaniel.guse@gmail.com> 2013-01-15 11:31:39 -0600
committer: Nathan Guse <nathaniel.guse@gmail.com> 2013-01-15 11:31:39 -0600
commit: 51e0f002eeaf2d55a63feee66ccb37d689f46f55 (patch)
tree: 21590506df83029d97a02ccaafa86c085f8c568f /phpBB/assets/javascript
parent: 44fcec520f785d18d3cd3b19e26db977f23b844c (diff)
parent: a2f6e494f37914352b0bb72d5a84904d3f2c51a3 (diff)
download: forums-51e0f002eeaf2d55a63feee66ccb37d689f46f55.tar
forums-51e0f002eeaf2d55a63feee66ccb37d689f46f55.tar.gz
forums-51e0f002eeaf2d55a63feee66ccb37d689f46f55.tar.bz2
forums-51e0f002eeaf2d55a63feee66ccb37d689f46f55.tar.xz
forums-51e0f002eeaf2d55a63feee66ccb37d689f46f55.zip
1 files changed, 142 insertions, 156 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js
index f7d6688f68..a5a10e7377 100644
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -1,5 +1,5 @@
 var phpbb = {};
-phpbb.alert_time = 100;
+phpbb.alertTime = 100;
 
 (function($) {  // Avoid conflicts with other libraries
 
@@ -12,35 +12,42 @@ var keymap = {
 };
 
 var dark = $('#darkenwrapper');
-var loading_alert = $('#loadingalert');
+var loadingAlert = $('#loadingalert');
+var phpbbAlertTimer = null;
 
 
 /**
- * Display a loading screen.
+ * Display a loading screen
  *
- * @returns object Returns loading_alert.
+ * @returns object Returns loadingAlert.
  */
-phpbb.loading_alert = function() {
-	if (dark.is(':visible'))
-	{
-		loading_alert.fadeIn(phpbb.alert_time);
-	}
-	else
-	{
-		loading_alert.show();
-		dark.fadeIn(phpbb.alert_time, function() {
+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.
-			setTimeout(function() {
-				if (loading_alert.is(':visible'))
-				{
+			phpbbAlertTimer = setTimeout(function() {
+				if (loadingAlert.is(':visible')) {
 					phpbb.alert($('#phpbb_alert').attr('data-l-err'), $('#phpbb_alert').attr('data-l-timeout-processing-req'));
 				}
 			}, 5000);
 		});
 	}
 
-	return loading_alert;
-}
+	return loadingAlert;
+};
+
+/**
+ * Clear loading alert timeout
+*/
+phpbb.clearLoadingTimeout = function() {
+	if (phpbbAlertTimer !== null) {
+		clearTimeout(phpbbAlertTimer);
+		phpbbAlertTimer = null;
+	}
+};
 
 /**
  * Display a simple alert similar to JSs native alert().
@@ -67,7 +74,7 @@ phpbb.alert = function(title, msg, fadedark) {
 
 		div.find('.alert_close').unbind('click');
 		fade = (typeof fadedark !== 'undefined' && !fadedark) ? div : dark;
-		fade.fadeOut(phpbb.alert_time, function() {
+		fade.fadeOut(phpbb.alertTime, function() {
 			div.hide();
 		});
 
@@ -90,27 +97,22 @@ phpbb.alert = function(title, msg, fadedark) {
 		e.preventDefault();
 	});
 
-	if (loading_alert.is(':visible'))
-	{
-		loading_alert.fadeOut(phpbb.alert_time, function() {
+	if (loadingAlert.is(':visible')) {
+		loadingAlert.fadeOut(phpbb.alertTime, function() {
 			dark.append(div);
-			div.fadeIn(phpbb.alert_time);
+			div.fadeIn(phpbb.alertTime);
 		});
-	}
-	else if (dark.is(':visible'))
-	{
+	} else if (dark.is(':visible')) {
 		dark.append(div);
-		div.fadeIn(phpbb.alert_time);
-	}
-	else
-	{
+		div.fadeIn(phpbb.alertTime);
+	} else {
 		dark.append(div);
 		div.show();
-		dark.fadeIn(phpbb.alert_time);
+		dark.fadeIn(phpbb.alertTime);
 	}
 
 	return div;
-}
+};
 
 /**
  * Display a simple yes / no box to the user.
@@ -133,13 +135,13 @@ phpbb.confirm = function(msg, callback, fadedark) {
 		e.stopPropagation();
 	});
 
-	var click_handler = function(e) {
+	var clickHandler = function(e) {
 		var res = this.className === 'button1';
 		var fade = (typeof fadedark !== 'undefined' && !fadedark && res) ? div : dark;
-		fade.fadeOut(phpbb.alert_time, function() {
+		fade.fadeOut(phpbb.alertTime, function() {
 			div.hide();
 		});
-		div.find('input[type="button"]').unbind('click', click_handler);
+		div.find('input[type="button"]').unbind('click', clickHandler);
 		callback(res);
 
 		if (e) {
@@ -147,11 +149,11 @@ phpbb.confirm = function(msg, callback, fadedark) {
 			e.stopPropagation();
 		}
 	};
-	div.find('input[type="button"]').one('click', click_handler);
+	div.find('input[type="button"]').one('click', clickHandler);
 
 	dark.one('click', function(e) {
 		div.find('.alert_close').unbind('click');
-		dark.fadeOut(phpbb.alert_time, function() {
+		dark.fadeOut(phpbb.alertTime, function() {
 			div.hide();
 		});
 		callback(false);
@@ -174,7 +176,7 @@ phpbb.confirm = function(msg, callback, fadedark) {
 
 	div.find('.alert_close').one('click', function(e) {
 		var fade = (typeof fadedark !== 'undefined' && fadedark) ? div : dark;
-		fade.fadeOut(phpbb.alert_time, function() {
+		fade.fadeOut(phpbb.alertTime, function() {
 			div.hide();
 		});
 		callback(false);
@@ -182,27 +184,22 @@ phpbb.confirm = function(msg, callback, fadedark) {
 		e.preventDefault();
 	});
 
-	if (loading_alert.is(':visible'))
-	{
-		loading_alert.fadeOut(phpbb.alert_time, function() {
+	if (loadingAlert.is(':visible')) {
+		loadingAlert.fadeOut(phpbb.alertTime, function() {
 			dark.append(div);
-			div.fadeIn(phpbb.alert_time);
+			div.fadeIn(phpbb.alertTime);
 		});
-	}
-	else if (dark.is(':visible'))
-	{
+	} else if (dark.is(':visible')) {
 		dark.append(div);
-		div.fadeIn(phpbb.alert_time);
-	}
-	else
-	{
+		div.fadeIn(phpbb.alertTime);
+	} else {
 		dark.append(div);
 		div.show();
-		dark.fadeIn(phpbb.alert_time);
+		dark.fadeIn(phpbb.alertTime);
 	}
 
 	return div;
-}
+};
 
 /**
  * Turn a querystring into an array.
@@ -210,17 +207,16 @@ phpbb.confirm = function(msg, callback, fadedark) {
  * @argument string string The querystring to parse.
  * @returns object The object created.
  */
-phpbb.parse_querystring = function(string) {
+phpbb.parseQuerystring = function(string) {
 	var params = {}, i, split;
 
 	string = string.split('&');
-	for (i = 0; i < string.length; i++)
-	{
+	for (i = 0; i < string.length; i++) {
 		split = string[i].split('=');
 		params[split[0]] = decodeURIComponent(split[1]);
 	}
 	return params;
-}
+};
 
 
 /**
@@ -246,14 +242,13 @@ phpbb.ajaxify = function(options) {
 		refresh = options.refresh,
 		callback = options.callback,
 		overlay = (typeof options.overlay !== 'undefined') ? options.overlay : true,
-		is_form = elements.is('form'),
-		event_name = is_form ? 'submit' : 'click';
+		isForm = elements.is('form'),
+		eventName = isForm ? 'submit' : 'click';
 
-	elements.bind(event_name, function(event) {
+	elements.bind(eventName, function(event) {
 		var action, method, data, submit, that = this, $this = $(this);
 
-		if ($this.find('input[type="submit"][data-clicked]').attr('data-ajax') === 'false')
-		{
+		if ($this.find('input[type="submit"][data-clicked]').attr('data-ajax') === 'false') {
 			return;
 		}
 
@@ -267,110 +262,88 @@ phpbb.ajaxify = function(options) {
 		 *
 		 * @param object res The object sent back by the server.
 		 */
-		function return_handler(res)
-		{
+		function returnHandler(res) {
 			var alert;
 
+			phpbb.clearLoadingTimeout();
+
 			// Is a confirmation required?
-			if (typeof res.S_CONFIRM_ACTION === 'undefined')
-			{
+			if (typeof res.S_CONFIRM_ACTION === 'undefined') {
 				// If a confirmation is not required, display an alert and call the
 				// callbacks.
-				if (typeof res.MESSAGE_TITLE !== 'undefined')
-				{
+				if (typeof res.MESSAGE_TITLE !== 'undefined') {
 					alert = phpbb.alert(res.MESSAGE_TITLE, res.MESSAGE_TEXT);
-				}
-				else
-				{
-					dark.fadeOut(phpbb.alert_time);
+				} else {
+					dark.fadeOut(phpbb.alertTime);
 				}
 
-				if (typeof phpbb.ajax_callbacks[callback] === 'function')
-				{
-					phpbb.ajax_callbacks[callback].call(that, res);
+				if (typeof phpbb.ajaxCallbacks[callback] === 'function') {
+					phpbb.ajaxCallbacks[callback].call(that, res);
 				}
 
 				// If the server says to refresh the page, check whether the page should
 				// be refreshed and refresh page after specified time if required.
-				if (res.REFRESH_DATA)
-				{
-					if (typeof refresh === 'function')
-					{
+				if (res.REFRESH_DATA) {
+					if (typeof refresh === 'function') {
 						refresh = refresh(res.REFRESH_DATA.url);
-					}
-					else if (typeof refresh !== 'boolean')
-					{
+					} else if (typeof refresh !== 'boolean') {
 						refresh = false;
 					}
 
 					setTimeout(function() {
-						if (refresh)
-						{
+						if (refresh) {
 							window.location = res.REFRESH_DATA.url;
 						}
 
 						// Hide the alert even if we refresh the page, in case the user
 						// presses the back button.
-						dark.fadeOut(phpbb.alert_time, function() {
+						dark.fadeOut(phpbb.alertTime, function() {
 							alert.hide();
 						});
 					}, res.REFRESH_DATA.time * 1000); // Server specifies time in seconds
 				}
-			}
-			else
-			{
+			} else {
 				// If confirmation is required, display a diologue to the user.
 				phpbb.confirm(res.MESSAGE_TEXT, function(del) {
-					if (del)
-					{
-						phpbb.loading_alert();
+					if (del) {
+						phpbb.loadingAlert();
 						data =  $('<form>' + res.S_HIDDEN_FIELDS + '</form>').serialize();
 						$.ajax({
 							url: res.S_CONFIRM_ACTION,
 							type: 'POST',
 							data: data + '&confirm=' + res.YES_VALUE,
-							success: return_handler,
-							error: error_handler
+							success: returnHandler,
+							error: errorHandler
 						});
 					}
 				}, false);
 			}
 		}
 
-		function error_handler()
-		{
+		function errorHandler() {
 			var alert;
 
+			phpbb.clearLoadingTimeout();
 			alert = phpbb.alert(dark.attr('data-ajax-error-title'), dark.attr('data-ajax-error-text'));
-
-			setTimeout(function () {
-				dark.fadeOut(phpbb.alert_time, function() {
-					alert.hide();
-				});
-			}, 5000);
 		}
 
 		// If the element is a form, POST must be used and some extra data must
 		// be taken from the form.
-		var run_filter = (typeof options.filter === 'function');
+		var runFilter = (typeof options.filter === 'function');
 
-		if (is_form)
-		{
+		if (isForm) {
 			action = $this.attr('action').replace('&amp;', '&');
 			data = $this.serializeArray();
 			method = $this.attr('method') || 'GET';
 
-			if ($this.find('input[type="submit"][data-clicked]'))
-			{
+			if ($this.find('input[type="submit"][data-clicked]')) {
 				submit = $this.find('input[type="submit"][data-clicked]');
 				data.push({
 					name: submit.attr('name'),
 					value: submit.val()
 				});
 			}
-		}
-		else
-		{
+		} else {
 			action = this.href;
 			data = null;
 			method = 'GET';
@@ -378,28 +351,27 @@ phpbb.ajaxify = function(options) {
 
 		// If filter function returns false, cancel the AJAX functionality,
 		// and return true (meaning that the HTTP request will be sent normally).
-		if (run_filter && !options.filter.call(this, data))
-		{
+		if (runFilter && !options.filter.call(this, data)) {
 			return;
 		}
 
 		if (overlay && (typeof $this.attr('data-overlay') === 'undefined' || $this.attr('data-overlay') == 'true'))
 		{
-			phpbb.loading_alert();
+			phpbb.loadingAlert();
 		}
 
 		$.ajax({
 			url: action,
 			type: method,
 			data: data,
-			success: return_handler,
-			error: error_handler
+			success: returnHandler,
+			error: errorHandler
 		});
 
 		event.preventDefault();
 	});
 
-	if (is_form) {
+	if (isForm) {
 		elements.find('input:submit').click(function () {
 			var $this = $(this);
 
@@ -409,14 +381,14 @@ phpbb.ajaxify = function(options) {
 	}
 
 	return this;
-}
+};
 
 /**
 * Hide the optgroups that are not the selected timezone
 *
-* @param	bool	keep_selection		Shall we keep the value selected, or shall the user be forced to repick one.
+* @param	bool	keepSelection		Shall we keep the value selected, or shall the user be forced to repick one.
 */
-phpbb.timezone_switch_date = function(keep_selection) {
+phpbb.timezoneSwitchDate = function(keepSelection) {
 	if ($('#timezone_copy').length == 0) {
 		// We make a backup of the original dropdown, so we can remove optgroups
 		// instead of setting display to none, because IE and chrome will not
@@ -440,27 +412,30 @@ phpbb.timezone_switch_date = function(keep_selection) {
 	if ($("#timezone > optgroup[label='" + $('#tz_date').val() + "'] > option").size() == 1) {
 		// If there is only one timezone for the selected date, we just select that automatically.
 		$("#timezone > optgroup[label='" + $('#tz_date').val() + "'] > option:first").attr('selected', true);
-		keep_selection = true;
+		keepSelection = true;
 	}
 
-	if (typeof keep_selection !== 'undefined' && !keep_selection) {
-		$('#timezone > option:first').attr('selected', true);
+	if (typeof keepSelection !== 'undefined' && !keepSelection) {
+		var timezoneOptions = $('#timezone > optgroup option');
+		if (timezoneOptions.filter(':selected').length <= 0) {
+			timezoneOptions.filter(':first').attr('selected', true);
+		}
 	}
-}
+};
 
 /**
 * Display the date/time select
 */
-phpbb.timezone_enable_date_selection = function() {
+phpbb.timezoneEnableDateSelection = function() {
 	$('#tz_select_date').css('display', 'block');
-}
+};
 
 /**
 * Preselect a date/time or suggest one, if it is not picked.
 *
-* @param	bool	force_selector		Shall we select the suggestion?
+* @param	bool	forceSelector		Shall we select the suggestion?
 */
-phpbb.timezone_preselect_select = function(force_selector) {
+phpbb.timezonePreselectSelect = function(forceSelector) {
 
 	// The offset returned here is in minutes and negated.
 	// http://www.w3schools.com/jsref/jsref_getTimezoneOffset.asp
@@ -489,21 +464,21 @@ phpbb.timezone_preselect_select = function(force_selector) {
 	}
 
 	var prefix = 'GMT' + sign + hours + ':' + minutes;
-	var prefix_length = prefix.length;
-	var selector_options = $('#tz_date > option');
+	var prefixLength = prefix.length;
+	var selectorOptions = $('#tz_date > option');
 
-	for (var i = 0; i < selector_options.length; ++i) {
-		var option = selector_options[i];
+	for (var i = 0; i < selectorOptions.length; ++i) {
+		var option = selectorOptions[i];
 
-		if (option.value.substring(0, prefix_length) == prefix) {
-			if ($('#tz_date').val() != option.value && !force_selector) {
+		if (option.value.substring(0, prefixLength) == prefix) {
+			if ($('#tz_date').val() != option.value && !forceSelector) {
 				// We do not select the option for the user, but notify him,
 				// that we would suggest a different setting.
-				phpbb.timezone_switch_date(true);
+				phpbb.timezoneSwitchDate(true);
 				$('#tz_select_date_suggest').css('display', 'inline');
 			} else {
 				option.selected = true;
-				phpbb.timezone_switch_date(!force_selector);
+				phpbb.timezoneSwitchDate(!forceSelector);
 				$('#tz_select_date_suggest').css('display', 'none');
 			}
 
@@ -515,9 +490,22 @@ phpbb.timezone_preselect_select = function(force_selector) {
 			return;
 		}
 	}
-}
+};
 
-phpbb.ajax_callbacks = {};
+// Toggle notification list
+$('#notification_list_button').click(function(e) {
+	$('#notification_list').toggle();
+	e.preventDefault();
+});
+$('#phpbb').click(function(e) {
+    var target = e.target;
+
+    if (!$(target).is('#notification_list') && !$(target).is('#notification_list_button') && !$(target).parents().is('#notification_list')) {
+        $('#notification_list').hide();
+    }
+});
+
+phpbb.ajaxCallbacks = {};
 
 /**
  * Adds an AJAX callback to be used by phpbb.ajaxify.
@@ -527,14 +515,12 @@ phpbb.ajax_callbacks = {};
  * @param string id The name of the callback.
  * @param function callback The callback to be called.
  */
-phpbb.add_ajax_callback = function(id, callback)
-{
-	if (typeof callback === 'function')
-	{
-		phpbb.ajax_callbacks[id] = callback;
+phpbb.addAjaxCallback = function(id, callback) {
+	if (typeof callback === 'function') {
+		phpbb.ajaxCallbacks[id] = callback;
 	}
 	return this;
-}
+};
 
 
 /**
@@ -542,14 +528,14 @@ phpbb.add_ajax_callback = function(id, callback)
  * the alt-text data attribute, and replaces the text in the attribute with the
  * current text so that the process can be repeated.
  */
-phpbb.add_ajax_callback('alt_text', function() {
+phpbb.addAjaxCallback('alt_text', function() {
 	var el = $(this),
-		alt_text;
+		altText;
 
-	alt_text = el.attr('data-alt-text');
+	altText = el.attr('data-alt-text');
 	el.attr('data-alt-text', el.text());
-	el.attr('title', alt_text);
-	el.text(alt_text);
+	el.attr('title', altText);
+	el.text(altText);
 });
 
 /**
@@ -561,28 +547,28 @@ phpbb.add_ajax_callback('alt_text', function() {
  * Additionally it replaces the class of the link's parent
  * and changes the link itself.
  */
-phpbb.add_ajax_callback('toggle_link', function() {
+phpbb.addAjaxCallback('toggle_link', function() {
 	var el = $(this),
-		toggle_text,
-		toggle_url,
-		toggle_class;
+		toggleText,
+		toggleUrl,
+		toggleClass;
 
 	// Toggle link text
 
-	toggle_text = el.attr('data-toggle-text');
+	toggleText = el.attr('data-toggle-text');
 	el.attr('data-toggle-text', el.text());
-	el.attr('title', toggle_text);
-	el.text(toggle_text);
+	el.attr('title', toggleText);
+	el.text(toggleText);
 
 	// Toggle link url
-	toggle_url = el.attr('data-toggle-url');
+	toggleUrl = el.attr('data-toggle-url');
 	el.attr('data-toggle-url', el.attr('href'));
-	el.attr('href', toggle_url);
+	el.attr('href', toggleUrl);
 
 	// Toggle class of link parent
-	toggle_class = el.attr('data-toggle-class');
+	toggleClass = el.attr('data-toggle-class');
 	el.attr('data-toggle-class', el.parent().attr('class'));
-	el.parent().attr('class', toggle_class);
+	el.parent().attr('class', toggleClass);
 });
 
 })(jQuery); // Avoid conflicts with other libraries
author	Nathan Guse <nathaniel.guse@gmail.com>	2013-01-15 11:31:39 -0600
committer	Nathan Guse <nathaniel.guse@gmail.com>	2013-01-15 11:31:39 -0600
commit	51e0f002eeaf2d55a63feee66ccb37d689f46f55 (patch)
tree	21590506df83029d97a02ccaafa86c085f8c568f /phpBB/assets/javascript
parent	44fcec520f785d18d3cd3b19e26db977f23b844c (diff)
parent	a2f6e494f37914352b0bb72d5a84904d3f2c51a3 (diff)
download	forums-51e0f002eeaf2d55a63feee66ccb37d689f46f55.tar forums-51e0f002eeaf2d55a63feee66ccb37d689f46f55.tar.gz forums-51e0f002eeaf2d55a63feee66ccb37d689f46f55.tar.bz2 forums-51e0f002eeaf2d55a63feee66ccb37d689f46f55.tar.xz forums-51e0f002eeaf2d55a63feee66ccb37d689f46f55.zip