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

FIX: Hide bootbox after a negative answer (#10028)

Browse Source 
Starting to reply and then editing a post was not possible because of a
bootbox which kept showing up.
This commit is contained in:
Bianca Nenciu 2020-06-12 14:48:45 +03:00 committed by GitHub
parent 4b793a1072
commit 60196cc192
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/app/controllers/composer.js
View File

@ -1040,7 +1040,7 @@ export default Controller.extend({
const keyPrefix =
this.model.action === "edit" ? "post.abandon_edit" : "post.abandon";
let promise = new Promise(resolve => {
let promise = new Promise((resolve, reject) => {
if (this.get("model.hasMetaData") || this.get("model.replyDirty")) {
bootbox.dialog(I18n.t(keyPrefix + ".confirm"), [
{
@ -1052,8 +1052,10 @@ export default Controller.extend({
if (differentDraft) {
this.model.clearState();
this.close();
resolve();
}
resolve();
reject();
}
},
{

18
test/javascripts/acceptance/composer-test.js
View File

@ -271,6 +271,24 @@ QUnit.test("Create a Reply", async assert => {
);
});
QUnit.test("Can edit a post after starting a reply", async assert => {
await visit("/t/internationalization-localization/280");
await click("#topic-footer-buttons .create");
await fillIn(".d-editor-input", "this is the content of my reply");
await click(".topic-post:eq(0) button.show-more-actions");
await click(".topic-post:eq(0) button.edit");
await click("a[data-handler='0']");
assert.ok(!visible(".bootbox.modal"));
assert.equal(
find(".d-editor-input").val(),
"this is the content of my reply"
);
});
QUnit.test("Posting on a different topic", async assert => {
await visit("/t/internationalization-localization/280");
await click("#topic-footer-buttons .btn.create");