[FIX] Drag and drop disabled when file upload is disabled #16049
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MartinSchoeler
previously requested changes
Dec 23, 2019
app/ui/client/views/app/room.js
Outdated
| @@ -586,6 +597,11 @@ export const dropzoneEvents = { | |||
|
|
|||
| e.stopPropagation(); | |||
|
|
|||
| if (!userCanDrop() || !settings.get('FileUpload_Enabled')) { | |||
There was a problem hiding this comment.
I think here we can add the !settings.get('FileUpload_Enabled') to the userCanDrop instead of testing both
There was a problem hiding this comment.
Also, this check can be done earlier in the event, maybe right after removing the over class from the element
There was a problem hiding this comment.
same here: userCanDrop(this._id)
ggazzo
previously requested changes
Dec 26, 2019
app/ui/client/views/app/room.js
Outdated
| }, | ||
|
|
||
| dragAndDropLabel() { | ||
| if (!userCanDrop) { |
app/ui/client/views/app/room.js
Outdated
| @@ -586,6 +597,11 @@ export const dropzoneEvents = { | |||
|
|
|||
| e.stopPropagation(); | |||
|
|
|||
| if (!userCanDrop() || !settings.get('FileUpload_Enabled')) { | |||
There was a problem hiding this comment.
same here: userCanDrop(this._id)
MartinSchoeler
approved these changes
Jan 2, 2020
gabriellsh
added a commit
that referenced
this pull request
Jan 9, 2020
…default-favorite-channels * 'develop' of github.com:RocketChat/Rocket.Chat: (31 commits) fix space update on mongo, node and caddy [NEW] Enforce plain text emails converting from HTML when no text version supplied (#16063) [IMPROVE] Status Text form validation (#16121) [FIX] auto translate cache (#15768) [FIX] Save new password without confirmation (#16060) Disable PR Docker image build (#16141) [IMPROVE] Set the color of the cancel button on modals to #bdbebf for enhanced visibiity (#15913) [FIX] Break message-attachment text to the next line (#16039) [IMPROVE] Remove NRR (#16071) Add Cloud Info to translation dictionary (#16122) [FIX] Resolving console errors Administrations (#16139) [FIX] SafePorts: Ports 80, 8080 & 443 linked to respective protocols (#16108) [FIX] Drag and drop disabled when file upload is disabled (#16049) [FIX] Video message sent to wrong room (#16113) [FIX] "User not found" for direct messages (#16047) [BREAK] Removed room counter from sidebar (#16036) [FIX] Embedded style when using 'go' command (#16051) [NEW] Setting Top navbar in embedded mode (#16064) [FIX] Thread message icon overlapping text (#16083) ...
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #7816
Drag and Drop now is disabled when the File Upload is disabled.