Merge remote-tracking branch 'origin/master'

Conflicts:
	public/src/client/topic/postTools.js
This commit is contained in:
psychobunny
2015-03-19 15:06:14 -04:00

View File

@@ -126,7 +126,7 @@ define('forum/topic/postTools', ['composer', 'share', 'navigator'], function(com
openChat($(this));
});
$('[component="topic/reply"]').on('click', function() {
components.get('topic/reply').on('click', function() {
if (!threadState.locked) {
onReplyClicked($(this), tid, topicName);
}