Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-10 16:05:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

changed to title raw

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2016-02-18 20:26:09 +02:00
parent ef48b5d13e
commit 573840ccbd
5 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/src/client/topic.js
View File

@@ -217,7 +217,7 @@ define('forum/topic', [
function updateTopicTitle() {
var span = components.get('navbar/title').find('span');
if ($(window).scrollTop() > 50) {
span.html(ajaxify.data.titleEscaped).show();
span.html(ajaxify.data.title).show();
} else {
span.html('').hide();
}

6
public/src/client/topic/postTools.js
View File

@@ -194,7 +194,7 @@ define('forum/topic/postTools', ['share', 'navigator', 'components', 'translator
slug: ajaxify.data.slug,
index: getData(button, 'data-index'),
pid: toPid,
topicName: ajaxify.data.title,
topicName: ajaxify.data.titleRaw,
username: username,
text: selectionText
});
@@ -202,7 +202,7 @@ define('forum/topic/postTools', ['share', 'navigator', 'components', 'translator
$(window).trigger('action:composer.post.new', {
tid: tid,
pid: toPid,
topicName: ajaxify.data.title,
topicName: ajaxify.data.titleRaw,
text: username ? username + ' ' : ''
});
}
@@ -227,7 +227,7 @@ define('forum/topic/postTools', ['share', 'navigator', 'components', 'translator
index: getData(button, 'data-index'),
pid: pid,
username: username,
topicName: ajaxify.data.title,
topicName: ajaxify.data.titleRaw,
text: post
});
});

2
src/controllers/topics.js
View File

@@ -131,7 +131,7 @@ topicsController.get = function(req, res, callback) {
url: nconf.get('relative_path') + '/category/' + data.topicData.category.slug
},
{
text: validator.escape(data.topicData.title)
text: data.topicData.title
}
];

3
src/topics/data.js
View File

@@ -58,7 +58,8 @@ module.exports = function(Topics) {
if (!topic) {
return;
}
topic.titleEscaped = validator.escape(topic.title);
topic.titleRaw = topic.title;
topic.title = validator.escape(topic.title);
topic.relativeTime = utils.toISOString(topic.timestamp);
topic.lastposttimeISO = utils.toISOString(topic.lastposttime);
}

4
tests/topics.js
View File

@@ -154,8 +154,8 @@ describe('Topic\'s', function() {
assert.ifError(err);
topics.getTopicData(result.topicData.tid, function(err, topicData) {
assert.ifError(err);
assert.strictEqual(topicData.titleEscaped, titleEscaped);
assert.strictEqual(topicData.title, title);
assert.strictEqual(topicData.titleRaw, title);
assert.strictEqual(topicData.title, titleEscaped);
done();
});
});