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

src: remove function hasTextDecoder in encoding.js #23625

Closed
wants to merge 2 commits into from
Closed

src: remove function hasTextDecoder in encoding.js #23625

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d50f11
src: remove function hasTextDecoder in
chichiwang Oct 12, 2018
4e92f72
src: return TextDecoder directly from factories
chichiwang Oct 12, 2018
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
13 changes: 3 additions & 10 deletions lib/internal/encoding.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,21 +341,15 @@ Object.defineProperties(
value: 'TextEncoder'
} });

const { hasConverter, TextDecoder } =
const TextDecoder =
process.binding('config').hasIntl ?
makeTextDecoderICU() :
makeTextDecoderJS();

function hasTextDecoder(encoding = 'utf-8') {
validateArgument(encoding, 'string', 'encoding', 'string');
return hasConverter(getEncodingFromLabel(encoding));
}

function makeTextDecoderICU() {
const {
decode: _decode,
getConverter,
hasConverter
} = internalBinding('icu');

class TextDecoder {
Expand Down Expand Up @@ -409,7 +403,7 @@ function makeTextDecoderICU() {
}
}

return { hasConverter, TextDecoder };
return TextDecoder;
}

function makeTextDecoderJS() {
Expand Down Expand Up @@ -497,7 +491,7 @@ function makeTextDecoderJS() {
}
}

return { hasConverter, TextDecoder };
return TextDecoder;
}

// Mix in some shared properties.
Expand Down Expand Up @@ -552,7 +546,6 @@ function makeTextDecoderJS() {

module.exports = {
getEncodingFromLabel,
hasTextDecoder,
TextDecoder,
TextEncoder
};