paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 14:03:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

compose: Re-open the compose editor after restoring a draft.

Browse Source 
Fix #5951.
This commit is contained in:
Marco Burstein
2017-12-18 18:34:55 -08:00
committed by showell
parent 6fc50fa21a
commit 096088969d
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
frontend_tests/casper_tests/14-drafts.js
View File

@@ -70,6 +70,16 @@ casper.then(function () {
}); });
}); });
casper.then(function () {
casper.test.info('Opening Markdown Preview');
casper.waitUntilVisible('#left_bar_compose_stream_button_big', function () {
casper.click('#left_bar_compose_stream_button_big');
});
casper.waitUntilVisible('#markdown_preview', function () {
casper.click('#markdown_preview');
});
});
casper.then(function () { casper.then(function () {
casper.waitUntilVisible('.drafts-link', function () { casper.waitUntilVisible('.drafts-link', function () {
casper.click('.drafts-link'); casper.click('.drafts-link');
@@ -95,6 +105,7 @@ casper.then(function () {
casper.click("#drafts_table .message_row:not(.private-message) .restore-draft"); casper.click("#drafts_table .message_row:not(.private-message) .restore-draft");
waitWhileDraftsVisible(function () { waitWhileDraftsVisible(function () {
casper.test.assertVisible('#stream-message', 'Stream Message Box Restored'); casper.test.assertVisible('#stream-message', 'Stream Message Box Restored');
casper.test.assertNotVisible('#preview_message_area', 'Preview Was Hidden');
common.check_form('form#send_message_form', { common.check_form('form#send_message_form', {
stream: 'all', stream: 'all',
subject: 'tests', subject: 'tests',

2
static/js/drafts.js
View File

@@ -143,6 +143,8 @@ exports.restore_draft = function (draft_id) {
overlays.close_overlay("drafts"); overlays.close_overlay("drafts");
compose_fade.clear_compose(); compose_fade.clear_compose();
compose.clear_preview_area();
if (draft.type === "stream" && draft.stream === "") { if (draft.type === "stream" && draft.stream === "") {
draft_copy.subject = ""; draft_copy.subject = "";
} }