1 files changed, 113 insertions, 129 deletions
diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index 1d70adc48d..aec6b0bbe6 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -1,26 +1,17 @@
+/* global phpbb */
+
 (function($) {  // Avoid conflicts with other libraries
 
-"use strict";
-
-/**
-* Close popup alert after a specified delay
-*
-* @param int Delay in ms until darkenwrapper's click event is triggered
-*/
-phpbb.closeDarkenWrapper = function(delay) {
-	setTimeout(function() {
-		$('#darkenwrapper').trigger('click');
-	}, delay);
-};
+'use strict';
 
 // This callback will mark all forum icons read
 phpbb.addAjaxCallback('mark_forums_read', function(res) {
 	var readTitle = res.NO_UNREAD_POSTS;
 	var unreadTitle = res.UNREAD_POSTS;
 	var iconsArray = {
-		'forum_unread': 'forum_read',
-		'forum_unread_subforum': 'forum_read_subforum',
-		'forum_unread_locked': 'forum_read_locked'
+		forum_unread: 'forum_read',
+		forum_unread_subforum: 'forum_read_subforum',
+		forum_unread_locked: 'forum_read_locked'
 	};
 
 	$('li.row').find('dl[class*="forum_unread"]').each(function() {
@@ -48,28 +39,28 @@ phpbb.addAjaxCallback('mark_forums_read', function(res) {
 	phpbb.closeDarkenWrapper(3000);
 });
 
-/** 
+/**
 * This callback will mark all topic icons read
 *
-* @param update_topic_links bool Wether "Mark topics read" links should be
-*     updated. Defaults to true.
+* @param {bool} [update_topic_links=true] 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 = {
-		'global_unread': 'global_read',
-		'announce_unread': 'announce_read',
-		'sticky_unread': 'sticky_read',
-		'topic_unread': 'topic_read'
+		global_unread: 'global_read',
+		announce_unread: 'announce_read',
+		sticky_unread: 'sticky_read',
+		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) {
@@ -96,10 +87,10 @@ phpbb.addAjaxCallback('mark_topics_read', function(res, update_topic_links) {
 	});
 
 	// Remove link to first unread post
-	$('a').has('span.icon_topic_newest').remove();
+	$('a.unread').has('.icon-red').remove();
 
 	// Update mark topics read links
-	if (update_topic_links) {
+	if (updateTopicLinks) {
 		$('[data-ajax="mark_topics_read"]').attr('href', res.U_MARK_TOPICS);
 	}
 
@@ -125,36 +116,41 @@ 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();
 	}
+
+	// Update page title
+	var $title = $('title');
+	var originalTitle = $title.text().replace(/(\((\d+)\))/, '');
+	$title.text((unreadCount ? '(' + unreadCount + ')' : '') + originalTitle);
 };
 
 // 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');
@@ -173,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();
@@ -205,17 +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 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 height = (typeof height === 'undefined') ? panel.find('.inner').outerHeight() : height;
+		var updatePanelHeight = function (height) {
+			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);
 		}
 
@@ -228,30 +224,49 @@ phpbb.addAjaxCallback('vote_poll', function(res) {
 			poll.find('.resultbar, .poll_option_percent, .poll_total_votes').show(500);
 		}
 
+		// Get the votes count of the highest poll option
+		poll.find('[data-poll-option-id]').each(function() {
+			var option = $(this);
+			var optionId = option.attr('data-poll-option-id');
+			mostVotes = (res.vote_counts[optionId] >= mostVotes) ? res.vote_counts[optionId] : mostVotes;
+		});
+
 		// Update the total votes count
 		poll.find('.poll_total_vote_cnt').html(res.total_votes);
 
 		// 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 percent = (!res.total_votes) ? 0 : Math.round((res.vote_counts[option_id] / res.total_votes) * 100);
-
-			option.toggleClass('voted', voted);
+			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);
+			var altText;
+
+			altText = $this.attr('data-alt-text');
+			if (voted) {
+				$this.attr('title', $.trim(altText));
+			} else {
+				$this.attr('title', '');
+			};
+			$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 + '%'}, 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) {
@@ -259,30 +274,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({ minHeight: '', height: panelHeight })
+					.animate({ height: innerHeight }, time, function () {
+						panel.css({ minHeight: innerHeight, height: '' });
+					});
 			}
 		};
 	}
@@ -295,22 +311,25 @@ $('.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'),
-		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({
 			selector: this,
 			refresh: $this.attr('data-refresh') !== undefined,
+			filter: filter,
 			callback: fn
 		});
 	}
@@ -335,49 +354,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();
-});
-
-
-
-/**
- * This AJAXifies the quick-mod tools. The reason it cannot be a standard
- * callback / data attribute is that it requires filtering - some of the options
- * can be ajaxified, while others cannot.
- */
-phpbb.ajaxify({
-	selector: '#quickmodform',
-	refresh: true,
-	filter: function (data) {
-		var action = $('#quick-mod-select').val();
-
-		if (action === 'make_normal') {
-			return $(this).find('select option[value="make_global"]').length > 0;
-		} else if (action === 'lock' || action === 'unlock') {
-			return true;
-		}
-
-		if (action === 'delete_topic' || action === 'make_sticky' || action === 'make_announce' || action === 'make_global') {
-			return true;
-		}
-
-		return false;
-	}
-});
-
-$('#quick-mod-select').change(function () {
-	$('#quickmodform').submit();
-});
-
-$('#delete_permanent').click(function () {
-	if ($(this).attr('checked')) {
-		$('#delete_reason').hide();
-	} else {
-		$('#delete_reason').show();
-	}
+	var postId = $(this).attr('data-post-id');
+	$('#post_content' + postId).show();
+	$('#profile' + postId).show();
+	$('#post_hidden' + postId).hide();
 });
 
 /**
@@ -388,10 +368,13 @@ $('#delete_permanent').click(function () {
 * appropriately changed based on the status of the search panel.
 */
 $('#member_search').click(function () {
-	$('#memberlist_search').slideToggle('fast');
-	phpbb.ajax_callbacks.alt_text.call(this);
+	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;
@@ -400,9 +383,10 @@ $('#member_search').click(function () {
 /**
 * Automatically resize textarea
 */
-$(document).ready(function() {
-	phpbb.resizeTextArea($('textarea:not(#message-box textarea, .no-auto-resize)'), {minHeight: 75, maxHeight: 250});
-	phpbb.resizeTextArea($('#message-box textarea'));
+$(function() {
+	var $textarea = $('textarea:not(#message-box textarea, .no-auto-resize)');
+	phpbb.resizeTextArea($textarea, { minHeight: 75, maxHeight: 250 });
+	phpbb.resizeTextArea($('textarea', '#message-box'));
 });