github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-26 22:53:43 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

When you click Quote Reply, and then cancel the reply, don't ask if you're sure.

Browse Source
This commit is contained in:
Neil Lalonde 2013-11-15 13:13:42 -05:00
parent 01523554f3
commit e01ce546e8
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/discourse/controllers/quote_button_controller.js
View File

@ -117,12 +117,11 @@ Discourse.QuoteButtonController = Discourse.Controller.extend({
var buffer = this.get('buffer');
var quotedText = Discourse.Quote.build(post, buffer);
composerOpts.quote = quotedText;
if (composerController.get('content.replyDirty')) {
composerController.appendText(quotedText);
} else {
composerController.open(composerOpts).then(function() {
composerController.appendText(quotedText);
});
composerController.open(composerOpts);
}
this.set('buffer', '');
return false;

5
app/assets/javascripts/discourse/models/composer.js
View File

@ -361,6 +361,11 @@ Discourse.Composer = Discourse.Model.extend({
loading: false
});
});
} else if (opts.action === REPLY && opts.quote) {
this.setProperties({
reply: opts.quote,
originalText: opts.quote
});
}
if (opts.title) { this.set('title', opts.title); }
this.set('originalText', opts.draft ? '' : this.get('reply'));

10
test/javascripts/models/composer_test.js
View File

@ -204,3 +204,13 @@ test('showPreview', function() {
Discourse.Mobile.mobileView = false;
equal(new_composer().get('showPreview'), true, "Show preview by default in desktop view");
});
test('open with a quote', function() {
var quote = '[quote="neil, post:5, topic:413"]\nSimmer down you two.\n[/quote]';
var new_composer = function() {
return Discourse.Composer.open({action: Discourse.Composer.REPLY, draftKey: 'asfd', draftSequence: 1, quote: quote});
};
equal(new_composer().get('originalText'), quote, "originalText is the quote" );
equal(new_composer().get('replyDirty'), false, "replyDirty is initally false with a quote" );
});