Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Reply and new Topic broke with new composer

This commit is contained in:
Robin Ward 2015-11-09 12:28:42 -05:00
parent 7d3be0f8f1
commit a33c2fa165
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,7 +103,7 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
composerController.get('content.action') === Discourse.Composer.REPLY) { composerController.get('content.action') === Discourse.Composer.REPLY) {
composerController.set('content.post', post); composerController.set('content.post', post);
composerController.set('content.composeState', Discourse.Composer.OPEN); composerController.set('content.composeState', Discourse.Composer.OPEN);
composerController.appendText(quotedText); this.appEvents.trigger('composer:insert-text', quotedText.trim());
} else { } else {
const opts = { const opts = {
@ -395,9 +395,10 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
}).then(() => { }).then(() => {
return Em.isEmpty(quotedText) ? Discourse.Post.loadQuote(post.get('id')) : quotedText; return Em.isEmpty(quotedText) ? Discourse.Post.loadQuote(post.get('id')) : quotedText;
}).then(q => { }).then(q => {
const postUrl = `${location.protocol}//${location.host}${post.get('url')}`, const postUrl = `${location.protocol}//${location.host}${post.get('url')}`;
postLink = `[${Handlebars.escapeExpression(self.get('model.title'))}](${postUrl})`; const postLink = `[${Handlebars.escapeExpression(self.get('model.title'))}](${postUrl})`;
composerController.appendText(`${I18n.t("post.continue_discussion", { postLink })}\n\n${q}`);
this.appEvents.trigger('composer:insert-text', `${I18n.t("post.continue_discussion", { postLink })}\n\n${q}`);
}); });
}, },