some more fixes, cant quote and see deleted messages

public/src/forum/pagination.js

@@ -14,11 +14,11 @@ define(function() {
 
 		$('.pagination')
 			.on('click', '.previous', function() {
-				pagination.loadPage(pagination.currentPage - 1);
+				return pagination.loadPage(pagination.currentPage - 1);
 			}).on('click', '.next', function() {
-				pagination.loadPage(pagination.currentPage + 1);
+				return pagination.loadPage(pagination.currentPage + 1);
 			}).on('click', '.page', function() {
-				pagination.loadPage($(this).attr('data-page'));
+				return pagination.loadPage($(this).attr('data-page'));
 			}).on('click', '.select_page', function(e) {
 				e.preventDefault();
 				bootbox.prompt('Enter page number:', function(pageNum) {
@@ -58,7 +58,7 @@ define(function() {
 		for(var i=0; i<pagesToShow.length; ++i) {
 			if(i > 0) {
 				if (pagesToShow[i] - 1 !== pagesToShow[i-1]) {
-					html += '<li class="disabled"><a class="select_page" href="#">|</a></li>';
+					html += '<li><a class="select_page" href="#">|</a></li>';
 				}
 			}
 			html += '<li class="page" data-page="' + pagesToShow[i] + '"><a href="#">' + pagesToShow[i] + '</a></li>';
@@ -72,10 +72,11 @@ define(function() {
 	pagination.loadPage = function(page, callback) {
 		page = parseInt(page, 10);
 		if(!utils.isNumber(page) || page < 1 || page > pagination.pageCount) {
-			return;
+			return false;
 		}
 
 		ajaxify.go(window.location.pathname.slice(1) + '?page=' + page);
+		return true;
 	}
 
 	function updatePageLinks() {

public/src/forum/topic.js

@@ -396,7 +396,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
 
 				socket.emit('posts.getRawPost', pid, function(err, post) {
 					if(err) {
-						return app.alert(err.message);
+						return app.alertError(err.message);
 					}
 					var quoted = '';
 					if(post) {
@@ -895,47 +895,34 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
 		}
 
 		function toggle_post_delete_state(pid) {
-			var postEl = $(document.querySelector('#post-container li[data-pid="' + pid + '"]'));
+			var postEl = $('#post-container li[data-pid="' + pid + '"]');
 
-			if (postEl[0]) {
+			if (postEl.length) {
-				quoteEl = postEl.find('.quote'),
+				postEl.toggleClass('deleted');
-				favEl = postEl.find('.favourite'),
-				replyEl = postEl.find('.post_reply');
 
-				socket.emit('posts.getPrivileges', pid, function(err, privileges) {
+				toggle_post_tools(pid, postEl.hasClass('deleted'));
-					if(err) {
-						return app.alert(err.message);
-					}
 
-					if (privileges.editable) {
+				updatePostCount();
-						if (!postEl.hasClass('deleted')) {
-							toggle_post_tools(pid, false);
-						} else {
-							toggle_post_tools(pid, true);
-						}
-					}
-
-					postEl.toggleClass('deleted');
-
-					updatePostCount();
-				});
 			}
 		}
 
-		function toggle_post_tools(pid, state) {
+		function toggle_post_tools(pid, isDeleted) {
-			var postEl = $(document.querySelector('#post-container li[data-pid="' + pid + '"]')),
+			var postEl = $('#post-container li[data-pid="' + pid + '"]'),
 				quoteEl = $(postEl[0].querySelector('.quote')),
 				favEl = $(postEl[0].querySelector('.favourite')),
-				replyEl = $(postEl[0].querySelector('.post_reply'));
+				replyEl = $(postEl[0].querySelector('.post_reply')),
+				chatEl = $(postEl[0].querySelector('.chat'));
 
-			if (state) {
+			if (isDeleted) {
-				quoteEl.removeClass('none');
-				favEl.removeClass('none');
-				replyEl.removeClass('none');
-			} else {
 				quoteEl.addClass('none');
 				favEl.addClass('none');
 				replyEl.addClass('none');
+				chatEl.addClass('none');
+			} else {
+				quoteEl.removeClass('none');
+				favEl.removeClass('none');
+				replyEl.removeClass('none');
+				chatEl.removeClass('none');
 			}
 		}
 

src/socket.io/posts.js

@@ -93,7 +93,17 @@ SocketPosts.uploadFile = function(socket, data, callback) {
 };
 
 SocketPosts.getRawPost = function(socket, pid, callback) {
-	posts.getPostField(pid, 'content', callback);
+	posts.getPostFields(pid, ['content', 'deleted'], function(err, data) {
+		if(err) {
+			return callback(err);
+		}
+
+		if(data.deleted === '1') {
+			return callback(new Error('This post no longer exists'));
+		}
+
+		callback(null, data.content);
+	});
 };
 
 SocketPosts.edit = function(socket, data, callback) {