DGNum/demarches-normaliennes
11
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

2019-06-12-01 (#3954)

Browse source 
2019-06-12-01
This commit is contained in:
Pierre de La Morinerie 2019-06-12 12:16:14 +02:00 committed by GitHub
commit dad7e5ee4b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/javascript/shared/activestorage/ujs.js
View file

@ -6,11 +6,25 @@ const PROGRESS_EVENT = 'direct-upload:progress';
const ERROR_EVENT = 'direct-upload:error'; const ERROR_EVENT = 'direct-upload:error';
const END_EVENT = 'direct-upload:end'; const END_EVENT = 'direct-upload:end';
addEventListener(INITIALIZE_EVENT, ({ target, detail: { id, file } }) => { function addUploadEventListener(type, handler) {
addEventListener(type, event => {
// Internet Explorer and Edge will sometime replay Javascript events
// that were dispatched just before a page navigation (!), but without
// the event payload.
//
// Ignore these replayed events.
const isEventValid = event && event.detail && event.detail.id != undefined;
if (!isEventValid) return;
handler(event);
});
}
addUploadEventListener(INITIALIZE_EVENT, ({ target, detail: { id, file } }) => {
ProgressBar.init(target, id, file); ProgressBar.init(target, id, file);
}); });
addEventListener(START_EVENT, ({ target, detail: { id } }) => { addUploadEventListener(START_EVENT, ({ target, detail: { id } }) => {
ProgressBar.start(id); ProgressBar.start(id);
const button = target.form.querySelector('button.primary'); const button = target.form.querySelector('button.primary');
if (button) { if (button) {
@ -18,14 +32,14 @@ addEventListener(START_EVENT, ({ target, detail: { id } }) => {
} }
}); });
addEventListener(PROGRESS_EVENT, ({ detail: { id, progress } }) => { addUploadEventListener(PROGRESS_EVENT, ({ detail: { id, progress } }) => {
ProgressBar.progress(id, progress); ProgressBar.progress(id, progress);
}); });
addEventListener(ERROR_EVENT, ({ detail: { id, error } }) => { addUploadEventListener(ERROR_EVENT, ({ detail: { id, error } }) => {
ProgressBar.error(id, error); ProgressBar.error(id, error);
}); });
addEventListener(END_EVENT, ({ detail: { id } }) => { addUploadEventListener(END_EVENT, ({ detail: { id } }) => {
ProgressBar.end(id); ProgressBar.end(id);
}); });