From 59832e1d1a595440dbb0cdc517c2c7953052eef9 Mon Sep 17 00:00:00 2001 From: Conduitry Date: Mon, 6 Mar 2017 19:38:45 -0500 Subject: [PATCH 1/2] allow using whitelisted globals themselves in tags --- src/generators/Generator.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/generators/Generator.js b/src/generators/Generator.js index feebc13263..e25fdc5a9b 100644 --- a/src/generators/Generator.js +++ b/src/generators/Generator.js @@ -99,7 +99,7 @@ export default class Generator { if ( globalWhitelist[ name ] ) { code.prependRight( node.start, `( '${name}' in root ? root.` ); - code.appendLeft( node.object.end, ` : ${name} )` ); + code.appendLeft( node.object ? node.object.end : node.end, ` : ${name} )` ); } else { code.prependRight( node.start, `root.` ); } @@ -361,4 +361,3 @@ export default class Generator { if ( visitor.leave ) visitor.leave( this, node ); } } - From af0372246d4eb14daf973f62bc87b6e963a4be52 Mon Sep 17 00:00:00 2001 From: Conduitry Date: Mon, 6 Mar 2017 19:48:29 -0500 Subject: [PATCH 2/2] unit test --- test/generator/globals-accessible-directly/_config.js | 7 +++++++ test/generator/globals-accessible-directly/main.html | 1 + 2 files changed, 8 insertions(+) create mode 100644 test/generator/globals-accessible-directly/_config.js create mode 100644 test/generator/globals-accessible-directly/main.html diff --git a/test/generator/globals-accessible-directly/_config.js b/test/generator/globals-accessible-directly/_config.js new file mode 100644 index 0000000000..ee7e79fd17 --- /dev/null +++ b/test/generator/globals-accessible-directly/_config.js @@ -0,0 +1,7 @@ +export default { + html: '', + + test ( assert, component, target ) { + assert.htmlEqual( target.innerHTML, 'NaN' ); + } +}; diff --git a/test/generator/globals-accessible-directly/main.html b/test/generator/globals-accessible-directly/main.html new file mode 100644 index 0000000000..349b4b1d32 --- /dev/null +++ b/test/generator/globals-accessible-directly/main.html @@ -0,0 +1 @@ +{{NaN}}