Fixed #7760 - Refactor forwardRef injects

primefaces · Jun 1, 2019 · a3b1759 · a3b1759
1 parent 5a94e4c
commit a3b1759
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 9 deletions.
diff --git a/src/app/components/accordion/accordion.ts b/src/app/components/accordion/accordion.ts
@@ -70,7 +70,11 @@ export class AccordionTab implements OnDestroy {
 
     loaded: boolean;
 
-    constructor( @Inject(forwardRef(() => Accordion)) public accordion: Accordion) {}
+    accordion: Accordion;
+
+    constructor( @Inject(forwardRef(() => Accordion)) accordion) {
+        this.accordion = accordion as Accordion;
+    }
 
     ngAfterContentInit() {
         this.templates.forEach((item) => {

diff --git a/src/app/components/contextmenu/contextmenu.ts b/src/app/components/contextmenu/contextmenu.ts
@@ -38,7 +38,11 @@ export class ContextMenuSub {
 
     @Input() root: boolean;
 
-    constructor(@Inject(forwardRef(() => ContextMenu)) public contextMenu: ContextMenu) { }
+    contextMenu: ContextMenu;
+
+    constructor(@Inject(forwardRef(() => ContextMenu)) contextMenu) {
+        this.contextMenu = contextMenu as ContextMenu;
+    }
 
     activeItem: any;
 

diff --git a/src/app/components/menu/menu.ts b/src/app/components/menu/menu.ts
@@ -24,8 +24,12 @@ import {RouterModule} from '@angular/router';
 export class MenuItemContent {
 
     @Input("pMenuItemContent") item: MenuItem;
+
+    menu: Menu;
 
-    constructor(@Inject(forwardRef(() => Menu)) public menu: Menu) {}
+    constructor(@Inject(forwardRef(() => Menu)) menu) {
+        this.menu = menu as Menu;
+    }
 }
 
 @Component({

diff --git a/src/app/components/organizationchart/organizationchart.ts b/src/app/components/organizationchart/organizationchart.ts
@@ -71,8 +71,12 @@ export class OrganizationChartNode {
     @Input() first: boolean;
 
     @Input() last: boolean;
+
+    chart: OrganizationChart;
 
-    constructor(@Inject(forwardRef(() => OrganizationChart)) public chart:OrganizationChart) {}
+    constructor(@Inject(forwardRef(() => OrganizationChart)) chart) {
+        this.chart = chart as OrganizationChart;
+    }
 
     get leaf(): boolean {
         return this.node.leaf == false ? false : !(this.node.children&&this.node.children.length);

diff --git a/src/app/components/slidemenu/slidemenu.ts b/src/app/components/slidemenu/slidemenu.ts
@@ -52,9 +52,13 @@ export class SlideMenuSub implements OnDestroy {
     @Input() easing: string = 'ease-out';
 
     @Input() index: number;
-
-    constructor(@Inject(forwardRef(() => SlideMenu)) public slideMenu: SlideMenu) {}
-
+
+    slideMenu: SlideMenu;
+
+    constructor(@Inject(forwardRef(() => SlideMenu)) slideMenu) {
+        this.slideMenu = slideMenu as SlideMenu;
+    }
+
     activeItem: any;
 
     itemClick(event, item: MenuItem, listitem: any) {

diff --git a/src/app/components/tieredmenu/tieredmenu.ts b/src/app/components/tieredmenu/tieredmenu.ts
@@ -47,8 +47,12 @@ export class TieredMenuSub {
 
     @Input() hideDelay: number = 250;
 
-    constructor(@Inject(forwardRef(() => TieredMenu)) public tieredMenu: TieredMenu, private cf: ChangeDetectorRef) {}
+    tieredMenu: TieredMenu;
 
+    constructor(@Inject(forwardRef(() => TieredMenu)) tieredMenu, private cf: ChangeDetectorRef) {
+        this.tieredMenu = tieredMenu as TieredMenu;
+    }
+
     activeItem: HTMLLIElement;
 
     hideTimeout: any;

diff --git a/src/app/components/tree/tree.ts b/src/app/components/tree/tree.ts
@@ -101,7 +101,11 @@ export class UITreeNode implements OnInit {
 
     @Input() lastChild: boolean;
 
-    constructor(@Inject(forwardRef(() => Tree)) public tree:Tree) {}
+    tree: Tree;
+
+    constructor(@Inject(forwardRef(() => Tree)) tree) {
+        this.tree = tree as Tree;
+    }
 
     draghoverPrev: boolean;