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

Jump to bottom

More correct filereader event firing #1796

Merged
merged 2 commits into from Dec 3, 2022
Merged

More correct filereader event firing #1796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a4852f
fix(FileReader): set `on[event]` listeners correctly
KhafraDev Dec 3, 2022
fae7a20
fix: always remove previous listener
KhafraDev Dec 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 30 additions & 0 deletions lib/fileapi/filereader.js
View file
Open in desktop
Expand Up @@ -182,8 +182,13 @@ class FileReader extends EventTarget {
set onloadend (fn) {
webidl.brandCheck(this, FileReader)

if (this[kEvents].loadend) {
this.removeEventListener('loadend', this[kEvents].loadend)
}

if (typeof fn === 'function') {
this[kEvents].loadend = fn
this.addEventListener('loadend', fn)
} else {
this[kEvents].loadend = null
}
Expand All @@ -198,8 +203,13 @@ class FileReader extends EventTarget {
set onerror (fn) {
webidl.brandCheck(this, FileReader)

if (this[kEvents].error) {
this.removeEventListener('error', this[kEvents].error)
}

if (typeof fn === 'function') {
this[kEvents].error = fn
this.addEventListener('error', fn)
} else {
this[kEvents].error = null
}
Expand All @@ -214,8 +224,13 @@ class FileReader extends EventTarget {
set onloadstart (fn) {
webidl.brandCheck(this, FileReader)

if (this[kEvents].loadstart) {
this.removeEventListener('loadstart', this[kEvents].loadstart)
}

if (typeof fn === 'function') {
this[kEvents].loadstart = fn
this.addEventListener('loadstart', fn)
} else {
this[kEvents].loadstart = null
}
Expand All @@ -230,8 +245,13 @@ class FileReader extends EventTarget {
set onprogress (fn) {
webidl.brandCheck(this, FileReader)

if (this[kEvents].progress) {
this.removeEventListener('progress', this[kEvents].progress)
}

if (typeof fn === 'function') {
this[kEvents].progress = fn
this.addEventListener('progress', fn)
} else {
this[kEvents].progress = null
}
Expand All @@ -246,8 +266,13 @@ class FileReader extends EventTarget {
set onload (fn) {
webidl.brandCheck(this, FileReader)

if (this[kEvents].load) {
this.removeEventListener('load', this[kEvents].load)
}

if (typeof fn === 'function') {
this[kEvents].load = fn
this.addEventListener('load', fn)
} else {
this[kEvents].load = null
}
Expand All @@ -262,8 +287,13 @@ class FileReader extends EventTarget {
set onabort (fn) {
webidl.brandCheck(this, FileReader)

if (this[kEvents].abort) {
this.removeEventListener('abort', this[kEvents].abort)
}

if (typeof fn === 'function') {
this[kEvents].abort = fn
this.addEventListener('abort', fn)
} else {
this[kEvents].abort = null
}
Expand Down
12 changes: 3 additions & 9 deletions lib/fileapi/util.js
View file
Open in desktop
Expand Up @@ -191,25 +191,19 @@ function readOperation (fr, blob, type, encodingName) {

/**
* @see https://w3c.github.io/FileAPI/#fire-a-progress-event
* @see https://dom.spec.whatwg.org/#concept-event-fire
* @param {string} e The name of the event
* @param {import('./filereader').FileReader} reader
*/
function fireAProgressEvent (e, reader) {
// The progress event e does not bubble. e.bubbles must be false
// The progress event e is NOT cancelable. e.cancelable must be false
const event = new ProgressEvent(e, {
bubbles: false,
cancelable: false
})

reader.dispatchEvent(event)
try {
// eslint-disable-next-line no-useless-call
reader[`on${e}`]?.call(reader, event)
} catch (err) {
// Prevent the error from being swallowed
queueMicrotask(() => {
throw err
})
}
}

/**
Expand Down