3 files changed, 322 insertions, 340 deletions
diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index 63efe5f8ae..13e8d02469 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -1,6 +1,8 @@
+/* global phpbb */
+
 (function($) {  // Avoid conflicts with other libraries
 
-"use strict";
+'use strict';
 
 // This callback will mark all forum icons read
 phpbb.addAjaxCallback('mark_forums_read', function(res) {
@@ -40,10 +42,10 @@ phpbb.addAjaxCallback('mark_forums_read', function(res) {
 /** 
 * This callback will mark all topic icons read
 *
-* @param update_topic_links bool Wether "Mark topics read" links should be
+* @param update_topic_links bool Whether "Mark topics read" links should be
 *     updated. Defaults to true.
 */
-phpbb.addAjaxCallback('mark_topics_read', function(res, update_topic_links) {
+phpbb.addAjaxCallback('mark_topics_read', function(res, updateTopicLinks) {
 	var readTitle = res.NO_UNREAD_POSTS;
 	var unreadTitle = res.UNREAD_POSTS;
 	var iconsArray = {
@@ -53,12 +55,12 @@ phpbb.addAjaxCallback('mark_topics_read', function(res, update_topic_links) {
 		'topic_unread': 'topic_read'
 	};
 	var iconsState = ['', '_hot', '_hot_mine', '_locked', '_locked_mine', '_mine'];
-	var unreadClassSelectors = '';
+	var unreadClassSelectors;
 	var classMap = {};
 	var classNames = [];
 
-	if (typeof update_topic_links === 'undefined') {
-		update_topic_links = true;
+	if (typeof updateTopicLinks === 'undefined') {
+		updateTopicLinks = true;
 	}
 
 	$.each(iconsArray, function(unreadClass, readClass) {
@@ -88,7 +90,7 @@ phpbb.addAjaxCallback('mark_topics_read', function(res, update_topic_links) {
 	$('a').has('span.icon_topic_newest').remove();
 
 	// Update mark topics read links
-	if (update_topic_links) {
+	if (updateTopicLinks) {
 		$('[data-ajax="mark_topics_read"]').attr('href', res.U_MARK_TOPICS);
 	}
 
@@ -114,22 +116,22 @@ phpbb.addAjaxCallback('notification.mark_read', function(res) {
 /**
  * Mark notification popup rows as read.
  *
- * @param {jQuery} el jQuery object(s) to mark read.
+ * @param {jQuery} $popup jQuery object(s) to mark read.
  * @param {int} unreadCount The new unread notifications count.
  */
-phpbb.markNotifications = function(el, unreadCount) {
+phpbb.markNotifications = function($popup, unreadCount) {
 	// Remove the unread status.
-	el.removeClass('bg2');
-	el.find('a.mark_read').remove();
+	$popup.removeClass('bg2');
+	$popup.find('a.mark_read').remove();
 
 	// Update the notification link to the real URL.
-	el.each(function() {
+	$popup.each(function() {
 		var link = $(this).find('a');
 		link.attr('href', link.attr('data-real-url'));
 	});
 
 	// Update the unread count.
-	$('#notification_list_button strong').html(unreadCount);
+	$('strong', '#notification_list_button').html(unreadCount);
 	// Remove the Mark all read link if there are no unread notifications.
 	if (!unreadCount) {
 		$('#mark_all_notifications').remove();
@@ -143,12 +145,12 @@ phpbb.markNotifications = function(el, unreadCount) {
 
 // This callback finds the post from the delete link, and removes it.
 phpbb.addAjaxCallback('post_delete', function() {
-	var el = $(this),
+	var $this = $(this),
 		postId;
 
-	if (el.attr('data-refresh') === undefined) {
-		postId = el[0].href.split('&p=')[1];
-		var post = el.parents('#p' + postId).css('pointer-events', 'none');
+	if ($this.attr('data-refresh') === undefined) {
+		postId = $this[0].href.split('&p=')[1];
+		var post = $this.parents('#p' + postId).css('pointer-events', 'none');
 		if (post.hasClass('bg1') || post.hasClass('bg2')) {
 			var posts1 = post.nextAll('.bg1');
 			post.nextAll('.bg2').removeClass('bg2').addClass('bg1');
@@ -167,8 +169,7 @@ phpbb.addAjaxCallback('post_visibility', function(res) {
 		$(this).remove();
 	});
 
-	if (res.visible)
-	{
+	if (res.visible) {
 		// Remove the "Deleted by" message from the post on restoring.
 		remove.parents('.post').find('.post_deleted_msg').css('pointer-events', 'none').fadeOut(function() {
 			$(this).remove();
@@ -199,18 +200,18 @@ phpbb.addAjaxCallback('vote_poll', function(res) {
 	if (typeof res.success !== 'undefined') {
 		var poll = $('.topic_poll');
 		var panel = poll.find('.panel');
-		var results_visible = poll.find('dl:first-child .resultbar').is(':visible');
-		var most_votes = 0;
+		var resultsVisible = poll.find('dl:first-child .resultbar').is(':visible');
+		var mostVotes = 0;
 
 		// Set min-height to prevent the page from jumping when the content changes
-		var update_panel_height = function (height) {
+		var updatePanelHeight = function (height) {
 			var height = (typeof height === 'undefined') ? panel.find('.inner').outerHeight() : height;
 			panel.css('min-height', height);
 		};
-		update_panel_height();
+		updatePanelHeight();
 
 		// Remove the View results link
-		if (!results_visible) {
+		if (!resultsVisible) {
 			poll.find('.poll_view_results').hide(500);
 		}
 
@@ -226,8 +227,8 @@ phpbb.addAjaxCallback('vote_poll', function(res) {
 		// Get the votes count of the highest poll option
 		poll.find('[data-poll-option-id]').each(function() {
 			var option = $(this);
-			var option_id = option.attr('data-poll-option-id');
-			most_votes = (res.vote_counts[option_id] >= most_votes) ? res.vote_counts[option_id] : most_votes;
+			var optionId = option.attr('data-poll-option-id');
+			mostVotes = (res.vote_counts[optionId] >= mostVotes) ? res.vote_counts[optionId] : mostVotes;
 		});
 
 		// Update the total votes count
@@ -235,28 +236,30 @@ phpbb.addAjaxCallback('vote_poll', function(res) {
 
 		// Update each option
 		poll.find('[data-poll-option-id]').each(function() {
-			var option = $(this);
-			var option_id = option.attr('data-poll-option-id');
-			var voted = (typeof res.user_votes[option_id] !== 'undefined') ? true : false;
-			var most_voted = (res.vote_counts[option_id] == most_votes) ? true : false;
-			var percent = (!res.total_votes) ? 0 : Math.round((res.vote_counts[option_id] / res.total_votes) * 100);
-			var percent_rel = (most_votes == 0) ? 0 : Math.round((res.vote_counts[option_id] / most_votes) * 100);
+			var $this = $(this);
+			var optionId = $this.attr('data-poll-option-id');
+			var voted = (typeof res.user_votes[optionId] !== 'undefined');
+			var mostVoted = (res.vote_counts[optionId] === mostVotes);
+			var percent = (!res.total_votes) ? 0 : Math.round((res.vote_counts[optionId] / res.total_votes) * 100);
+			var percentRel = (mostVotes === 0) ? 0 : Math.round((res.vote_counts[optionId] / mostVotes) * 100);
 
-			option.toggleClass('voted', voted);
-			option.toggleClass('most-votes', most_voted);
+			$this.toggleClass('voted', voted);
+			$this.toggleClass('most-votes', mostVoted);
 
 			// Update the bars
-			var bar = option.find('.resultbar div');
-			var bar_time_lapse = (res.can_vote) ? 500 : 1500;
-			var new_bar_class = (percent == 100) ? 'pollbar5' : 'pollbar' + (Math.floor(percent / 20) + 1);
+			var bar = $this.find('.resultbar div');
+			var barTimeLapse = (res.can_vote) ? 500 : 1500;
+			var newBarClass = (percent === 100) ? 'pollbar5' : 'pollbar' + (Math.floor(percent / 20) + 1);
 
 			setTimeout(function () {
-				bar.animate({width: percent_rel + '%'}, 500).removeClass('pollbar1 pollbar2 pollbar3 pollbar4 pollbar5').addClass(new_bar_class);
-				bar.html(res.vote_counts[option_id]);
-
-				var percent_txt = (!percent) ? res.NO_VOTES : percent + '%';
-				option.find('.poll_option_percent').html(percent_txt);
-			}, bar_time_lapse);
+				bar.animate({width: percentRel + '%'}, 500)
+					.removeClass('pollbar1 pollbar2 pollbar3 pollbar4 pollbar5')
+					.addClass(newBarClass)
+					.html(res.vote_counts[optionId]);
+
+				var percentText = percent ? percent + '%' : res.NO_VOTES;
+				$this.find('.poll_option_percent').html(percentText);
+			}, barTimeLapse);
 		});
 
 		if (!res.can_vote) {
@@ -264,30 +267,31 @@ phpbb.addAjaxCallback('vote_poll', function(res) {
 		}
 
 		// Display "Your vote has been cast." message. Disappears after 5 seconds.
-		var confirmation_delay = (res.can_vote) ? 300 : 900;
-		poll.find('.vote-submitted').delay(confirmation_delay).slideDown(200, function() {
-			if (results_visible) {
-				update_panel_height();
+		var confirmationDelay = (res.can_vote) ? 300 : 900;
+		poll.find('.vote-submitted').delay(confirmationDelay).slideDown(200, function() {
+			if (resultsVisible) {
+				updatePanelHeight();
 			}
 
 			$(this).delay(5000).fadeOut(500, function() {
-				resize_panel(300);
+				resizePanel(300);
 			});
 		});
 
 		// Remove the gap resulting from removing options
 		setTimeout(function() {
-			resize_panel(500);
+			resizePanel(500);
 		}, 1500);
 
-		var resize_panel = function (time) {
-			var panel_height = panel.height();
-			var inner_height = panel.find('.inner').outerHeight();
+		var resizePanel = function (time) {
+			var panelHeight = panel.height();
+			var innerHeight = panel.find('.inner').outerHeight();
 
-			if (panel_height != inner_height) {
-				panel.css({'min-height': '', 'height': panel_height}).animate({height: inner_height}, time, function () {
-					panel.css({'min-height': inner_height, 'height': ''});
-				});
+			if (panelHeight != innerHeight) {
+				panel.css({'min-height': '', 'height': panelHeight})
+					.animate({height: innerHeight}, time, function () {
+						panel.css({'min-height': innerHeight, 'height': ''});
+					});
 			}
 		};
 	}
@@ -300,20 +304,19 @@ $('.poll_view_results a').click(function(e) {
 	// Do not follow the link
 	e.preventDefault();
 
-	var poll = $(this).parents('.topic_poll');
+	var $poll = $(this).parents('.topic_poll');
 
-	poll.find('.resultbar, .poll_option_percent, .poll_total_votes').show(500);
-	poll.find('.poll_view_results').hide(500);
+	$poll.find('.resultbar, .poll_option_percent, .poll_total_votes').show(500);
+	$poll.find('.poll_view_results').hide(500);
 });
 
 $('[data-ajax]').each(function() {
-	var $this = $(this),
-		ajax = $this.attr('data-ajax'),
-		filter = $this.attr('data-filter'),
-		fn;
+	var $this = $(this);
+	var ajax = $this.attr('data-ajax');
+	var filter = $this.attr('data-filter');
 
 	if (ajax !== 'false') {
-		fn = (ajax !== 'true') ? ajax : null;
+		var fn = (ajax !== 'true') ? ajax : null;
 		filter = (filter !== undefined) ? phpbb.getFunctionByName(filter) : null;
 
 		phpbb.ajaxify({
@@ -344,10 +347,10 @@ $('.display_post').click(function(e) {
 	// Do not follow the link
 	e.preventDefault();
 
-	var post_id = $(this).attr('data-post-id');
-	$('#post_content' + post_id).show();
-	$('#profile' + post_id).show();
-	$('#post_hidden' + post_id).hide();
+	var postId = $(this).attr('data-post-id');
+	$('#post_content' + postId).show();
+	$('#profile' + postId).show();
+	$('#post_hidden' + postId).hide();
 });
 
 $('#delete_permanent').click(function () {
@@ -366,10 +369,13 @@ $('#delete_permanent').click(function () {
 * appropriately changed based on the status of the search panel.
 */
 $('#member_search').click(function () {
-	$('#memberlist_search').slideToggle('fast');
+	var $memberlistSearch = $('#memberlist_search');
+
+	$memberlistSearch.slideToggle('fast');
 	phpbb.ajaxCallbacks.alt_text.call(this);
+
 	// Focus on the username textbox if it's available and displayed
-	if ($('#memberlist_search').is(':visible')) {
+	if ($memberlistSearch.is(':visible')) {
 		$('#username').focus();
 	}
 	return false;
@@ -378,7 +384,7 @@ $('#member_search').click(function () {
 /**
 * Automatically resize textarea
 */
-$(document).ready(function() {
+$(function() {
 	phpbb.resizeTextArea($('textarea:not(#message-box textarea, .no-auto-resize)'), {minHeight: 75, maxHeight: 250});
 	phpbb.resizeTextArea($('#message-box textarea'));
 });
diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js
index 4929e14ef7..1280ceb8ac 100644
--- a/phpBB/styles/prosilver/template/forum_fn.js
+++ b/phpBB/styles/prosilver/template/forum_fn.js
@@ -1,3 +1,5 @@
+/* global phpbb */
+
 /**
 * phpBB3 forum functions
 */
@@ -6,6 +8,8 @@
 * Find a member
 */
 function find_username(url) {
+	'use strict';
+
 	popup(url, 760, 570, '_usersearch');
 	return false;
 }
@@ -14,6 +18,8 @@ function find_username(url) {
 * Window popup
 */
 function popup(url, width, height, name) {
+	'use strict';
+
 	if (!name) {
 		name = '_popup';
 	}
@@ -26,17 +32,18 @@ function popup(url, width, height, name) {
 * Jump to page
 */
 function pageJump(item) {
+	'use strict';
 
 	var page = item.val(),
-		per_page = item.attr('data-per-page'),
-		base_url = item.attr('data-base-url'),
-		start_name = item.attr('data-start-name');
+		perPage = item.attr('data-per-page'),
+		baseUrl = item.attr('data-base-url'),
+		startName = item.attr('data-start-name');
 
 	if (page !== null && !isNaN(page) && page == Math.floor(page) && page > 0) {
-		if (base_url.indexOf('?') === -1) {
-			document.location.href = base_url + '?' + start_name + '=' + ((page - 1) * per_page);
+		if (baseUrl.indexOf('?') === -1) {
+			document.location.href = baseUrl + '?' + startName + '=' + ((page - 1) * perPage);
 		} else {
-			document.location.href = base_url.replace(/&amp;/g, '&') + '&' + start_name + '=' + ((page - 1) * per_page);
+			document.location.href = baseUrl.replace(/&amp;/g, '&') + '&' + startName + '=' + ((page - 1) * perPage);
 		}
 	}
 }
@@ -46,9 +53,11 @@ function pageJump(item) {
 * id = ID of parent container, name = name prefix, state = state [true/false]
 */
 function marklist(id, name, state) {
+	'use strict';
+
 	jQuery('#' + id + ' input[type=checkbox][name]').each(function() {
 		var $this = jQuery(this);
-		if ($this.attr('name').substr(0, name.length) == name) {
+		if ($this.attr('name').substr(0, name.length) === name) {
 			$this.prop('checked', state);
 		}
 	});
@@ -59,6 +68,8 @@ function marklist(id, name, state) {
 * e = element
 */
 function viewableArea(e, itself) {
+	'use strict';
+
 	if (!e) {
 		return;
 	}
@@ -86,18 +97,20 @@ function viewableArea(e, itself) {
 /**
 * Alternate display of subPanels
 */
-jQuery(document).ready(function() {
-	jQuery('.sub-panels').each(function() {
+jQuery(function($) {
+	'use strict';
 
-		var panels = [],
-			childNodes = jQuery('a[data-subpanel]', this).each(function() {
-				panels.push(this.getAttribute('data-subpanel'));
+	$('.sub-panels').each(function() {
+
+		var $childNodes = $('a[data-subpanel]', this),
+			panels = $childNodes.map(function () {
+				return this.getAttribute('data-subpanel');
 			}),
-			show_panel = this.getAttribute('data-show-panel');
+			showPanel = this.getAttribute('data-show-panel');
 
 		if (panels.length) {
-			activateSubPanel(show_panel, panels);
-			childNodes.click(function () {
+			activateSubPanel(showPanel, panels);
+			$childNodes.click(function () {
 				activateSubPanel(this.getAttribute('data-subpanel'), panels);
 				return false;
 			});
@@ -109,60 +122,30 @@ jQuery(document).ready(function() {
 * Activate specific subPanel
 */
 function activateSubPanel(p, panels) {
-	var i;
+	'use strict';
+
+	var i, showPanel;
 
 	if (typeof(p) === 'string') {
-		show_panel = p;
+		showPanel = p;
 	}
-	$('input[name="show_panel"]').val(show_panel);
+	$('input[name="show_panel"]').val(showPanel);
 
-	if (typeof(panels) === 'undefined') {
-		panels = [];
-		jQuery('.sub-panels a[data-subpanel]').each(function() {
-			panels.push(this.getAttribute('data-subpanel'));
+	if (typeof panels === 'undefined') {
+		panels = jQuery('.sub-panels a[data-subpanel]').map(function() {
+			return this.getAttribute('data-subpanel');
 		});
 	}
 
 	for (i = 0; i < panels.length; i++) {
-		jQuery('#' + panels[i]).css('display', panels[i] === show_panel ? 'block' : 'none');
-		jQuery('#' + panels[i] + '-tab').toggleClass('activetab', panels[i] === show_panel);
-	}
-}
-
-/**
-* Call print preview
-*/
-function printPage() {
-	if (is_ie) {
-		printPreview();
-	} else {
-		window.print();
-	}
-}
-
-/**
-* Show/hide groups of blocks
-* c = CSS style name
-* e = checkbox element
-* t = toggle dispay state (used to show 'grip-show' image in the profile block when hiding the profiles)
-*/
-function displayBlocks(c, e, t) {
-	var s = (e.checked === true) ?  1 : -1;
-
-	if (t) {
-		s *= -1;
-	}
-
-	var divs = document.getElementsByTagName("DIV");
-
-	for (var d = 0; d < divs.length; d++) {
-		if (divs[d].className.indexOf(c) === 0) {
-			divs[d].style.display = (s === 1) ? 'none' : 'block';
-		}
+		jQuery('#' + panels[i]).css('display', panels[i] === showPanel ? 'block' : 'none');
+		jQuery('#' + panels[i] + '-tab').toggleClass('activetab', panels[i] === showPanel);
 	}
 }
 
 function selectCode(a) {
+	'use strict';
+
 	// Get ID of code block
 	var e = a.parentNode.parentNode.getElementsByTagName('CODE')[0];
 	var s, r;
@@ -209,6 +192,8 @@ function selectCode(a) {
 * from the displayed rectangle area
 */
 function play_qt_file(obj) {
+	'use strict';
+
 	var rectangle = obj.GetRectangle();
 	var width, height;
 
@@ -233,30 +218,32 @@ function play_qt_file(obj) {
 	obj.Play();
 }
 
-var in_autocomplete = false;
-var last_key_entered = '';
+var inAutocomplete = false;
+var lastKeyEntered = '';
 
 /**
 * Check event key
 */
-function phpbb_check_key(event) {
+function phpbbCheckKey(event) {
+	'use strict';
+
 	// Keycode is array down or up?
 	if (event.keyCode && (event.keyCode === 40 || event.keyCode === 38)) {
-		in_autocomplete = true;
+		inAutocomplete = true;
 	}
 
 	// Make sure we are not within an "autocompletion" field
-	if (in_autocomplete) {
+	if (inAutocomplete) {
 		// If return pressed and key changed we reset the autocompletion
-		if (!last_key_entered || last_key_entered === event.which) {
-			in_autocompletion = false;
+		if (!lastKeyEntered || lastKeyEntered === event.which) {
+			inAutocomplete = false;
 			return true;
 		}
 	}
 
 	// Keycode is not return, then return. ;)
 	if (event.which !== 13) {
-		last_key_entered = event.which;
+		lastKeyEntered = event.which;
 		return true;
 	}
 
@@ -266,115 +253,106 @@ function phpbb_check_key(event) {
 /**
 * Apply onkeypress event for forcing default submit button on ENTER key press
 */
-function apply_onkeypress_event() {
-	jQuery('form input[type=text], form input[type=password]').on('keypress', function (e) {
-		var default_button = jQuery(this).parents('form').find('input[type=submit].default-submit-action');
+jQuery(function($) {
+	'use strict';
+
+	$('form input[type=text], form input[type=password]').on('keypress', function (e) {
+		var defaultButton = $(this).parents('form').find('input[type=submit].default-submit-action');
 
-		if (!default_button || default_button.length <= 0) {
+		if (!defaultButton || defaultButton.length <= 0) {
 			return true;
 		}
 
-		if (phpbb_check_key(e)) {
+		if (phpbbCheckKey(e)) {
 			return true;
 		}
 
 		if ((e.which && e.which === 13) || (e.keyCode && e.keyCode === 13)) {
-			default_button.click();
+			defaultButton.click();
 			return false;
 		}
 
 		return true;
 	});
-}
-
-jQuery(document).ready(apply_onkeypress_event);
+});
 
 /**
 * Functions for user search popup
 */
-function insert_user(formId, value)
+function insertUser(formId, value)
 {
-	var form = jQuery(formId),
-		formName = form.attr('data-form-name'),
-		fieldName = form.attr('data-field-name'),
+	'use strict';
+
+	var $form = jQuery(formId),
+		formName = $form.attr('data-form-name'),
+		fieldName = $form.attr('data-field-name'),
 		item = opener.document.forms[formName][fieldName];
 
 	if (item.value.length && item.type == 'textarea') {
-		value = item.value + "\n" + value;
+		value = item.value + '\n' + value;
 	}
 
 	item.value = value;
 }
 
-function insert_marked_users(formId, users)
-{
-	if (typeof(users.length) == "undefined")
-	{
-		if (users.checked)
-		{
-			insert_user(formId, users.value);
-		}
-	}
-	else if (users.length > 0)
-	{
-		for (i = 0; i < users.length; i++)
-		{
-			if (users[i].checked)
-			{
-				insert_user(formId, users[i].value);
-			}
+function insert_marked_users(formId, users) {
+	'use strict';
+
+	for (var i = 0; i < users.length; i++) {
+		if (users[i].checked) {
+			insertUser(formId, users[i].value);
 		}
 	}
 
-	self.close();
+	window.close();
 }
 
-function insert_single_user(formId, user)
-{
-	insert_user(formId, user);
-	self.close();
+function insert_single_user(formId, user) {
+	'use strict';
+
+	insertUser(formId, user);
+	window.close();
 }
 
 /**
 * Parse document block
 */
-function parse_document(container) 
-{
+function parseDocument($container) {
+	'use strict';
+
 	var test = document.createElement('div'),
 		oldBrowser = (typeof test.style.borderRadius == 'undefined');
 
-	delete test;
-
 	/**
 	* Reset avatar dimensions when changing URL or EMAIL
 	*/
-	container.find('input[data-reset-on-edit]').bind('keyup', function() {
+	$container.find('input[data-reset-on-edit]').on('keyup', function() {
 		$(this.getAttribute('data-reset-on-edit')).val('');
 	});
 
 	/**
 	* Pagination
 	*/
-	container.find('.pagination .page-jump-form :button').click(function() {
-		$input = $(this).siblings('input.inputbox');
+	$container.find('.pagination .page-jump-form :button').click(function() {
+		var $input = $(this).siblings('input.inputbox');
 		pageJump($input);
 	});
 
-	container.find('.pagination .page-jump-form input.inputbox').on('keypress', function(event) {
-		if (event.which == 13 || event.keyCode == 13) {
+	$container.find('.pagination .page-jump-form input.inputbox').on('keypress', function(event) {
+		if (event.which === 13 || event.keyCode === 13) {
 			event.preventDefault();
 			pageJump($(this));
 		}
 	});
 
-	container.find('.pagination .dropdown-trigger').click(function() {
-		$dropdown_container = $(this).parent();
+	$container.find('.pagination .dropdown-trigger').click(function() {
+		var $dropdownContainer = $(this).parent();
 		// Wait a little bit to make sure the dropdown has activated
 		setTimeout(function() { 
-			if ($dropdown_container.hasClass('dropdown-visible')) {
-				$dropdown_container.find('input.inputbox').focus();
+			if ($dropdownContainer.hasClass('dropdown-visible')) {
+				$dropdownContainer.find('input.inputbox').focus();
 			}
-		},100);
+		}, 100);
 	});
 
 	/**
@@ -382,27 +360,29 @@ function parse_document(container)
 	*/
 	if (oldBrowser) {
 		// Fix .linklist.bulletin lists
-		container.find('ul.linklist.bulletin > li:first-child, ul.linklist.bulletin > li.rightside:last-child').addClass('no-bulletin');
+		$container.find('ul.linklist.bulletin > li:first-child, ul.linklist.bulletin > li.rightside:last-child').addClass('no-bulletin');
 	}
 
 	/**
 	* Resize navigation block to keep all links on same line
 	*/
-	container.find('.navlinks').each(function() {
+	$container.find('.navlinks').each(function() {
 		var $this = $(this),
-			left = $this.children().not('.rightside'),
-			right = $this.children('.rightside');
+			$left = $this.children().not('.rightside'),
+			$right = $this.children('.rightside');
 
-		if (left.length !== 1 || !right.length) return;
+		if ($left.length !== 1 || !$right.length) {
+			return;
+		}
 
 		function resize() {
 			var width = 0,
-				diff = left.outerWidth(true) - left.width();
+				diff = $left.outerWidth(true) - $left.width();
 
-			right.each(function() {
+			$right.each(function() {
 				width += $(this).outerWidth(true);
 			});
-			left.css('max-width', Math.floor($this.width() - width - diff) + 'px');
+			$left.css('max-width', Math.floor($this.width() - width - diff) + 'px');
 		}
 
 		resize();
@@ -412,11 +392,11 @@ function parse_document(container)
 	/**
 	* Makes breadcrumbs responsive
 	*/
-	container.find('.breadcrumbs:not([data-skip-responsive])').each(function() {
+	$container.find('.breadcrumbs:not([data-skip-responsive])').each(function() {
 		var $this = $(this),
 			$body = $('body'),
-			links = $this.find('.crumb'),
-			length = links.length,
+			$links = $this.find('.crumb'),
+			length = $links.length,
 			classes = ['wrapped-max', 'wrapped-wide', 'wrapped-medium', 'wrapped-small', 'wrapped-tiny'],
 			classesLength = classes.length,
 			maxHeight = 0,
@@ -429,14 +409,13 @@ function parse_document(container)
 			$link.attr('title', $link.text());
 		});
 
-		// Funciton that checks breadcrumbs
+		// Function that checks breadcrumbs
 		function check() {
 			var height = $this.height(),
-				width = $body.width(),
-				link, i, j;
+				width = $body.width();
 
-			maxHeight = parseInt($this.css('line-height')) | 0;
-			links.each(function() {
+			maxHeight = parseInt($this.css('line-height'));
+			$links.each(function() {
 				if ($(this).height() > 0) {
 					maxHeight = Math.max(maxHeight, $(this).outerHeight(true));
 				}
@@ -444,7 +423,6 @@ function parse_document(container)
 
 			if (height <= maxHeight) {
 				if (!wrapped || lastWidth === false || lastWidth >= width) {
-					lastWidth = width;
 					return;
 				}
 			}
@@ -452,7 +430,6 @@ function parse_document(container)
 
 			if (wrapped) {
 				$this.removeClass('wrapped').find('.crumb.wrapped').removeClass('wrapped ' + classes.join(' '));
-				wrapped = false;
 				if ($this.height() <= maxHeight) {
 					return;
 				}
@@ -464,9 +441,9 @@ function parse_document(container)
 				return;
 			}
 
-			for (i = 0; i < classesLength; i ++) {
-				for (j = length - 1; j >= 0; j --) {
-					links.eq(j).addClass('wrapped ' + classes[i]);
+			for (var i = 0; i < classesLength; i ++) {
+				for (var j = length - 1; j >= 0; j --) {
+					$links.eq(j).addClass('wrapped ' + classes[i]);
 					if ($this.height() <= maxHeight) {
 						return;
 					}
@@ -482,32 +459,29 @@ function parse_document(container)
 	/**
 	* Responsive link lists
 	*/
-	container.find('.linklist:not(.navlinks, [data-skip-responsive]), .postbody .post-buttons:not([data-skip-responsive])').each(function() {
+	$container.find('.linklist:not(.navlinks, [data-skip-responsive]), .postbody .post-buttons:not([data-skip-responsive])').each(function() {
 		var $this = $(this),
 			$body = $('body'),
 			filterSkip = '.breadcrumbs, [data-skip-responsive]',
 			filterLast = '.edit-icon, .quote-icon, [data-last-responsive]',
 			persist = $this.attr('id') == 'nav-main',
-			allLinks = $this.children(),
-			links = allLinks.not(filterSkip),
+			$allLinks = $this.children(),
+			$links = $allLinks.not(filterSkip),
 			html = '<li class="responsive-menu" style="display:none;"><a href="javascript:void(0);" class="responsive-menu-link">&nbsp;</a><div class="dropdown" style="display:none;"><div class="pointer"><div class="pointer-inner" /></div><ul class="dropdown-contents" /></div></li>',
-			filterLastList = links.filter(filterLast),
+			$filterLastList = $links.filter(filterLast),
 			slack = 1; // Vertical slack space (in pixels). Determines how sensitive the script is in determining whether a line-break has occured. 
 
 		if (!persist) {
-			if (links.is('.rightside'))
-			{
-				links.filter('.rightside:first').before(html);
+			if ($links.is('.rightside')) {
+				$links.filter('.rightside:first').before(html);
 				$this.children('.responsive-menu').addClass('rightside');
-			}
-			else
-			{
+			} else {
 				$this.append(html);
 			}
 		}
 
-		var item = $this.children('.responsive-menu'),
-			menu = item.find('.dropdown-contents'),
+		var $item = $this.children('.responsive-menu'),
+			$menu = $item.find('.dropdown-contents'),
 			lastWidth = false,
 			compact = false,
 			responsive = false,
@@ -521,29 +495,31 @@ function parse_document(container)
 
 			// Unhide the quick-links menu if it has content
 			if (persist) {
-				item.addClass('hidden');
-				if (menu.find('li:not(.separator, .clone)').length || (responsive && menu.find('li.clone').length)) {
-					item.removeClass('hidden');
+				$item.addClass('hidden');
+				if ($menu.find('li:not(.separator, .clone)').length || (responsive && $menu.find('li.clone').length)) {
+					$item.removeClass('hidden');
 				}
 			}
 
 			// Reset responsive and compact layout
 			if (responsive) {
-				responsive = false;
 				$this.removeClass('responsive');
-				links.css('display', '');
-				if (!persist) item.css('display', 'none');
+				$links.css('display', '');
+				if (!persist) {
+					$item.css('display', 'none');
+				}
 			}
 
 			if (compact) {
-				compact = false;
 				$this.removeClass('compact');
 			}
 
 			// Find tallest element
 			var maxHeight = 0;
-			allLinks.each(function() {
-				if (!$(this).height()) return;
+			$allLinks.each(function() {
+				if (!$(this).height()) {
+					return;
+				}
 				maxHeight = Math.max(maxHeight, $(this).outerHeight(true));
 			});
 
@@ -557,12 +533,13 @@ function parse_document(container)
 			}
 
 			// Enable compact layout, find tallest element, compare to height of whole block
-			compact = true;
 			$this.addClass('compact');
 
 			var compactMaxHeight = 0;
-			allLinks.each(function() {
-				if (!$(this).height()) return;
+			$allLinks.each(function() {
+				if (!$(this).height()) {
+					return;
+				}
 				compactMaxHeight = Math.max(compactMaxHeight, $(this).outerHeight(true));
 			});
 
@@ -571,51 +548,51 @@ function parse_document(container)
 			}
 
 			// Compact layout did not resize block enough, switch to responsive layout
-			compact = false;
 			$this.removeClass('compact');
 			responsive = true;
 
 			if (!copied) {
-				var clone = links.clone(true);
+				var clone = $links.clone(true);
 				clone.filter('.rightside').each(function() {
-					if (persist) $(this).addClass('clone');
-					menu.prepend(this);
+					if (persist) {
+						$(this).addClass('clone');
+					}
+					$menu.prepend(this);
 				});
 				
 				if (persist) {
-					menu.prepend(clone.not('.rightside').addClass('clone'));
+					$menu.prepend(clone.not('.rightside').addClass('clone'));
 				} else {
-					menu.prepend(clone.not('.rightside'));
+					$menu.prepend(clone.not('.rightside'));
 				}
 
-				menu.find('li.leftside, li.rightside').removeClass('leftside rightside');
-				menu.find('.inputbox').parents('li:first').css('white-space', 'normal');
+				$menu.find('li.leftside, li.rightside').removeClass('leftside rightside');
+				$menu.find('.inputbox').parents('li:first').css('white-space', 'normal');
 
 				if ($this.hasClass('post-buttons')) {
-					$('.button', menu).removeClass('button icon-button');
-					$('.responsive-menu-link', item).addClass('button icon-button').prepend('<span></span>');
+					$('.button', $menu).removeClass('button icon-button');
+					$('.responsive-menu-link', $item).addClass('button icon-button').prepend('<span></span>');
 				}
 				copied = true;
-			}
-			else {
-				menu.children().css('display', '');
+			} else {
+				$menu.children().css('display', '');
 			}
 
-			item.css('display', '');
+			$item.css('display', '');
 			$this.addClass('responsive');
 
 			// Try to not hide filtered items
-			if (filterLastList.length) {
-				links.not(filterLast).css('display', 'none');
+			if ($filterLastList.length) {
+				$links.not(filterLast).css('display', 'none');
 
 				maxHeight = 0;
-				filterLastList.each(function() {
+				$filterLastList.each(function() {
 					if (!$(this).height()) return;
 					maxHeight = Math.max(maxHeight, $(this).outerHeight(true));
 				});
 
 				if ($this.height() <= (maxHeight + slack)) {
-					menu.children().filter(filterLast).css('display', 'none');
+					$menu.children().filter(filterLast).css('display', 'none');
 					return;
 				}
 			}
@@ -624,10 +601,12 @@ function parse_document(container)
 			compact = true;
 			$this.addClass('compact');
 
-			links.css('display', 'none');
+			$links.css('display', 'none');
 		}
 
-		if (!persist) phpbb.registerDropdown(item.find('a.responsive-menu-link'), item.find('.dropdown'));
+		if (!persist) {
+			phpbb.registerDropdown($item.find('a.responsive-menu-link'), $item.find('.dropdown'));
+		}
 
 		check();
 		$(window).resize(check);
@@ -643,7 +622,7 @@ function parse_document(container)
 	/**
 	* Adjust topiclist lists with check boxes
 	*/
-	container.find('ul.topiclist dd.mark').siblings('dt').children('.list-inner').addClass('with-mark');
+	$container.find('ul.topiclist dd.mark').siblings('dt').children('.list-inner').addClass('with-mark');
 
 	/**
 	* Appends contents of all extra columns to first column in
@@ -652,31 +631,30 @@ function parse_document(container)
 	* To add that functionality to .topiclist list simply add
 	* responsive-show-all to list of classes
 	*/
-	container.find('.topiclist.responsive-show-all > li > dl').each(function() {
+	$container.find('.topiclist.responsive-show-all > li > dl').each(function() {
 		var $this = $(this),
-			block = $this.find('dt .responsive-show:last-child'),
+			$block = $this.find('dt .responsive-show:last-child'),
 			first = true;
 
 		// Create block that is visible only on mobile devices
-		if (!block.length) {
+		if (!$block.length) {
 			$this.find('dt > .list-inner').append('<div class="responsive-show" style="display:none;" />');
-			block = $this.find('dt .responsive-show:last-child');
-		}
-		else {
-			first = ($.trim(block.text()).length == 0);
+			$block = $this.find('dt .responsive-show:last-child');
+		} else {
+			first = ($.trim($block.text()).length === 0);
 		}
 
 		// Copy contents of each column
 		$this.find('dd').not('.mark').each(function() {
 			var column = $(this),
-				children = column.children(),
+				$children = column.children(),
 				html = column.html();
 
-			if (children.length == 1 && children.text() == column.text()) {
-				html = children.html();
+			if ($children.length == 1 && $children.text() == column.text()) {
+				html = $children.html();
 			}
 
-			block.append((first ? '' : '<br />') + html);
+			$block.append((first ? '' : '<br />') + html);
 
 			first = false;
 		});
@@ -689,15 +667,15 @@ function parse_document(container)
 	* To add that functionality to .topiclist list simply add
 	* responsive-show-columns to list of classes
 	*/
-	container.find('.topiclist.responsive-show-columns').each(function() {
-		var list = $(this),
+	$container.find('.topiclist.responsive-show-columns').each(function() {
+		var $list = $(this),
 			headers = [],
 			headersLength = 0;
 
 		// Find all headers, get contents
-		list.prev('.topiclist').find('li.header dd').not('.mark').each(function() {
+		$list.prev('.topiclist').find('li.header dd').not('.mark').each(function() {
 			headers.push($(this).text());
-			headersLength ++;
+			headersLength++;
 		});
 
 		if (!headersLength) {
@@ -705,18 +683,18 @@ function parse_document(container)
 		}
 
 		// Parse each row
-		list.find('dl').each(function() {
+		$list.find('dl').each(function() {
 			var $this = $(this),
-				block = $this.find('dt .responsive-show:last-child'),
+				$block = $this.find('dt .responsive-show:last-child'),
 				first = true;
 
 			// Create block that is visible only on mobile devices
-			if (!block.length) {
+			if (!$block.length) {
 				$this.find('dt > .list-inner').append('<div class="responsive-show" style="display:none;" />');
-				block = $this.find('dt .responsive-show:last-child');
+				$block = $this.find('dt .responsive-show:last-child');
 			}
 			else {
-				first = ($.trim(block.text()).length == 0);
+				first = ($.trim($block.text()).length === 0);
 			}
 
 			// Copy contents of each column
@@ -734,7 +712,7 @@ function parse_document(container)
 					html = headers[i] + ': <strong>' + html + '</strong>';
 				}
 
-				block.append((first ? '' : '<br />') + html);
+				$block.append((first ? '' : '<br />') + html);
 
 				first = false;
 			});
@@ -744,16 +722,15 @@ function parse_document(container)
 	/**
 	* Responsive tables
 	*/
-	container.find('table.table1').not('.not-responsive').each(function() {
+	$container.find('table.table1').not('.not-responsive').each(function() {
 		var $this = $(this),
-			th = $this.find('thead > tr > th'),
-			columns = th.length,
+			$th = $this.find('thead > tr > th'),
 			headers = [],
 			totalHeaders = 0,
 			i, headersLength;
 
 		// Find each header
-		th.each(function(column) {
+		$th.each(function(column) {
 			var cell = $(this),
 				colspan = parseInt(cell.attr('colspan')),
 				dfn = cell.attr('data-dfn'),
@@ -761,10 +738,10 @@ function parse_document(container)
 
 			colspan = isNaN(colspan) || colspan < 1 ? 1 : colspan;
 
-			for (i=0; i<colspan; i++) {
+			for (i = 0; i < colspan; i++) {
 				headers.push(text);
 			}
-			totalHeaders ++;
+			totalHeaders++;
 
 			if (dfn && !column) {
 				$this.addClass('show-header');
@@ -802,8 +779,7 @@ function parse_document(container)
 
 				if ((text.length && text !== '-') || cell.children().length) {
 					cell.prepend('<dfn style="display: none;">' + headers[column] + '</dfn>');
-				}
-				else {
+				} else {
 					cell.addClass('empty');
 				}
 
@@ -816,10 +792,9 @@ function parse_document(container)
 	/**
 	* Hide empty responsive tables
 	*/
-	container.find('table.responsive > tbody').not('.responsive-skip-empty').each(function() {
-		var items = $(this).children('tr');
-		if (items.length == 0)
-		{
+	$container.find('table.responsive > tbody').not('.responsive-skip-empty').each(function() {
+		var $items = $(this).children('tr');
+		if (!$items.length) {
 			$(this).parent('table:first').addClass('responsive-hide');
 		}
 	});
@@ -827,65 +802,64 @@ function parse_document(container)
 	/**
 	* Responsive tabs
 	*/
-	container.find('#tabs, #minitabs').not('[data-skip-responsive]').each(function() {
+	$container.find('#tabs, #minitabs').not('[data-skip-responsive]').each(function() {
 		var $this = $(this),
 			$body = $('body'),
-			ul = $this.children(),
-			tabs = ul.children().not('[data-skip-responsive]'),
-			links = tabs.children('a'),
-			item = ul.append('<li class="tab responsive-tab" style="display:none;"><a href="javascript:void(0);" class="responsive-tab-link">&nbsp;</a><div class="dropdown tab-dropdown" style="display: none;"><div class="pointer"><div class="pointer-inner" /></div><ul class="dropdown-contents" /></div></li>').find('li.responsive-tab'),
-			menu = item.find('.dropdown-contents'),
+			$ul = $this.children(),
+			$tabs = $ul.children().not('[data-skip-responsive]'),
+			$links = $tabs.children('a'),
+			$item = $ul.append('<li class="tab responsive-tab" style="display:none;"><a href="javascript:void(0);" class="responsive-tab-link">&nbsp;</a><div class="dropdown tab-dropdown" style="display: none;"><div class="pointer"><div class="pointer-inner" /></div><ul class="dropdown-contents" /></div></li>').find('li.responsive-tab'),
+			$menu = $item.find('.dropdown-contents'),
 			maxHeight = 0,
 			lastWidth = false,
 			responsive = false;
 
-		links.each(function() {
-			var link = $(this);
-			maxHeight = Math.max(maxHeight, Math.max(link.outerHeight(true), link.parent().outerHeight(true)));
-		})
+		$links.each(function() {
+			var $this = $(this);
+			maxHeight = Math.max(maxHeight, Math.max($this.outerHeight(true), $this.parent().outerHeight(true)));
+		});
 
 		function check() {
 			var width = $body.width(),
 				height = $this.height();
 
-			if (arguments.length == 0 && (!responsive || width <= lastWidth) && height <= maxHeight) {
+			if (!arguments.length && (!responsive || width <= lastWidth) && height <= maxHeight) {
 				return;
 			}
 
-			tabs.show();
-			item.hide();
+			$tabs.show();
+			$item.hide();
 
 			lastWidth = width;
 			height = $this.height();
 			if (height <= maxHeight) {
-				responsive = false;
-				if (item.hasClass('dropdown-visible')) {
-					phpbb.toggleDropdown.call(item.find('a.responsive-tab-link').get(0));
+				if ($item.hasClass('dropdown-visible')) {
+					phpbb.toggleDropdown.call($item.find('a.responsive-tab-link').get(0));
 				}
 				return;
 			}
 
 			responsive = true;
-			item.show();
-			menu.html('');
+			$item.show();
+			$menu.html('');
 
-			var availableTabs = tabs.filter(':not(.activetab, .responsive-tab)'),
-				total = availableTabs.length,
-				i, tab;
+			var $availableTabs = $tabs.filter(':not(.activetab, .responsive-tab)'),
+				total = $availableTabs.length,
+				i, $tab;
 
 			for (i = total - 1; i >= 0; i --) {
-				tab = availableTabs.eq(i);
-				menu.prepend(tab.clone(true).removeClass('tab'));
-				tab.hide();
+				$tab = $availableTabs.eq(i);
+				$menu.prepend($tab.clone(true).removeClass('tab'));
+				$tab.hide();
 				if ($this.height() <= maxHeight) {
-					menu.find('a').click(function() { check(true); });
+					$menu.find('a').click(function() { check(true); });
 					return;
 				}
 			}
-			menu.find('a').click(function() { check(true); });
+			$menu.find('a').click(function() { check(true); });
 		}
 
-		phpbb.registerDropdown(item.find('a.responsive-tab-link'), item.find('.dropdown'), {visibleClass: 'activetab'});
+		phpbb.registerDropdown($item.find('a.responsive-tab-link'), $item.find('.dropdown'), {visibleClass: 'activetab'});
 
 		check(true);
 		$(window).resize(check);
@@ -894,10 +868,9 @@ function parse_document(container)
 	/**
 	 * Hide UCP/MCP navigation if there is only 1 item
 	 */
-	container.find('#navigation').each(function() {
-		var items = $(this).children('ol, ul').children('li');
-		if (items.length == 1)
-		{
+	$container.find('#navigation').each(function() {
+		var $items = $(this).children('ol, ul').children('li');
+		if ($items.length === 1) {
 			$(this).addClass('responsive-hide');
 		}
 	});
@@ -905,7 +878,7 @@ function parse_document(container)
 	/**
 	* Replace responsive text
 	*/
-	container.find('[data-responsive-text]').each(function() {
+	$container.find('[data-responsive-text]').each(function() {
 		var $this = $(this),
 			fullText = $this.text(),
 			responsiveText = $this.attr('data-responsive-text'),
@@ -913,12 +886,16 @@ function parse_document(container)
 
 		function check() {
 			if ($(window).width() > 700) {
-				if (!responsive) return;
+				if (!responsive) {
+					return;
+				}
 				$this.text(fullText);
 				responsive = false;
 				return;
 			}
-			if (responsive) return;
+			if (responsive) {
+				return;
+			}
 			$this.text(responsiveText);
 			responsive = true;
 		}
@@ -931,18 +908,18 @@ function parse_document(container)
 /**
 * Run onload functions
 */
-(function($) {
-	$(document).ready(function() {
-		// Swap .nojs and .hasjs
-		$('#phpbb.nojs').toggleClass('nojs hasjs');
-		$('#phpbb').toggleClass('hastouch', phpbb.isTouch);
-		$('#phpbb.hastouch').removeClass('notouch');
-
-		// Focus forms
-		$('form[data-focus]:first').each(function() {
-			$('#' + this.getAttribute('data-focus')).focus();
-		});
+jQuery(function($) {
+	'use strict';
+
+	// Swap .nojs and .hasjs
+	$('#phpbb.nojs').toggleClass('nojs hasjs');
+	$('#phpbb').toggleClass('hastouch', phpbb.isTouch);
+	$('#phpbb.hastouch').removeClass('notouch');
 
-		parse_document($('body'));
+	// Focus forms
+	$('form[data-focus]:first').each(function() {
+		$('#' + this.getAttribute('data-focus')).focus();
 	});
-})(jQuery);
+
+	parseDocument($('body'));
+});
diff --git a/phpBB/styles/prosilver/template/timezone.js b/phpBB/styles/prosilver/template/timezone.js
index e0d3da9ff7..44ec1b0979 100644
--- a/phpBB/styles/prosilver/template/timezone.js
+++ b/phpBB/styles/prosilver/template/timezone.js
@@ -1,6 +1,8 @@
+/* global phpbb */
+
 (function($) { // Avoid conflicts with other libraries
 
-"use strict";
+'use strict';
 
 $('#tz_date').change(function() {
 	phpbb.timezoneSwitchDate(false);
@@ -10,12 +12,9 @@ $('#tz_select_date_suggest').click(function(){
 	phpbb.timezonePreselectSelect(true);
 });
 
-$(document).ready(
-	phpbb.timezoneEnableDateSelection
-);
-
-$(document).ready(
-	phpbb.timezonePreselectSelect($('#tz_select_date_suggest').attr('timezone-preselect') === 'true')
-);
+$(function () {
+	phpbb.timezoneEnableDateSelection();
+	phpbb.timezonePreselectSelect($('#tz_select_date_suggest').attr('timezone-preselect') === 'true');
+});
 
 })(jQuery); // Avoid conflicts with other libraries