fixed file-upload-button in MUC and added changes.md entry

530e7f9d · worlword · b23712ae · 530e7f9d · 530e7f9d · 530e7f9d
Commit 530e7f9d authored Apr 03, 2018 by worlword
Expand all Show whitespace changes
Inline Side-by-side

Showing with 961 additions and 538 deletions

CHANGES.md CHANGES.md +7 -0

dist/converse.js dist/converse.js +952 -538

src/converse-muc-views.js src/converse-muc-views.js +2 -0

No files found.
--- a/CHANGES.md
+++ b/CHANGES.md
 # Changelog

+## Http-File-Upload
+
+## New Features
+
+- files can now be send via http-file-upload (XEP-0363)
+- mp4 and mp3 files will now be playable directly in chat. 
+
 ## 4.0.0 (Unreleased)

 ## UI changes

--- a/dist/converse.js
+++ b/dist/converse.js
--- a/src/converse-muc-views.js
+++ b/src/converse-muc-views.js
@@ -412,6 +412,8 @@
                    'click .toggle-smiley ul.emoji-picker li': 'insertEmoji',
                    'click .toggle-clear': 'clearChatRoomMessages',
                    'click .toggle-call': 'toggleCall',
+                    'click .toggle-fileUpload': 'toggleFileUpload',
+                    'change .fileUpload_input': 'handleFileSelect',
                    'click .toggle-occupants': 'toggleOccupants',
                    'click .new-msgs-indicator': 'viewUnreadMessages',
                    'click .occupant': 'onOccupantClicked',