Skip to content

Commit

Permalink
fix(ivy): fix PR collision with static: true and new test
Browse files Browse the repository at this point in the history
This fixes a collision between angular#30639 and angular#30543 where the latter added
usages of @ViewChild without the static flag present, but the former
made the flag required.
  • Loading branch information
alxhub committed May 24, 2019
1 parent 84dd267 commit 4fdefc2
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions packages/core/test/acceptance/styling_next_spec.ts
Expand Up @@ -383,7 +383,7 @@ describe('new styling integration', () => {
map: any = {width: '111px', opacity: '0.5'};
width: string|null = '555px';

@ViewChild('dir', {read: DirThatSetsStyling})
@ViewChild('dir', {read: DirThatSetsStyling, static: true})
dir !: DirThatSetsStyling;
}

Expand Down Expand Up @@ -458,7 +458,7 @@ describe('new styling integration', () => {

map: any = {width: '555px', height: '555px'};

@ViewChild('dir', {read: DirThatSetsStyling})
@ViewChild('dir', {read: DirThatSetsStyling, static: true})
dir !: DirThatSetsStyling;
}

Expand Down

0 comments on commit 4fdefc2

Please sign in to comment.