Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-29 03:40:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

renamed reading to not-following

Browse Source 
added more description text
This commit is contained in:
barisusakli
2016-05-19 14:20:34 +03:00
parent 11d3834eb9
commit b02869b0f8
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
public/language/en_GB/topic.json
View File

@@ -51,12 +51,12 @@
"watch.title": "Be notified of new replies in this topic",
"unwatch.title": "Stop watching this topic",
"share_this_post": "Share this Post",
"following": "Following",
"reading": "Reading",
"watching": "Watching",
"not-watching": "Not Watching",
"ignoring": "Ignoring",
"following.description": "Notify me of new replies",
"reading.description": "Show topic in unread",
"ignoring.description": "Do not show topic in unread",
"watching.description": "Notify me of new replies.<br/>Show topic in unread.",
"not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
"ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
"thread_tools.title": "Topic Tools",
"thread_tools.markAsUnreadForAll": "Mark Unread",

14
public/src/client/topic/threadTools.js
View File

@@ -84,16 +84,16 @@ define('forum/topic/threadTools', [
fork.init();
$('.topic').on('click', '[component="topic/following"]', function() {
setFollow('follow');
changeWatching('follow');
});
$('.topic').on('click', '[component="topic/reading"]', function() {
setFollow('unfollow');
$('.topic').on('click', '[component="topic/not-following"]', function() {
changeWatching('unfollow');
});
$('.topic').on('click', '[component="topic/ignoring"]', function() {
setFollow('ignore');
changeWatching('ignore');
});
function setFollow(type) {
function changeWatching(type) {
socket.emit('topics.changeWatching', {tid: tid, type: type}, function(err) {
if (err) {
return app.alert({
@@ -212,9 +212,9 @@ define('forum/topic/threadTools', [
menu.toggleClass('hidden', state !== 'follow');
components.get('topic/following/check').toggleClass('fa-check', state === 'follow');
menu = components.get('topic/reading/menu');
menu = components.get('topic/not-following/menu');
menu.toggleClass('hidden', state !== 'unfollow');
components.get('topic/reading/check').toggleClass('fa-check', state === 'unfollow');
components.get('topic/not-following/check').toggleClass('fa-check', state === 'unfollow');
menu = components.get('topic/ignoring/menu');
menu.toggleClass('hidden', state !== 'ignore' );

2
src/topics.js
View File

@@ -199,7 +199,7 @@ var social = require('./social');
topicData.thread_tools = results.threadTools.tools;
topicData.tags = results.tags;
topicData.isFollowing = results.isFollowing[0];
topicData.isReading = !results.isFollowing[0] && !results.isIgnoring[0];
topicData.isNotFollowing = !results.isFollowing[0] && !results.isIgnoring[0];
topicData.isIgnoring = results.isIgnoring[0];
topicData.bookmark = results.bookmark;
topicData.postSharing = results.postSharing;