Merge pull request #378 from rgarmsen2295/mm-316c

MM-316 Allows users to drag and drop files from their computer to the center pane or RHS to upload them
Этот коммит содержится в:
Christopher Speller
2015-08-18 08:46:14 -04:00
родитель ab197e9835 2c098d7711
Коммит 96d1eb1c80
16 изменённых файлов: 327 добавлений и 33 удалений

Просмотреть файл

@@ -34,6 +34,7 @@ var ChannelInfoModal = require('../components/channel_info_modal.jsx');
var AccessHistoryModal = require('../components/access_history_modal.jsx');
var ActivityLogModal = require('../components/activity_log_modal.jsx');
var RemovedFromChannelModal = require('../components/removed_from_channel_modal.jsx')
var FileUploadOverlay = require('../components/file_upload_overlay.jsx');
var AsyncClient = require('../utils/async_client.jsx');
@@ -224,4 +225,10 @@ global.window.setup_channel_page = function(team_name, team_type, team_id, chann
document.getElementById('removed_from_channel_modal')
);
React.render(
<FileUploadOverlay
overlayType='center' />,
document.getElementById('file_upload_overlay')
);
};