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

FileLoader: text honors mimetype's charset as encoding #23292

Merged
merged 9 commits into from
Jan 24, 2022
Merged

FileLoader: text honors mimetype's charset as encoding #23292

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b65be81
honor encoding
ycw Jan 21, 2022
6956846
npm run lint-fix
ycw Jan 21, 2022
097ce1f
cmp idx
ycw Jan 21, 2022
b0a3d8d
lint
ycw Jan 21, 2022
7eac248
textual encoding
ycw Jan 21, 2022
275a846
record state
ycw Jan 21, 2022
bb37c45
new api `.setResponseType`
ycw Jan 21, 2022
1a6ae6b
rollback mmdloader
ycw Jan 22, 2022
40819e7
sniff encoding for 'text' kind
ycw Jan 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions src/loaders/FileLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@ class FileLoader extends Loader {
// An abort controller could be added within a future PR
} );

// record states ( avoid data race )
const mimeType = this.mimeType;
const responseType = this.responseType;

// start the fetch
fetch( req )
.then( response => {
Expand Down Expand Up @@ -147,7 +151,7 @@ class FileLoader extends Loader {
} )
.then( response => {

switch ( this.responseType ) {
switch ( responseType ) {

case 'arraybuffer':

Expand All @@ -163,7 +167,7 @@ class FileLoader extends Loader {
.then( text => {

const parser = new DOMParser();
return parser.parseFromString( text, this.mimeType );
return parser.parseFromString( text, mimeType );

} );

Expand All @@ -173,7 +177,20 @@ class FileLoader extends Loader {

default:

return response.text();
if ( mimeType === undefined ) {

return response.text();

} else {

// sniff encoding
const re = /charset="?([^;"\s]*)"?/i;
const exec = re.exec( mimeType );
const label = exec && exec[ 1 ] ? exec[ 1 ].toLowerCase() : undefined;
const decoder = new TextDecoder( label );
return response.arrayBuffer().then( ab => decoder.decode( ab ) );

}

}

Expand Down