honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(ivy): fix merge errors (master is broken) (#22291) 

PR Close #22291
This commit is contained in:
Victor Berchet 2018-02-18 14:18:11 -08:00
parent 991300b86c
commit c30d329faa
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/core/test/render3/compiler_canonical/compiler_canonical_spec.ts
View File

@ -6,8 +6,8 @@
* found in the LICENSE file at https://angular.io/license * found in the LICENSE file at https://angular.io/license
*/ */
import {Component, ContentChild, ContentChildren, Directive, HostBinding, HostListener, Injectable, Input, NgModule, OnDestroy, Optional, Pipe, PipeTransform, QueryList, SimpleChanges, TemplateRef, ViewChild, ViewChildren, ViewContainerRef} from '../../src/core'; import {Component, ContentChild, ContentChildren, Directive, HostBinding, HostListener, Injectable, Input, NgModule, OnDestroy, Optional, Pipe, PipeTransform, QueryList, SimpleChanges, TemplateRef, ViewChild, ViewChildren, ViewContainerRef} from '../../../src/core';
import * as $r3$ from '../../src/core_render3_private_export'; import * as $r3$ from '../../../src/core_render3_private_export';
import {renderComponent, toHtml} from '../render_util'; import {renderComponent, toHtml} from '../render_util';
@ -189,7 +189,8 @@ describe('compiler specification', () => {
type: HostListenerDir, type: HostListenerDir,
factory: function HostListenerDir_Factory() { factory: function HostListenerDir_Factory() {
const $dir$ = new HostListenerDir(); const $dir$ = new HostListenerDir();
$r3$.ɵL('click', function HostListenerDir_click_Handler(event) { $dir$.onClick(); }); $r3$.ɵL(
'click', function HostListenerDir_click_Handler(event: any) { $dir$.onClick(); });
return $dir$; return $dir$;
}, },
}); });