github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-24 21:46:39 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: prepend 'continue discussion' link to topic template

Browse Source
This commit is contained in:
Arpit Jalan 2016-05-03 14:37:57 +05:30
parent 44868c9e77
commit 706ea28ef9
3 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/controllers/topic.js.es6
View File

@ -509,7 +509,7 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
}).then(q => {
const postUrl = `${location.protocol}//${location.host}${post.get('url')}`;
const postLink = `[${Handlebars.escapeExpression(self.get('model.title'))}](${postUrl})`;
composerController.get('model').appendText(`${I18n.t("post.continue_discussion", { postLink })}\n\n${q}`);
composerController.get('model').prependText(`${I18n.t("post.continue_discussion", { postLink })}\n\n${q}`, {new_line: true});
});
},

9
app/assets/javascripts/discourse/models/composer.js.es6
View File

@ -360,6 +360,15 @@ const Composer = RestModel.extend({
return before.length + text.length;
},
prependText(text, opts) {
const reply = (this.get('reply') || '');
if (opts && opts.new_line && reply.length > 0) {
text = text.trim() + "\n\n";
}
this.set('reply', text + reply);
},
applyTopicTemplate(oldCategoryId, categoryId) {
if (this.get('action') !== CREATE_TOPIC) { return; }
let reply = this.get('reply');

15
test/javascripts/models/composer-test.js.es6
View File

@ -95,6 +95,21 @@ test("appendText", function() {
equal(composer.get("reply"), "c\n\nab");
});
test("prependText", function() {
const composer = createComposer();
blank(composer.get('reply'), "the reply is blank by default");
composer.prependText("hello");
equal(composer.get('reply'), "hello", "it prepends text to nothing");
composer.prependText("world ");
equal(composer.get('reply'), "world hello", "it prepends text to existing text");
composer.prependText("before new line", {new_line: true});
equal(composer.get('reply'), "before new line\n\nworld hello", "it prepends text with new line to existing text");
});
test("Title length for regular topics", function() {
Discourse.SiteSettings.min_topic_title_length = 5;
Discourse.SiteSettings.max_topic_title_length = 10;