1 files changed, 101 insertions, 32 deletions
diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index f0a9cd84e3..d1d44ed5b8 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -2,17 +2,103 @@
 
 "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);
+};
+
+// 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'
+	};
+
+	$('li.row').find('dl[class*="forum_unread"]').each(function() {
+		var $this = $(this);
+
+		$.each(iconsArray, function(unreadClass, readClass) {
+			if ($this.hasClass(unreadClass)) {
+				$this.removeClass(unreadClass).addClass(readClass);
+			}
+		});
+		$this.children('dt[title="' + unreadTitle + '"]').attr('title', readTitle);
+	});
+
+	// Mark subforums read
+	$('a.subforum[class*="unread"]').removeClass('unread').addClass('read');
+
+	// Update mark forums read links
+	$('[data-ajax="mark_forums_read"]').attr('href', res.U_MARK_FORUMS);
+
+	phpbb.closeDarkenWrapper(3000);
+});
+
+// This callback will mark all topic icons read
+phpbb.addAjaxCallback('mark_topics_read', function(res) {
+	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'
+	};
+	var iconsState = ['', '_hot', '_hot_mine', '_locked', '_locked_mine', '_mine'];
+	var unreadClassSelectors = '';
+	var classMap = {};
+	var classNames = [];
+
+	$.each(iconsArray, function(unreadClass, readClass) {
+		$.each(iconsState, function(key, value) {
+			// Only topics can be hot
+			if ((value == '_hot' || value == '_hot_mine') && unreadClass != 'topic_unread') {
+				return true;
+			}
+			classMap[unreadClass + value] = readClass + value;
+			classNames.push(unreadClass + value);
+		});
+	});
+
+	unreadClassSelectors = '.' + classNames.join(',.');
+
+	$('li.row').find(unreadClassSelectors).each(function() {
+		var $this = $(this);
+		$.each(classMap, function(unreadClass, readClass) {
+			if ($this.hasClass(unreadClass)) {
+				$this.removeClass(unreadClass).addClass(readClass);
+			}
+		});
+		$this.children('dt[title="' + unreadTitle + '"]').attr('title', readTitle);
+	});
+
+	// Remove link to first unread post
+	$('a').has('span.icon_topic_newest').remove();
+
+	// Update mark topics read links
+	$('[data-ajax="mark_topics_read"]').attr('href', res.U_MARK_TOPICS);
+
+	phpbb.closeDarkenWrapper(3000);
+});
+
 // This callback finds the post from the delete link, and removes it.
-phpbb.add_ajax_callback('post_delete', function() {
+phpbb.addAjaxCallback('post_delete', function() {
 	var el = $(this),
-		post_id;
-
-	if (el.attr('data-refresh') === undefined)
-	{
-		post_id = el[0].href.split('&p=')[1];
-		var post = el.parents('#p' + post_id).css('pointer-events', 'none');
-		if (post.hasClass('bg1') || post.hasClass('bg2'))
-		{
+		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 (post.hasClass('bg1') || post.hasClass('bg2')) {
 			var posts1 = post.nextAll('.bg1');
 			post.nextAll('.bg2').removeClass('bg2').addClass('bg1');
 			posts1.removeClass('bg1').addClass('bg2');
@@ -24,7 +110,7 @@ phpbb.add_ajax_callback('post_delete', function() {
 });
 
 // This callback removes the approve / disapprove div or link.
-phpbb.add_ajax_callback('post_approve', function(res) {
+phpbb.addAjaxCallback('post_approve', function(res) {
 	var remove = (res.approved) ? $(this) : $(this).parents('.post');
 	$(remove).css('pointer-events', 'none').fadeOut(function() {
 		$(this).remove();
@@ -32,12 +118,12 @@ phpbb.add_ajax_callback('post_approve', function(res) {
 });
 
 // This removes the parent row of the link or form that fired the callback.
-phpbb.add_ajax_callback('row_delete', function() {
+phpbb.addAjaxCallback('row_delete', function() {
 	$(this).parents('tr').remove();
 });
 
 // This handles friend / foe additions removals.
-phpbb.add_ajax_callback('zebra', function(res) {
+phpbb.addAjaxCallback('zebra', function(res) {
 	var zebra;
 
 	if (res.success) {
@@ -54,8 +140,7 @@ $('[data-ajax]').each(function() {
 		ajax = $this.attr('data-ajax'),
 		fn;
 
-	if (ajax !== 'false')
-	{
+	if (ajax !== 'false') {
 		fn = (ajax !== 'true') ? ajax : null;
 		phpbb.ajaxify({
 			selector: this,
@@ -76,19 +161,6 @@ $('#qr_full_editor').click(function() {
 	});
 });
 
-// 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();
-    }
-});
-
 /**
  * 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
@@ -100,12 +172,9 @@ phpbb.ajaxify({
 	filter: function (data) {
 		var action = $('#quick-mod-select').val();
 
-		if (action === 'make_normal')
-		{
+		if (action === 'make_normal') {
 			return $(this).find('select option[value="make_global"]').length > 0;
-		}
-		else if (action === 'lock' || action === 'unlock')
-		{
+		} else if (action === 'lock' || action === 'unlock') {
 			return true;
 		}