Merge pull request #11997 from Snuffleupagus/nullish-coalescing

Add basic support for the nullish coalescing operator `??`
This commit is contained in:
Tim van der Meij 2020-06-13 00:07:32 +02:00 committed by GitHub
commit c809f00b3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 2 deletions

View File

@ -215,6 +215,12 @@ function createWebpackConfig(defines, output) {
options: {
presets: skipBabel ? undefined : ["@babel/preset-env"],
plugins: [
[
"@babel/plugin-proposal-nullish-coalescing-operator",
{
loose: true,
},
],
"@babel/plugin-transform-modules-commonjs",
[
"@babel/plugin-transform-runtime",

View File

@ -3,6 +3,7 @@
"version": "2.0.0",
"devDependencies": {
"@babel/core": "^7.10.1",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.1",
"@babel/plugin-transform-modules-commonjs": "^7.10.1",
"@babel/plugin-transform-runtime": "^7.10.1",
"@babel/preset-env": "^7.10.1",

View File

@ -448,7 +448,7 @@ class PDFThumbnailView {
get _thumbPageTitle() {
return this.l10n.get(
"thumb_page_title",
{ page: this.pageLabel !== null ? this.pageLabel : this.id },
{ page: this.pageLabel ?? this.id },
"Page {{page}}"
);
}
@ -456,7 +456,7 @@ class PDFThumbnailView {
get _thumbPageCanvas() {
return this.l10n.get(
"thumb_page_canvas",
{ page: this.pageLabel !== null ? this.pageLabel : this.id },
{ page: this.pageLabel ?? this.id },
"Thumbnail of Page {{page}}"
);
}