Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] When the message is too long declining to send as an attachment does not restore the content into the composer #16332

Merged
merged 13 commits into from
Jun 4, 2020
Merged

[FIX] When the message is too long declining to send as an attachment does not restore the content into the composer #16332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0dbd47b
Fixed Unread Tray Icon Alert setting
Jan 24, 2020
49fba4c
fixed style issue
Jan 24, 2020
cf518a3
removed empty style spaces
Jan 24, 2020
fa2dadf
updated space problem
Jan 25, 2020
c837afe
updated line break problem
Jan 25, 2020
01e2378
fixed message window
Jan 27, 2020
fa225bc
fixig syntax errror
Jan 27, 2020
08041a9
fixed the declaration error
Jan 27, 2020
a99d92b
Merge remote-tracking branch 'origin/develop' into pr/16332
rodrigok Jun 2, 2020
9dcc5f7
Remove uncessary changes
rodrigok Jun 2, 2020
c9ba627
Use a better solution
rodrigok Jun 2, 2020
d618fcf
Remove unecessary id
rodrigok Jun 2, 2020
631e150
Merge branch 'develop' into temp
ggazzo Jun 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/ui-utils/client/lib/modal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ const createModal = (config = {}, fn, onCancel) => {
},

close: () => {
if (onCancel) {
onCancel.call(instance);
}
instance.destroy();
modalStack = modalStack.filter((modal) => modal !== instance);
if (modalStack.length) {
Expand All @@ -89,9 +92,6 @@ const createModal = (config = {}, fn, onCancel) => {
},

cancel: () => {
if (onCancel) {
onCancel.call(instance);
}
instance.close();
},

Expand Down
1 change: 1 addition & 0 deletions app/ui/client/lib/chatMessages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,7 @@ export class ChatMessages {
const file = new File([messageBlob], fileName, { type: contentType, lastModified: Date.now() });
fileUpload([{ file, name: fileName }], this.input, { rid, tmid });
} catch (e) {
messageBoxState.set(this.input, msg);
return true;
}
return true;
Expand Down