Merge branch 'master' of https://github.com/NodeBB/NodeBB

public/src/admin/manage/categories.js

@@ -11,9 +11,9 @@ define('admin/manage/categories', [
 	var sortables;
 
 	Categories.init = function () {
-		socket.emit('admin.categories.getAll', function (error, payload) {
-			if (error) {
-				return app.alertError(error.message);
+		socket.emit('admin.categories.getAll', function (err, payload) {
+			if (err) {
+				return app.alertError(err.message);
 			}
 
 			Categories.render(payload);
@@ -63,8 +63,55 @@ define('admin/manage/categories', [
 			el.find('i').toggleClass('fa-minus', expand).toggleClass('fa-plus', !expand);
 			el.closest('[data-cid]').find('> ul[data-cid]').toggleClass('hidden', !expand);
 		}
+
+		$('#category-search').on('keyup', function () {
+			searchCategory();
+		});
 	};
 
+	function searchCategory() {
+		var container = $('#content .categories');
+		function revealParents(cid) {
+			var parentCid = container.find('li[data-cid="' + cid + '"]').attr('data-parent-cid');
+			if (parentCid) {
+				container.find('li[data-cid="' + parentCid + '"]').removeClass('hidden');
+				revealParents(parentCid);
+			}
+		}
+
+		function revealChildren(cid) {
+			var els = container.find('li[data-parent-cid="' + cid + '"]');
+			els.each(function (index, el) {
+				var $el = $(el);
+				$el.removeClass('hidden');
+				revealChildren($el.attr('data-cid'));
+			});
+		}
+
+		var categoryEls = container.find('li[data-cid]');
+		var val = $('#category-search').val().toLowerCase();
+		var noMatch = true;
+		var cids = [];
+		categoryEls.each(function () {
+			var liEl = $(this);
+			var isMatch = liEl.attr('data-name').toLowerCase().indexOf(val) !== -1;
+			if (noMatch && isMatch) {
+				noMatch = false;
+			}
+			if (isMatch && val) {
+				cids.push(liEl.attr('data-cid'));
+			}
+			liEl.toggleClass('hidden', !isMatch);
+		});
+
+		cids.forEach(function (cid) {
+			revealParents(cid);
+			revealChildren(cid);
+		});
+
+		$('[component="category/no-matches"]').toggleClass('hidden', !noMatch);
+	}
+
 	Categories.throwCreateModal = function () {
 		socket.emit('categories.getSelectCategories', {}, function (err, categories) {
 			if (err) {

public/src/admin/manage/post-queue.js

@@ -1,7 +1,7 @@
 'use strict';
 
 
-define('admin/manage/post-queue', function () {
+define('admin/manage/post-queue', ['categorySelector'], function (categorySelector) {
 	var PostQueue = {};
 
 	PostQueue.init = function () {
@@ -22,31 +22,64 @@ define('admin/manage/post-queue', function () {
 			return false;
 		});
 
-		$('.posts-list').on('click', '.post-content', function () {
+		handleContentEdit('.post-content', '.post-content-editable', 'textarea');
+		handleContentEdit('.topic-title', '.topic-title-editable', 'input');
+
+		$('.posts-list').on('click', '.topic-category[data-editable]', function () {
+			var $this = $(this);
+			var id = $this.parents('[data-id]').attr('data-id');
+			categorySelector.modal(ajaxify.data.allCategories, function (cid) {
+				var category = ajaxify.data.allCategories.find(function (c) {
+					return parseInt(c.cid, 10) === parseInt(cid, 10);
+				});
+				socket.emit('posts.editQueuedContent', {
+					id: id,
+					cid: cid,
+				}, function (err) {
+					if (err) {
+						return app.alertError(err.message);
+					}
+					app.parseAndTranslate('admin/manage/post-queue', 'posts', {
+						posts: [{
+							category: category,
+						}],
+					}, function (html) {
+						$this.replaceWith(html.find('.topic-category'));
+					});
+				});
+			});
+			return false;
+		});
+	};
+
+	function handleContentEdit(displayClass, editableClass, inputSelector) {
+		$('.posts-list').on('click', displayClass, function () {
 			var el = $(this);
 			el.addClass('hidden');
-			var textareaParent = el.parent().find('.post-content-editable');
-			textareaParent.removeClass('hidden').find('textarea').focus();
+			var inputEl = el.parent().find(editableClass);
+			inputEl.removeClass('hidden').find(inputSelector).focus();
 		});
 
-		$('.posts-list').on('blur', '.post-content-editable textarea', function () {
+		$('.posts-list').on('blur', editableClass + ' ' + inputSelector, function () {
 			var textarea = $(this);
-			var preview = textarea.parent().parent().find('.post-content');
+			var preview = textarea.parent().parent().find(displayClass);
 			var id = textarea.parents('[data-id]').attr('data-id');
+			var titleEdit = displayClass === '.topic-title';
 
 			socket.emit('posts.editQueuedContent', {
 				id: id,
-				content: textarea.val(),
+				title: titleEdit ? textarea.val() : undefined,
+				content: titleEdit ? undefined : textarea.val(),
 			}, function (err, data) {
 				if (err) {
 					return app.alertError(err);
 				}
-				preview.html(data.postData.content);
+				preview.html(titleEdit ? data.postData.title : data.postData.content);
 				textarea.parent().addClass('hidden');
 				preview.removeClass('hidden');
 			});
 		});
-	};
+	}
 
 	return PostQueue;
 });

public/src/app.js

@@ -38,8 +38,6 @@ app.cacheBuster = null;
 	});
 
 	app.load = function () {
-		app.loadProgressiveStylesheet();
-
 		overrides.overrideTimeago();
 
 		var url = ajaxify.start(window.location.pathname.slice(1) + window.location.search + window.location.hash);
@@ -751,14 +749,6 @@ app.cacheBuster = null;
 		});
 	};
 
-	app.loadProgressiveStylesheet = function () {
-		var linkEl = document.createElement('link');
-		linkEl.rel = 'stylesheet';
-		linkEl.href = config.relative_path + '/assets/js-enabled.css?' + app.cacheBuster;
-
-		document.head.appendChild(linkEl);
-	};
-
 	app.showCookieWarning = function () {
 		require(['translator', 'storage'], function (translator, storage) {
 			if (!config.cookies.enabled || !navigator.cookieEnabled) {

public/src/client/chats.js

@@ -56,6 +56,7 @@ define('forum/chats', [
 		Chats.addRenameHandler(ajaxify.data.roomId, components.get('chat/controls').find('[data-action="rename"]'));
 		Chats.addLeaveHandler(ajaxify.data.roomId, components.get('chat/controls').find('[data-action="leave"]'));
 		Chats.addScrollHandler(ajaxify.data.roomId, ajaxify.data.uid, $('.chat-content'));
+		Chats.addScrollBottomHandler($('.chat-content'));
 		Chats.addCharactersLeftHandler($('[component="chat/main-wrapper"]'));
 		Chats.addIPHandler($('[component="chat/main-wrapper"]'));
 		Chats.createAutoComplete($('[component="chat/input"]'));
@@ -101,6 +102,7 @@ define('forum/chats', [
 	Chats.addScrollHandler = function (roomId, uid, el) {
 		var loading = false;
 		el.off('scroll').on('scroll', function () {
+			messages.toggleScrollUpAlert(el);
 			if (loading) {
 				return;
 			}
@@ -144,6 +146,14 @@ define('forum/chats', [
 		});
 	};
 
+	Chats.addScrollBottomHandler = function (chatContent) {
+		chatContent.parent()
+			.find('[component="chat/messages/scroll-up-alert"]')
+			.off('click').on('click', function () {
+				messages.scrollToBottom(chatContent);
+			});
+	};
+
 	Chats.addCharactersLeftHandler = function (parent) {
 		var element = parent.find('[component="chat/input"]');
 		element.on('change keyup paste', function () {

public/src/client/chats/messages.js

@@ -84,11 +84,13 @@ define('forum/chats/messages', ['components', 'sounds', 'translator', 'benchpres
 
 	function onMessagesParsed(chatContentEl, html) {
 		var newMessage = $(html);
-
+		var isAtBottom = messages.isAtBottom(chatContentEl);
 		newMessage.appendTo(chatContentEl);
 		newMessage.find('.timeago').timeago();
 		newMessage.find('img:not(.not-responsive)').addClass('img-responsive');
-		messages.scrollToBottom(chatContentEl);
+		if (isAtBottom) {
+			messages.scrollToBottom(chatContentEl);
+		}
 
 		$(window).trigger('action:chat.received', {
 			messageEl: newMessage,
@@ -112,13 +114,31 @@ define('forum/chats/messages', ['components', 'sounds', 'translator', 'benchpres
 		}
 	};
 
+	messages.isAtBottom = function (containerEl, threshold) {
+		if (containerEl.length) {
+			var distanceToBottom = containerEl[0].scrollHeight - (
+				containerEl.outerHeight() + containerEl.scrollTop()
+			);
+			return distanceToBottom < (threshold || 100);
+		}
+	};
 
 	messages.scrollToBottom = function (containerEl) {
-		if (containerEl.length) {
+		if (containerEl && containerEl.length) {
 			containerEl.scrollTop(containerEl[0].scrollHeight - containerEl.height());
+			containerEl.parent()
+				.find('[component="chat/messages/scroll-up-alert"]')
+				.addClass('hidden');
 		}
 	};
 
+	messages.toggleScrollUpAlert = function (containerEl) {
+		var isAtBottom = messages.isAtBottom(containerEl, 300);
+		containerEl.parent()
+			.find('[component="chat/messages/scroll-up-alert"]')
+			.toggleClass('hidden', isAtBottom);
+	};
+
 	messages.prepEdit = function (inputEl, messageId, roomId) {
 		socket.emit('modules.chats.getRaw', { mid: messageId, roomId: roomId }, function (err, raw) {
 			if (err) {

public/src/modules/chat.js

@@ -91,7 +91,9 @@ define('chat', [
 
 			if (modal.is(':visible')) {
 				taskbar.updateActive(modal.attr('data-uuid'));
-				ChatsMessages.scrollToBottom(modal.find('.chat-content'));
+				if (ChatsMessages.isAtBottom(modal.find('.chat-content'))) {
+					ChatsMessages.scrollToBottom(modal.find('.chat-content'));
+				}
 			} else if (!ajaxify.data.template.chats) {
 				module.toggleNew(modal.attr('data-uuid'), true, true);
 			}
@@ -239,6 +241,7 @@ define('chat', [
 				Chats.createAutoComplete(chatModal.find('[component="chat/input"]'));
 
 				Chats.addScrollHandler(chatModal.attr('data-roomid'), data.uid, chatModal.find('.chat-content'));
+				Chats.addScrollBottomHandler(chatModal.find('.chat-content'));
 
 				Chats.addCharactersLeftHandler(chatModal);
 				Chats.addIPHandler(chatModal);

public/src/modules/translator.js

@@ -278,7 +278,7 @@
 			}
 
 			if (namespace && !key) {
-				warn('Missing key in translation token "' + name + '"');
+				warn('Missing key in translation token "' + name + '" for language "' + self.lang + '"');
 				return Promise.resolve('[[' + namespace + ']]');
 			}
 
@@ -286,7 +286,7 @@
 			return translation.then(function (translated) {
 				// check if the translation is missing first
 				if (!translated) {
-					warn('Missing translation "' + name + '"');
+					warn('Missing translation "' + name + '" for language "' + self.lang + '"');
 					return backup || key;
 				}